diff --git a/android/uhabits-android/build.gradle b/android/uhabits-android/build.gradle index 8cc8882cf..0df060e82 100644 --- a/android/uhabits-android/build.gradle +++ b/android/uhabits-android/build.gradle @@ -88,7 +88,6 @@ dependencies { implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation "com.github.paolorotolo:appintro:3.4.0" implementation "com.google.dagger:dagger:$DAGGER_VERSION" - implementation "com.jakewharton:butterknife:8.6.1-SNAPSHOT" implementation "org.apmem.tools:layouts:1.10" implementation "com.google.code.gson:gson:2.8.5" implementation "com.google.code.findbugs:jsr305:3.0.2" diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmDeleteDialog.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmDeleteDialog.java index 25bbd2a6c..a84384952 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmDeleteDialog.java +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmDeleteDialog.java @@ -20,42 +20,37 @@ package org.isoron.uhabits.activities.common.dialogs; import android.content.*; +import android.content.res.*; -import androidx.annotation.NonNull; +import androidx.annotation.*; import androidx.appcompat.app.*; import com.google.auto.factory.*; import org.isoron.androidbase.activities.*; -import org.isoron.uhabits.R; +import org.isoron.uhabits.*; import org.isoron.uhabits.core.ui.callbacks.*; -import butterknife.*; - /** * Dialog that asks the user confirmation before executing a delete operation. */ @AutoFactory(allowSubclasses = true) public class ConfirmDeleteDialog extends AlertDialog { - @BindString(R.string.delete_habits_message) - protected String question; - - @BindString(android.R.string.yes) - protected String yes; - - @BindString(android.R.string.no) - protected String no; - protected ConfirmDeleteDialog(@Provided @ActivityContext Context context, @NonNull OnConfirmedCallback callback) { super(context); - ButterKnife.bind(this); - setTitle(R.string.delete_habits); - setMessage(question); - setButton(BUTTON_POSITIVE, yes, (dialog, which) -> callback.onConfirmed()); - setButton(BUTTON_NEGATIVE, no, (dialog, which) -> {}); + Resources res = context.getResources(); + setMessage(res.getString(R.string.delete_habits_message)); + setButton(BUTTON_POSITIVE, + res.getString(R.string.yes), + (dialog, which) -> callback.onConfirmed() + ); + setButton(BUTTON_NEGATIVE, + res.getString(R.string.no), + (dialog, which) -> { } + ); } } diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmSyncKeyDialog.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmSyncKeyDialog.java index 3d034269d..82fe12c51 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmSyncKeyDialog.java +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmSyncKeyDialog.java @@ -20,6 +20,7 @@ package org.isoron.uhabits.activities.common.dialogs; import android.content.*; +import android.content.res.*; import androidx.annotation.*; import androidx.appcompat.app.*; @@ -27,32 +28,26 @@ import androidx.appcompat.app.*; import com.google.auto.factory.*; import org.isoron.androidbase.activities.*; +import org.isoron.uhabits.*; import org.isoron.uhabits.core.ui.callbacks.*; -import org.isoron.uhabits.R; - -import butterknife.*; @AutoFactory(allowSubclasses = true) public class ConfirmSyncKeyDialog extends AlertDialog { - @BindString(R.string.sync_confirm) - protected String question; - - @BindString(R.string.yes) - protected String yes; - - @BindString(R.string.no) - protected String no; - protected ConfirmSyncKeyDialog(@Provided @ActivityContext Context context, @NonNull OnConfirmedCallback callback) { super(context); - ButterKnife.bind(this); - setTitle(R.string.device_sync); - setMessage(question); - setButton(BUTTON_POSITIVE, yes, (dialog, which) -> callback.onConfirmed()); - setButton(BUTTON_NEGATIVE, no, (dialog, which) -> {}); + Resources res = context.getResources(); + setMessage(res.getString(R.string.sync_confirm)); + setButton(BUTTON_POSITIVE, + res.getString(R.string.yes), + (dialog, which) -> callback.onConfirmed() + ); + setButton(BUTTON_NEGATIVE, + res.getString(R.string.no), + (dialog, which) -> { } + ); } }