Bladeren bron

Improvements in the app base theme.

seavenois 9 jaren geleden
bovenliggende
commit
f1b369706d
3 gewijzigde bestanden met toevoegingen van 18 en 3 verwijderingen
  1. 1 3
      app/src/main/AndroidManifest.xml
  2. 10 0
      app/src/main/res/values-v21/styles.xml
  3. 7 0
      app/src/main/res/values/styles.xml

+ 1 - 3
app/src/main/AndroidManifest.xml

@@ -24,7 +24,7 @@
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme"
+        android:theme="@style/Theme.AppBaseTheme"
         android:supportsRtl="true"
         android:isGame="false"
         android:fullBackupContent="@xml/backup"
@@ -43,7 +43,6 @@
         
         <activity
             android:name="com.ivalentin.margolariak.MainActivity"
-            android:theme="@style/Theme.NoTitle"
             android:windowSoftInputMode="stateHidden|adjustResize"
             android:configChanges="orientation"
             android:screenOrientation="portrait"
@@ -57,7 +56,6 @@
 
         <activity
             android:name=".SettingsActivity"
-            android:theme="@style/Theme.NoTitle"
             android:windowSoftInputMode="stateHidden|adjustResize"
             android:configChanges="orientation"
             android:screenOrientation="portrait"

+ 10 - 0
app/src/main/res/values-v21/styles.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="Theme.AppBaseTheme" parent="android:Theme.Material.Light">
+        <item name="android:colorPrimary">@color/background_menu</item>
+        <item name="android:colorPrimaryDark">@color/background_menu</item>
+        <item name="android:colorAccent">@color/background_menu</item>
+        <item name="android:colorBackground">@color/background_app</item>
+    </style>
+</resources>

+ 7 - 0
app/src/main/res/values/styles.xml

@@ -16,6 +16,13 @@
     <style name="AppTheme" parent="AppBaseTheme">
         <!-- All customizations that are NOT specific to a particular API-level can go here. -->
         <item name="android:textColorPrimary">#333333</item>
+        <item name="android:windowBackground">@color/background_menu</item>
+        <item name="android:colorBackground">@color/background_app</item>
+
+        <item name="colorPrimary">@color/background_menu</item>
+        <item name="colorPrimaryDark">@color/background_menu</item>
+        <item name="colorAccent">@color/background_menu</item>
+
     </style>
     
     <style name="Theme.Default" parent="Theme.AppCompat.Light"></style>