<!-- The theme has to be defined here because the activity uses a `NoActionBar` theme. -->
<com.google.android.material.appbar.AppBarLayout
+ android:id="@+id/appbar_layout"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:theme="@style/PrivacyBrowserAppBarLight" >
android:layout_width="match_parent"
app:layout_scrollFlags="scroll|enterAlways|snap" />
- <HorizontalScrollView
- android:layout_height="wrap_content"
- android:layout_width="match_parent"
- app:layout_scrollFlags="scroll|enterAlways|snap" >
-
- <LinearLayout
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:orientation="horizontal" >
-
- <com.google.android.material.tabs.TabLayout
- android:id="@+id/tablayout"
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- app:tabMode="scrollable" />
-
- <ImageView
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:layout_gravity="center_vertical"
- android:paddingStart="15dp"
- android:paddingEnd="15dp"
- android:src="@drawable/add_light"
- android:tint="@color/gray_700"
- android:onClick="addTab"
- android:contentDescription="@string/add_tab" />
- </LinearLayout>
- </HorizontalScrollView>
-
<!-- The find on page linear layout. It is initially `visibility="gone"`. -->
<LinearLayout
android:id="@+id/find_on_page_linearlayout"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:orientation="horizontal"
- android:visibility="gone" >
+ android:visibility="gone"
+ app:layout_scrollFlags="scroll|enterAlways|snap" >
<!-- `android:imeOptions="actionDone"` sets the keyboard to have a `check mark` key instead of a `new line` key. -->
<EditText
android:contentDescription="@string/close"
android:onClick="closeFindOnPage" />
</LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/tabs_linearlayout"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:orientation="horizontal"
+ app:layout_scrollFlags="scroll|enterAlways|snap" >
+
+ <ImageView
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:paddingStart="10dp"
+ android:paddingEnd="10dp"
+ android:src="@drawable/close_light"
+ android:tint="?attr/addTabIconTintColor"
+ android:onClick="closeTab"
+ android:contentDescription="@string/close_tab" />
+
+ <com.google.android.material.tabs.TabLayout
+ android:id="@+id/tablayout"
+ android:layout_height="wrap_content"
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ app:tabIndicatorGravity="top"
+ app:tabMode="scrollable" />
+
+ <ImageView
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:paddingStart="10dp"
+ android:paddingEnd="10dp"
+ android:src="@drawable/add_light"
+ android:tint="?attr/addTabIconTintColor"
+ android:onClick="addTab"
+ android:contentDescription="@string/add_tab" />
+ </LinearLayout>
</com.google.android.material.appbar.AppBarLayout>
<!-- `app:layout_behavior="@string/appbar_scrolling_view_behavior"` must be set on the sibling of AppBarLayout. -->
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior" >
- <!-- The frame layout allows the progress bar to float above the WebView. -->
- <FrameLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent">
-
- <androidx.viewpager.widget.ViewPager
+ <com.stoutner.privacybrowser.views.NoSwipeViewPager
android:id="@+id/webviewpager"
android:layout_width="match_parent"
android:layout_height="match_parent" />
-
- <!-- `android:max` changes the maximum `ProgressBar` value from 10000 to 100 to match progress percentage.
- `android:layout_height="2dp"` works best for API >= 23, but `3dp` is required for visibility on API <= 22.
- `tools:ignore="UnusedAttribute"` removes the lint warning about `progressTint` and `progressBackgroundTint` not applying to API < 21. -->
- <ProgressBar
- android:id="@+id/progress_bar"
- style="?android:attr/progressBarStyleHorizontal"
- android:layout_height="3dp"
- android:layout_width="match_parent"
- android:max="100"
- android:progressTint="?attr/progressTintColor"
- android:progressBackgroundTint="@color/transparent"
- android:visibility="gone"
- tools:ignore="UnusedAttribute" />
- </FrameLayout>
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
</RelativeLayout>