aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'OpenKeychain/src/main')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptDecryptOverviewFragment.java (renamed from OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptOverviewFragment.java)36
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NavDrawerActivity.java5
-rw-r--r--OpenKeychain/src/main/res/drawable-hdpi/ic_lock_black_24dp.pngbin0 -> 397 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-hdpi/ic_lock_open_black_24dp.pngbin393 -> 0 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-hdpi/ic_lock_outline_black_24dp.pngbin398 -> 0 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-mdpi/ic_lock_black_24dp.pngbin0 -> 291 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-mdpi/ic_lock_open_black_24dp.pngbin295 -> 0 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-mdpi/ic_lock_outline_black_24dp.pngbin294 -> 0 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_black_24dp.pngbin0 -> 498 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_open_black_24dp.pngbin450 -> 0 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_outline_black_24dp.pngbin484 -> 0 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_black_24dp.pngbin0 -> 636 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_open_black_24dp.pngbin615 -> 0 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_outline_black_24dp.pngbin675 -> 0 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_black_24dp.pngbin0 -> 830 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_open_black_24dp.pngbin881 -> 0 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_outline_black_24dp.pngbin883 -> 0 bytes
-rw-r--r--OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml (renamed from OpenKeychain/src/main/res/layout/decrypt_overview_fragment.xml)47
-rw-r--r--OpenKeychain/src/main/res/values/strings.xml10
19 files changed, 73 insertions, 25 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptOverviewFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptDecryptOverviewFragment.java
index 8407a8ca7..a498d0763 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptOverviewFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptDecryptOverviewFragment.java
@@ -35,10 +35,12 @@ import org.sufficientlysecure.keychain.ui.util.SubtleAttentionSeeker;
import java.util.regex.Matcher;
-public class DecryptOverviewFragment extends Fragment {
+public class EncryptDecryptOverviewFragment extends Fragment {
- View mActionFile;
- View mActionFromClipboard;
+ View mEncryptFile;
+ View mEncryptText;
+ View mDecryptFile;
+ View mDecryptFromClipboard;
View mClipboardIcon;
@Override
@@ -49,13 +51,31 @@ public class DecryptOverviewFragment extends Fragment {
@Override
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
- View view = inflater.inflate(R.layout.decrypt_overview_fragment, container, false);
+ View view = inflater.inflate(R.layout.encrypt_decrypt_overview_fragment, container, false);
- mActionFile = view.findViewById(R.id.decrypt_files);
- mActionFromClipboard = view.findViewById(R.id.decrypt_from_clipboard);
+ mEncryptFile = view.findViewById(R.id.encrypt_files);
+ mEncryptText = view.findViewById(R.id.encrypt_text);
+ mDecryptFile = view.findViewById(R.id.decrypt_files);
+ mDecryptFromClipboard = view.findViewById(R.id.decrypt_from_clipboard);
mClipboardIcon = view.findViewById(R.id.clipboard_icon);
- mActionFile.setOnClickListener(new View.OnClickListener() {
+ mEncryptFile.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Intent encrypt = new Intent(getActivity(), EncryptFilesActivity.class);
+ startActivity(encrypt);
+ }
+ });
+
+ mEncryptText.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Intent encrypt = new Intent(getActivity(), EncryptTextActivity.class);
+ startActivity(encrypt);
+ }
+ });
+
+ mDecryptFile.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Intent filesDecrypt = new Intent(getActivity(), DecryptFilesActivity.class);
@@ -64,7 +84,7 @@ public class DecryptOverviewFragment extends Fragment {
}
});
- mActionFromClipboard.setOnClickListener(new View.OnClickListener() {
+ mDecryptFromClipboard.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Intent clipboardDecrypt = new Intent(getActivity(), DecryptTextActivity.class);
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NavDrawerActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NavDrawerActivity.java
index 035bed412..d82e1c246 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NavDrawerActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NavDrawerActivity.java
@@ -40,10 +40,7 @@ public abstract class NavDrawerActivity extends MaterialNavigationDrawer {
// create sections
addSection(newSection(getString(R.string.title_keys), R.drawable.ic_vpn_key_black_24dp, new KeyListFragment()));
-
- addSection(newSection(getString(R.string.title_encrypt_text), R.drawable.ic_lock_outline_black_24dp, new Intent(this, EncryptTextActivity.class)));
- addSection(newSection(getString(R.string.title_encrypt_files), R.drawable.ic_lock_outline_black_24dp, new Intent(this, EncryptFilesActivity.class)));
- addSection(newSection(getString(R.string.title_decrypt), R.drawable.ic_lock_open_black_24dp, new DecryptOverviewFragment()));
+ addSection(newSection(getString(R.string.nav_encrypt_decrypt), R.drawable.ic_lock_black_24dp, new EncryptDecryptOverviewFragment()));
addSection(newSection(getString(R.string.title_api_registered_apps), R.drawable.ic_apps_black_24dp, new AppsListFragment()));
// create bottom section
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_black_24dp.png
new file mode 100644
index 000000000..0888c6173
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_black_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_open_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_open_black_24dp.png
deleted file mode 100644
index 8ac075245..000000000
--- a/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_open_black_24dp.png
+++ /dev/null
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_outline_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_outline_black_24dp.png
deleted file mode 100644
index fc019db72..000000000
--- a/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_outline_black_24dp.png
+++ /dev/null
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_black_24dp.png
new file mode 100644
index 000000000..d18d4b667
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_black_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_open_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_open_black_24dp.png
deleted file mode 100644
index 9e6d0f0ac..000000000
--- a/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_open_black_24dp.png
+++ /dev/null
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_outline_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_outline_black_24dp.png
deleted file mode 100644
index 1df91994c..000000000
--- a/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_outline_black_24dp.png
+++ /dev/null
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_black_24dp.png
new file mode 100644
index 000000000..8856c70df
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_black_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_open_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_open_black_24dp.png
deleted file mode 100644
index 9cd050100..000000000
--- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_open_black_24dp.png
+++ /dev/null
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_outline_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_outline_black_24dp.png
deleted file mode 100644
index ae48a3bf7..000000000
--- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_outline_black_24dp.png
+++ /dev/null
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_black_24dp.png
new file mode 100644
index 000000000..c49d420e0
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_black_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_open_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_open_black_24dp.png
deleted file mode 100644
index 529a7724b..000000000
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_open_black_24dp.png
+++ /dev/null
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_outline_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_outline_black_24dp.png
deleted file mode 100644
index cf149aa37..000000000
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_outline_black_24dp.png
+++ /dev/null
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_black_24dp.png
new file mode 100644
index 000000000..db080df4e
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_black_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_open_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_open_black_24dp.png
deleted file mode 100644
index a0fe0156f..000000000
--- a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_open_black_24dp.png
+++ /dev/null
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_outline_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_outline_black_24dp.png
deleted file mode 100644
index 7460e0894..000000000
--- a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_outline_black_24dp.png
+++ /dev/null
Binary files differ
diff --git a/OpenKeychain/src/main/res/layout/decrypt_overview_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml
index c3e31bf11..465fd195e 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_overview_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml
@@ -12,10 +12,10 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
- android:text="@string/section_decrypt_files" />
+ android:text="@string/section_encrypt" />
<TextView
- android:id="@+id/decrypt_files"
+ android:id="@+id/encrypt_files"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:textAppearance="?android:attr/textAppearanceMedium"
@@ -24,23 +24,52 @@
android:minHeight="?android:attr/listPreferredItemHeight"
android:clickable="true"
style="@style/SelectableItem"
- android:text="@string/btn_decrypt_files"
+ android:text="@string/btn_encrypt_files"
android:drawableRight="@drawable/ic_action_collection"
android:drawablePadding="8dp"
android:gravity="center_vertical" />
- <View
+ <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="1dip"
- android:background="?android:attr/listDivider"
- android:layout_marginBottom="8dp" />
+ android:layout_height="wrap_content"
+ android:minHeight="?android:attr/listPreferredItemHeight"
+ android:clickable="true"
+ style="@style/SelectableItem"
+ android:text="@string/btn_encrypt_text"
+ android:drawableRight="@drawable/ic_action_copy"
+ android:drawablePadding="8dp"
+ android:gravity="center_vertical" />
<TextView
style="@style/SectionHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="32dp"
- android:text="@string/section_decrypt_text" />
+ 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="@style/SelectableItem"
+ android:text="@string/btn_decrypt_files"
+ android:drawableRight="@drawable/ic_action_collection"
+ 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"
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 23b549660..e01f1c049 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -62,6 +62,8 @@
<string name="section_decrypt_files">"Files"</string>
<string name="section_decrypt_text">"Text"</string>
<string name="section_certs">"Certificates"</string>
+ <string name="section_encrypt">"Encrypt"</string>
+ <string name="section_decrypt">"Decrypt"</string>
<!-- button -->
<string name="btn_decrypt_verify_file">"Decrypt, verify, and save file"</string>
@@ -82,9 +84,11 @@
<string name="btn_create_key">"Create key"</string>
<string name="btn_add_files">"Add file(s)"</string>
<string name="btn_add_share_decrypted_text">"Share decrypted text"</string>
- <string name="btn_decrypt_clipboard">"Decrypt from clipboard"</string>
+ <string name="btn_decrypt_clipboard">"Decrypt text from clipboard"</string>
<string name="btn_decrypt_and_verify">"and verify signatures"</string>
<string name="btn_decrypt_files">"Decrypt files"</string>
+ <string name="btn_encrypt_files">"Encrypt files"</string>
+ <string name="btn_encrypt_text">"Encrypt text"</string>
<!-- menu -->
<string name="menu_preferences">"Settings"</string>
@@ -584,9 +588,7 @@
<!-- Navigation Drawer -->
<string name="nav_keys">"Keys"</string>
- <string name="nav_encrypt_text">"Encrypt text"</string>
- <string name="nav_encrypt_files">"Encrypt files"</string>
- <string name="nav_decrypt">"Decrypt"</string>
+ <string name="nav_encrypt_decrypt">"Encrypt/Decrypt"</string>
<string name="nav_apps">"Apps"</string>
<string name="drawer_open">"Open navigation drawer"</string>
<string name="drawer_close">"Close navigation drawer"</string>