From 8de6589c9d4d6b9278ed4f46da7adbb6b81f1e30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 6 May 2015 03:29:04 +0200
Subject: Renaming for consisitency

---
 .../keychain/ui/DecryptFilesFragment.java          |  11 +-
 .../src/main/res/layout/decrypt_file_fragment.xml  | 149 ---------------------
 .../src/main/res/layout/decrypt_files_fragment.xml | 149 +++++++++++++++++++++
 3 files changed, 154 insertions(+), 155 deletions(-)
 delete mode 100644 OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml
 create mode 100644 OpenKeychain/src/main/res/layout/decrypt_files_fragment.xml

(limited to 'OpenKeychain')

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java
index 96af45dd2..234362edc 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java
@@ -31,7 +31,6 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CheckBox;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import org.sufficientlysecure.keychain.Constants;
@@ -87,12 +86,12 @@ public class DecryptFilesFragment extends DecryptFragment {
      */
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.decrypt_file_fragment, container, false);
+        View view = inflater.inflate(R.layout.decrypt_files_fragment, container, false);
 
-        mFilename = (TextView) view.findViewById(R.id.decrypt_file_filename);
-        mDeleteAfter = (CheckBox) view.findViewById(R.id.decrypt_file_delete_after_decryption);
-        mDecryptButton = view.findViewById(R.id.decrypt_file_action_decrypt);
-        view.findViewById(R.id.decrypt_file_browse).setOnClickListener(new View.OnClickListener() {
+        mFilename = (TextView) view.findViewById(R.id.decrypt_files_filename);
+        mDeleteAfter = (CheckBox) view.findViewById(R.id.decrypt_files_delete_after_decryption);
+        mDecryptButton = view.findViewById(R.id.decrypt_files_action_decrypt);
+        view.findViewById(R.id.decrypt_files_browse).setOnClickListener(new View.OnClickListener() {
             public void onClick(View v) {
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
                     FileHelper.openDocument(DecryptFilesFragment.this, "*/*", REQUEST_CODE_INPUT);
diff --git a/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml
deleted file mode 100644
index 8374c6aad..000000000
--- a/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <ScrollView
-            android:fillViewport="true"
-            android:paddingTop="8dp"
-            android:layout_width="match_parent"
-            android:scrollbars="vertical"
-            android:layout_height="0dp"
-            android:layout_weight="1">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <View
-                    android:id="@+id/status_divider"
-                    android:layout_height="1dip"
-                    android:layout_width="match_parent"
-                    android:background="?android:attr/listDivider" />
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:paddingTop="4dp"
-                    android:paddingLeft="16dp"
-                    android:paddingRight="16dp"
-                    android:orientation="vertical">
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="?android:attr/listPreferredItemHeight"
-                        android:orientation="horizontal"
-
-                        android:id="@+id/decrypt_file_browse"
-                        android:clickable="true"
-                        android:background="?android:selectableItemBackground">
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="match_parent"
-                            android:paddingLeft="8dp"
-                            android:textAppearance="?android:attr/textAppearanceMedium"
-                            android:text="@string/label_file_colon"
-                            android:gravity="center_vertical" />
-
-                        <TextView
-                            android:id="@+id/decrypt_file_filename"
-                            android:paddingLeft="8dp"
-                            android:paddingRight="8dp"
-                            android:textAppearance="?android:attr/textAppearanceMedium"
-                            android:layout_width="match_parent"
-                            android:layout_height="match_parent"
-                            android:hint="@string/filemanager_title_open"
-                            android:drawableRight="@drawable/ic_folder_grey_24dp"
-                            android:drawablePadding="8dp"
-                            android:gravity="center_vertical" />
-                    </LinearLayout>
-
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="1dip"
-                        android:background="?android:attr/listDivider"
-                        android:layout_marginBottom="8dp" />
-
-                    <CheckBox
-                        android:id="@+id/decrypt_file_delete_after_decryption"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/label_delete_after_decryption" />
-
-                    <RelativeLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent">
-
-                        <TextView
-                            android:id="@+id/decrypt_file_action_decrypt"
-                            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:text="@string/btn_decrypt_verify_file"
-                            android:clickable="true"
-                            android:background="?android:selectableItemBackground"
-                            android:drawableRight="@drawable/ic_save_grey_24dp"
-                            android:drawablePadding="8dp"
-                            android:gravity="center_vertical"
-                            android:layout_alignParentBottom="true"
-                            android:layout_alignParentLeft="true"
-                            android:layout_alignParentStart="true" />
-
-                        <View
-                            android:layout_width="match_parent"
-                            android:layout_height="1dip"
-                            android:background="?android:attr/listDivider"
-                            android:layout_above="@+id/decrypt_file_action_decrypt" />
-
-                    </RelativeLayout>
-                </LinearLayout>
-            </LinearLayout>
-        </ScrollView>
-    </LinearLayout>
-
-    <!-- TODO: Use this layout later to hide file list -->
-    <LinearLayout
-        android:visibility="gone"
-        android:id="@+id/decrypt_content"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"></LinearLayout>
-
-    <LinearLayout
-        android:visibility="gone"
-        android:id="@+id/decrypt_error_overlay"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:gravity="center_vertical">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:text="@string/decrypt_invalid_text"
-            android:padding="16dp"
-            android:layout_gravity="center"
-            android:textColor="@color/android_red_light" />
-
-        <Button
-            android:id="@+id/decrypt_error_overlay_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@drawable/button_edgy"
-            android:textColor="@color/android_red_light"
-            android:text="@string/decrypt_invalid_button"
-            android:layout_gravity="center_horizontal" />
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/decrypt_files_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_files_fragment.xml
new file mode 100644
index 000000000..22ee7e09f
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/decrypt_files_fragment.xml
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <ScrollView
+            android:fillViewport="true"
+            android:paddingTop="8dp"
+            android:layout_width="match_parent"
+            android:scrollbars="vertical"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <View
+                    android:id="@+id/status_divider"
+                    android:layout_height="1dip"
+                    android:layout_width="match_parent"
+                    android:background="?android:attr/listDivider" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:paddingTop="4dp"
+                    android:paddingLeft="16dp"
+                    android:paddingRight="16dp"
+                    android:orientation="vertical">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="?android:attr/listPreferredItemHeight"
+                        android:orientation="horizontal"
+
+                        android:id="@+id/decrypt_files_browse"
+                        android:clickable="true"
+                        android:background="?android:selectableItemBackground">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
+                            android:paddingLeft="8dp"
+                            android:textAppearance="?android:attr/textAppearanceMedium"
+                            android:text="@string/label_file_colon"
+                            android:gravity="center_vertical" />
+
+                        <TextView
+                            android:id="@+id/decrypt_files_filename"
+                            android:paddingLeft="8dp"
+                            android:paddingRight="8dp"
+                            android:textAppearance="?android:attr/textAppearanceMedium"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:hint="@string/filemanager_title_open"
+                            android:drawableRight="@drawable/ic_folder_grey_24dp"
+                            android:drawablePadding="8dp"
+                            android:gravity="center_vertical" />
+                    </LinearLayout>
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="1dip"
+                        android:background="?android:attr/listDivider"
+                        android:layout_marginBottom="8dp" />
+
+                    <CheckBox
+                        android:id="@+id/decrypt_files_delete_after_decryption"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/label_delete_after_decryption" />
+
+                    <RelativeLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent">
+
+                        <TextView
+                            android:id="@+id/decrypt_files_action_decrypt"
+                            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:text="@string/btn_decrypt_verify_file"
+                            android:clickable="true"
+                            android:background="?android:selectableItemBackground"
+                            android:drawableRight="@drawable/ic_save_grey_24dp"
+                            android:drawablePadding="8dp"
+                            android:gravity="center_vertical"
+                            android:layout_alignParentBottom="true"
+                            android:layout_alignParentLeft="true"
+                            android:layout_alignParentStart="true" />
+
+                        <View
+                            android:layout_width="match_parent"
+                            android:layout_height="1dip"
+                            android:background="?android:attr/listDivider"
+                            android:layout_above="@+id/decrypt_files_action_decrypt" />
+
+                    </RelativeLayout>
+                </LinearLayout>
+            </LinearLayout>
+        </ScrollView>
+    </LinearLayout>
+
+    <!-- TODO: Use this layout later to hide file list -->
+    <LinearLayout
+        android:visibility="gone"
+        android:id="@+id/decrypt_content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"></LinearLayout>
+
+    <LinearLayout
+        android:visibility="gone"
+        android:id="@+id/decrypt_error_overlay"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:gravity="center_vertical">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:text="@string/decrypt_invalid_text"
+            android:padding="16dp"
+            android:layout_gravity="center"
+            android:textColor="@color/android_red_light" />
+
+        <Button
+            android:id="@+id/decrypt_error_overlay_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@drawable/button_edgy"
+            android:textColor="@color/android_red_light"
+            android:text="@string/decrypt_invalid_button"
+            android:layout_gravity="center_horizontal" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3