isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-06 09:08:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into feature/refactoring-mvc

Browse Source
This commit is contained in:
Alinson S. Xavier
2016-06-28 22:45:49 -04:00
parent 4ae813e6f9 a445ca962b
commit 9a059275ce
4 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/AndroidManifest.xml
View File

@@ -21,8 +21,8 @@
<manifest <manifest
package="org.isoron.uhabits" package="org.isoron.uhabits"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:versionCode="21" android:versionCode="22"
android:versionName="1.5.5"> android:versionName="1.5.6">
<uses-permission android:name="android.permission.VIBRATE"/> <uses-permission android:name="android.permission.VIBRATE"/>

3
app/src/main/java/org/isoron/uhabits/HabitBroadcastReceiver.java
View File

@@ -175,7 +175,8 @@ public class HabitBroadcastReceiver extends BroadcastReceiver
dismissPendingIntent = dismissPendingIntent =
HabitPendingIntents.dismissNotification(context); HabitPendingIntents.dismissNotification(context);
PendingIntent checkIntentPending = PendingIntent checkIntentPending =
HabitPendingIntents.toggleCheckmark(context, habit, timestamp); HabitPendingIntents.toggleCheckmark(context, habit,
timestamp, 1);
PendingIntent snoozeIntentPending = PendingIntent snoozeIntentPending =
HabitPendingIntents.snoozeNotification(context, habit); HabitPendingIntents.snoozeNotification(context, habit);

11
app/src/main/java/org/isoron/uhabits/HabitPendingIntents.java
View File

@@ -37,7 +37,7 @@ public abstract class HabitPendingIntents
Intent deleteIntent = new Intent(context, HabitBroadcastReceiver.class); Intent deleteIntent = new Intent(context, HabitBroadcastReceiver.class);
deleteIntent.setAction(HabitBroadcastReceiver.ACTION_DISMISS); deleteIntent.setAction(HabitBroadcastReceiver.ACTION_DISMISS);
return PendingIntent.getBroadcast(context, 0, deleteIntent, return PendingIntent.getBroadcast(context, 0, deleteIntent,
PendingIntent.FLAG_CANCEL_CURRENT); PendingIntent.FLAG_UPDATE_CURRENT);
} }
public static PendingIntent snoozeNotification(Context context, Habit habit) public static PendingIntent snoozeNotification(Context context, Habit habit)
@@ -47,20 +47,21 @@ public abstract class HabitPendingIntents
snoozeIntent.setData(data); snoozeIntent.setData(data);
snoozeIntent.setAction(HabitBroadcastReceiver.ACTION_SNOOZE); snoozeIntent.setAction(HabitBroadcastReceiver.ACTION_SNOOZE);
return PendingIntent.getBroadcast(context, 0, snoozeIntent, return PendingIntent.getBroadcast(context, 0, snoozeIntent,
PendingIntent.FLAG_CANCEL_CURRENT); PendingIntent.FLAG_UPDATE_CURRENT);
} }
public static PendingIntent toggleCheckmark(Context context, public static PendingIntent toggleCheckmark(Context context,
Habit habit, Habit habit,
Long timestamp) Long timestamp,
int requestCode)
{ {
Uri data = habit.getUri(); Uri data = habit.getUri();
Intent checkIntent = new Intent(context, HabitBroadcastReceiver.class); Intent checkIntent = new Intent(context, HabitBroadcastReceiver.class);
checkIntent.setData(data); checkIntent.setData(data);
checkIntent.setAction(HabitBroadcastReceiver.ACTION_CHECK); checkIntent.setAction(HabitBroadcastReceiver.ACTION_CHECK);
if (timestamp != null) checkIntent.putExtra("timestamp", timestamp); if (timestamp != null) checkIntent.putExtra("timestamp", timestamp);
return PendingIntent.getBroadcast(context, 0, checkIntent, return PendingIntent.getBroadcast(context, requestCode, checkIntent,
PendingIntent.FLAG_CANCEL_CURRENT); PendingIntent.FLAG_UPDATE_CURRENT);
} }
public static PendingIntent viewHabit(Context context, Habit habit) public static PendingIntent viewHabit(Context context, Habit habit)

2
app/src/main/java/org/isoron/uhabits/ui/widgets/CheckmarkWidget.java
View File

@@ -45,7 +45,7 @@ public class CheckmarkWidget extends BaseWidget
@Override @Override
public PendingIntent getOnClickPendingIntent(Context context) public PendingIntent getOnClickPendingIntent(Context context)
{ {
return HabitPendingIntents.toggleCheckmark(context, habit, null); return HabitPendingIntents.toggleCheckmark(context, habit, null, 2);
} }
@Override @Override