diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8d7e8eff2..75e3ed840 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -18,15 +18,18 @@ ~ with this program. If not, see . --> - + + + @@ -38,6 +41,7 @@ android:icon="@mipmap/ic_launcher" android:label="@string/main_activity_title" android:theme="@style/AppBaseTheme"> + @@ -58,8 +62,6 @@ - - + + + + + + + + + + + android:label="@string/checkmark"> @@ -93,9 +110,10 @@ android:name="android.appwidget.provider" android:resource="@xml/widget_checkmark_info"/> + + android:label="@string/history"> @@ -104,9 +122,10 @@ android:name="android.appwidget.provider" android:resource="@xml/widget_history_info"/> + + android:label="@string/habit_strength"> @@ -115,9 +134,10 @@ android:name="android.appwidget.provider" android:resource="@xml/widget_score_info"/> + + android:label="@string/streaks"> @@ -127,18 +147,20 @@ android:resource="@xml/widget_streak_info"/> - + - + - - - + + + + + + diff --git a/app/src/main/java/org/isoron/uhabits/MainActivity.java b/app/src/main/java/org/isoron/uhabits/MainActivity.java index 769e58a8f..697b18d18 100644 --- a/app/src/main/java/org/isoron/uhabits/MainActivity.java +++ b/app/src/main/java/org/isoron/uhabits/MainActivity.java @@ -41,6 +41,7 @@ import org.isoron.uhabits.fragments.ListHabitsFragment; import org.isoron.uhabits.helpers.ReminderHelper; import org.isoron.uhabits.models.Habit; import org.isoron.uhabits.widgets.CheckmarkWidgetProvider; +import org.isoron.uhabits.widgets.FrequencyWidgetProvider; import org.isoron.uhabits.widgets.HistoryWidgetProvider; import org.isoron.uhabits.widgets.ScoreWidgetProvider; import org.isoron.uhabits.widgets.StreakWidgetProvider; @@ -159,6 +160,7 @@ public class MainActivity extends ReplayableActivity updateWidgets(context, HistoryWidgetProvider.class); updateWidgets(context, ScoreWidgetProvider.class); updateWidgets(context, StreakWidgetProvider.class); + updateWidgets(context, FrequencyWidgetProvider.class); } private static void updateWidgets(Context context, Class providerClass) diff --git a/app/src/main/java/org/isoron/uhabits/widgets/FrequencyWidgetProvider.java b/app/src/main/java/org/isoron/uhabits/widgets/FrequencyWidgetProvider.java new file mode 100644 index 000000000..8ea2248df --- /dev/null +++ b/app/src/main/java/org/isoron/uhabits/widgets/FrequencyWidgetProvider.java @@ -0,0 +1,64 @@ +/* + * Copyright (C) 2016 Álinson Santos Xavier + * + * This file is part of Loop Habit Tracker. + * + * Loop Habit Tracker is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or (at your + * option) any later version. + * + * Loop Habit Tracker is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +package org.isoron.uhabits.widgets; + +import android.app.PendingIntent; +import android.content.Context; +import android.view.View; + +import org.isoron.uhabits.R; +import org.isoron.uhabits.models.Habit; +import org.isoron.uhabits.views.HabitFrequencyView; + +public class FrequencyWidgetProvider extends BaseWidgetProvider +{ + @Override + protected View buildCustomView(Context context, Habit habit) + { + HabitFrequencyView view = new HabitFrequencyView(context, null); + view.setIsBackgroundTransparent(true); + view.setHabit(habit); + return view; + } + + @Override + protected PendingIntent getOnClickPendingIntent(Context context, Habit habit) + { + return null; + } + + @Override + protected int getDefaultHeight() + { + return 200; + } + + @Override + protected int getDefaultWidth() + { + return 200; + } + + @Override + protected int getLayoutId() + { + return R.layout.widget_graph; + } +} diff --git a/app/src/main/res/drawable/widget_preview_frequency.png b/app/src/main/res/drawable/widget_preview_frequency.png new file mode 100644 index 000000000..a3fc86505 Binary files /dev/null and b/app/src/main/res/drawable/widget_preview_frequency.png differ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4bc8fb465..793dec774 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -123,5 +123,6 @@ Developers Version %s Frequency + Checkmark \ No newline at end of file diff --git a/app/src/main/res/xml/widget_frequency_info.xml b/app/src/main/res/xml/widget_frequency_info.xml new file mode 100644 index 000000000..32a25906b --- /dev/null +++ b/app/src/main/res/xml/widget_frequency_info.xml @@ -0,0 +1,33 @@ + + + + + + \ No newline at end of file