From 1f5f937d008673bd2d57d88b2f63dc35576c29e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Sun, 21 Sep 2014 18:10:51 +0200 Subject: Small UI fixes --- .../keychain/ui/ImportKeysListFragment.java | 5 +- .../keychain/ui/KeyListActivity.java | 2 +- .../src/main/res/layout/decrypt_file_fragment.xml | 55 +++++++++++----------- .../src/main/res/layout/decrypt_text_fragment.xml | 3 +- .../src/main/res/layout/encrypt_file_content.xml | 23 +++++---- .../src/main/res/layout/encrypt_file_fragment.xml | 1 - .../src/main/res/layout/encrypt_text_fragment.xml | 3 +- .../src/main/res/layout/import_keys_activity.xml | 3 +- 8 files changed, 44 insertions(+), 51 deletions(-) diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java index 4dbe23863..1efcfde27 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java @@ -77,7 +77,6 @@ public class ImportKeysListFragment extends ListFragment implements public ArrayList getSelectedData() { ArrayList result = new ArrayList(); for (ImportKeysListEntry entry : getSelectedEntries()) { - Log.d(Constants.TAG, "code" + Integer.toString(entry.hashCode())); result.add(mCachedKeyData.get(entry.hashCode())); } return result; @@ -149,8 +148,6 @@ public class ImportKeysListFragment extends ListFragment implements if (dataUri != null || bytes != null) { mLoaderState = new BytesLoaderState(bytes, dataUri); } else if (query != null) { - // TODO: this is used when updating a key. - // Currently it simply uses keyserver nr 0 Preferences prefs = Preferences.getPreferences(getActivity()); mLoaderState = new CloudLoaderState(query, prefs.getCloudSearchPrefs()); } @@ -165,6 +162,8 @@ public class ImportKeysListFragment extends ListFragment implements } }); + getListView().setFastScrollEnabled(true); + restartLoaders(); } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java index 24c15046a..f06531b01 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java @@ -120,7 +120,7 @@ public class KeyListActivity extends DrawerActivity { try { KeychainDatabase.debugBackup(this, false); Notify.showNotify(this, "Backup to debug_backup.db completed", Notify.Style.INFO); - } catch(IOException e) { + } catch (IOException e) { Log.e(Constants.TAG, "IO Error", e); Notify.showNotify(this, "IO Error: " + e.getMessage(), Notify.Style.ERROR); } diff --git a/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml index 6ff827894..394ef10f4 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml @@ -26,40 +26,40 @@ android:orientation="vertical"> + android:id="@+id/decrypt_file_browse" + android:clickable="true" + style="@style/SelectableItem"> + 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" /> + 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_action_collection" + android:drawablePadding="8dp" + android:gravity="center_vertical" /> + android:layout_width="match_parent" + android:layout_height="1dip" + android:background="?android:attr/listDivider" + android:layout_marginBottom="8dp" /> + android:layout_alignParentStart="true" /> + android:orientation="horizontal"> - + - + + android:id="@+id/encrypt_pager_mode" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" /> diff --git a/OpenKeychain/src/main/res/layout/encrypt_text_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_text_fragment.xml index f724604c2..83e2cf9ee 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_text_fragment.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_text_fragment.xml @@ -32,8 +32,7 @@ android:layout_height="wrap_content" android:clickable="true" style="@style/SelectableItem" - android:orientation="horizontal" - android:layout_marginBottom="8dp"> + android:orientation="horizontal"> - +