X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Fimport_export_coordinatorlayout.xml;h=14ed65558c65a0906fa2826caa5a808a2c2f9e34;hb=af8631a31e1eeec0cb3e102f33c27008b93e6c80;hp=5803328693752d4c4477f97a041ad6d1bf78a207;hpb=9cb208c1f5c7a905f787f4ec4795a92e72195fba;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/res/layout/import_export_coordinatorlayout.xml b/app/src/main/res/layout/import_export_coordinatorlayout.xml
index 58033286..14ed6555 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-2020 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2018-2021 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
@@ -37,7 +37,7 @@
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
             android:background="?android:attr/colorBackground"
-            android:theme="@style/ThemeOverlay.AppCompat.DayNight.ActionBar" >
+            android:theme="@style/PrivacyBrowserAppBar" >
 
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/import_export_toolbar"
@@ -92,13 +92,13 @@
 
                         <!-- The encryption password. -->
                         <com.google.android.material.textfield.TextInputLayout
-                            android:id="@+id/password_encryption_textinputlayout"
+                            android:id="@+id/encryption_password_textinputlayout"
                             android:layout_height="wrap_content"
                             android:layout_width="match_parent"
                             app:passwordToggleEnabled="true" >
 
                             <com.google.android.material.textfield.TextInputEditText
-                                android:id="@+id/password_encryption_edittext"
+                                android:id="@+id/encryption_password_edittext"
                                 android:layout_height="wrap_content"
                                 android:layout_width="match_parent"
                                 android:hint="@string/password"
@@ -211,27 +211,6 @@
                                 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"
@@ -255,17 +234,6 @@
                             android:textColor="?attr/buttonTextColorSelector" />
                     </LinearLayout>
                 </androidx.cardview.widget.CardView>
-
-                <TextView
-                    android:id="@+id/import_export_storage_permission_textview"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_marginBottom="10dp"
-                    android:layout_marginStart="15dp"
-                    android:layout_marginEnd="15dp"
-                    android:text="@string/storage_permission_explanation"
-                    android:textAlignment="center" />
             </LinearLayout>
         </ScrollView>
     </LinearLayout>