From 9e8529f6403442571ff168038d29fbd996298bf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20K=C3=BCrten?= <sebastian@mobanisto.de>
Date: Wed, 16 Feb 2022 11:52:12 +0100
Subject: [PATCH] Move showOnboardingDialog() and styles to mailbox module
---
.../android/dontkillmelib/PowerUtils.java | 9 ---------
.../src/main/res/values/styles.xml | 12 -----------
.../AbstractDoNotKillMeFragment.java | 2 +-
.../android/dontkillme/DoNotKillMeUtils.java | 20 +++++++++++++++++++
.../mailbox/android/dontkillme/PowerView.java | 2 +-
.../android/dontkillme/XiaomiView.java | 2 +-
.../src/main/res/values/styles.xml | 2 ++
7 files changed, 25 insertions(+), 24 deletions(-)
delete mode 100644 dont-kill-me-lib/src/main/res/values/styles.xml
create mode 100644 mailbox-android/src/main/java/org/briarproject/mailbox/android/dontkillme/DoNotKillMeUtils.java
diff --git a/dont-kill-me-lib/src/main/java/org/briarproject/android/dontkillmelib/PowerUtils.java b/dont-kill-me-lib/src/main/java/org/briarproject/android/dontkillmelib/PowerUtils.java
index 361d0400..36cab27c 100644
--- a/dont-kill-me-lib/src/main/java/org/briarproject/android/dontkillmelib/PowerUtils.java
+++ b/dont-kill-me-lib/src/main/java/org/briarproject/android/dontkillmelib/PowerUtils.java
@@ -14,7 +14,6 @@ import java.util.List;
import java.util.Scanner;
import androidx.annotation.Nullable;
-import androidx.appcompat.app.AlertDialog;
import static android.content.Context.POWER_SERVICE;
import static android.content.pm.PackageManager.MATCH_DEFAULT_ONLY;
@@ -49,14 +48,6 @@ public class PowerUtils {
return i;
}
- public static void showOnboardingDialog(Context ctx, String text) {
- new AlertDialog.Builder(ctx, R.style.OnboardingDialogTheme)
- .setMessage(text)
- .setNeutralButton(R.string.got_it,
- (dialog, which) -> dialog.cancel())
- .show();
- }
-
/**
* Determine whether a Huawei "Protected apps" feature is available on the
* device.
diff --git a/dont-kill-me-lib/src/main/res/values/styles.xml b/dont-kill-me-lib/src/main/res/values/styles.xml
deleted file mode 100644
index b608b8fd..00000000
--- a/dont-kill-me-lib/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
- <style name="OnboardingDialogTheme" parent="Theme.AppCompat.DayNight.Dialog.MinWidth" />
-
- <style name="DoNotKillMeButton" parent="Widget.AppCompat.Button.Colored" />
-
- <style name="HelpButton" parent="Widget.AppCompat.Button.Borderless">
- <item name="android:tint">#418cd8</item>
- </style>
-
-</resources>
diff --git a/mailbox-android/src/main/java/org/briarproject/mailbox/android/dontkillme/AbstractDoNotKillMeFragment.java b/mailbox-android/src/main/java/org/briarproject/mailbox/android/dontkillme/AbstractDoNotKillMeFragment.java
index 7bdd35e8..b99c26ba 100644
--- a/mailbox-android/src/main/java/org/briarproject/mailbox/android/dontkillme/AbstractDoNotKillMeFragment.java
+++ b/mailbox-android/src/main/java/org/briarproject/mailbox/android/dontkillme/AbstractDoNotKillMeFragment.java
@@ -23,7 +23,7 @@ import androidx.fragment.app.Fragment;
import static android.view.View.INVISIBLE;
import static android.view.View.VISIBLE;
import static org.briarproject.android.dontkillmelib.PowerUtils.getDozeWhitelistingIntent;
-import static org.briarproject.android.dontkillmelib.PowerUtils.showOnboardingDialog;
+import static org.briarproject.mailbox.android.dontkillme.DoNotKillMeUtils.showOnboardingDialog;
public abstract class AbstractDoNotKillMeFragment extends Fragment
implements OnCheckedChangedListener,
diff --git a/mailbox-android/src/main/java/org/briarproject/mailbox/android/dontkillme/DoNotKillMeUtils.java b/mailbox-android/src/main/java/org/briarproject/mailbox/android/dontkillme/DoNotKillMeUtils.java
new file mode 100644
index 00000000..f3f0b799
--- /dev/null
+++ b/mailbox-android/src/main/java/org/briarproject/mailbox/android/dontkillme/DoNotKillMeUtils.java
@@ -0,0 +1,20 @@
+package org.briarproject.mailbox.android.dontkillme;
+
+import android.content.Context;
+
+import org.briarproject.mailbox.R;
+
+import androidx.appcompat.app.AlertDialog;
+
+public class DoNotKillMeUtils {
+
+ static void showOnboardingDialog(Context ctx, String text) {
+ new AlertDialog.Builder(ctx,
+ R.style.OnboardingDialogTheme)
+ .setMessage(text)
+ .setNeutralButton(
+ org.briarproject.android.dontkillmelib.R.string.got_it,
+ (dialog, which) -> dialog.cancel())
+ .show();
+ }
+}
diff --git a/mailbox-android/src/main/java/org/briarproject/mailbox/android/dontkillme/PowerView.java b/mailbox-android/src/main/java/org/briarproject/mailbox/android/dontkillme/PowerView.java
index 47e0864f..55d91b07 100644
--- a/mailbox-android/src/main/java/org/briarproject/mailbox/android/dontkillme/PowerView.java
+++ b/mailbox-android/src/main/java/org/briarproject/mailbox/android/dontkillme/PowerView.java
@@ -22,7 +22,7 @@ import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.core.content.ContextCompat;
import static android.content.Context.LAYOUT_INFLATER_SERVICE;
-import static org.briarproject.android.dontkillmelib.PowerUtils.showOnboardingDialog;
+import static org.briarproject.mailbox.android.dontkillme.DoNotKillMeUtils.showOnboardingDialog;
@UiThread
abstract class PowerView extends ConstraintLayout {
diff --git a/mailbox-android/src/main/java/org/briarproject/mailbox/android/dontkillme/XiaomiView.java b/mailbox-android/src/main/java/org/briarproject/mailbox/android/dontkillme/XiaomiView.java
index d48aa985..623f5d41 100644
--- a/mailbox-android/src/main/java/org/briarproject/mailbox/android/dontkillme/XiaomiView.java
+++ b/mailbox-android/src/main/java/org/briarproject/mailbox/android/dontkillme/XiaomiView.java
@@ -9,7 +9,7 @@ import androidx.annotation.UiThread;
import static org.briarproject.android.dontkillmelib.PowerUtils.isMiuiTenOrLater;
import static org.briarproject.android.dontkillmelib.PowerUtils.isXiaomiOrRedmiDevice;
-import static org.briarproject.android.dontkillmelib.PowerUtils.showOnboardingDialog;
+import static org.briarproject.mailbox.android.dontkillme.DoNotKillMeUtils.showOnboardingDialog;
@UiThread
public class XiaomiView extends PowerView {
diff --git a/mailbox-android/src/main/res/values/styles.xml b/mailbox-android/src/main/res/values/styles.xml
index 679e8d58..8794b78b 100644
--- a/mailbox-android/src/main/res/values/styles.xml
+++ b/mailbox-android/src/main/res/values/styles.xml
@@ -5,6 +5,8 @@
<item name="android:textColor">?attr/colorSecondary</item>
</style>
+ <style name="OnboardingDialogTheme" parent="Theme.AppCompat.DayNight.Dialog.MinWidth" />
+
<style name="PowerIcon">
<item name="android:background">@drawable/ic_circle</item>
<!-- Figma had #222E3C as backgroundTint, but the style guide's closest is this -->
--
GitLab