From 97cf253c649bb30ba5aa395098629b41e6e4b41f Mon Sep 17 00:00:00 2001 From: Nam Nguyen Date: Mon, 7 Sep 2020 09:10:49 +0700 Subject: [PATCH] 1. Remove changes which are not related to functionality 2. Use wildcard imports --- android/uhabits-android/build.gradle | 2 +- .../isoron/uhabits/activities/habits/show/ShowHabitScreen.java | 2 +- .../uhabits/notifications/SnoozeDelayPickerActivity.java | 1 - .../main/java/org/isoron/uhabits/receivers/WidgetReceiver.java | 3 +-- .../widgets/activities/NumericalCheckmarkWidgetActivity.kt | 1 - .../uhabits/core/ui/screens/habits/show/ShowHabitBehavior.java | 2 +- 6 files changed, 4 insertions(+), 7 deletions(-) diff --git a/android/uhabits-android/build.gradle b/android/uhabits-android/build.gradle index 42fae060d..45d2a0416 100644 --- a/android/uhabits-android/build.gradle +++ b/android/uhabits-android/build.gradle @@ -87,7 +87,7 @@ 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:10.0.0" + 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/habits/show/ShowHabitScreen.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitScreen.java index e34b66aec..cf1dcfbd2 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitScreen.java +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitScreen.java @@ -28,7 +28,7 @@ import org.isoron.uhabits.*; import org.isoron.uhabits.activities.common.dialogs.*; import org.isoron.uhabits.core.models.*; import org.isoron.uhabits.core.ui.callbacks.*; -import org.isoron.uhabits.core.ui.screens.habits.list.ListHabitsBehavior; +import org.isoron.uhabits.core.ui.screens.habits.list.*; import org.isoron.uhabits.core.ui.screens.habits.show.*; import org.isoron.uhabits.intents.*; diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/notifications/SnoozeDelayPickerActivity.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/notifications/SnoozeDelayPickerActivity.java index 7074e02ea..fe2e33e0c 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/notifications/SnoozeDelayPickerActivity.java +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/notifications/SnoozeDelayPickerActivity.java @@ -46,7 +46,6 @@ public class SnoozeDelayPickerActivity extends FragmentActivity habit = appComponent.getHabitList().getById(parseId(getIntent().getData())); if (habit == null) finish(); - // Unlock device on clicking notification action if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { KeyguardManager km = (KeyguardManager) getSystemService(KEYGUARD_SERVICE); km.requestDismissKeyguard(this, null); diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/receivers/WidgetReceiver.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/receivers/WidgetReceiver.java index d8f41c154..a1cb1d018 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/receivers/WidgetReceiver.java +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/receivers/WidgetReceiver.java @@ -67,6 +67,7 @@ public class WidgetReceiver extends BroadcastReceiver IntentParser parser = app.getComponent().getIntentParser(); WidgetBehavior controller = component.getWidgetController(); + Preferences prefs = app.getComponent().getPreferences(); Log.i(TAG, String.format("Received intent: %s", intent.toString())); @@ -104,9 +105,7 @@ public class WidgetReceiver extends BroadcastReceiver data.getTimestamp()); break; case ACTION_SET_NUMERICAL_VALUE: - // close Notification drawer context.sendBroadcast(new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS)); - Intent numberSelectorIntent = new Intent(context, NumericalCheckmarkWidgetActivity.class); numberSelectorIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); numberSelectorIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK); diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/NumericalCheckmarkWidgetActivity.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/NumericalCheckmarkWidgetActivity.kt index 916310dfd..88e8d35c0 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/NumericalCheckmarkWidgetActivity.kt +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/NumericalCheckmarkWidgetActivity.kt @@ -52,7 +52,6 @@ class NumericalCheckmarkWidgetActivity : Activity(), ListHabitsBehavior.NumberPi widgetUpdater = component.widgetUpdater showNumberSelector(this) - // Unlock device on clicking notification action if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { val km = getSystemService(KEYGUARD_SERVICE) as KeyguardManager km.requestDismissKeyguard(this, null) diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitBehavior.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitBehavior.java index 2834656ec..3f81dfeb2 100644 --- a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitBehavior.java +++ b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitBehavior.java @@ -23,7 +23,7 @@ import androidx.annotation.*; import org.isoron.uhabits.core.commands.*; import org.isoron.uhabits.core.models.*; -import org.isoron.uhabits.core.ui.screens.habits.list.ListHabitsBehavior; +import org.isoron.uhabits.core.ui.screens.habits.list.*; import javax.inject.*;