cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Small UI fixes

Browse Source
This commit is contained in:
Dominik Schürmann
2014-09-21 18:10:51 +02:00
parent 9bd3383b49
commit 1f5f937d00
8 changed files with 48 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java
View File

@@ -77,7 +77,6 @@ public class ImportKeysListFragment extends ListFragment implements
public ArrayList<ParcelableKeyRing> getSelectedData() { public ArrayList<ParcelableKeyRing> getSelectedData() {
ArrayList<ParcelableKeyRing> result = new ArrayList<ParcelableKeyRing>(); ArrayList<ParcelableKeyRing> result = new ArrayList<ParcelableKeyRing>();
for (ImportKeysListEntry entry : getSelectedEntries()) { for (ImportKeysListEntry entry : getSelectedEntries()) {
Log.d(Constants.TAG, "code" + Integer.toString(entry.hashCode()));
result.add(mCachedKeyData.get(entry.hashCode())); result.add(mCachedKeyData.get(entry.hashCode()));
} }
return result; return result;
@@ -149,8 +148,6 @@ public class ImportKeysListFragment extends ListFragment implements
if (dataUri != null || bytes != null) { if (dataUri != null || bytes != null) {
mLoaderState = new BytesLoaderState(bytes, dataUri); mLoaderState = new BytesLoaderState(bytes, dataUri);
} else if (query != null) { } else if (query != null) {
// TODO: this is used when updating a key.
// Currently it simply uses keyserver nr 0
Preferences prefs = Preferences.getPreferences(getActivity()); Preferences prefs = Preferences.getPreferences(getActivity());
mLoaderState = new CloudLoaderState(query, prefs.getCloudSearchPrefs()); mLoaderState = new CloudLoaderState(query, prefs.getCloudSearchPrefs());
} }
@@ -165,6 +162,8 @@ public class ImportKeysListFragment extends ListFragment implements
} }
}); });
getListView().setFastScrollEnabled(true);
restartLoaders(); restartLoaders();
} }

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
View File

@@ -120,7 +120,7 @@ public class KeyListActivity extends DrawerActivity {
try { try {
KeychainDatabase.debugBackup(this, false); KeychainDatabase.debugBackup(this, false);
Notify.showNotify(this, "Backup to debug_backup.db completed", Notify.Style.INFO); 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); Log.e(Constants.TAG, "IO Error", e);
Notify.showNotify(this, "IO Error: " + e.getMessage(), Notify.Style.ERROR); Notify.showNotify(this, "IO Error: " + e.getMessage(), Notify.Style.ERROR);
} }

63
OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml
View File

@@ -26,40 +26,40 @@
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <LinearLayout
android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeight"
android:orientation="horizontal"
android:id="@+id/decrypt_file_browse"
android:clickable="true"
style="@style/SelectableItem">
<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_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeight" android:layout_height="match_parent"
android:orientation="horizontal" android:hint="@string/filemanager_title_open"
android:drawableRight="@drawable/ic_action_collection"
android:id="@+id/decrypt_file_browse" android:drawablePadding="8dp"
android:clickable="true" android:gravity="center_vertical" />
style="@style/SelectableItem">
<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_action_collection"
android:drawablePadding="8dp"
android:gravity="center_vertical"/>
</LinearLayout> </LinearLayout>
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dip" android:layout_height="1dip"
android:background="?android:attr/listDivider" android:background="?android:attr/listDivider"
android:layout_marginBottom="8dp"/> android:layout_marginBottom="8dp" />
<CheckBox <CheckBox
android:id="@+id/decrypt_file_delete_after_decryption" android:id="@+id/decrypt_file_delete_after_decryption"
@@ -87,8 +87,7 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" android:layout_alignParentStart="true" />
android:layout_marginBottom="8dp" />
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"

3
OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml
View File

@@ -48,8 +48,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:clickable="true" android:clickable="true"
style="@style/SelectableItem" style="@style/SelectableItem"
android:orientation="horizontal" android:orientation="horizontal">
android:layout_marginBottom="8dp">
<TextView <TextView
android:paddingLeft="8dp" android:paddingLeft="8dp"

23
OpenKeychain/src/main/res/layout/encrypt_file_content.xml
View File

@@ -1,19 +1,18 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/content_frame"
android:id="@+id/content_frame" android:layout_marginLeft="@dimen/drawer_content_padding"
android:layout_marginLeft="@dimen/drawer_content_padding" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="match_parent"
android:layout_height="match_parent" android:orientation="vertical">
android:orientation="vertical">
<include layout="@layout/notify_area"/> <include layout="@layout/notify_area" />
<FrameLayout <FrameLayout
android:id="@+id/encrypt_pager_mode" android:id="@+id/encrypt_pager_mode"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" /> android:orientation="vertical" />
<fragment <fragment
android:id="@+id/encrypt_file_fragment" android:id="@+id/encrypt_file_fragment"

1
OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml
View File

@@ -34,7 +34,6 @@
android:paddingLeft="8dp" android:paddingLeft="8dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeight" android:layout_height="?android:attr/listPreferredItemHeight"
android:layout_marginBottom="8dp"
android:clickable="true" android:clickable="true"
style="@style/SelectableItem" style="@style/SelectableItem"
android:orientation="horizontal"> android:orientation="horizontal">

3
OpenKeychain/src/main/res/layout/encrypt_text_fragment.xml
View File

@@ -32,8 +32,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:clickable="true" android:clickable="true"
style="@style/SelectableItem" style="@style/SelectableItem"
android:orientation="horizontal" android:orientation="horizontal">
android:layout_marginBottom="8dp">
<TextView <TextView
android:paddingLeft="8dp" android:paddingLeft="8dp"

3
OpenKeychain/src/main/res/layout/import_keys_activity.xml
View File

@@ -4,7 +4,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
<include layout="@layout/notify_area"/> <include layout="@layout/notify_area" />
<org.sufficientlysecure.keychain.ui.widget.SlidingTabLayout <org.sufficientlysecure.keychain.ui.widget.SlidingTabLayout
android:id="@+id/import_sliding_tab_layout" android:id="@+id/import_sliding_tab_layout"
@@ -57,7 +57,6 @@
android:id="@+id/import_import" android:id="@+id/import_import"
android:paddingLeft="8dp" android:paddingLeft="8dp"
android:paddingRight="8dp" android:paddingRight="8dp"
android:layout_marginBottom="8dp"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"