Declaration builder created

Took 2 hours 34 minutes Took 2 minutes
2025-12-10 02:05:20 +00:00 · 2022-04-06 22:59:45 +01:00
parent d7534d585e
commit 1c415b4f9a
7 changed files with 111 additions and 15 deletions
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -14,4 +14,6 @@
    <string name="min">Min:</string>
    <string name="max">Max:</string>
    <string name="average">Average:</string>
+    <string name="cancel">Cancel</string>
+    <string name="ok">OK</string>
 </resources>
--- a/app/src/monoWeather/java/com/appttude/h_mal/atlas_weather/monoWeather/dialog/DeclarationBuilder.kt
+++ b/app/src/monoWeather/java/com/appttude/h_mal/atlas_weather/monoWeather/dialog/DeclarationBuilder.kt
@@ -0,0 +1,21 @@
+package com.appttude.h_mal.atlas_weather.monoWeather.dialog
+
+import android.content.Context
+import android.os.Build
+import android.text.Html
+import androidx.annotation.RequiresApi
+import androidx.annotation.StringRes
+
+interface DeclarationBuilder{
+    val link: String
+    val message: String
+
+    fun Context.readFromResources(@StringRes id: Int) = resources.getString(id)
+
+    @RequiresApi(Build.VERSION_CODES.N)
+    fun buildMessage(): CharSequence? {
+        val link1 = "<font color='blue'><a href=\"$link\">here</a></font>"
+        val message = "$message See my privacy policy: $link1"
+        return Html.fromHtml(message, Html.FROM_HTML_MODE_LEGACY)
+    }
+}
--- a/app/src/monoWeather/java/com/appttude/h_mal/atlas_weather/monoWeather/dialog/PermissionsDeclarationDialog.kt
+++ b/app/src/monoWeather/java/com/appttude/h_mal/atlas_weather/monoWeather/dialog/PermissionsDeclarationDialog.kt
@@ -0,0 +1,45 @@
+package com.appttude.h_mal.atlas_weather.monoWeather.dialog
+
+import android.content.Context
+import android.os.Build
+import android.text.method.LinkMovementMethod
+import android.view.View
+import android.widget.TextView
+import androidx.annotation.RequiresApi
+import androidx.appcompat.app.AlertDialog
+import com.appttude.h_mal.atlas_weather.R
+
+
+class PermissionsDeclarationDialog(context: Context) : BaseDeclarationDialog(context) {
+
+    override val link: String = "https://sites.google.com/view/hmaldev/home/monochrome"
+    override val message: String = "Hi, thank you for downloading my app. Google play isn't letting me upload my app to the Playstore until I have a privacy declaration :(. My app is basically used to demonstrate my code=ing to potential employers and others. I do NOT store or process any information. The location permission in the app is there just to provide the end user with weather data."
+}
+
+abstract class BaseDeclarationDialog(val context: Context): DeclarationBuilder {
+    abstract override val link: String
+    abstract override val message: String
+
+    @RequiresApi(Build.VERSION_CODES.N)
+    fun showDialog(agreeCallback: () -> Unit = { Unit }, disagreeCallback: () -> Unit = { Unit }) {
+        val myMessage = buildMessage()
+
+        val builder = AlertDialog.Builder(context)
+                .setPositiveButton("agree") { _, _ ->
+                    agreeCallback()
+                }
+                .setNegativeButton("disagree") { _, _ ->
+                    disagreeCallback()
+                }
+                .setMessage(myMessage)
+                .setCancelable(false)
+
+        val alertDialog = builder.create()
+        alertDialog.show()
+
+        // Make the textview clickable. Must be called after show()
+        val msgTxt = alertDialog.findViewById<View>(R.id.message) as TextView?
+        msgTxt!!.movementMethod = LinkMovementMethod.getInstance()
+    }
+}
+
--- a/app/src/monoWeather/java/com/appttude/h_mal/atlas_weather/monoWeather/ui/home/HomeFragment.kt
+++ b/app/src/monoWeather/java/com/appttude/h_mal/atlas_weather/monoWeather/ui/home/HomeFragment.kt
@@ -12,6 +12,7 @@ import androidx.lifecycle.observe
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.appttude.h_mal.atlas_weather.R
 import com.appttude.h_mal.atlas_weather.application.LOCATION_PERMISSION_REQUEST
+import com.appttude.h_mal.atlas_weather.monoWeather.dialog.PermissionsDeclarationDialog
 import com.appttude.h_mal.atlas_weather.monoWeather.ui.BaseFragment
 import com.appttude.h_mal.atlas_weather.monoWeather.ui.home.adapter.WeatherRecyclerAdapter
 import com.appttude.h_mal.atlas_weather.utils.displayToast
@@ -49,9 +50,12 @@ class HomeFragment : BaseFragment() {
            adapter = recyclerAdapter
        }

