From 16860603fd77e016f5217a60e4ab86c2eac0eb81 Mon Sep 17 00:00:00 2001
From: Yuuu2990 <110877395+Yuuu2990@users.noreply.github.com>
Date: Wed, 26 Oct 2022 18:59:51 +1100
Subject: [PATCH] Add Link to FAQ in the app (#9164)
* Link to FAQ in the app #4447
* remove redundant comments produced by me.
* Update app/src/main/res/values/strings.xml
Update FAQ description
Co-authored-by: opusforlife2 <53176348+opusforlife2@users.noreply.github.com>
* Format the CodeStyle and readjust the layout.
* Update app/src/main/res/layout/fragment_about.xml
Remove redundant id.
Co-authored-by: Stypox <stypox@pm.me>
* Update app/src/main/res/layout/fragment_about.xml
Remove redundant id.
Co-authored-by: Stypox <stypox@pm.me>
* Update app/src/main/res/values/strings.xml
Keep the uppercase for consistency.
Co-authored-by: Stypox <stypox@pm.me>
* Update app/src/main/res/values/strings.xml
Modify the description of FAQ.
Co-authored-by: Stypox <stypox@pm.me>
Co-authored-by: opusforlife2 <53176348+opusforlife2@users.noreply.github.com>
Co-authored-by: Stypox <stypox@pm.me>
---
.../org/schabi/newpipe/about/AboutActivity.kt | 1 +
app/src/main/res/layout/fragment_about.xml | 20 +++++++++++++++++++
app/src/main/res/values/donottranslate.xml | 1 +
app/src/main/res/values/strings.xml | 5 ++++-
4 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/app/src/main/java/org/schabi/newpipe/about/AboutActivity.kt b/app/src/main/java/org/schabi/newpipe/about/AboutActivity.kt
index 50a3984e3..c1eec1526 100644
--- a/app/src/main/java/org/schabi/newpipe/about/AboutActivity.kt
+++ b/app/src/main/java/org/schabi/newpipe/about/AboutActivity.kt
@@ -78,6 +78,7 @@ class AboutActivity : AppCompatActivity() {
aboutDonationLink.openLink(R.string.donation_url)
aboutWebsiteLink.openLink(R.string.website_url)
aboutPrivacyPolicyLink.openLink(R.string.privacy_policy_url)
+ faqLink.openLink(R.string.faq_url)
return root
}
}
diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
index 1807acb10..5e6e11d00 100644
--- a/app/src/main/res/layout/fragment_about.xml
+++ b/app/src/main/res/layout/fragment_about.xml
@@ -44,6 +44,26 @@
android:paddingBottom="5dp"
android:text="@string/app_description" />
+ <org.schabi.newpipe.views.NewPipeTextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingTop="10dp"
+ android:text="@string/faq_title"
+ android:textAppearance="@android:style/TextAppearance.Medium" />
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/faq_description" />
+
+ <Button
+ android:id="@+id/faq_link"
+ style="@style/Base.Widget.AppCompat.Button.Borderless"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="end"
+ android:text="@string/faq" />
+
<org.schabi.newpipe.views.NewPipeTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml
index c3cc48726..d28f794c0 100644
--- a/app/src/main/res/values/donottranslate.xml
+++ b/app/src/main/res/values/donottranslate.xml
@@ -21,6 +21,7 @@
<string name="donation_url">https://newpipe.net/donate/</string>
<string name="website_url">https://newpipe.net/</string>
<string name="privacy_policy_url">https://newpipe.net/legal/privacy/</string>
+ <string name="faq_url">https://newpipe.net/FAQ/</string>
<string name="service_kiosk_string">%1$s/%2$s</string>
<string name="youtube">YouTube</string>
<string name="soundcloud">SoundCloud</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e685ca081..fd1add6c9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -348,7 +348,7 @@
<string name="title_activity_about">About NewPipe</string>
<string name="title_licenses">Third-party Licenses</string>
<string name="copyright">© %1$s by %2$s under %3$s</string>
- <string name="tab_about">About</string>
+ <string name="tab_about">About \u0026 FAQ</string>
<string name="tab_licenses">Licenses</string>
<string name="app_description">Libre lightweight streaming on Android.</string>
<string name="contribution_title">Contribute</string>
@@ -365,6 +365,9 @@
<string name="app_license_title">NewPipe\'s License</string>
<string name="app_license">NewPipe is copyleft libre software: You can use, study, share, and improve it at will. Specifically you can redistribute and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.</string>
<string name="read_full_license">Read license</string>
+ <string name="faq_title">Frequently asked questions</string>
+ <string name="faq_description">If you are having trouble using the app, be sure to check out these answers to common questions!</string>
+ <string name="faq">View on website</string>
<!-- History -->
<string name="title_activity_history">History</string>
<string name="action_history">History</string>