Alternative to Simons original proposal

This commit is contained in:
HarryJohnso 2019-08-24 12:13:09 +10:00 committed by ligi
parent 539fc8f85e
commit 2eac57f68f
No known key found for this signature in database
GPG key ID: 8E81894010ABF23D
6 changed files with 14 additions and 26 deletions

View file

@ -51,7 +51,7 @@
<activity
android:name=".ui.PassListActivity"
android:label="@string/app_name"
android:theme="@style/AppBaseThemeNoActionbar">
android:theme="@style/AppThemeNoActionbar">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
@ -64,7 +64,7 @@
<activity
android:name=".ui.HelpActivity"
android:theme="@style/AppBaseThemeNoActionbar"/>
android:theme="@style/AppThemeNoActionbar"/>
<activity
android:name=".ui.PassEditActivity"/>
<activity
@ -1792,7 +1792,7 @@
<activity
android:name=".ui.PassViewActivity"
android:theme="@style/AppBaseThemeNoActionbar"
android:theme="@style/AppThemeNoActionbar"
android:label="@string/app_name"
android:exported="true"
android:parentActivityName=".ui.PassListActivity">

View file

@ -1,14 +1,6 @@
<resources xmlns:tools="http://schemas.android.com/tools">
<style name="AppBaseTheme" parent="Theme.AppCompat.DayNight.DarkActionBar">
<item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
<item name="colorPrimary">@color/primary</item>
<item name="colorPrimaryDark">@color/secondary</item>
<item name="colorAccent">@color/accent</item>
<item name="color">@color/secondary</item>
<item name="actionModeBackground">@color/secondary</item>
<item name="android:navigationBarColor">@android:color/black</item>
<style name="AppTheme" parent="AppBaseTheme">
<!-- <item name="android:navigationBarColor">@color/system_navigation_bar</item>-->
<item name="android:windowLightNavigationBar">false</item>
</style>
</resources>

View file

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="card_view_background">#424242</color>
<color name="system_navigation_bar">@android:color/black</color>
</resources>

View file

@ -1,14 +1,6 @@
<resources xmlns:tools="http://schemas.android.com/tools">
<style name="AppBaseTheme" parent="Theme.AppCompat.DayNight.DarkActionBar">
<item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
<item name="colorPrimary">@color/primary</item>
<item name="colorPrimaryDark">@color/secondary</item>
<item name="colorAccent">@color/accent</item>
<item name="color">@color/secondary</item>
<item name="actionModeBackground">@color/secondary</item>
<item name="android:navigationBarColor">@android:color/white</item>
<item name="android:windowLightNavigationBar">true</item>
</style>
<!-- <style name="AppTheme" parent="AppBaseTheme">-->
<!-- <item name="android:navigationBarColor">@color/system_navigation_bar</item>-->
<!-- <item name="android:windowLightNavigationBar">true</item>-->
<!-- </style>-->
</resources>

View file

@ -7,6 +7,7 @@
<color name="secondary">#ff2c51a7</color>
<color name="card_view_background">#f9f9f9</color>
<color name="system_navigation_bar">#ebebeb</color>
<color name="icon_green">#ffbfdf00</color>
</resources>

View file

@ -1,6 +1,6 @@
<resources xmlns:tools="http://schemas.android.com/tools">
<style name="AppBaseThemeNoActionbar" parent="AppBaseTheme">
<style name="AppThemeNoActionbar" parent="AppTheme">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>
@ -13,6 +13,8 @@
<item name="colorAccent">@color/accent</item>
<item name="color">@color/secondary</item>
<item name="actionModeBackground">@color/secondary</item>
<item name="android:navigationBarColor" tools:targetApi="27">@color/system_navigation_bar</item>
<item name="android:windowLightNavigationBar" tools:targetApi="27">true</item>
</style>