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

ImportKeys: Refactoring

Browse Source
This commit is contained in:
Andrea Torlaschi
2016-08-17 11:14:23 +02:00
parent 28af02c6c7
commit 8ce6aba68e
3 changed files with 36 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -266,24 +266,24 @@ public class ImportKeysListFragment extends Fragment implements
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) { switch (item.getItemId()) {
case R.id.basic: case R.id.basic:
mAdvanced = false; setAdvanced(false);
mAdapter.setAdvanced(false);
mActivity.invalidateOptionsMenu();
binding.setAdvanced(mAdvanced);
return true; return true;
case R.id.advanced: case R.id.advanced:
mAdvanced = true; setAdvanced(true);
mAdapter.setAdvanced(true);
mActivity.invalidateOptionsMenu();
binding.setAdvanced(mAdvanced);
return true; return true;
} }
return false; return false;
} }
public void setAdvanced(boolean advanced) {
this.mAdvanced = advanced;
mAdapter.setAdvanced(advanced);
mActivity.invalidateOptionsMenu();
binding.setAdvanced(advanced);
}
@Override @Override
public void onRequestPermissionsResult(int requestCode, public void onRequestPermissionsResult(int requestCode,
@NonNull String[] permissions, @NonNull String[] permissions,

42
OpenKeychain/src/main/res/layout/import_keys_list_item.xml
View File

@@ -2,7 +2,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"> xmlns:app="http://schemas.android.com/apk/res-auto">
<data> <data>
<import type="android.view.View" /> <import type="android.view.View" alias="V" />
<import type="org.sufficientlysecure.keychain.keyimport.ImportKeysListEntry" /> <import type="org.sufficientlysecure.keychain.keyimport.ImportKeysListEntry" />
<variable name="advanced" type="boolean" /> <variable name="advanced" type="boolean" />
@@ -20,7 +20,8 @@
<LinearLayout <LinearLayout
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"
android:paddingTop="24dp">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -28,8 +29,7 @@
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="16dp" android:paddingBottom="16dp"
android:paddingLeft="16dp" android:paddingLeft="16dp"
android:paddingRight="16dp" android:paddingRight="16dp">
android:paddingTop="24dp">
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -69,7 +69,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:visibility="@{entry.revokedOrExpired ? View.VISIBLE : View.GONE}" android:visibility="@{entry.revokedOrExpired ? V.VISIBLE : V.GONE}"
app:keyExpired="@{entry.expired}" app:keyExpired="@{entry.expired}"
app:keyRevoked="@{entry.revoked}" /> app:keyRevoked="@{entry.revoked}" />
@@ -77,48 +77,36 @@
</LinearLayout> </LinearLayout>
<LinearLayout <!-- This empty layout is needed to get correct bottom padding in basic mode -->
<FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="8dp" android:paddingBottom="8dp"
android:visibility="@{(!advanced || nonInteractive) ? View.VISIBLE : View.GONE}" /> android:visibility="@{(!advanced || nonInteractive) ? V.VISIBLE : V.GONE}" />
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="8dp" android:padding="8dp"
android:visibility="@{(!advanced || nonInteractive) ? View.GONE : View.VISIBLE}"> android:visibility="@{(!advanced || nonInteractive) ? V.GONE : V.VISIBLE}">
<Button <Button
android:id="@+id/import_key" android:id="@+id/import_key"
android:layout_width="wrap_content" style="@style/CardViewActionButton"
android:layout_height="wrap_content" android:text="@string/btn_import" />
android:layout_centerVertical="true"
android:background="?android:attr/selectableItemBackground"
android:minHeight="0dp"
android:minWidth="0dp"
android:padding="8dp"
android:text="@string/btn_import"
android:textColor="@color/card_view_button" />
<ImageButton <ImageButton
android:id="@+id/expand" android:id="@+id/expand"
android:layout_width="wrap_content" style="@style/CardViewActionButton"
android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:background="?android:attr/selectableItemBackground"
android:minHeight="0dp"
android:minWidth="0dp"
android:padding="8dp"
android:src="@drawable/ic_expand_more_black_24dp" /> android:src="@drawable/ic_expand_more_black_24dp" />
</RelativeLayout> </RelativeLayout>
<LinearLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:visibility="@{advanced ? View.VISIBLE : View.GONE}"> android:visibility="@{advanced ? V.VISIBLE : V.GONE}">
<LinearLayout <LinearLayout
android:id="@+id/extra_container" android:id="@+id/extra_container"
@@ -138,7 +126,7 @@
</LinearLayout> </LinearLayout>
</LinearLayout> </FrameLayout>
</LinearLayout> </LinearLayout>

11
OpenKeychain/src/main/res/values/styles.xml
View File

@@ -11,6 +11,17 @@
<item name="android:textSize">17sp</item> <item name="android:textSize">17sp</item>
</style> </style>
<style name="CardViewActionButton">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_centerVertical">true</item>
<item name="android:background">?android:attr/selectableItemBackground</item>
<item name="android:minHeight">0dp</item>
<item name="android:minWidth">0dp</item>
<item name="android:padding">8dp</item>
<item name="android:textColor">@color/card_view_button</item>
</style>
<style name="SectionHeader"> <style name="SectionHeader">
<item name="android:drawableBottom">?attr/sectionHeaderDrawable</item> <item name="android:drawableBottom">?attr/sectionHeaderDrawable</item>
<item name="android:drawablePadding">4dp</item> <item name="android:drawablePadding">4dp</item>