diff --git a/build.gradle b/build.gradle index 536485f0f25ff50270b4a685e6269cdaf92e1240..91966bd61559b5b559c58d77b86fe426faf8cfd1 100644 --- a/build.gradle +++ b/build.gradle @@ -27,6 +27,7 @@ allprojects { //noinspection JcenterRepositoryObsolete jcenter() // for dependencies that haven't moved, yet mavenCentral() + mavenLocal() } } diff --git a/mailbox-android/build.gradle b/mailbox-android/build.gradle index 744978cd48c4a17c8b4ca50a2abe1ac1d443f6c7..2a2629015b0cd91f2c6788dd1b07fefe537fe6ae 100644 --- a/mailbox-android/build.gradle +++ b/mailbox-android/build.gradle @@ -55,7 +55,7 @@ configurations { dependencies { implementation project(path: ':mailbox-core', configuration: 'default') - implementation project(path: ':dont-kill-me-lib') + implementation 'org.briarproject:dont-kill-me-lib:0.1' implementation 'com.github.tony19:logback-android:2.0.0' implementation 'androidx.appcompat:appcompat:1.4.1' 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 b99c26ba926f2665a9c6391caf0982d6741a3a16..fb988d8642a747ee42a701121df69debb1d74371 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 @@ -44,7 +44,7 @@ public abstract class AbstractDoNotKillMeFragment extends Fragment public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - requireActivity().setTitle(getString(R.string.setup_doze_title)); + requireActivity().setTitle(getString(R.string.dnkm_doze_title)); setHasOptionsMenu(false); View v = inflater.inflate(R.layout.fragment_dont_kill_me, container, false); @@ -93,8 +93,7 @@ public abstract class AbstractDoNotKillMeFragment extends Fragment dozeView.setChecked(true); } else if (getContext() != null) { secondAttempt = true; - String s = getString( - org.briarproject.android.dontkillmelib.R.string.setup_doze_explanation); + String s = getString(R.string.dnkm_doze_explanation); showOnboardingDialog(getContext(), s); } } 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 index f3f0b79915660b0bd3e5afef03956320711223a3..8fd695f9aaa0cd47af800d95d57774cccbe7d3e9 100644 --- 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 @@ -12,8 +12,7 @@ public class DoNotKillMeUtils { new AlertDialog.Builder(ctx, R.style.OnboardingDialogTheme) .setMessage(text) - .setNeutralButton( - org.briarproject.android.dontkillmelib.R.string.got_it, + .setNeutralButton(R.string.dnkm_got_it, (dialog, which) -> dialog.cancel()) .show(); } diff --git a/mailbox-android/src/main/java/org/briarproject/mailbox/android/dontkillme/DozeView.java b/mailbox-android/src/main/java/org/briarproject/mailbox/android/dontkillme/DozeView.java index 00cfefe3b83487e41998e92daed64b83531787ca..beb7da114b6a3d41492104f6b6b51553e281446c 100644 --- a/mailbox-android/src/main/java/org/briarproject/mailbox/android/dontkillme/DozeView.java +++ b/mailbox-android/src/main/java/org/briarproject/mailbox/android/dontkillme/DozeView.java @@ -28,10 +28,9 @@ public class DozeView extends PowerView { public DozeView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); - setText(org.briarproject.android.dontkillmelib.R.string.setup_doze_intro); + setText(R.string.dnkm_doze_intro); setIcon(R.drawable.ic_battery_alert_white); - setButtonText( - org.briarproject.android.dontkillmelib.R.string.setup_doze_button); + setButtonText(R.string.dnkm_doze_button); } @Override @@ -45,7 +44,7 @@ public class DozeView extends PowerView { @Override protected int getHelpText() { - return org.briarproject.android.dontkillmelib.R.string.setup_doze_explanation; + return R.string.dnkm_doze_explanation; } @Override diff --git a/mailbox-android/src/main/java/org/briarproject/mailbox/android/dontkillme/HuaweiAppLaunchView.java b/mailbox-android/src/main/java/org/briarproject/mailbox/android/dontkillme/HuaweiAppLaunchView.java index 0b5e3b2c83308a70034425e7320f495cd7b33e1c..36dd76b804233738ca32ac7117b4775a867b2912 100644 --- a/mailbox-android/src/main/java/org/briarproject/mailbox/android/dontkillme/HuaweiAppLaunchView.java +++ b/mailbox-android/src/main/java/org/briarproject/mailbox/android/dontkillme/HuaweiAppLaunchView.java @@ -26,10 +26,9 @@ public class HuaweiAppLaunchView extends PowerView { public HuaweiAppLaunchView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); - setText(org.briarproject.android.dontkillmelib.R.string.setup_huawei_app_launch_text); + setText(R.string.dnkm_huawei_app_launch_text); setIcon(R.drawable.ic_restore_mirrored_white); - setButtonText( - org.briarproject.android.dontkillmelib.R.string.setup_huawei_app_launch_button); + setButtonText(R.string.dnkm_huawei_app_launch_button); } @Override @@ -40,7 +39,7 @@ public class HuaweiAppLaunchView extends PowerView { @Override @StringRes protected int getHelpText() { - return org.briarproject.android.dontkillmelib.R.string.setup_huawei_app_launch_help; + return R.string.dnkm_huawei_app_launch_help; } @Override diff --git a/mailbox-android/src/main/java/org/briarproject/mailbox/android/dontkillme/HuaweiProtectedAppsView.java b/mailbox-android/src/main/java/org/briarproject/mailbox/android/dontkillme/HuaweiProtectedAppsView.java index e218dc05eb809dcc4ec1ff71f1aaccac19cb7acb..5ac80e1c3ec419e1ac93a97aca0c54182145edaa 100644 --- a/mailbox-android/src/main/java/org/briarproject/mailbox/android/dontkillme/HuaweiProtectedAppsView.java +++ b/mailbox-android/src/main/java/org/briarproject/mailbox/android/dontkillme/HuaweiProtectedAppsView.java @@ -4,6 +4,7 @@ import android.content.Context; import android.util.AttributeSet; import org.briarproject.android.dontkillmelib.PowerUtils; +import org.briarproject.mailbox.R; import androidx.annotation.Nullable; import androidx.annotation.StringRes; @@ -27,9 +28,8 @@ public class HuaweiProtectedAppsView extends PowerView { @Nullable AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); - setText(org.briarproject.android.dontkillmelib.R.string.setup_huawei_text); - setButtonText( - org.briarproject.android.dontkillmelib.R.string.setup_huawei_button); + setText(R.string.dnkm_huawei_protected_text); + setButtonText(R.string.dnkm_huawei_protected_button); } @Override @@ -40,7 +40,7 @@ public class HuaweiProtectedAppsView extends PowerView { @Override @StringRes protected int getHelpText() { - return org.briarproject.android.dontkillmelib.R.string.setup_huawei_help; + return R.string.dnkm_huawei_protected_help; } @Override 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 623f5d410bf6519c576d38e063eef0d5a77b97a5..27768ba8ea3be999b9dd90195dc9771a7b4ad3c5 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 @@ -3,6 +3,8 @@ package org.briarproject.mailbox.android.dontkillme; import android.content.Context; import android.util.AttributeSet; +import org.briarproject.mailbox.R; + import androidx.annotation.Nullable; import androidx.annotation.StringRes; import androidx.annotation.UiThread; @@ -25,9 +27,8 @@ public class XiaomiView extends PowerView { public XiaomiView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); - setText(org.briarproject.android.dontkillmelib.R.string.setup_xiaomi_text); - setButtonText( - org.briarproject.android.dontkillmelib.R.string.setup_xiaomi_button); + setText(R.string.dnkm_xiaomi_text); + setButtonText(R.string.dnkm_xiaomi_button); } @Override @@ -38,16 +39,14 @@ public class XiaomiView extends PowerView { @Override @StringRes protected int getHelpText() { - return org.briarproject.android.dontkillmelib.R.string.setup_xiaomi_help; + return R.string.dnkm_xiaomi_help; } @Override protected void onButtonClick() { int bodyRes = isMiuiTenOrLater() - ? - org.briarproject.android.dontkillmelib.R.string.setup_xiaomi_dialog_body_new - : - org.briarproject.android.dontkillmelib.R.string.setup_xiaomi_dialog_body_old; + ? R.string.dnkm_xiaomi_dialog_body_new + : R.string.dnkm_xiaomi_dialog_body_old; showOnboardingDialog(getContext(), getContext().getString(bodyRes)); setChecked(true); } diff --git a/mailbox-android/src/main/res/layout/fragment_dont_kill_me.xml b/mailbox-android/src/main/res/layout/fragment_dont_kill_me.xml index a7a7cba64ec29f58dc66f47c1e5be86c228a8ef1..a5c2ab2f4f91ecccce8afaadc5bc8ed973df81ba 100644 --- a/mailbox-android/src/main/res/layout/fragment_dont_kill_me.xml +++ b/mailbox-android/src/main/res/layout/fragment_dont_kill_me.xml @@ -78,7 +78,7 @@ android:layout_height="wrap_content" android:layout_marginTop="24dp" android:enabled="false" - android:text="@string/create_account_button" + android:text="@string/button_continue" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/mailbox-android/src/main/res/layout/power_view.xml b/mailbox-android/src/main/res/layout/power_view.xml index ed868eb9c4fcce4e1d9141c6bdd48f889626a5d2..01b7cdf695ba6c7260744a4869ff2eca93e82344 100644 --- a/mailbox-android/src/main/res/layout/power_view.xml +++ b/mailbox-android/src/main/res/layout/power_view.xml @@ -14,7 +14,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/icon" app:layout_constraintTop_toTopOf="parent" - tools:text="@string/setup_huawei_text" /> + tools:text="@string/dnkm_huawei_protected_text" /> <androidx.appcompat.widget.AppCompatImageView android:id="@+id/icon" @@ -23,7 +23,7 @@ android:layout_height="48dp" android:layout_marginEnd="12dp" android:layout_marginRight="12dp" - android:contentDescription="@string/help" + android:contentDescription="@string/dnkm_help" android:padding="12dp" app:layout_constraintBottom_toBottomOf="@+id/textView" app:layout_constraintEnd_toStartOf="@+id/textView" @@ -53,7 +53,7 @@ app:layout_constraintEnd_toStartOf="@+id/helpButton" app:layout_constraintStart_toEndOf="@+id/icon" app:layout_constraintTop_toBottomOf="@+id/textView" - tools:text="@string/setup_huawei_button" /> + tools:text="@string/dnkm_huawei_protected_button" /> <ImageButton android:id="@+id/helpButton" @@ -61,7 +61,7 @@ android:layout_width="48dp" android:layout_height="48dp" android:background="?attr/selectableItemBackgroundBorderless" - android:contentDescription="@string/help" + android:contentDescription="@string/dnkm_help" app:layout_constraintBottom_toBottomOf="@+id/button" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@+id/button" diff --git a/settings.gradle b/settings.gradle index 24ab31199a3120ce34f9bd4515174ecf233be1e5..9d74d743739822bcdf4f6e648676f5506116bee1 100644 --- a/settings.gradle +++ b/settings.gradle @@ -2,5 +2,3 @@ include ':mailbox-core' include ':mailbox-android' include ':mailbox-cli' include ':mailbox-cli' - -include ':dont-kill-me-lib'