From be1fae956bca27bb1f028fc8d723ef566f897765 Mon Sep 17 00:00:00 2001
From: john2020star <62385383+john2020star@users.noreply.github.com>
Date: Thu, 30 Apr 2020 18:36:26 +0800
Subject: [PATCH] Fix compatibility issue in styles_custom.xml (#201)

* Adding indeterminateTintMode="src_in"
* Add a new ThemeCustomNotTransparentto change the color of ProgressBar
---
 .../de/dennisguse/opentracks/util/DialogUtils.java     |  2 +-
 src/main/res/values/styles_custom.xml                  |  3 ++-
 src/main/res/values/themes_custom.xml                  | 10 +++++++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/util/DialogUtils.java b/src/main/java/de/dennisguse/opentracks/util/DialogUtils.java
index 6dfe25289..3c2dff4a6 100644
--- a/src/main/java/de/dennisguse/opentracks/util/DialogUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/util/DialogUtils.java
@@ -85,7 +85,7 @@ public class DialogUtils {
      * @param formatArgs       the format arguments for the message id
      */
     private static ProgressDialog createProgressDialog(boolean spinner, final Context context, int messageId, DialogInterface.OnCancelListener onCancelListener, Object... formatArgs) {
-        final ProgressDialog progressDialog = new ProgressDialog(context);
+        final ProgressDialog progressDialog = new ProgressDialog(context, R.style.ThemeCustomNotTransparent);
         progressDialog.setCancelable(true);
         progressDialog.setCanceledOnTouchOutside(false);
         progressDialog.setIcon(R.drawable.ic_dialog_info_24dp);
diff --git a/src/main/res/values/styles_custom.xml b/src/main/res/values/styles_custom.xml
index e8d6c8f1e..861d30775 100644
--- a/src/main/res/values/styles_custom.xml
+++ b/src/main/res/values/styles_custom.xml
@@ -9,10 +9,11 @@
     <style name="ProgressBarCustom" parent="android:Widget.Holo.ProgressBar.Horizontal">
         <item name="android:progressTint">@color/holo_orange_dark</item>
         <item name="android:indeterminateTint">@color/holo_orange_dark</item>
+        <item name="android:indeterminateTintMode">src_in</item>
     </style>
 
     <style name="SpinnerCustom" parent="android:Widget.Holo.Spinner">
         <item name="android:background">@drawable/spinner_background_holo_dark</item>
         <item name="android:dropDownSelector">@drawable/list_selector_holo_dark</item>
     </style>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/src/main/res/values/themes_custom.xml b/src/main/res/values/themes_custom.xml
index b913d67c0..e078da93c 100644
--- a/src/main/res/values/themes_custom.xml
+++ b/src/main/res/values/themes_custom.xml
@@ -35,6 +35,14 @@ limitations under the License.
         <item name="android:colorAccent">@color/holo_orange_dark</item>
         <item name="windowActionModeOverlay">true</item>
     </style>
+     
+    <style name="ThemeCustomNotTransparent" parent="ThemeCustom">
+        <!-- TODO Remove when moving to settings to fragments. -->
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:backgroundDimEnabled">true</item>
+    </style>
 
     <style name="ThemeCustomTransparent" parent="ThemeCustom">
         <!-- TODO Remove when moving to settings to fragments. -->
@@ -45,4 +53,4 @@ limitations under the License.
         <item name="android:windowIsFloating">true</item>
         <item name="android:backgroundDimEnabled">false</item>
     </style>
-</resources>
\ No newline at end of file
+</resources>