diff --git a/app/src/main/java/org/isoron/uhabits/AboutActivity.java b/app/src/main/java/org/isoron/uhabits/AboutActivity.java
index 20af24efe..8952bc460 100644
--- a/app/src/main/java/org/isoron/uhabits/AboutActivity.java
+++ b/app/src/main/java/org/isoron/uhabits/AboutActivity.java
@@ -68,7 +68,7 @@ public class AboutActivity extends Activity implements View.OnClickListener
{
Intent intent = new Intent();
intent.setAction(Intent.ACTION_VIEW);
- intent.setData(Uri.parse("market://details?id=org.isoron.uhabits"));
+ intent.setData(Uri.parse(getString(R.string.playStoreURL)));
startActivity(intent);
break;
}
@@ -77,8 +77,7 @@ public class AboutActivity extends Activity implements View.OnClickListener
{
Intent intent = new Intent();
intent.setAction(Intent.ACTION_SENDTO);
- intent.setData(Uri.parse("mailto:isoron+habits@gmail.com?" +
- "subject=Feedback%20about%20Loop%20Habit%20Tracker"));
+ intent.setData(Uri.parse(getString(R.string.feedbackURL)));
startActivity(intent);
break;
}
@@ -87,7 +86,7 @@ public class AboutActivity extends Activity implements View.OnClickListener
{
Intent intent = new Intent();
intent.setAction(Intent.ACTION_VIEW);
- intent.setData(Uri.parse("https://github.com/iSoron/uhabits"));
+ intent.setData(Uri.parse(getString(R.string.sourceCodeURL)));
startActivity(intent);
break;
}
diff --git a/app/src/main/java/org/isoron/uhabits/fragments/ListHabitsFragment.java b/app/src/main/java/org/isoron/uhabits/fragments/ListHabitsFragment.java
index 51b24d696..b6ea51dd9 100644
--- a/app/src/main/java/org/isoron/uhabits/fragments/ListHabitsFragment.java
+++ b/app/src/main/java/org/isoron/uhabits/fragments/ListHabitsFragment.java
@@ -21,7 +21,9 @@ package org.isoron.uhabits.fragments;
import android.app.Activity;
import android.app.Fragment;
+import android.content.Intent;
import android.content.SharedPreferences;
+import android.net.Uri;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.view.ActionMode;
@@ -222,6 +224,15 @@ public class ListHabitsFragment extends Fragment
return true;
}
+ case R.id.action_faq:
+ {
+ Intent intent = new Intent();
+ intent.setAction(Intent.ACTION_VIEW);
+ intent.setData(Uri.parse(getString(R.string.helpURL)));
+ startActivity(intent);
+ return true;
+ }
+
default:
return super.onOptionsItemSelected(item);
}
diff --git a/app/src/main/res/menu/list_habits_menu.xml b/app/src/main/res/menu/list_habits_menu.xml
index 1734213fc..320dc357a 100644
--- a/app/src/main/res/menu/list_habits_menu.xml
+++ b/app/src/main/res/menu/list_habits_menu.xml
@@ -34,6 +34,12 @@
android:title="@string/action_settings"
app:showAsAction="never"/>
+
+
-
+
+
+ https://isoron.github.io/uhabits/faq.html
+ market://details?id=org.isoron.uhabits
+ mailto:isoron+habits@gmail.com?subject=Feedback%20about%20Loop%20Habit%20Tracker
+ https://github.com/iSoron/uhabits
+
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8ac6b8f76..3417ff2d1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -137,4 +137,5 @@
2 times per week
5 times per week
Custom …
+ Help & FAQ
\ No newline at end of file
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 90659f074..c1b5f5b0a 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -44,6 +44,12 @@
android:key="pref_key_links"
android:title="@string/links">
+
+
+
+