Fixed naming, added preview png

Everything related this widget was renamed to Timed Checkmark, a unique preview for this widget was added
pull/626/head
aglebionek 5 years ago
parent dabb880972
commit 6493ef18b8

@ -137,15 +137,15 @@
</receiver> </receiver>
<receiver <receiver
android:name=".widgets.CheckmarkWidgetWithTimeProvider" android:name=".widgets.TimedCheckmarkWidgetProvider"
android:label="CheckmarkTime"> android:label="Timed Checkmark">
<intent-filter> <intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" /> <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
</intent-filter> </intent-filter>
<meta-data <meta-data
android:name="android.appwidget.provider" android:name="android.appwidget.provider"
android:resource="@xml/widget_checkmarktime_info" /> android:resource="@xml/widget_timed_checkmark_info" />
</receiver> </receiver>
<service <service

@ -2,8 +2,6 @@ package org.isoron.uhabits.widgets;
import org.isoron.uhabits.R; import org.isoron.uhabits.R;
import java.lang.annotation.Target;
/** /**
* Created by victoryu on 11/3/17. * Created by victoryu on 11/3/17.
*/ */
@ -61,7 +59,7 @@ public enum StackWidgetType {
case TARGET: case TARGET:
return R.layout.target_stackview_widget; return R.layout.target_stackview_widget;
case CHECKMARKTIME: case CHECKMARKTIME:
return R.layout.checkmarktime_stackview_widget; return R.layout.timed_checkmark_stackview_widget;
} }
return 0; return 0;
} }

@ -27,7 +27,7 @@ import org.isoron.uhabits.core.models.*
import org.isoron.uhabits.utils.* import org.isoron.uhabits.utils.*
import org.isoron.uhabits.widgets.views.* import org.isoron.uhabits.widgets.views.*
open class CheckmarkWidgetWithTime( open class TimedCheckmarkWidget(
context: Context, context: Context,
widgetId: Int, widgetId: Int,
protected val habit: Habit protected val habit: Habit
@ -42,7 +42,7 @@ open class CheckmarkWidgetWithTime(
} }
override fun refreshData(v: View) { override fun refreshData(v: View) {
(v as CheckmarkTimeWidgetView).apply { (v as TimedCheckmarkWidgetView).apply {
setBackgroundAlpha(preferedBackgroundAlpha) setBackgroundAlpha(preferedBackgroundAlpha)
setNewest(habit.repetitions.newest) setNewest(habit.repetitions.newest)
setActiveColor(PaletteUtils.getColor(context, habit.color)) setActiveColor(PaletteUtils.getColor(context, habit.color))
@ -60,7 +60,7 @@ open class CheckmarkWidgetWithTime(
} }
override fun buildView(): View { override fun buildView(): View {
return CheckmarkTimeWidgetView(context) return TimedCheckmarkWidgetView(context)
} }
override fun getDefaultHeight() = 125 override fun getDefaultHeight() = 125

@ -20,10 +20,10 @@ package org.isoron.uhabits.widgets
import android.content.* import android.content.*
class CheckmarkWidgetWithTimeProvider : BaseWidgetProvider() { class TimedCheckmarkWidgetProvider : BaseWidgetProvider() {
override fun getWidgetFromId(context: Context, id: Int): BaseWidget { override fun getWidgetFromId(context: Context, id: Int): BaseWidget {
val habits = getHabitsFromWidgetId(id) val habits = getHabitsFromWidgetId(id)
if (habits.size == 1) return CheckmarkWidgetWithTime(context, id, habits[0]) if (habits.size == 1) return TimedCheckmarkWidget(context, id, habits[0])
else return StackWidget(context, id, StackWidgetType.CHECKMARKTIME, habits) else return StackWidget(context, id, StackWidgetType.CHECKMARKTIME, habits)
} }
} }

@ -68,7 +68,7 @@ class WidgetUpdater
updateWidgets(modifiedHabitId, StreakWidgetProvider::class.java) updateWidgets(modifiedHabitId, StreakWidgetProvider::class.java)
updateWidgets(modifiedHabitId, FrequencyWidgetProvider::class.java) updateWidgets(modifiedHabitId, FrequencyWidgetProvider::class.java)
updateWidgets(modifiedHabitId, TargetWidgetProvider::class.java) updateWidgets(modifiedHabitId, TargetWidgetProvider::class.java)
updateWidgets(modifiedHabitId, CheckmarkWidgetWithTimeProvider::class.java) updateWidgets(modifiedHabitId, TimedCheckmarkWidgetProvider::class.java)
} }
} }

@ -20,9 +20,13 @@
package org.isoron.uhabits.widgets.views; package org.isoron.uhabits.widgets.views;
import android.content.Context; import android.content.Context;
import android.os.Build;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.Log;
import android.widget.TextView; import android.widget.TextView;
import androidx.annotation.RequiresApi;
import org.isoron.uhabits.R; import org.isoron.uhabits.R;
import org.isoron.uhabits.activities.common.views.RingView; import org.isoron.uhabits.activities.common.views.RingView;
import org.isoron.uhabits.activities.habits.list.views.NumberButtonViewKt; import org.isoron.uhabits.activities.habits.list.views.NumberButtonViewKt;
@ -31,16 +35,20 @@ import org.isoron.uhabits.core.models.Repetition;
import org.isoron.uhabits.core.models.Timestamp; import org.isoron.uhabits.core.models.Timestamp;
import org.isoron.uhabits.utils.PaletteUtils; import org.isoron.uhabits.utils.PaletteUtils;
public class CheckmarkTimeWidgetView extends CheckmarkWidgetView { import java.time.LocalDate;
import java.time.ZoneId;
import java.util.Calendar;
public class TimedCheckmarkWidgetView extends CheckmarkWidgetView {
protected Repetition newest; protected Repetition newest;
public CheckmarkTimeWidgetView(Context context) public TimedCheckmarkWidgetView(Context context)
{ {
super(context); super(context);
init(); init();
} }
public CheckmarkTimeWidgetView(Context context, AttributeSet attrs) public TimedCheckmarkWidgetView(Context context, AttributeSet attrs)
{ {
super(context, attrs); super(context, attrs);
init(); init();

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.0 KiB

@ -22,7 +22,7 @@
android:minHeight="40dp" android:minHeight="40dp"
android:minWidth="40dp" android:minWidth="40dp"
android:initialLayout="@layout/widget_wrapper" android:initialLayout="@layout/widget_wrapper"
android:previewImage="@drawable/widget_preview_checkmark" android:previewImage="@drawable/widget_preview_timed_checkmark"
android:resizeMode="none" android:resizeMode="none"
android:updatePeriodMillis="3600000" android:updatePeriodMillis="3600000"
android:configure="org.isoron.uhabits.widgets.activities.HabitPickerDialog" android:configure="org.isoron.uhabits.widgets.activities.HabitPickerDialog"
Loading…
Cancel
Save