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 361d04000da1a66e90970bb187ec93d1741d07ba..36cab27c3dee554b8594f7798c6fd4f2cbb3ee5f 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 b608b8fdf7fa11d51c5646355cb3700ca7b4b2ff..0000000000000000000000000000000000000000 --- 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 7bdd35e8dbc7d6921fce460993410589263b6546..b99c26ba926f2665a9c6391caf0982d6741a3a16 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 0000000000000000000000000000000000000000..f3f0b79915660b0bd3e5afef03956320711223a3 --- /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 47e0864f7375148c1a500fd48dfb7186ec683bb5..55d91b07d80beb0b46190b2527e91ffedd1faf07 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 d48aa9851b8fafe8e9d70eec3c40a0be41ca8814..623f5d410bf6519c576d38e063eef0d5a77b97a5 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 679e8d58cb2f759afbdbd7ca60160a5a7a24ec3a..8794b78ba41708b9bd0386411fce023c0c960da0 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 -->