caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge pull request #1092 from TebbeUbben/sw-same-color-scheme

Browse source 
Same color scheme for SW
This commit is contained in:
AdrianLxM 2018-06-09 13:37:31 +02:00 committed by GitHub
parent e1cc07ca11 934a7e6797
commit 3a9017ae10
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View file

@ -169,7 +169,7 @@
<activity <activity
android:name=".setupwizard.SetupWizardActivity" android:name=".setupwizard.SetupWizardActivity"
android:configChanges="orientation|keyboardHidden|screenSize" android:configChanges="orientation|keyboardHidden|screenSize"
android:theme="@style/AppTheme.SetupWizard" android:theme="@style/AppTheme.NoActionBar"
android:label="@string/title_activity_setup_wizard" /> android:label="@string/title_activity_setup_wizard" />
<activity android:name=".SingleFragmentActivity" <activity android:name=".SingleFragmentActivity"

6
app/src/main/res/values/colors.xml
View file

@ -75,10 +75,4 @@
<color name="deviationred">#72FF0000</color> <color name="deviationred">#72FF0000</color>
<color name="deviationblack">#72000000</color> <color name="deviationblack">#72000000</color>
<color name="swColorPrimary">#303030</color>
<color name="swColorPrimaryDark">#303030</color>
<color name="swColorAccent">#FFEB3B</color>
<color name="swColorBackground">#303030</color>
</resources> </resources>

7
app/src/main/res/values/styles.xml
View file

@ -28,12 +28,5 @@
<item name="android:textSize">10sp</item> <item name="android:textSize">10sp</item>
</style> </style>
<style name="AppTheme.SetupWizard" parent="Theme.AppCompat.NoActionBar">
<item name="colorPrimary">@color/swColorPrimary</item>
<item name="colorPrimaryDark">@color/swColorPrimaryDark</item>
<item name="colorAccent">@color/swColorAccent</item>
<item name="android:windowBackground">@color/swColorBackground</item>
</style>
<!-- Preferences --> <!-- Preferences -->
</resources> </resources>