Some initial refactoring of the themes (#213)

Context: issue: #210 I'm going to follow up with a special build for Android P.
sky-map-team · Sep 3, 2018 · f558523 · f558523
1 parent 8011aae
commit f558523
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 22 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -59,9 +59,9 @@ android {
       }
 
       // uses only open source software
-      fdroid {
-        resValue "string", "analytics_enabled", "false"
-      }
+      //fdroid {
+      //  resValue "string", "analytics_enabled", "false"
+      //}
     }
 }
 

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -48,15 +48,14 @@
         android:name=".StardroidApplication"
         android:icon="@drawable/skymap_logo"
         android:label="@string/app_name"
-        android:theme="@android:style/Theme.Holo">
+        android:theme="@style/AppTheme">
         <activity
             android:name=".activities.SplashScreenActivity"
             android:label="@string/app_name"
             android:screenOrientation="nosensor"
             android:theme="@android:style/Theme.Holo.NoActionBar.Fullscreen">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
-
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
@@ -69,7 +68,6 @@
             android:theme="@style/FullscreenTheme">
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH"/>
-
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
 
@@ -78,15 +76,12 @@
                 android:resource="@xml/searchable"/>
         </activity>
         <activity
-            android:name=".activities.EditSettingsActivity"
-            android:theme="@android:style/Theme.Holo"/>
+            android:name=".activities.EditSettingsActivity"/>
         <activity
-            android:name=".activities.ImageGalleryActivity"
-            android:theme="@android:style/Theme.Holo"/>
+            android:name=".activities.ImageGalleryActivity"/>
         <activity
             android:name=".activities.ImageDisplayActivity"
-            android:screenOrientation="portrait"
-            android:theme="@android:style/Theme.Holo"/>
+            android:screenOrientation="portrait"/>
         <activity
             android:name=".activities.DiagnosticActivity"
             android:label="@string/title_activity_diagnostic">

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -6,5 +6,4 @@
     <color name="low_accuracy">#ffff6900</color>
     <color name="bad_sensor">#ffff0000</color>
     <color name="absent_sensor">#ffa0a0a0</color>
-
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -1,14 +1,9 @@
 <resources>
-
-    <style name="title" parent="text">
-        <item name="android:textStyle">bold</item>
-    </style>
-
-    <style name="text">
-        <item name="android:paddingLeft">5px</item>
+    <!-- Main App Theme to make global changes easier -->
+    <style name = "AppTheme" parent="@android:style/Theme.Holo">
     </style>
 
-    <style name="FullscreenTheme" parent="@android:style/Theme.Holo">
+    <style name="FullscreenTheme" parent="AppTheme">
         <item name="android:actionBarStyle">@style/FullscreenActionBarStyle</item>
         <item name="android:windowActionBarOverlay">true</item>
         <item name="android:windowBackground">@null</item>
@@ -41,4 +36,12 @@
         <item name="android:paddingTop">5dp</item>
         <item name="android:paddingBottom">5dp</item>
     </style>
+
+    <style name="title" parent="text">
+        <item name="android:textStyle">bold</item>
+    </style>
+
+    <style name="text">
+        <item name="android:paddingLeft">5px</item>
+    </style>
 </resources>
diff --git a/gradle.properties b/gradle.properties
@@ -18,4 +18,4 @@
 # org.gradle.parallel=true
 
 org.gradle.daemon=true
-org.gradle.jvmargs=-Xmx2048M
+org.gradle.jvmargs=-Xmx2048M