X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Fimport_export_coordinatorlayout.xml;h=d203ec30b3cb67c72ebbbb0ed777a256496f1ce5;hp=a38850aae5a5393bfe8410347ac38b8e2ab8b8c8;hb=27e33047e14466c84212bca02a14a7fc4ff15af8;hpb=ba40295dffd761ccdc95d3b46ca7acbad1f00d5e

diff --git a/app/src/main/res/layout/import_export_coordinatorlayout.xml b/app/src/main/res/layout/import_export_coordinatorlayout.xml
index a38850aa..d203ec30 100644
--- a/app/src/main/res/layout/import_export_coordinatorlayout.xml
+++ b/app/src/main/res/layout/import_export_coordinatorlayout.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright © 2018-2019 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2018-2020 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
@@ -18,17 +18,14 @@
   You should have received a copy of the GNU General Public License
   along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<!-- `android:fitsSystemWindows="true"` moves the AppBar below the status bar.
-    When it is specified the theme should include `<item name="android:windowTranslucentStatus">true</item>` to make the status bar a transparent, darkened overlay. -->
 <androidx.coordinatorlayout.widget.CoordinatorLayout
     android:id="@+id/import_export_coordinatorlayout"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_height="match_parent"
-    android:layout_width="match_parent"
-    android:fitsSystemWindows="true" >
+    android:layout_width="match_parent" >
 
-    <!-- the `LinearLayout` with `orientation="vertical"` moves the content below the `AppBarLayout`. -->
+    <!-- the linear layout with `orientation="vertical"` moves the content below the app bar layout. -->
     <LinearLayout
         android:layout_height="match_parent"
         android:layout_width="match_parent"
@@ -37,15 +34,13 @@
         <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/import_export_appbarlayout"
             android:layout_height="wrap_content"
-            android:layout_width="match_parent" >
+            android:layout_width="match_parent"
+            android:background="?android:attr/colorBackground" >
 
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/import_export_toolbar"
                 android:layout_height="wrap_content"
-                android:layout_width="match_parent"
-                android:background="?attr/colorPrimaryDark"
-                android:theme="?attr/appBarTextTheme"
-                app:popupTheme="?attr/popupsTheme" />
+                android:layout_width="match_parent" />
         </com.google.android.material.appbar.AppBarLayout>
 
         <ScrollView
@@ -116,7 +111,6 @@
                             android:layout_gravity="center_horizontal"
                             android:layout_marginTop="10dp"
                             android:text="@string/kitkat_password_encryption_message"
-                            android:textColor="?android:textColorPrimary"
                             android:textAlignment="center" />
 
                         <!-- OpenKeychain required message. -->
@@ -127,7 +121,6 @@
                             android:layout_gravity="center_horizontal"
                             android:layout_marginTop="10dp"
                             android:text="@string/openkeychain_required"
-                            android:textColor="?android:textColorPrimary"
                             android:textAlignment="center" />
                     </LinearLayout>
                 </androidx.cardview.widget.CardView>
@@ -184,7 +177,7 @@
                                 android:onClick="onClickRadioButton" />
                         </RadioGroup>
 
-                        <!-- Align the EditText and the select file button horizontally. -->
+                        <!-- Align the edit text and the select file button horizontally. -->
                         <LinearLayout
                             android:id="@+id/file_name_linearlayout"
                             android:layout_height="wrap_content"
@@ -192,7 +185,7 @@
                             android:orientation="horizontal"
                             android:layout_marginTop="10dp">
 
-                            <!-- `android.support.design.widget.TextInputLayout` makes the `android:hint` float above the `EditText`. -->
+                            <!-- The text input layout makes the hint float above the edit text. -->
                             <com.google.android.material.textfield.TextInputLayout
                                 android:layout_height="wrap_content"
                                 android:layout_width="0dp"
@@ -216,6 +209,27 @@
                                 android:onClick="browse" />
                         </LinearLayout>
 
+                        <!-- File notices. -->
+                        <TextView
+                            android:id="@+id/file_does_not_exist_textview"
+                            android:layout_height="wrap_content"
+                            android:layout_width="wrap_content"
+                            android:layout_gravity="center_horizontal"
+                            android:layout_margin="5dp"
+                            android:text="@string/file_does_not_exist"
+                            android:textColor="?attr/redTextColor"
+                            android:textAlignment="center" />
+
+                        <TextView
+                            android:id="@+id/file_exists_warning_textview"
+                            android:layout_height="wrap_content"
+                            android:layout_width="wrap_content"
+                            android:layout_gravity="center_horizontal"
+                            android:layout_margin="5dp"
+                            android:text="@string/file_exists_warning"
+                            android:textColor="?attr/redTextColor"
+                            android:textAlignment="center" />
+
                         <!-- OpenKeychain import instructions -->
                         <TextView
                             android:id="@+id/openkeychain_import_instructions_textview"
@@ -224,7 +238,6 @@
                             android:layout_gravity="center_horizontal"
                             android:layout_margin="5dp"
                             android:text="@string/openkeychain_import_instructions"
-                            android:textColor="?android:textColorPrimary"
                             android:textAlignment="center" />
 
                         <Button
@@ -250,7 +263,6 @@
                     android:layout_marginStart="15dp"
                     android:layout_marginEnd="15dp"
                     android:text="@string/storage_permission_explanation"
-                    android:textColor="?android:textColorPrimary"
                     android:textAlignment="center" />
             </LinearLayout>
         </ScrollView>