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

Merge branch 'auto_theme'

Browse Source
This commit is contained in:
Vincent Breitmoser
2022-12-27 22:27:00 +01:00
parent cdec29f5a9 f4bbc17751
commit e803a4064e
7 changed files with 43 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,7 +14,7 @@
android:elevation="4dp"
android:minHeight="?attr/actionBarSize"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
app:popupTheme="?popupOverlayStyle"
tools:ignore="UnusedAttribute" />
<FrameLayout

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

@@ -148,7 +148,7 @@
android:touchscreenBlocksFocus="false"
android:transitionGroup="false"
app:layout_collapseMode="pin"
app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
app:popupTheme="?popupOverlayStyle"
tools:ignore="UnusedAttribute" />
</com.google.android.material.appbar.CollapsingToolbarLayout>

6
OpenKeychain/src/main/res/values/arrays.xml
View File

@@ -32,11 +32,15 @@
</string-array>
<string-array name="theme_entries" translatable="false">
<item>@string/theme_dark</item>
<item>@string/theme_auto</item>
<item>@string/theme_light</item>
<item>@string/theme_dark</item>
</string-array>
<string-array name="theme_values" translatable="false">
<item>"auto"</item>
<item>"dark"</item>
<item>"light"</item>
</string-array>
<attr name="popupOverlayStyle" format="reference" />
</resources>

3
OpenKeychain/src/main/res/values/strings.xml
View File

@@ -314,8 +314,9 @@
<string name="usage_sign_and_encrypt">"Sign &amp; Encrypt"</string>
<string name="error">"Error"</string>
<string name="error_message">"Error: %s"</string>
<string name="theme_dark">"Dark"</string>
<string name="theme_auto">"Automatic"</string>
<string name="theme_light">"Light"</string>
<string name="theme_dark">"Dark"</string>
<string name="strip">"Strip it"</string>
<!-- sentences -->

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

@@ -7,6 +7,8 @@
<item name="colorAccent">#2196f3</item>
<item name="colorBrightToolbar">#dddddd</item>
<item name="popupOverlayStyle">@style/ThemeOverlay.AppCompat.Light</item>
<item name="colorFab">#2196f3</item>
<item name="colorFabPressed">#1976d2</item>
<item name="colorFabText">#fafafa</item>
@@ -48,6 +50,8 @@
<item name="colorAccent">#2196f3</item>
<item name="colorBrightToolbar">#808080</item>
<item name="popupOverlayStyle">@style/ThemeOverlay.AppCompat.Dark</item>
<item name="colorFab">#2196f3</item>
<item name="colorFabPressed">#1976d2</item>
<item name="colorFabText">#fafafa</item>