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

Fix theme problems

Browse Source
This commit is contained in:
Dominik Schürmann
2015-08-18 11:19:50 +02:00
parent 979605b5de
commit 2ef691b264
11 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenKeychain/src/main/res/layout/api_app_settings_activity.xml
View File

@@ -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"

2
OpenKeychain/src/main/res/layout/main_activity.xml
View File

@@ -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" />

4
OpenKeychain/src/main/res/layout/nfc_operation_activity.xml
View File

@@ -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>

2
OpenKeychain/src/main/res/layout/toolbar_inner_layout.xml
View File

@@ -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>

2
OpenKeychain/src/main/res/layout/toolbar_inner_layout_white.xml
View File

@@ -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>

2
OpenKeychain/src/main/res/layout/view_key_activity.xml
View File

@@ -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"

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

@@ -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>

18
OpenKeychain/src/main/res/values/themes.xml
View File

@@ -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>