<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:android.support.design="http://schemas.android.com/apk/res-auto"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/root_framelayout"
android:layout_height="match_parent"
android:id="@+id/toolbar"
android:layout_height="wrap_content"
android:layout_width="match_parent"
- android.support.design:layout_scrollFlags="scroll|enterAlways|snap" />
+ app:layout_scrollFlags="scroll|enterAlways|snap"
+ android:visibility="gone" />
<!-- The find on page linear layout. It is initially `visibility="gone"`. -->
<LinearLayout
android:layout_width="match_parent"
android:orientation="horizontal"
android:visibility="gone"
- android.support.design:layout_scrollFlags="scroll|enterAlways|snap" >
+ 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:layout_height="wrap_content"
android:layout_width="wrap_content"
android:orientation="horizontal"
- android.support.design:layout_scrollFlags="scroll|enterAlways|snap" >
+ app:layout_scrollFlags="scroll|enterAlways|snap"
+ android:visibility="gone" >
+
+ <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"
- android.support.design:tabIndicatorGravity="top"
- android.support.design:tabMode="scrollable" />
+ app:tabIndicatorGravity="top"
+ app:tabMode="scrollable" />
<ImageView
android:layout_height="wrap_content"
android:id="@+id/swiperefreshlayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android.support.design:layout_behavior="@string/appbar_scrolling_view_behavior" >
+ app:layout_behavior="@string/appbar_scrolling_view_behavior" >
- <androidx.viewpager.widget.ViewPager
+ <com.stoutner.privacybrowser.views.NoSwipeViewPager
android:id="@+id/webviewpager"
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:layout_height="match_parent"
android:layout_width="wrap_content"
android:layout_gravity="start"
- android.support.design:headerLayout="@layout/navigation_header"
- android.support.design:menu="@menu/webview_navigation_menu"
- android.support.design:itemIconTint="?attr/navigationIconTintColor" />
+ app:headerLayout="@layout/navigation_header"
+ app:menu="@menu/webview_navigation_menu"
+ app:itemIconTint="?attr/navigationIconTintColor" />
<!-- Include the bookmarks drawer, which varies based on screen width. -->
<include layout="@layout/bookmarks_drawer" />
</androidx.drawerlayout.widget.DrawerLayout>
- <!-- `The full screen video frame layout is used to display full screen videos. It is initially `android:visibility="gone"` to hide it from view. -->
+ <!-- The full screen video frame layout is used to display full screen videos. It is initially `android:visibility="gone"` to hide it from view. -->
<FrameLayout
android:id="@+id/full_screen_video_framelayout"
android:layout_height="match_parent"
android:layout_width="match_parent"
android:visibility="gone" />
+
+ <!-- The loading blocklists relative layout displays when the app first starts. It is hidden once the blocklists are populated. -->
+ <RelativeLayout
+ android:id="@+id/loading_blocklists_relativelayout"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <ImageView
+ android:id="@+id/privacy_browser_logo"
+ android:layout_height="256dp"
+ android:layout_width="256dp"
+ android:layout_centerInParent="true"
+ android:src="@drawable/privacy_browser_foreground"
+ tools:ignore="contentDescription" />
+
+ <TextView
+ android:id="@+id/loading_blocklist_textview"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/privacy_browser_logo"
+ android:layout_centerHorizontal="true"
+ android:layout_margin="10dp"
+ android:textSize="16sp"
+ android:textAlignment="center"
+ android:textColor="?android:textColorPrimary" />
+ </RelativeLayout>
</FrameLayout>
\ No newline at end of file