Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/passman-android.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcos Zuriaga <wolfi@wolfi.es>2022-09-08 17:03:38 +0300
committerMarcos Zuriaga <wolfi@wolfi.es>2022-09-08 17:03:38 +0300
commitf716acb6006386d93b270e8f1c4211a15c010813 (patch)
tree1789e1c0d6ff60ea603efbf046db0d335d4755c9
parent654fc4ee5aefbf24ae25c87c07b9c7169c7e4633 (diff)
parenta84a61d293c8990f9fbb8dd84669f3a58353e1ae (diff)
Merge branch 'add-faq-button'
-rw-r--r--app/src/main/java/es/wolfi/app/passman/activities/PasswordListActivity.java5
-rw-r--r--app/src/main/res/menu/menu_password_list.xml4
-rw-r--r--app/src/main/res/values/strings.xml3
3 files changed, 11 insertions, 1 deletions
diff --git a/app/src/main/java/es/wolfi/app/passman/activities/PasswordListActivity.java b/app/src/main/java/es/wolfi/app/passman/activities/PasswordListActivity.java
index 07e2380..755edda 100644
--- a/app/src/main/java/es/wolfi/app/passman/activities/PasswordListActivity.java
+++ b/app/src/main/java/es/wolfi/app/passman/activities/PasswordListActivity.java
@@ -634,6 +634,11 @@ public class PasswordListActivity extends AppCompatActivity implements
case R.id.action_settings:
settingsButtonPressed();
return true;
+ case R.id.action_faq:
+ String url = "https://github.com/nextcloud/passman-android/blob/master/FAQ.md";
+ Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
+ startActivity(Intent.createChooser(intent, "Browse with"));
+ return true;
case R.id.action_refresh:
refreshButtonPressed();
return true;
diff --git a/app/src/main/res/menu/menu_password_list.xml b/app/src/main/res/menu/menu_password_list.xml
index 1db08ac..23fc0e1 100644
--- a/app/src/main/res/menu/menu_password_list.xml
+++ b/app/src/main/res/menu/menu_password_list.xml
@@ -6,6 +6,10 @@
android:title="@string/action_settings"
android:orderInCategory="104"
app:showAsAction="never" />
+ <item android:id="@+id/action_faq"
+ android:title="@string/faq"
+ android:orderInCategory="103"
+ app:showAsAction="never" />
<item android:id="@+id/action_refresh"
android:title="@string/action_refresh"
android:orderInCategory="100"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cdfe103..d672573 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,4 +1,4 @@
-<resources>
+s<resources>
<string name="app_name_release" translatable="false">Passman</string>
<string name="app_name_alpha" translatable="false">Passman - Alpha</string>
<string name="action_settings">Settings</string>
@@ -88,4 +88,5 @@
<string name="manual_login">Manual Login</string>
<string name="confirm_account_logout">Are you sure you want to log out?</string>
<string name="value">Value</string>
+ <string name="faq">FAQ</string>
</resources>