From a4fc7db3bc82d4a2222bcfc0cd33b298bc5d3430 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Fri, 7 Feb 2020 22:00:53 -0800 Subject: [PATCH] altosdroid: Use custom dialog themes for all dialogs Instead of a mixture of custom application and standard dialog themes Signed-off-by: Keith Packard --- .../altusmetrum/AltosDroid/AltosDroid.java | 7 +++++++ .../AltosDroid/DeviceListActivity.java | 1 + .../AltosDroid/IdleModeActivity.java | 1 + .../AltosDroid/IgniterActivity.java | 3 ++- .../AltosDroid/ManageFrequenciesActivity.java | 1 + .../AltosDroid/MapTypeActivity.java | 1 + .../AltosDroid/PreloadMapActivity.java | 1 + .../altusmetrum/AltosDroid/SetupActivity.java | 2 +- .../app/src/main/res/values/CustomTheme.xml | 20 +++++++++++++++++++ .../app/src/main/res/values/strings.xml | 4 ++-- 10 files changed, 37 insertions(+), 4 deletions(-) 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 efb42578..e2dfddf7 100644 --- 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 839fb531..5a76d52d 100644 --- 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 f10c7186..14ea814e 100644 --- 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 9e5a14ed..2ae2a3e7 100644 --- 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 { 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 6e8e38db..dd7dc967 100644 --- 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 167fb293..f5d84252 100644 --- 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 a9f30f11..e6fd07fa 100644 --- 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 17757ca0..ccdfc38f 100644 --- 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 6a22a37a..c61451d9 100644 --- a/altosdroid/app/src/main/res/values/CustomTheme.xml +++ b/altosdroid/app/src/main/res/values/CustomTheme.xml @@ -21,4 +21,24 @@ 27sp 32sp + + + + diff --git a/altosdroid/app/src/main/res/values/strings.xml b/altosdroid/app/src/main/res/values/strings.xml index 14412209..5e8c91c4 100644 --- a/altosdroid/app/src/main/res/values/strings.xml +++ b/altosdroid/app/src/main/res/values/strings.xml @@ -44,8 +44,8 @@ - scanning for devices… - select a device to connect + Scanning… + Select device No devices have been paired No devices found Paired Devices -- 2.30.2