isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-06 09:08:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove ButterKnife

Browse Source
This commit is contained in:
Alinson S. Xavier
2020-12-23 11:18:25 -06:00
parent 638bc2816f
commit 8cd729480f
3 changed files with 25 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
android/uhabits-android/build.gradle
View File

@@ -88,7 +88,6 @@ dependencies {
implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation "com.github.paolorotolo:appintro:3.4.0" implementation "com.github.paolorotolo:appintro:3.4.0"
implementation "com.google.dagger:dagger:$DAGGER_VERSION" implementation "com.google.dagger:dagger:$DAGGER_VERSION"
implementation "com.jakewharton:butterknife:8.6.1-SNAPSHOT"
implementation "org.apmem.tools:layouts:1.10" implementation "org.apmem.tools:layouts:1.10"
implementation "com.google.code.gson:gson:2.8.5" implementation "com.google.code.gson:gson:2.8.5"
implementation "com.google.code.findbugs:jsr305:3.0.2" implementation "com.google.code.findbugs:jsr305:3.0.2"

31
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmDeleteDialog.java
View File

@@ -20,42 +20,37 @@
package org.isoron.uhabits.activities.common.dialogs; package org.isoron.uhabits.activities.common.dialogs;
import android.content.*; import android.content.*;
import android.content.res.*;
import androidx.annotation.NonNull; import androidx.annotation.*;
import androidx.appcompat.app.*; import androidx.appcompat.app.*;
import com.google.auto.factory.*; import com.google.auto.factory.*;
import org.isoron.androidbase.activities.*; import org.isoron.androidbase.activities.*;
import org.isoron.uhabits.R; import org.isoron.uhabits.*;
import org.isoron.uhabits.core.ui.callbacks.*; import org.isoron.uhabits.core.ui.callbacks.*;
import butterknife.*;
/** /**
* Dialog that asks the user confirmation before executing a delete operation. * Dialog that asks the user confirmation before executing a delete operation.
*/ */
@AutoFactory(allowSubclasses = true) @AutoFactory(allowSubclasses = true)
public class ConfirmDeleteDialog extends AlertDialog 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, protected ConfirmDeleteDialog(@Provided @ActivityContext Context context,
@NonNull OnConfirmedCallback callback) @NonNull OnConfirmedCallback callback)
{ {
super(context); super(context);
ButterKnife.bind(this);
setTitle(R.string.delete_habits); setTitle(R.string.delete_habits);
setMessage(question); Resources res = context.getResources();
setButton(BUTTON_POSITIVE, yes, (dialog, which) -> callback.onConfirmed()); setMessage(res.getString(R.string.delete_habits_message));
setButton(BUTTON_NEGATIVE, no, (dialog, which) -> {}); setButton(BUTTON_POSITIVE,
res.getString(R.string.yes),
(dialog, which) -> callback.onConfirmed()
);
setButton(BUTTON_NEGATIVE,
res.getString(R.string.no),
(dialog, which) -> { }
);
} }
} }

29
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmSyncKeyDialog.java
View File

@@ -20,6 +20,7 @@
package org.isoron.uhabits.activities.common.dialogs; package org.isoron.uhabits.activities.common.dialogs;
import android.content.*; import android.content.*;
import android.content.res.*;
import androidx.annotation.*; import androidx.annotation.*;
import androidx.appcompat.app.*; import androidx.appcompat.app.*;
@@ -27,32 +28,26 @@ import androidx.appcompat.app.*;
import com.google.auto.factory.*; import com.google.auto.factory.*;
import org.isoron.androidbase.activities.*; import org.isoron.androidbase.activities.*;
import org.isoron.uhabits.*;
import org.isoron.uhabits.core.ui.callbacks.*; import org.isoron.uhabits.core.ui.callbacks.*;
import org.isoron.uhabits.R;
import butterknife.*;
@AutoFactory(allowSubclasses = true) @AutoFactory(allowSubclasses = true)
public class ConfirmSyncKeyDialog extends AlertDialog 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, protected ConfirmSyncKeyDialog(@Provided @ActivityContext Context context,
@NonNull OnConfirmedCallback callback) @NonNull OnConfirmedCallback callback)
{ {
super(context); super(context);
ButterKnife.bind(this);
setTitle(R.string.device_sync); setTitle(R.string.device_sync);
setMessage(question); Resources res = context.getResources();
setButton(BUTTON_POSITIVE, yes, (dialog, which) -> callback.onConfirmed()); setMessage(res.getString(R.string.sync_confirm));
setButton(BUTTON_NEGATIVE, no, (dialog, which) -> {}); setButton(BUTTON_POSITIVE,
res.getString(R.string.yes),
(dialog, which) -> callback.onConfirmed()
);
setButton(BUTTON_NEGATIVE,
res.getString(R.string.no),
(dialog, which) -> { }
);
} }
} }