more code cleanup

pull/499/head
thomas 6 years ago
parent 216dfd9024
commit 645a74a8a3

@ -175,9 +175,7 @@
<receiver android:name=".receivers.WidgetReceiver"> <receiver android:name=".receivers.WidgetReceiver">
<intent-filter> <intent-filter>
<category android:name="android.intent.category.DEFAULT"/> <category android:name="android.intent.category.DEFAULT"/>
<action android:name="org.isoron.uhabits.ACTION_SET_NUMERICAL_VALUE"/> <action android:name="org.isoron.uhabits.ACTION_SET_NUMERICAL_VALUE"/>
<data <data
android:host="org.isoron.uhabits" android:host="org.isoron.uhabits"
android:scheme="content"/> android:scheme="content"/>

@ -36,8 +36,6 @@ class NumberPickerFactory
@Inject constructor( @Inject constructor(
@ActivityContext private val context: Context @ActivityContext private val context: Context
) { ) {
fun create(value: Double, fun create(value: Double,
unit: String, unit: String,
callback: ListHabitsBehavior.NumberPickerCallback): AlertDialog { callback: ListHabitsBehavior.NumberPickerCallback): AlertDialog {

@ -46,7 +46,6 @@ class ListHabitsMenu @Inject constructor(
hideArchivedItem.isChecked = !preferences.showArchived hideArchivedItem.isChecked = !preferences.showArchived
hideCompletedItem.isChecked = !preferences.showCompleted hideCompletedItem.isChecked = !preferences.showCompleted
topBarMenu = menu topBarMenu = menu
//the habit creation menu should be disabled when numeric habits are also disabled //the habit creation menu should be disabled when numeric habits are also disabled
if (!preferences.isNumericalHabitsFeatureEnabled) { if (!preferences.isNumericalHabitsFeatureEnabled) {

@ -83,9 +83,6 @@ class WidgetReceiver : BroadcastReceiver() {
} }
@ReceiverScope @ReceiverScope
@Component(dependencies = [HabitsApplicationComponent::class]) @Component(dependencies = [HabitsApplicationComponent::class])
internal interface WidgetComponent { internal interface WidgetComponent {

@ -36,7 +36,6 @@ open class CheckmarkWidget(
return pendingIntentFactory.toggleCheckmark(habit, null) return pendingIntentFactory.toggleCheckmark(habit, null)
} }
override fun refreshData(v: View) { override fun refreshData(v: View) {
(v as CheckmarkWidgetView).apply { (v as CheckmarkWidgetView).apply {
setPercentage(habit.scores.todayValue.toFloat()) setPercentage(habit.scores.todayValue.toFloat())
@ -45,11 +44,8 @@ open class CheckmarkWidget(
setCheckmarkValue(habit.checkmarks.todayValue) setCheckmarkValue(habit.checkmarks.todayValue)
refresh() refresh()
} }
} }
override fun buildView(): View = CheckmarkWidgetView(context) override fun buildView(): View = CheckmarkWidgetView(context)
override fun getDefaultHeight() = 125 override fun getDefaultHeight() = 125
override fun getDefaultWidth() = 125 override fun getDefaultWidth() = 125

@ -16,7 +16,6 @@ import org.isoron.uhabits.intents.IntentParser
import org.isoron.uhabits.intents.PendingIntentFactory import org.isoron.uhabits.intents.PendingIntentFactory
import org.isoron.uhabits.widgets.WidgetUpdater import org.isoron.uhabits.widgets.WidgetUpdater
class NumericalCheckmarkWidgetActivity : Activity() { class NumericalCheckmarkWidgetActivity : Activity() {
private lateinit var behavior : NumericalCheckmarkWidgetBehavior private lateinit var behavior : NumericalCheckmarkWidgetBehavior
@ -36,7 +35,6 @@ class NumericalCheckmarkWidgetActivity : Activity() {
showNumberSelector(this) showNumberSelector(this)
} }
class CallBackReceiver : ListHabitsBehavior.NumberPickerCallback{ class CallBackReceiver : ListHabitsBehavior.NumberPickerCallback{
private val activity : NumericalCheckmarkWidgetActivity private val activity : NumericalCheckmarkWidgetActivity
@ -68,5 +66,4 @@ class NumericalCheckmarkWidgetActivity : Activity() {
companion object{ companion object{
const val ACTION_SHOW_NUMERICAL_VALUE_ACTIVITY = "org.isoron.uhabits.ACTION_SHOW_NUMERICAL_VALUE_ACTIVITY" const val ACTION_SHOW_NUMERICAL_VALUE_ACTIVITY = "org.isoron.uhabits.ACTION_SHOW_NUMERICAL_VALUE_ACTIVITY"
} }
} }

@ -62,7 +62,6 @@ public class CreateRepetitionCommand extends Command
reps.add(newRep); reps.add(newRep);
habit.invalidateNewerThan(timestamp); habit.invalidateNewerThan(timestamp);
} }
@NonNull @NonNull

@ -206,7 +206,7 @@ public class Preferences
public boolean isDeveloper() public boolean isDeveloper()
{ {
return true;//return storage.getBoolean("pref_developer", false); return storage.getBoolean("pref_developer", false);
} }
public void setDeveloper(boolean isDeveloper) public void setDeveloper(boolean isDeveloper)

Loading…
Cancel
Save