From 8279f84eb88a80e197514f2ab94e0e91416a19e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 15 Oct 2015 19:10:06 +0200
Subject: Add restore to backup fragment, cleanup, renamings

---
 .../main/res/layout/backup_restore_fragment.xml    |  93 +++++++++++++++
 .../src/main/res/layout/drawer_backup_fragment.xml |  71 ------------
 .../main/res/layout/encrypt_decrypt_fragment.xml   | 127 +++++++++++++++++++++
 .../layout/encrypt_decrypt_overview_fragment.xml   | 127 ---------------------
 4 files changed, 220 insertions(+), 198 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/layout/backup_restore_fragment.xml
 delete mode 100644 OpenKeychain/src/main/res/layout/drawer_backup_fragment.xml
 create mode 100644 OpenKeychain/src/main/res/layout/encrypt_decrypt_fragment.xml
 delete mode 100644 OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml

(limited to 'OpenKeychain/src/main/res/layout')

diff --git a/OpenKeychain/src/main/res/layout/backup_restore_fragment.xml b/OpenKeychain/src/main/res/layout/backup_restore_fragment.xml
new file mode 100644
index 000000000..ce97b7fd4
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/backup_restore_fragment.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:paddingTop="24dp">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingBottom="8dip"
+            android:text="@string/backup_text"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <TextView
+            style="@style/SectionHeader"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:text="@string/backup_section" />
+
+        <TextView
+            android:id="@+id/backup_all"
+            style="?android:attr/borderlessButtonStyle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:clickable="true"
+            android:drawablePadding="8dp"
+            android:drawableRight="@drawable/ic_save_grey_24dp"
+            android:gravity="center_vertical"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            android:text="@string/backup_all"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider" />
+
+        <TextView
+            android:id="@+id/backup_public_keys"
+            style="?android:attr/borderlessButtonStyle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:clickable="true"
+            android:drawablePadding="8dp"
+            android:drawableRight="@drawable/ic_save_grey_24dp"
+            android:gravity="center_vertical"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            android:text="@string/backup_public_keys"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <TextView
+            style="@style/SectionHeader"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:text="@string/restore_section" />
+
+        <TextView
+            android:id="@+id/restore"
+            style="?android:attr/borderlessButtonStyle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:clickable="true"
+            android:drawablePadding="8dp"
+            android:drawableRight="@drawable/ic_folder_grey_24dp"
+            android:gravity="center_vertical"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            android:text="@string/btn_decrypt_files"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:layout_marginBottom="8dp"
+            android:background="?android:attr/listDivider" />
+    </LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/drawer_backup_fragment.xml b/OpenKeychain/src/main/res/layout/drawer_backup_fragment.xml
deleted file mode 100644
index 96fba954b..000000000
--- a/OpenKeychain/src/main/res/layout/drawer_backup_fragment.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp"
-        android:paddingTop="24dp">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingBottom="8dip"
-            android:text="@string/backup_text"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
-
-        <TextView
-            style="@style/SectionHeader"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:text="@string/backup_section" />
-
-        <TextView
-            android:id="@+id/backup_all"
-            style="?android:attr/borderlessButtonStyle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:clickable="true"
-            android:drawablePadding="8dp"
-            android:drawableRight="@drawable/ic_save_grey_24dp"
-            android:gravity="center_vertical"
-            android:minHeight="?android:attr/listPreferredItemHeight"
-            android:paddingLeft="8dp"
-            android:paddingRight="8dp"
-            android:text="@string/backup_all"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:background="?android:attr/listDivider" />
-
-        <TextView
-            android:id="@+id/backup_public_keys"
-            style="?android:attr/borderlessButtonStyle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:clickable="true"
-            android:drawablePadding="8dp"
-            android:drawableRight="@drawable/ic_save_grey_24dp"
-            android:gravity="center_vertical"
-            android:minHeight="?android:attr/listPreferredItemHeight"
-            android:paddingLeft="8dp"
-            android:paddingRight="8dp"
-            android:text="@string/backup_public_keys"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:layout_marginBottom="8dp"
-            android:background="?android:attr/listDivider" />
-    </LinearLayout>
-
-</ScrollView>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/encrypt_decrypt_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_decrypt_fragment.xml
new file mode 100644
index 000000000..7bd919abc
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/encrypt_decrypt_fragment.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="4dp"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:orientation="vertical"
+        >
+
+        <TextView
+            style="@style/SectionHeader"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:text="@string/section_encrypt" />
+
+        <TextView
+            android:id="@+id/encrypt_files"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:clickable="true"
+            style="?android:attr/borderlessButtonStyle"
+            android:text="@string/btn_encrypt_files"
+            android:drawableRight="@drawable/ic_folder_grey_24dp"
+            android:drawablePadding="8dp"
+            android:gravity="center_vertical" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider" />
+
+        <TextView
+            android:id="@+id/encrypt_text"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:clickable="true"
+            style="?android:attr/borderlessButtonStyle"
+            android:text="@string/btn_encrypt_text"
+            android:drawableRight="@drawable/ic_comment_text_grey600_24dp"
+            android:drawablePadding="8dp"
+            android:gravity="center_vertical" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider" />
+
+        <TextView
+            style="@style/SectionHeader"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:text="@string/section_decrypt" />
+
+        <TextView
+            android:id="@+id/decrypt_files"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:clickable="true"
+            style="?android:attr/borderlessButtonStyle"
+            android:text="@string/btn_decrypt_files"
+            android:drawableRight="@drawable/ic_folder_grey_24dp"
+            android:drawablePadding="8dp"
+            android:gravity="center_vertical" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider" />
+
+        <LinearLayout
+            android:id="@+id/decrypt_from_clipboard"
+            android:layout_width="match_parent"
+            android:layout_height="?android:attr/listPreferredItemHeight"
+            android:clickable="true"
+            style="?android:attr/borderlessButtonStyle"
+            android:orientation="horizontal"
+            android:paddingLeft="8dp"
+            android:paddingRight="0dp"
+            tools:ignore="UseCompoundDrawables">
+
+            <TextView
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:layout_gravity="center_vertical"
+                android:text="@string/btn_decrypt_clipboard" />
+
+            <ImageView
+                android:id="@+id/clipboard_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:padding="8dp"
+                android:src="@drawable/ic_content_paste_grey_24dp"
+                android:layout_gravity="center_vertical" />
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dip"
+            android:background="?android:attr/listDivider"
+            android:layout_marginBottom="8dp" />
+    </LinearLayout>
+
+</ScrollView>
diff --git a/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml
deleted file mode 100644
index 7bd919abc..000000000
--- a/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="4dp"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp"
-        android:orientation="vertical"
-        >
-
-        <TextView
-            style="@style/SectionHeader"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:text="@string/section_encrypt" />
-
-        <TextView
-            android:id="@+id/encrypt_files"
-            android:paddingLeft="8dp"
-            android:paddingRight="8dp"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:minHeight="?android:attr/listPreferredItemHeight"
-            android:clickable="true"
-            style="?android:attr/borderlessButtonStyle"
-            android:text="@string/btn_encrypt_files"
-            android:drawableRight="@drawable/ic_folder_grey_24dp"
-            android:drawablePadding="8dp"
-            android:gravity="center_vertical" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:background="?android:attr/listDivider" />
-
-        <TextView
-            android:id="@+id/encrypt_text"
-            android:paddingLeft="8dp"
-            android:paddingRight="8dp"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:minHeight="?android:attr/listPreferredItemHeight"
-            android:clickable="true"
-            style="?android:attr/borderlessButtonStyle"
-            android:text="@string/btn_encrypt_text"
-            android:drawableRight="@drawable/ic_comment_text_grey600_24dp"
-            android:drawablePadding="8dp"
-            android:gravity="center_vertical" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:background="?android:attr/listDivider" />
-
-        <TextView
-            style="@style/SectionHeader"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:text="@string/section_decrypt" />
-
-        <TextView
-            android:id="@+id/decrypt_files"
-            android:paddingLeft="8dp"
-            android:paddingRight="8dp"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:minHeight="?android:attr/listPreferredItemHeight"
-            android:clickable="true"
-            style="?android:attr/borderlessButtonStyle"
-            android:text="@string/btn_decrypt_files"
-            android:drawableRight="@drawable/ic_folder_grey_24dp"
-            android:drawablePadding="8dp"
-            android:gravity="center_vertical" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:background="?android:attr/listDivider" />
-
-        <LinearLayout
-            android:id="@+id/decrypt_from_clipboard"
-            android:layout_width="match_parent"
-            android:layout_height="?android:attr/listPreferredItemHeight"
-            android:clickable="true"
-            style="?android:attr/borderlessButtonStyle"
-            android:orientation="horizontal"
-            android:paddingLeft="8dp"
-            android:paddingRight="0dp"
-            tools:ignore="UseCompoundDrawables">
-
-            <TextView
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:layout_gravity="center_vertical"
-                android:text="@string/btn_decrypt_clipboard" />
-
-            <ImageView
-                android:id="@+id/clipboard_icon"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:padding="8dp"
-                android:src="@drawable/ic_content_paste_grey_24dp"
-                android:layout_gravity="center_vertical" />
-
-        </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:background="?android:attr/listDivider"
-            android:layout_marginBottom="8dp" />
-    </LinearLayout>
-
-</ScrollView>
-- 
cgit v1.2.3