From 95e534e1f5c8494d745b6fec016b21b754fa108e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Mon, 2 Feb 2015 17:19:27 +0100 Subject: UI experiments for app settings --- .../keychain/remote/ui/AppSettingsActivity.java | 31 ++++++++----- .../keychain/ui/BaseActivity.java | 8 ++++ .../main/res/layout/api_app_settings_activity.xml | 16 +++---- .../main/res/layout/api_app_settings_fragment.xml | 12 +++-- .../src/main/res/layout/foldable_linearlayout.xml | 52 +++++++++++----------- 5 files changed, 69 insertions(+), 50 deletions(-) (limited to 'OpenKeychain') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsActivity.java index 8f822a338..38e971f2b 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsActivity.java @@ -17,6 +17,7 @@ package org.sufficientlysecure.keychain.remote.ui; +import android.app.Activity; import android.content.Intent; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; @@ -59,9 +60,10 @@ public class AppSettingsActivity extends BaseActivity { new View.OnClickListener() { @Override public void onClick(View v) { - finish(); + cancel(); } }); + setTitle(null); mSettingsFragment = (AppSettingsHeaderFragment) getSupportFragmentManager().findFragmentById( R.id.api_app_settings_fragment); @@ -80,6 +82,13 @@ public class AppSettingsActivity extends BaseActivity { private void save() { mAllowedKeysFragment.saveAllowedKeys(); + setResult(Activity.RESULT_OK); + finish(); + } + + private void cancel() { + setResult(Activity.RESULT_CANCELED); + finish(); } @Override @@ -127,16 +136,16 @@ public class AppSettingsActivity extends BaseActivity { mAppSettings = new ProviderHelper(this).getApiAppSettings(appUri); mSettingsFragment.setAppSettings(mAppSettings); - String appName; - PackageManager pm = getPackageManager(); - try { - ApplicationInfo ai = pm.getApplicationInfo(mAppSettings.getPackageName(), 0); - appName = (String) pm.getApplicationLabel(ai); - } catch (PackageManager.NameNotFoundException e) { - // fallback - appName = mAppSettings.getPackageName(); - } - setTitle(appName); +// String appName; +// PackageManager pm = getPackageManager(); +// try { +// ApplicationInfo ai = pm.getApplicationInfo(mAppSettings.getPackageName(), 0); +// appName = (String) pm.getApplicationLabel(ai); +// } catch (PackageManager.NameNotFoundException e) { +// // fallback +// appName = mAppSettings.getPackageName(); +// } +// setTitle(appName); Uri accountsUri = appUri.buildUpon().appendPath(KeychainContract.PATH_ACCOUNTS).build(); Log.d(Constants.TAG, "accountsUri: " + accountsUri); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BaseActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BaseActivity.java index 7423e6828..7037b5536 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BaseActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BaseActivity.java @@ -26,6 +26,7 @@ import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.LinearLayout; import android.widget.TextView; import org.sufficientlysecure.keychain.R; @@ -126,5 +127,12 @@ public abstract class BaseActivity extends ActionBarActivity { ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)); } +// public void add() { +// LayoutInflater inflater = LayoutInflater.from(mToolbar.getContext()); +// View view = inflater.inflate(R.layout.api_app_settings_fragment, null); +// Toolbar.LayoutParams layoutParams = new Toolbar.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT); +//// layoutParams.gravity = Gravity.BOTTOM; +// mToolbar.addView(view, layoutParams); +// } } diff --git a/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml b/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml index 3da0d4e7d..ac579d006 100644 --- a/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml +++ b/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml @@ -1,5 +1,6 @@ @@ -9,12 +10,16 @@ - + - - @@ -17,7 +16,6 @@ android:id="@+id/api_app_settings_app_icon" android:layout_width="48dp" android:layout_height="48dp" - android:layout_alignParentBottom="true" android:layout_alignParentTop="true" android:layout_marginRight="6dp" android:src="@drawable/ic_launcher" /> @@ -31,12 +29,14 @@ android:gravity="center_vertical" android:orientation="vertical" android:text="Name (set in-code)" + android:textColor="@color/icons" android:textAppearance="?android:attr/textAppearanceMedium" /> @@ -44,6 +44,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/api_settings_package_name" + android:textColor="@color/icons" android:textAppearance="?android:attr/textAppearanceMedium" /> diff --git a/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml b/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml index d6165c1e0..cddc98ac5 100644 --- a/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml +++ b/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml @@ -1,37 +1,37 @@ - + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + android:id="@+id/foldableControl" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:clickable="true"> + android:id="@+id/foldableIcon" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_marginRight="10dp" + android:src="@drawable/ic_expand_more_black_24dp" /> + android:id="@+id/foldableText" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/none" + android:layout_gravity="center_vertical" + android:textColor="@color/emphasis" /> + android:id="@+id/foldableContainer" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:visibility="gone" /> \ No newline at end of file -- cgit v1.2.3