diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-08-18 11:19:50 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-08-18 11:19:50 +0200 |
commit | 2ef691b264fcc985dfd94708c185ea6715a1972d (patch) | |
tree | 2ec3443e5ac84ea4a4898afa2e8aa80d04626265 /OpenKeychain/src/main | |
parent | 979605b5de92314736e43506ca262d5f57675485 (diff) | |
download | open-keychain-2ef691b264fcc985dfd94708c185ea6715a1972d.tar.gz open-keychain-2ef691b264fcc985dfd94708c185ea6715a1972d.tar.bz2 open-keychain-2ef691b264fcc985dfd94708c185ea6715a1972d.zip |
Fix theme problems
Diffstat (limited to 'OpenKeychain/src/main')
11 files changed, 27 insertions, 19 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index d422c3da1..dae34ff3a 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -701,7 +701,7 @@ --> <activity android:name=".ui.NfcOperationActivity" - android:theme="@style/Theme.Keychain.Light.Dialog.SecurityToken" + android:theme="@style/Theme.Keychain.Light.Dialog" android:allowTaskReparenting="true" android:launchMode="singleTop" android:taskAffinity=":Nfc" /> diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcOperationActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcOperationActivity.java index 6b48dbb4b..b811b218e 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcOperationActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcOperationActivity.java @@ -79,8 +79,8 @@ public class NfcOperationActivity extends BaseNfcActivity { @Override protected void initTheme() { mThemeChanger = new ThemeChanger(this); - mThemeChanger.setThemes(R.style.Theme_Keychain_Light_Dialog_SecurityToken, - R.style.Theme_Keychain_Dark_Dialog_SecurityToken); + mThemeChanger.setThemes(R.style.Theme_Keychain_Light_Dialog, + R.style.Theme_Keychain_Dark_Dialog); mThemeChanger.changeTheme(); } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/ThemeChanger.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/ThemeChanger.java index 75a0d1ea5..375483d89 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/ThemeChanger.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/ThemeChanger.java @@ -40,9 +40,9 @@ public class ThemeChanger { // hack to get holo design (which is not automatically applied due to activity's // Theme.NoDisplay) if (Constants.Pref.Theme.DARK.equals(preferences.getTheme())) { - return new ContextThemeWrapper(context, R.style.Theme_AppCompat_Dialog); + return new ContextThemeWrapper(context, R.style.Theme_Keychain_Dark); } else { - return new ContextThemeWrapper(context, R.style.Theme_AppCompat_Light_Dialog); + return new ContextThemeWrapper(context, R.style.Theme_Keychain_Light); } } 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 ea20b77b3..9557bf61e 100644 --- a/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml +++ b/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml @@ -29,7 +29,7 @@ android:minHeight="?attr/actionBarSize" android:background="?attr/colorPrimary" android:overScrollMode="always" - app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" + android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" app:popupTheme="@style/ThemeOverlay.AppCompat.Light" tools:ignore="UnusedAttribute" android:transitionGroup="false" diff --git a/OpenKeychain/src/main/res/layout/main_activity.xml b/OpenKeychain/src/main/res/layout/main_activity.xml index 45df0df71..e65969227 100644 --- a/OpenKeychain/src/main/res/layout/main_activity.xml +++ b/OpenKeychain/src/main/res/layout/main_activity.xml @@ -13,7 +13,7 @@ android:elevation="4dp" android:background="?attr/colorPrimary" android:minHeight="?attr/actionBarSize" - app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" + android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" app:popupTheme="@style/ThemeOverlay.AppCompat.Light" tools:ignore="UnusedAttribute" /> diff --git a/OpenKeychain/src/main/res/layout/nfc_operation_activity.xml b/OpenKeychain/src/main/res/layout/nfc_operation_activity.xml index 8b043861f..9a9738825 100644 --- a/OpenKeychain/src/main/res/layout/nfc_operation_activity.xml +++ b/OpenKeychain/src/main/res/layout/nfc_operation_activity.xml @@ -162,15 +162,13 @@ <Button android:id="@+id/nfc_activity_3_error_try_again" - style="?android:attr/borderlessButtonStyle" android:layout_width="wrap_content" android:layout_height="48dp" android:layout_alignParentEnd="true" android:layout_alignParentRight="true" android:layout_below="@+id/nfc_activity_3_placeholder" android:layout_margin="8dp" - android:text="@string/error_nfc_try_again" - android:textColor="@color/accent" /> + android:text="@string/error_nfc_try_again" /> </RelativeLayout> diff --git a/OpenKeychain/src/main/res/layout/toolbar_inner_layout.xml b/OpenKeychain/src/main/res/layout/toolbar_inner_layout.xml index 047225394..b3228ea06 100644 --- a/OpenKeychain/src/main/res/layout/toolbar_inner_layout.xml +++ b/OpenKeychain/src/main/res/layout/toolbar_inner_layout.xml @@ -20,7 +20,7 @@ android:layout_height="wrap_content" android:minHeight="?attr/actionBarSize" android:background="@color/transparent" - app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" + android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" app:popupTheme="@style/ThemeOverlay.AppCompat.Light" tools:ignore="UnusedAttribute" /> </merge>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/toolbar_inner_layout_white.xml b/OpenKeychain/src/main/res/layout/toolbar_inner_layout_white.xml index a626efb09..477967edd 100644 --- a/OpenKeychain/src/main/res/layout/toolbar_inner_layout_white.xml +++ b/OpenKeychain/src/main/res/layout/toolbar_inner_layout_white.xml @@ -20,7 +20,7 @@ android:layout_height="wrap_content" android:minHeight="?attr/actionBarSize" android:background="@color/transparent" - app:theme="@style/ThemeOverlay.AppCompat.ActionBar" + android:theme="@style/ThemeOverlay.AppCompat.ActionBar" app:popupTheme="@style/ThemeOverlay.AppCompat.Light" tools:ignore="UnusedAttribute" /> </merge>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml index 8e04f6899..32c63abb2 100644 --- a/OpenKeychain/src/main/res/layout/view_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml @@ -45,7 +45,7 @@ android:layout_height="wrap_content" android:minHeight="?attr/actionBarSize" android:overScrollMode="always" - app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" + android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" app:popupTheme="@style/ThemeOverlay.AppCompat.Light" tools:ignore="UnusedAttribute" android:transitionGroup="false" diff --git a/OpenKeychain/src/main/res/values/styles.xml b/OpenKeychain/src/main/res/values/styles.xml index c5710dadf..55c4e2220 100644 --- a/OpenKeychain/src/main/res/values/styles.xml +++ b/OpenKeychain/src/main/res/values/styles.xml @@ -34,4 +34,8 @@ <item name="android:background">?android:attr/listDivider</item> </style> + <style name="MaterialFlatButton" parent="@style/Widget.AppCompat.Button.Borderless"> + <item name="android:textColor">?attr/colorAccent</item> + </style> + </resources> diff --git a/OpenKeychain/src/main/res/values/themes.xml b/OpenKeychain/src/main/res/values/themes.xml index 2b1c00ba9..38cf8a3db 100644 --- a/OpenKeychain/src/main/res/values/themes.xml +++ b/OpenKeychain/src/main/res/values/themes.xml @@ -39,7 +39,7 @@ <item name="searchViewStyle">@style/Widget.Keychain.SearchView</item> <!-- style dialogs --> - <item name="alertDialogTheme">@style/Theme.Keychain.Light.Dialog</item> + <item name="alertDialogTheme">@style/Theme.Keychain.Light.Dialog.Alert</item> </style> <style name="Base.Theme.Keychain.Dark" parent="MaterialDrawerTheme.ActionBar"> @@ -82,7 +82,7 @@ <item name="searchViewStyle">@style/Widget.Keychain.SearchView</item> <!-- style dialogs --> - <item name="alertDialogTheme">@style/Theme.Keychain.Dark.Dialog</item> + <item name="alertDialogTheme">@style/Theme.Keychain.Dark.Dialog.Alert</item> </style> <style name="Theme.Keychain.Light" parent="Base.Theme.Keychain.Light"> @@ -111,20 +111,26 @@ <!--<item name="suggestionRowLayout">...</item>--> </style> - <style name="Theme.Keychain.Light.Dialog" parent="Base.Theme.AppCompat.Light.Dialog.Alert"> + <style name="Theme.Keychain.Light.Dialog.Alert" parent="Base.Theme.AppCompat.Light.Dialog.Alert"> <item name="colorAccent">#7bad45</item> </style> - <style name="Theme.Keychain.Dark.Dialog" parent="Base.Theme.AppCompat.Dialog.Alert"> + <style name="Theme.Keychain.Dark.Dialog.Alert" parent="Base.Theme.AppCompat.Dialog.Alert"> <item name="colorAccent">#268bd2</item> </style> - <style name="Theme.Keychain.Light.Dialog.SecurityToken" parent="Theme.AppCompat.Light.Dialog.MinWidth"> + <style name="Theme.Keychain.Light.Dialog" parent="Theme.AppCompat.Light.Dialog.MinWidth"> + <item name="colorAccent">#7bad45</item> + <item name="android:buttonStyle">@style/MaterialFlatButton</item> + <item name="windowActionBar">false</item> <item name="windowNoTitle">true</item> </style> - <style name="Theme.Keychain.Dark.Dialog.SecurityToken" parent="Theme.AppCompat.Dialog.MinWidth"> + <style name="Theme.Keychain.Dark.Dialog" parent="Theme.AppCompat.Dialog.MinWidth"> + <item name="colorAccent">#268bd2</item> + <item name="android:buttonStyle">@style/MaterialFlatButton</item> + <item name="windowActionBar">false</item> <item name="windowNoTitle">true</item> </style> |