From 99b737f2378333bc4180b77ab6fa14b34606eb7c Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <andreas@schildbach.de>
Date: Sun, 20 Oct 2024 12:10:44 +0200
Subject: [PATCH] Constants: move status bar style as a constant from
 activities

---
 oeffi/src/de/schildbach/oeffi/Constants.java                  | 4 ++++
 oeffi/src/de/schildbach/oeffi/OeffiActivity.java              | 3 +--
 .../de/schildbach/oeffi/network/NetworkPickerActivity.java    | 3 +--
 oeffi/src/de/schildbach/oeffi/plans/PlanActivity.java         | 3 +--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/oeffi/src/de/schildbach/oeffi/Constants.java b/oeffi/src/de/schildbach/oeffi/Constants.java
index 203d40f..3394e43 100644
--- a/oeffi/src/de/schildbach/oeffi/Constants.java
+++ b/oeffi/src/de/schildbach/oeffi/Constants.java
@@ -17,7 +17,9 @@
 
 package de.schildbach.oeffi;
 
+import android.graphics.Color;
 import android.text.format.DateUtils;
+import androidx.activity.SystemBarStyle;
 import okhttp3.HttpUrl;
 
 import java.util.Locale;
@@ -65,4 +67,6 @@ public class Constants {
     public static final String DESTINATION_ARROW_PREFIX = Character.toString(Constants.CHAR_RIGHTWARDS_ARROW)
             + Constants.CHAR_THIN_SPACE;
     public static final String DESTINATION_ARROW_INVISIBLE_PREFIX = "     ";
+
+    public static final SystemBarStyle STATUS_BAR_STYLE = SystemBarStyle.dark(Color.TRANSPARENT);
 }
diff --git a/oeffi/src/de/schildbach/oeffi/OeffiActivity.java b/oeffi/src/de/schildbach/oeffi/OeffiActivity.java
index 2a6edc4..5b66bc6 100644
--- a/oeffi/src/de/schildbach/oeffi/OeffiActivity.java
+++ b/oeffi/src/de/schildbach/oeffi/OeffiActivity.java
@@ -31,7 +31,6 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.activity.ComponentActivity;
 import androidx.activity.EdgeToEdge;
-import androidx.activity.SystemBarStyle;
 import de.schildbach.oeffi.network.NetworkResources;
 import de.schildbach.oeffi.util.ErrorReporter;
 import de.schildbach.pte.NetworkId;
@@ -47,7 +46,7 @@ public abstract class OeffiActivity extends ComponentActivity {
 
     @Override
     protected void onCreate(final Bundle savedInstanceState) {
-        EdgeToEdge.enable(this, SystemBarStyle.dark(Color.TRANSPARENT));
+        EdgeToEdge.enable(this, Constants.STATUS_BAR_STYLE);
         super.onCreate(savedInstanceState);
         this.application = (Application) getApplication();
         this.prefs = PreferenceManager.getDefaultSharedPreferences(this);
diff --git a/oeffi/src/de/schildbach/oeffi/network/NetworkPickerActivity.java b/oeffi/src/de/schildbach/oeffi/network/NetworkPickerActivity.java
index d5e579b..23e5757 100644
--- a/oeffi/src/de/schildbach/oeffi/network/NetworkPickerActivity.java
+++ b/oeffi/src/de/schildbach/oeffi/network/NetworkPickerActivity.java
@@ -40,7 +40,6 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.activity.ComponentActivity;
 import androidx.activity.EdgeToEdge;
-import androidx.activity.SystemBarStyle;
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.core.content.ContextCompat;
@@ -112,7 +111,7 @@ public class NetworkPickerActivity extends ComponentActivity implements Location
 
     @Override
     protected void onCreate(final Bundle savedInstanceState) {
-        EdgeToEdge.enable(this, SystemBarStyle.dark(Color.TRANSPARENT));
+        EdgeToEdge.enable(this, Constants.STATUS_BAR_STYLE);
         super.onCreate(savedInstanceState);
 
         prefs = PreferenceManager.getDefaultSharedPreferences(this);
diff --git a/oeffi/src/de/schildbach/oeffi/plans/PlanActivity.java b/oeffi/src/de/schildbach/oeffi/plans/PlanActivity.java
index 01d7efa..ec92162 100644
--- a/oeffi/src/de/schildbach/oeffi/plans/PlanActivity.java
+++ b/oeffi/src/de/schildbach/oeffi/plans/PlanActivity.java
@@ -37,7 +37,6 @@ import android.widget.TextView;
 import android.widget.ViewAnimator;
 import androidx.activity.ComponentActivity;
 import androidx.activity.EdgeToEdge;
-import androidx.activity.SystemBarStyle;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
@@ -119,7 +118,7 @@ public class PlanActivity extends ComponentActivity {
 
     @Override
     protected void onCreate(final Bundle savedInstanceState) {
-        EdgeToEdge.enable(this, SystemBarStyle.dark(Color.TRANSPARENT));
+        EdgeToEdge.enable(this, Constants.STATUS_BAR_STYLE);
         super.onCreate(savedInstanceState);
         this.application = (Application) getApplication();