-
-        getPermissionResult(Manifest.permission.ACCESS_COARSE_LOCATION, LOCATION_PERMISSION_REQUEST){
-            viewModel.fetchData()
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) {
+            PermissionsDeclarationDialog(requireContext()).showDialog(agreeCallback = {
+                getPermissionResult(Manifest.permission.ACCESS_COARSE_LOCATION, LOCATION_PERMISSION_REQUEST){
+                    viewModel.fetchData()
+                }
+            })
        }

        swipe_refresh.apply {
--- a/app/src/monoWeather/java/com/appttude/h_mal/atlas_weather/monoWeather/ui/widget/WidgetLocationPermissionActivity.kt
+++ b/app/src/monoWeather/java/com/appttude/h_mal/atlas_weather/monoWeather/ui/widget/WidgetLocationPermissionActivity.kt
@@ -6,15 +6,17 @@ import android.appwidget.AppWidgetManager.*
 import android.content.Intent
 import android.content.pm.PackageManager.PERMISSION_GRANTED
 import android.os.Bundle
+import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.ActivityCompat.checkSelfPermission
 import com.appttude.h_mal.atlas_weather.R
+import com.appttude.h_mal.atlas_weather.monoWeather.dialog.DeclarationBuilder
 import com.appttude.h_mal.atlas_weather.utils.displayToast
 import kotlinx.android.synthetic.monoWeather.permissions_declaration_dialog.*

 const val PERMISSION_CODE = 401

-class WidgetLocationPermissionActivity : AppCompatActivity() {
+class WidgetLocationPermissionActivity : AppCompatActivity(), DeclarationBuilder {
    private var mAppWidgetId = INVALID_APPWIDGET_ID

    override fun onCreate(savedInstanceState: Bundle?) {
@@ -36,6 +38,7 @@ class WidgetLocationPermissionActivity : AppCompatActivity() {
        }

        setContentView(R.layout.permissions_declaration_dialog)
+        findViewById<TextView>(R.id.declaration_text).setText(buildMessage())

        submit.setOnClickListener {
            if (checkSelfPermission(this, ACCESS_COARSE_LOCATION) != PERMISSION_GRANTED) {
@@ -44,6 +47,8 @@ class WidgetLocationPermissionActivity : AppCompatActivity() {
                submitWidget()
            }
        }
+
+        cancel.setOnClickListener { finish() }
    }

    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
@@ -83,4 +88,7 @@ class WidgetLocationPermissionActivity : AppCompatActivity() {
            sendBroadcast(this)
        }
    }
+
+    override val link: String = "https://sites.google.com/view/hmaldev/home/monochrome"
+    override val message: String = readFromResources(R.string.widget_declaration)
 }
--- a/app/src/monoWeather/res/layout/permissions_declaration_dialog.xml
+++ b/app/src/monoWeather/res/layout/permissions_declaration_dialog.xml
@@ -2,12 +2,12 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
    android:paddingLeft="@dimen/activity_horizontal_margin"
    android:paddingTop="@dimen/activity_vertical_margin"
    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:paddingBottom="@dimen/activity_vertical_margin">

    <ImageView
        android:id="@+id/imageView"
@@ -19,33 +19,48 @@
        app:layout_constraintRight_toRightOf="parent"
        app:layout_constraintTop_toTopOf="parent"
        app:layout_constraintVertical_bias="0.2"
-        app:srcCompat="@drawable/location_permission_decl" />
+        app:srcCompat="@drawable/cloud_symbol" />

    <TextView
+        android:id="@+id/declaration_text"
        android:layout_width="0dp"
        android:layout_height="wrap_content"
+        android:layout_marginLeft="64dp"
+        android:layout_marginRight="64dp"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintLeft_toLeftOf="parent"
        app:layout_constraintRight_toRightOf="parent"
        app:layout_constraintTop_toBottomOf="@id/imageView"
-        android:layout_marginLeft="64dp"
-        android:layout_marginRight="64dp"
        app:layout_constraintVertical_bias="0.2"
-        tools:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer nec odio. Praesent libero. Sed cursus ante dapibus diam. Sed nisi. Nulla quis sem at nibh elementum imperdiet. Duis sagittis ipsum. Praesent mauris. Fusce nec tellus sed augue semper porta. Mauris massa. Vestibulum lacinia arcu eget nulla. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos."/>
+        tools:text="@string/widget_declaration" />

    <Button
        android:id="@+id/submit"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
+        android:backgroundTint="@android:color/white"
+        android:text="@string/ok"
+        android:textColor="@android:color/black"
        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintHorizontal_bias="0.9"
        app:layout_constraintLeft_toLeftOf="parent"
        app:layout_constraintRight_toRightOf="parent"
        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.85"
-        app:layout_constraintHorizontal_bias="0.9"
+        app:layout_constraintVertical_bias="0.85" />
+
+    <Button
+        android:id="@+id/cancel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
        android:backgroundTint="@android:color/white"
+        android:text="@string/cancel"
        android:textColor="@android:color/black"
-        android:text="Ok" />
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintHorizontal_bias="0.1"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.85" />


 </androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/monoWeather/res/values/strings.xml
+++ b/app/src/monoWeather/res/values/strings.xml
@@ -8,5 +8,6 @@

    <string name="title_home">Home</string>
    <string name="title_world">World</string>
-    <!-- TODO: Remove or change this placeholder text -->
+
+    <string name="widget_declaration">When using the app widget with app will require the use of background location services. Just to confirm the location data is used just to provide the end user with widget data. The use of background location permission is to update the widget at 30 minute intervals. </string>
 </resources>