Add MediNET overview to resources menu

Resolves #36
merge-requests/7/head
Trevor Slocum 2020-03-11 16:49:58 -07:00
parent 73b62f4e12
commit 3168f28f4e
4 changed files with 22 additions and 9 deletions

View File

@ -1,5 +1,5 @@
1.5.9:
- Add resources menu linking to how to meditate, /r/meditation and replaying the tutorial
- Add resources menu linking to how to meditate, /r/meditation, an overview of MediNET and replaying the tutorial
- Add presets to tutorial
- Resolve possible crash when waking device
- Resolve duration not being preselected when editing

View File

@ -479,6 +479,14 @@ public class MainActivity extends Activity implements OnShowcaseEventListener {
finishedTutorial = null;
getMeditationAssistant().getPrefs().edit().putBoolean("finishedTutorial", false).apply();
showNextTutorial(true);
} else if (item.getItemId() == R.id.action_help_medinet) {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder
.setIcon(getResources().getDrawable(getTheme().obtainStyledAttributes(getMeditationAssistant().getMATheme(), new int[]{R.attr.actionIconInfo}).getResourceId(0, 0)))
.setTitle(getString(R.string.whatIsMediNET))
.setMessage(getString(R.string.whatIsMediNETHelp))
.setPositiveButton(R.string.ok, null)
.show();
} else if (item.getItemId() == R.id.action_settings) {
Intent intent = new Intent(this, SettingsActivity.class);
startActivity(intent);
@ -1126,10 +1134,10 @@ public class MainActivity extends Activity implements OnShowcaseEventListener {
+ timestamp
+ " Stop: "
+ getMeditationAssistant()
.getTimeToStopMeditate()
.getTimeToStopMeditate()
+ " Start: "
+ getMeditationAssistant()
.getTimeStartMeditate()
.getTimeStartMeditate()
);
getMeditationAssistant().setTimeStartMeditate(timestamp);
@ -1146,10 +1154,10 @@ public class MainActivity extends Activity implements OnShowcaseEventListener {
+ timestamp
+ " Stop: "
+ getMeditationAssistant()
.getTimeToStopMeditate()
.getTimeToStopMeditate()
+ " Start: "
+ getMeditationAssistant()
.getTimeStartMeditate()
.getTimeStartMeditate()
);
handler.removeCallbacks(meditateRunnable);
handler.removeCallbacks(intervalRunnable);
@ -1753,7 +1761,7 @@ public class MainActivity extends Activity implements OnShowcaseEventListener {
@Override
protected void onNewIntent(Intent intent) {
int widgetId = intent.getIntExtra("widgetid", -1);
int widgetId = intent.getIntExtra("widgetid", -1);
super.onNewIntent(intent);
setIntent(intent);
@ -1871,7 +1879,7 @@ public class MainActivity extends Activity implements OnShowcaseEventListener {
Log.d("MeditationAssistant", "Setting INTERVAL WAKEUP alarm for "
+ cal.getTimeInMillis() + " (Now: "
+ System.currentTimeMillis() + ", in: " + (cal.getTimeInMillis() - System.currentTimeMillis()) / 1000 + ") - TOTAL TIME LEFT: " + (getMeditationAssistant().getTimeToStopMeditate()
- (System.currentTimeMillis() / 1000)));
- (System.currentTimeMillis() / 1000)));
Intent intent_interval = new Intent(
getApplicationContext(), MainActivity.class);
@ -2085,10 +2093,10 @@ public class MainActivity extends Activity implements OnShowcaseEventListener {
Log.d("MeditationAssistant",
"Stopping - start:"
+ getMeditationAssistant()
.getTimeStartMeditate()
.getTimeStartMeditate()
+ " stop:"
+ getMeditationAssistant()
.getTimeToStopMeditate()
.getTimeToStopMeditate()
);
getMeditationAssistant().setRunnableStopped(true);

View File

@ -13,6 +13,9 @@
<item
android:id="@+id/action_reddit_community"
android:title="@string/meditationSubreddit" />
<item
android:id="@+id/action_help_medinet"
android:title="@string/whatIsMediNET" />
<item
android:id="@+id/action_replay_tutorial"
android:title="@string/replayTutorial" />

View File

@ -65,6 +65,8 @@
<string name="resources">Resources</string>
<string name="howToMeditate">How to meditate</string>
<string name="meditationSubreddit">Reddit community</string>
<string name="whatIsMediNET">MediNET overview</string>
<string name="whatIsMediNETHelp">MediNET is an online meditation session repository and community.\n\nYou may choose to store your sessions on MediNET to prevent data loss and/or to share your progress with others online.\n\nYou may instead choose to store session data on the device only.</string>
<string name="replayTutorial">Replay tutorial</string>
<!-- About -->
<string name="tapToLearnMore">Tap anywhere to learn more</string>