altosdroid: Use custom dialog themes for all dialogs

Instead of a mixture of custom application and standard dialog themes

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosDroid.java
index efb425787196d00f20b0bdde4248541689108da1..e2dfddf7a524f916fa81083cd4efab4f75a0c7a5 100644 (file)
--- a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -649,6 +649,13 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener,
                R.style.Extra
        };
 
+       static public int[] dialog_themes = {
+               R.style.Small_Dialog,
+               R.style.Medium_Dialog,
+               R.style.Large_Dialog,
+               R.style.Extra_Dialog
+       };
+
        @Override
        public void onCreate(Bundle savedInstanceState) {
                // Initialise preferences

diff --git a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/DeviceListActivity.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/DeviceListActivity.java
index 839fb5311df69fd3e388ced03b0e4817a0276b43..5a76d52d1af529f28bd16fd2ff63d2489b233258 100644 (file)
--- a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/DeviceListActivity.java
+++ b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/DeviceListActivity.java
@@ -55,6 +55,7 @@ public class DeviceListActivity extends Activity {
 
        @Override
        protected void onCreate(Bundle savedInstanceState) {
+               setTheme(AltosDroid.dialog_themes[AltosDroidPreferences.font_size()]);
                super.onCreate(savedInstanceState);
 
                // Setup the window

diff --git a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/IdleModeActivity.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/IdleModeActivity.java
index f10c718606bf0b78a9f1c9e400945e6d436fc8af..14ea814e93148acc7f61567ef654b5d19b69baab 100644 (file)
--- a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/IdleModeActivity.java
+++ b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/IdleModeActivity.java
@@ -74,6 +74,7 @@ public class IdleModeActivity extends Activity {
 
        @Override
        protected void onCreate(Bundle savedInstanceState) {
+               setTheme(AltosDroid.dialog_themes[AltosDroidPreferences.font_size()]);
                super.onCreate(savedInstanceState);
 
                // Setup the window

diff --git a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/IgniterActivity.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/IgniterActivity.java
index 9e5a14ed82e65eee708441d2d09c9d04048f4e46..2ae2a3e7415808b684fd85ef1b469960c4e481b7 100644 (file)
--- a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/IgniterActivity.java
+++ b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/IgniterActivity.java
@@ -101,7 +101,7 @@ class IgniterAdapter extends ArrayAdapter<IgniterItem> {
                if (position == selected_item)
                        item.igniter_view.setBackgroundColor(Color.RED);
                else
-                       item.igniter_view.setBackgroundColor(Color.BLACK);
+                       item.igniter_view.setBackgroundColor(Color.WHITE);
                return item.igniter_view;
        }
 }
@@ -339,6 +339,7 @@ public class IgniterActivity extends Activity {
 
        @Override
        protected void onCreate(Bundle savedInstanceState) {
+               setTheme(AltosDroid.dialog_themes[AltosDroidPreferences.font_size()]);
                super.onCreate(savedInstanceState);
 
                // Setup the window

diff --git a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/ManageFrequenciesActivity.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/ManageFrequenciesActivity.java
index 6e8e38dbb36043cf3385936fc1e0f0bf2c3b786d..dd7dc9670c9f1b43d5875e97643db2dce3ad9a86 100644 (file)
--- a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/ManageFrequenciesActivity.java
+++ b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/ManageFrequenciesActivity.java
@@ -236,6 +236,7 @@ public class ManageFrequenciesActivity extends Activity {
 
        @Override
        protected void onCreate(Bundle savedInstanceState) {
+               setTheme(AltosDroid.dialog_themes[AltosDroidPreferences.font_size()]);
                super.onCreate(savedInstanceState);
 
                // Setup the window

diff --git a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/MapTypeActivity.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/MapTypeActivity.java
index 167fb293372d9470ff04474b91cbef670cad922b..f5d8425261e3081bb2623bcb5902e3ee7993cc60 100644 (file)
--- a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/MapTypeActivity.java
+++ b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/MapTypeActivity.java
@@ -58,6 +58,7 @@ public class MapTypeActivity extends Activity {
 
        @Override
        protected void onCreate(Bundle savedInstanceState) {
+               setTheme(AltosDroid.dialog_themes[AltosDroidPreferences.font_size()]);
                super.onCreate(savedInstanceState);
 
                // Setup the window

diff --git a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/PreloadMapActivity.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/PreloadMapActivity.java
index a9f30f119c240973d0df8f11225964c6550e1c67..e6fd07fa84a2f1a24db0b511135197e82e51ce62 100644 (file)
--- a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/PreloadMapActivity.java
+++ b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/PreloadMapActivity.java
@@ -296,6 +296,7 @@ public class PreloadMapActivity extends Activity implements AltosLaunchSiteListe
 
        @Override
        protected void onCreate(Bundle savedInstanceState) {
+               setTheme(AltosDroid.dialog_themes[AltosDroidPreferences.font_size()]);
                super.onCreate(savedInstanceState);
 
                // Setup the window

diff --git a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/SetupActivity.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/SetupActivity.java
index 17757ca088231341bc0d09dd39592db4352428e7..ccdfc38ff36fb6e721273d132aed0cb5451f44d9 100644 (file)
--- a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/SetupActivity.java
+++ b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/SetupActivity.java
@@ -262,7 +262,7 @@ public class SetupActivity extends Activity {
 
        @Override
        protected void onCreate(Bundle savedInstanceState) {
-               setTheme(AltosDroid.themes[AltosDroidPreferences.font_size()]);
+               setTheme(AltosDroid.dialog_themes[AltosDroidPreferences.font_size()]);
                super.onCreate(savedInstanceState);
 
                AltosDebug.init(this);

diff --git a/altosdroid/app/src/main/res/values/CustomTheme.xml b/altosdroid/app/src/main/res/values/CustomTheme.xml
index 6a22a37a843a4cf1f41edcc6948aff4440776de7..c61451d93fa3019810dc838a3be5d2d7c14a0b74 100644 (file)
--- a/altosdroid/app/src/main/res/values/CustomTheme.xml
+++ b/altosdroid/app/src/main/res/values/CustomTheme.xml
@@ -21,4 +21,24 @@
        <item name="android:textSize">27sp</item>
        <item name="android:lineHeight">32sp</item>
     </style>
+    <style name="Small.Dialog" parent="android:Theme.Material.Light.Dialog">
+       <item name="android:textColor">#000000</item>
+       <item name="android:textSize">12sp</item>
+       <item name="android:lineHeight">14sp</item>
+    </style>
+    <style name="Medium.Dialog" parent="android:Theme.Material.Light.Dialog">
+       <item name="android:textColor">#000000</item>
+       <item name="android:textSize">15sp</item>
+       <item name="android:lineHeight">18sp</item>
+    </style>
+    <style name="Large.Dialog" parent="android:Theme.Material.Light.Dialog">
+       <item name="android:textColor">#000000</item>
+       <item name="android:textSize">20sp</item>
+       <item name="android:lineHeight">40sp</item>
+    </style>
+    <style name="Extra.Dialog" parent="android:Theme.Material.Light.Dialog">
+       <item name="android:textColor">#000000</item>
+       <item name="android:textSize">27sp</item>
+       <item name="android:lineHeight">32sp</item>
+    </style>
 </resources>

diff --git a/altosdroid/app/src/main/res/values/strings.xml b/altosdroid/app/src/main/res/values/strings.xml
index 144122097d3a5e08fd3725ac6a2604eeaa407200..5e8c91c4c2f640703f2fbff31e9d8c75e5f0f054 100644 (file)
--- a/altosdroid/app/src/main/res/values/strings.xml
+++ b/altosdroid/app/src/main/res/values/strings.xml
@@ -44,8 +44,8 @@
        <!-- <string name="map_type">Map Type</string> -->
 
        <!-- DeviceListActivity -->
-       <string name="scanning">scanning for devices…</string>
-       <string name="select_device">select a device to connect</string>
+       <string name="scanning">Scanning…</string>
+       <string name="select_device">Select device</string>
        <string name="none_paired">No devices have been paired</string>
        <string name="none_found">No devices found</string>
        <string name="title_paired_devices">Paired Devices</string>