Merge branch 'release/3.0.4' into latest

Author: cloudsftp

.github/workflows/test.yml

@@ -6,6 +6,8 @@ on:
       - develop
     tags:
       - 'v*'
+  schedule:
+    - cron: '0 5 * * 3'
 
 jobs:
   build:

README.md

@@ -1,4 +1,4 @@
-# Bad Radio Android ![version](https://img.shields.io/badge/v3.0.3-blue.svg)
+# Bad Radio Android ![version](https://img.shields.io/badge/v3.0.4-blue.svg)
 
 [![website](https://img.shields.io/badge/Website-grey.svg)](https://badradio.nz/)
 [![Build Develop](https://github.com/cloudsftp/BadRadioAndroid/actions/workflows/build.yml/badge.svg?branch=develop)](https://github.com/cloudsftp/BadRadioAndroid/actions/workflows/build.yml)

app/build.gradle

@@ -13,8 +13,8 @@ android {
         minSdkVersion 23
         compileSdk 34
         targetSdkVersion 34
-        versionCode 319
-        versionName "3.0.3"
+        versionCode 320
+        versionName "3.0.4"
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
     signingConfigs {

app/src/main/java/nz/badradio/badradio/view/AboutActivity.kt

@@ -9,9 +9,6 @@ import nz.badradio.badradio.R
 import nz.badradio.badradio.databinding.ActivityAboutBinding
 
 class AboutActivity : AppCompatActivity() {
-    private val radioWebsite    = "https://badradio.nz"
-    private val badradioDiscord = "https://discord.gg/sY87mUcyYD"
-
     private lateinit var binding: ActivityAboutBinding
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -27,13 +24,18 @@ class AboutActivity : AppCompatActivity() {
             }
         }
 
-        binding.websiteButton.setOnClickListener { openWebsite(radioWebsite) }
-        binding.discordButton.setOnClickListener { openWebsite(badradioDiscord) }
+        binding.websiteButton.setOnClickListener {
+            openWebsite(resources.getString(R.string.website_url))
+        }
+        binding.discordButton.setOnClickListener {
+            openWebsite(resources.getString(R.string.discord_url))
+        }
 
         binding.appVersionTextView.text = String.format(
             resources.getString(R.string.version_name),
             BuildConfig.VERSION_NAME
         )
+
         binding.shareButton.setOnClickListener { shareApp() }
         binding.betaButton.setOnClickListener {
             openWebsite(String.format(
@@ -42,6 +44,9 @@ class AboutActivity : AppCompatActivity() {
             ))
         }
 
+        binding.privacyButton.setOnClickListener {
+            openWebsite(resources.getString(R.string.privacy_policy_url))
+        }
     }
 
     private fun openWebsite(url: String) {

app/src/main/res/layout/activity_about.xml

@@ -86,7 +86,7 @@
         android:layout_marginLeft="20dp"
         android:layout_marginRight="20dp"
         app:layout_constraintTop_toBottomOf="@id/link_buttons_layout"
-        app:layout_constraintBottom_toBottomOf="parent">
+        app:layout_constraintBottom_toTopOf="@id/privacy_policy_layout">
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/app_version_text_view"
@@ -120,4 +120,26 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/privacy_policy_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        app:layout_constraintTop_toBottomOf="@id/app_info_layout"
+        app:layout_constraintBottom_toBottomOf="parent">
+
+        <TextView
+            android:id="@+id/privacy_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            android:textColor="@color/greyc"
+            android:text="@string/privacy_policy" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/values/strings.xml

@@ -10,14 +10,18 @@
     <string name="paul">Paul Grey</string>
 
     <string name="website">website</string>
+    <string name="website_url">https://badradio.nz</string>
     <string name="discord">discord</string>
+    <string name="discord_url">https://discord.gg/sY87mUcyYD</string>
 
     <string name="version_name">Android App Version: %1$s</string>
     <string name="share">share</string>
     <string name="share_app_text">24/7 Phonk Radio https://play.google.com/store/apps/details?id=%1$s</string>
     <string name="join_beta">join beta</string>
     <string name="beta_link">https://play.google.com/apps/testing/%1$s</string>
     <string name="beta_feedback">Please send bugs and improvements on discord</string>
+    <string name="privacy_policy">Privacy Policy</string>
+    <string name="privacy_policy_url">https://badradio.nz/privacy-policy/</string>
 
     <string name="restart_service">Restart Service</string>
     <string name="stop_service">Stop Service</string>