mirror of
https://github.com/iSoron/uhabits.git
synced 2025-12-06 09:08:52 -06:00
Add configuration activity for widgets
This commit is contained in:
@@ -10,11 +10,11 @@
|
|||||||
|
|
||||||
<application
|
<application
|
||||||
android:name="com.activeandroid.app.Application"
|
android:name="com.activeandroid.app.Application"
|
||||||
|
android:allowBackup="true"
|
||||||
|
android:backupAgent=".HabitsBackupAgent"
|
||||||
android:icon="@mipmap/ic_launcher"
|
android:icon="@mipmap/ic_launcher"
|
||||||
android:label="@string/main_activity_title"
|
android:label="@string/main_activity_title"
|
||||||
android:theme="@style/AppBaseTheme"
|
android:theme="@style/AppBaseTheme">
|
||||||
android:allowBackup="true"
|
|
||||||
android:backupAgent=".HabitsBackupAgent">
|
|
||||||
|
|
||||||
<meta-data
|
<meta-data
|
||||||
android:name="AA_DB_NAME"
|
android:name="AA_DB_NAME"
|
||||||
@@ -26,7 +26,7 @@
|
|||||||
|
|
||||||
<meta-data
|
<meta-data
|
||||||
android:name="com.google.android.backup.api_key"
|
android:name="com.google.android.backup.api_key"
|
||||||
android:value="AEdPqrEAAAAI6aeWncbnMNo8E5GWeZ44dlc5cQ7tCROwFhOtiw" />
|
android:value="AEdPqrEAAAAI6aeWncbnMNo8E5GWeZ44dlc5cQ7tCROwFhOtiw"/>
|
||||||
|
|
||||||
<activity
|
<activity
|
||||||
android:name=".MainActivity"
|
android:name=".MainActivity"
|
||||||
@@ -39,7 +39,7 @@
|
|||||||
</activity>
|
</activity>
|
||||||
|
|
||||||
<receiver
|
<receiver
|
||||||
android:name=".HabitBroadcastReceiver" />
|
android:name=".HabitBroadcastReceiver"/>
|
||||||
|
|
||||||
<activity
|
<activity
|
||||||
android:name=".ShowHabitActivity"
|
android:name=".ShowHabitActivity"
|
||||||
@@ -59,19 +59,30 @@
|
|||||||
android:value="org.isoron.uhabits.MainActivity"/>
|
android:value="org.isoron.uhabits.MainActivity"/>
|
||||||
</activity>
|
</activity>
|
||||||
|
|
||||||
<activity android:name=".IntroActivity"
|
<activity
|
||||||
android:label=""
|
android:name=".IntroActivity"
|
||||||
android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
|
android:label=""
|
||||||
|
android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
|
||||||
|
|
||||||
<receiver android:name="SmallWidgetProvider">
|
<receiver android:name="SmallWidgetProvider">
|
||||||
<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/small_widget_info" />
|
android:resource="@xml/small_widget_info"/>
|
||||||
</receiver>
|
</receiver>
|
||||||
|
|
||||||
|
<activity
|
||||||
|
android:name=".HabitWidgetConfigure"
|
||||||
|
android:theme="@style/Theme.AppCompat.Dialog">
|
||||||
|
|
||||||
|
<intent-filter>
|
||||||
|
<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/>
|
||||||
|
</intent-filter>
|
||||||
|
|
||||||
|
</activity>
|
||||||
|
|
||||||
</application>
|
</application>
|
||||||
|
|
||||||
</manifest>
|
</manifest>
|
||||||
|
|||||||
@@ -0,0 +1,91 @@
|
|||||||
|
/* Copyright (C) 2016 Alinson Santos Xavier
|
||||||
|
*
|
||||||
|
* This program 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.
|
||||||
|
*
|
||||||
|
* This program 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 <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.isoron.uhabits;
|
||||||
|
|
||||||
|
import android.app.Activity;
|
||||||
|
import android.appwidget.AppWidgetManager;
|
||||||
|
import android.content.Intent;
|
||||||
|
import android.content.SharedPreferences;
|
||||||
|
import android.os.Bundle;
|
||||||
|
import android.preference.PreferenceManager;
|
||||||
|
import android.view.View;
|
||||||
|
import android.widget.AdapterView;
|
||||||
|
import android.widget.ArrayAdapter;
|
||||||
|
import android.widget.ListView;
|
||||||
|
|
||||||
|
import org.isoron.helpers.DialogHelper;
|
||||||
|
import org.isoron.uhabits.models.Habit;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
public class HabitWidgetConfigure extends Activity implements AdapterView.OnItemClickListener
|
||||||
|
{
|
||||||
|
|
||||||
|
private Integer widgetId;
|
||||||
|
private ListView listView;
|
||||||
|
|
||||||
|
private ArrayList<Long> habitIds;
|
||||||
|
private ArrayList<String> habitNames;
|
||||||
|
private ArrayAdapter<String> adapter;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onCreate(Bundle savedInstanceState)
|
||||||
|
{
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
setContentView(R.layout.widget_configure_activity);
|
||||||
|
|
||||||
|
Intent intent = getIntent();
|
||||||
|
Bundle extras = intent.getExtras();
|
||||||
|
|
||||||
|
if (extras != null) widgetId = extras.getInt(AppWidgetManager.EXTRA_APPWIDGET_ID,
|
||||||
|
AppWidgetManager.INVALID_APPWIDGET_ID);
|
||||||
|
|
||||||
|
listView = (ListView) findViewById(R.id.listView);
|
||||||
|
|
||||||
|
habitIds = new ArrayList<>();
|
||||||
|
habitNames = new ArrayList<>();
|
||||||
|
|
||||||
|
List<Habit> habits = Habit.getAll(false);
|
||||||
|
for(Habit h : habits)
|
||||||
|
{
|
||||||
|
habitIds.add(h.getId());
|
||||||
|
habitNames.add(h.name);
|
||||||
|
}
|
||||||
|
|
||||||
|
adapter = new ArrayAdapter<>(this, android.R.layout.simple_list_item_1, habitNames);
|
||||||
|
listView.setAdapter(adapter);
|
||||||
|
listView.setOnItemClickListener(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onItemClick(AdapterView<?> parent, View view, int position, long id)
|
||||||
|
{
|
||||||
|
Long habitId = habitIds.get(position);
|
||||||
|
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(
|
||||||
|
getApplicationContext());
|
||||||
|
prefs.edit().putLong(SmallWidgetProvider.getWidgetPrefKey(widgetId), habitId).commit();
|
||||||
|
|
||||||
|
MainActivity.updateWidgets(this);
|
||||||
|
|
||||||
|
Intent resultValue = new Intent();
|
||||||
|
resultValue.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, widgetId);
|
||||||
|
setResult(RESULT_OK, resultValue);
|
||||||
|
finish();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -19,7 +19,9 @@ package org.isoron.uhabits;
|
|||||||
import android.appwidget.AppWidgetManager;
|
import android.appwidget.AppWidgetManager;
|
||||||
import android.appwidget.AppWidgetProvider;
|
import android.appwidget.AppWidgetProvider;
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
|
import android.content.SharedPreferences;
|
||||||
import android.graphics.Bitmap;
|
import android.graphics.Bitmap;
|
||||||
|
import android.preference.PreferenceManager;
|
||||||
import android.widget.RemoteViews;
|
import android.widget.RemoteViews;
|
||||||
|
|
||||||
import org.isoron.uhabits.models.Habit;
|
import org.isoron.uhabits.models.Habit;
|
||||||
@@ -27,6 +29,7 @@ import org.isoron.uhabits.views.SmallWidgetView;
|
|||||||
|
|
||||||
public class SmallWidgetProvider extends AppWidgetProvider
|
public class SmallWidgetProvider extends AppWidgetProvider
|
||||||
{
|
{
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onUpdate(Context context, AppWidgetManager manager, int[] appWidgetIds)
|
public void onUpdate(Context context, AppWidgetManager manager, int[] appWidgetIds)
|
||||||
{
|
{
|
||||||
@@ -37,8 +40,13 @@ public class SmallWidgetProvider extends AppWidgetProvider
|
|||||||
private void updateWidget(Context context, AppWidgetManager manager, int widgetId)
|
private void updateWidget(Context context, AppWidgetManager manager, int widgetId)
|
||||||
{
|
{
|
||||||
RemoteViews remoteViews = new RemoteViews(context.getPackageName(), R.layout.small_widget);
|
RemoteViews remoteViews = new RemoteViews(context.getPackageName(), R.layout.small_widget);
|
||||||
|
Context appContext = context.getApplicationContext();
|
||||||
|
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(appContext);
|
||||||
|
|
||||||
Habit habit = Habit.get(1L);
|
Long habitId = prefs.getLong(getWidgetPrefKey(widgetId), -1L);
|
||||||
|
if(habitId < 0) return;
|
||||||
|
|
||||||
|
Habit habit = Habit.get(habitId);
|
||||||
|
|
||||||
SmallWidgetView widgetView = new SmallWidgetView(context);
|
SmallWidgetView widgetView = new SmallWidgetView(context);
|
||||||
widgetView.setDrawingCacheEnabled(true);
|
widgetView.setDrawingCacheEnabled(true);
|
||||||
@@ -56,4 +64,18 @@ public class SmallWidgetProvider extends AppWidgetProvider
|
|||||||
manager.updateAppWidget(widgetId, remoteViews);
|
manager.updateAppWidget(widgetId, remoteViews);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static String getWidgetPrefKey(long widgetId)
|
||||||
|
{
|
||||||
|
return String.format("widget-%03d", widgetId);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onDeleted(Context context, int[] appWidgetIds)
|
||||||
|
{
|
||||||
|
Context appContext = context.getApplicationContext();
|
||||||
|
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(appContext);
|
||||||
|
|
||||||
|
for(Integer id : appWidgetIds)
|
||||||
|
prefs.edit().remove(getWidgetPrefKey(id));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,6 +25,6 @@
|
|||||||
android:textSize="12sp"
|
android:textSize="12sp"
|
||||||
android:maxLines="1"
|
android:maxLines="1"
|
||||||
android:ellipsize="end"
|
android:ellipsize="end"
|
||||||
android:text="Meditate"/>
|
android:text="@string/main_activity_title"/>
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
8
app/src/main/res/layout/widget_configure_activity.xml
Normal file
8
app/src/main/res/layout/widget_configure_activity.xml
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<ListView android:id="@+id/listView"
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:orientation="vertical">
|
||||||
|
|
||||||
|
</ListView>
|
||||||
@@ -5,7 +5,8 @@
|
|||||||
android:initialLayout="@layout/small_widget"
|
android:initialLayout="@layout/small_widget"
|
||||||
android:previewImage="@mipmap/ic_small_widget_preview"
|
android:previewImage="@mipmap/ic_small_widget_preview"
|
||||||
android:resizeMode="none"
|
android:resizeMode="none"
|
||||||
android:updatePeriodMillis="60000"
|
android:updatePeriodMillis="3600000"
|
||||||
|
android:configure="org.isoron.uhabits.HabitWidgetConfigure"
|
||||||
android:widgetCategory="home_screen">
|
android:widgetCategory="home_screen">
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user