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

Fix up navigation when opening the app from widget

Browse Source 
Fixes #94
This commit is contained in:
Alinson S. Xavier
2016-05-11 06:44:11 -04:00
parent 0b95b6a78c
commit e933cbbc43
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,8 +61,7 @@
<activity <activity
android:name=".ShowHabitActivity" android:name=".ShowHabitActivity"
android:label="@string/title_activity_show_habit" android:label="@string/title_activity_show_habit">
android:parentActivityName=".MainActivity">
<meta-data <meta-data
android:name="android.support.PARENT_ACTIVITY" android:name="android.support.PARENT_ACTIVITY"
android:value="org.isoron.uhabits.MainActivity"/> android:value="org.isoron.uhabits.MainActivity"/>
@@ -70,8 +69,7 @@
<activity <activity
android:name=".SettingsActivity" android:name=".SettingsActivity"
android:label="@string/settings" android:label="@string/settings">
android:parentActivityName=".MainActivity">
<meta-data <meta-data
android:name="android.support.PARENT_ACTIVITY" android:name="android.support.PARENT_ACTIVITY"
android:value="org.isoron.uhabits.MainActivity"/> android:value="org.isoron.uhabits.MainActivity"/>
@@ -92,8 +90,10 @@
<activity <activity
android:name=".AboutActivity" android:name=".AboutActivity"
android:label="@string/about" android:label="@string/about">
android:parentActivityName=".MainActivity"> <meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".MainActivity" />
</activity> </activity>
<receiver <receiver

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

@@ -33,6 +33,7 @@ import android.net.Uri;
import android.os.Handler; import android.os.Handler;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.support.v4.app.NotificationCompat; import android.support.v4.app.NotificationCompat;
import android.support.v4.app.TaskStackBuilder;
import android.support.v4.content.LocalBroadcastManager; import android.support.v4.content.LocalBroadcastManager;
import org.isoron.uhabits.helpers.DateHelper; import org.isoron.uhabits.helpers.DateHelper;
@@ -244,7 +245,10 @@ public class HabitBroadcastReceiver extends BroadcastReceiver
{ {
Intent intent = new Intent(context, ShowHabitActivity.class); Intent intent = new Intent(context, ShowHabitActivity.class);
intent.setData(Uri.parse("content://org.isoron.uhabits/habit/" + habit.getId())); intent.setData(Uri.parse("content://org.isoron.uhabits/habit/" + habit.getId()));
return PendingIntent.getActivity(context, 0, intent, 0);
return TaskStackBuilder.create(context.getApplicationContext())
.addNextIntentWithParentStack(intent)
.getPendingIntent(0, PendingIntent.FLAG_UPDATE_CURRENT);
} }
private boolean checkWeekday(Intent intent, Habit habit) private boolean checkWeekday(Intent intent, Habit habit)