maly-poszukiwacz-skarbow-27 bugfix for photo button

mjureczko · Jan 29, 2024 · b88fd82 · b88fd82
1 parent a09d9d6
commit b88fd82
Show file tree

Hide file tree

Showing 36 changed files with 609 additions and 231 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -56,7 +56,9 @@
 
         <activity
             android:name=".activity.result.ResultActivity"
-            android:exported="false" />
+            android:exported="false"
+            android:theme="@style/FullscreenTheme"
+            />
         <activity
             android:name=".activity.map.MapActivity"
             android:exported="false"
@@ -67,10 +69,12 @@
         <activity android:name=".activity.bluetooth.BluetoothActivity" />
         <activity
             android:name=".activity.photo.PhotoActivity"
-            android:label="@string/photo_tip" />
+            android:label="@string/photo_tip"
+            android:theme="@style/FullscreenTheme"
+            />
         <activity
             android:name=".activity.treasureseditor.TreasuresEditorActivity"
-            android:theme="@style/FullscreenTheme" />
+            android:theme="@style/AppTheme" />
         <activity
             android:name=".activity.main.MainActivity"
             android:exported="true"

diff --git a/app/src/main/java/pl/marianjureczko/poszukiwacz/activity/bluetooth/BluetoothActivity.kt b/app/src/main/java/pl/marianjureczko/poszukiwacz/activity/bluetooth/BluetoothActivity.kt
@@ -15,6 +15,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import pl.marianjureczko.poszukiwacz.App
 import pl.marianjureczko.poszukiwacz.R
+import pl.marianjureczko.poszukiwacz.activity.facebook.FacebookInputData
 import pl.marianjureczko.poszukiwacz.activity.main.Bluetooth
 import pl.marianjureczko.poszukiwacz.activity.main.BluetoothException
 import pl.marianjureczko.poszukiwacz.model.Route
@@ -101,7 +102,7 @@ class BluetoothActivity : PermissionActivity(), MemoConsole, BluetoothConnection
         setUpAds(findViewById(R.id.adView))
     }
 
-    override fun getCurrentTreasuresProgress(): TreasuresProgress? {
+    override fun getTreasureProgress(): TreasuresProgress? {
         return null
     }
 

diff --git a/...c/main/java/pl/marianjureczko/poszukiwacz/activity/commemorative/CommemorativeActivity.kt b/...c/main/java/pl/marianjureczko/poszukiwacz/activity/commemorative/CommemorativeActivity.kt
@@ -10,6 +10,7 @@ import androidx.activity.viewModels
 import androidx.lifecycle.lifecycleScope
 import kotlinx.coroutines.launch
 import pl.marianjureczko.poszukiwacz.R
+import pl.marianjureczko.poszukiwacz.activity.facebook.FacebookInputData
 import pl.marianjureczko.poszukiwacz.databinding.ActivityCommemorativeBinding
 import pl.marianjureczko.poszukiwacz.model.TreasuresProgress
 import pl.marianjureczko.poszukiwacz.shared.ActivityWithAdsAndBackButton
@@ -58,7 +59,7 @@ class CommemorativeActivity : ActivityWithAdsAndBackButton() {
         setUpAds(binding.adView)
     }
 
-    override fun getCurrentTreasuresProgress(): TreasuresProgress? = model.progress
+    override fun getTreasureProgress(): TreasuresProgress? = model.progress
 
     private fun rotatePhoto(photoFullPath: String, uri: Uri) {
         lifecycleScope.launch {

diff --git a/app/src/main/java/pl/marianjureczko/poszukiwacz/activity/facebook/FacebookActivity.kt b/app/src/main/java/pl/marianjureczko/poszukiwacz/activity/facebook/FacebookActivity.kt
@@ -12,7 +12,6 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import com.facebook.CallbackManager
 import com.facebook.FacebookCallback
 import com.facebook.FacebookException
-import com.facebook.FacebookSdk
 import com.facebook.share.Sharer
 import com.facebook.share.model.SharePhoto
 import com.facebook.share.model.SharePhotoContent
@@ -36,7 +35,7 @@ class FacebookActivity : PermissionActivity() {
     private val model: FacebookViewModel by viewModels()
 
     companion object {
-        const val TREASURE_PROGRESS = "pl.marianjureczko.poszukiwacz.activity.facebook_treasure_progress"
+        const val INPUT = "pl.marianjureczko.poszukiwacz.activity.input"
         const val STORAGE_DO_NOT_REQUIRE_PERMISSONS = Build.VERSION_CODES.Q
         private val xmlHelper = XmlHelper()
     }
@@ -48,11 +47,8 @@ class FacebookActivity : PermissionActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
-
-        model.initialize(
-            progress = xmlHelper.loadFromString(intent.getStringExtra(TREASURE_PROGRESS)!!),
-            this
-        )
+        val input = intent.getSerializableExtra(INPUT) as FacebookInputData
+        model.initialize(this, hunterPath = input.hunterPath, progress = input.progress)
         callbackManager = CallbackManager.Factory.create()
         shareDialog = ShareDialog(this)
 
@@ -120,5 +116,5 @@ class FacebookActivity : PermissionActivity() {
         }
     }
 
-    override fun getCurrentTreasuresProgress(): TreasuresProgress? = null
+    override fun getTreasureProgress(): TreasuresProgress? = null
 }
diff --git a/app/src/main/java/pl/marianjureczko/poszukiwacz/activity/facebook/FacebookContract.kt b/app/src/main/java/pl/marianjureczko/poszukiwacz/activity/facebook/FacebookContract.kt
@@ -4,11 +4,13 @@ import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import androidx.activity.result.contract.ActivityResultContract
+import pl.marianjureczko.poszukiwacz.model.HunterPath
 import pl.marianjureczko.poszukiwacz.model.TreasuresProgress
 import pl.marianjureczko.poszukiwacz.shared.XmlHelper
 import java.io.Serializable
 
 data class FacebookInputData(
+    val hunterPath: HunterPath?,
     val progress: TreasuresProgress
 ) : Serializable
 
@@ -18,13 +20,9 @@ data class FacebookOutputData(
 
 class FacebookContract : ActivityResultContract<FacebookInputData, FacebookOutputData?>() {
 
-    companion object {
-        private val xmlHelper = XmlHelper()
-    }
-
     override fun createIntent(context: Context, input: FacebookInputData): Intent {
         return Intent(context, FacebookActivity::class.java).apply {
-            putExtra(FacebookActivity.TREASURE_PROGRESS, xmlHelper.writeToString(input.progress))
+            putExtra(FacebookActivity.INPUT, input)
         }
     }
 

diff --git a/app/src/main/java/pl/marianjureczko/poszukiwacz/activity/facebook/FacebookViewModel.kt b/app/src/main/java/pl/marianjureczko/poszukiwacz/activity/facebook/FacebookViewModel.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import pl.marianjureczko.poszukiwacz.R
+import pl.marianjureczko.poszukiwacz.model.HunterPath
 import pl.marianjureczko.poszukiwacz.model.Route
 import pl.marianjureczko.poszukiwacz.model.TreasuresProgress
 import pl.marianjureczko.poszukiwacz.shared.StorageHelper
@@ -12,13 +13,16 @@ class FacebookViewModel(private val state: SavedStateHandle) : ViewModel() {
     private val TAG = javaClass.simpleName
     lateinit var progress: TreasuresProgress
         private set
+    var hunterPath: HunterPath? = null
+        private set
     lateinit var elements: List<ElementDescription>
         private set
 
     lateinit var route: Route
 
-    fun initialize(progress: TreasuresProgress, context: Context) {
+    fun initialize(context: Context, hunterPath: HunterPath?, progress: TreasuresProgress) {
         this.progress = progress
+        this.hunterPath = hunterPath
         val elements = mutableListOf<ElementDescription>()
         elements.add(ElementDescription(Type.TREASURES_SUMMARY, true, context.getString(R.string.collected_treasures)))
         val treasure = context.getString(R.string.treasure)

diff --git a/app/src/main/java/pl/marianjureczko/poszukiwacz/activity/facebook/ReportMap.kt b/app/src/main/java/pl/marianjureczko/poszukiwacz/activity/facebook/ReportMap.kt
@@ -62,19 +62,22 @@ class ReportMap(
     }
 
     private fun drawRoute(snapshot: MapSnapshotInterface, mapCanvas: Canvas) {
-        val locations = model.progress.hunterPath.pathAsCoordinates().toList()
-        if (locations.size > 1) {
-            var previousXY = snapshot.screenCoordinate(Point.fromLngLat(locations[0].longitude, locations[0].latitude))
-            locations.asSequence()
-                .drop(1)
-                .forEach {
-                    val xy = snapshot.screenCoordinate(Point.fromLngLat(it.longitude, it.latitude))
-                    mapCanvas.drawLine(
-                        previousXY.x.toFloat(), previousXY.y.toFloat(), xy.x.toFloat(), xy.y.toFloat(),
-                        Paint().apply { color = Color.RED }
-                    )
-                    previousXY = xy
-                }
+        model.hunterPath?.let {
+            val locations = it.pathAsCoordinates().toList()
+            if (locations.size > 1) {
+                var previousXY =
+                    snapshot.screenCoordinate(Point.fromLngLat(locations[0].longitude, locations[0].latitude))
+                locations.asSequence()
+                    .drop(1)
+                    .forEach {
+                        val xy = snapshot.screenCoordinate(Point.fromLngLat(it.longitude, it.latitude))
+                        mapCanvas.drawLine(
+                            previousXY.x.toFloat(), previousXY.y.toFloat(), xy.x.toFloat(), xy.y.toFloat(),
+                            Paint().apply { color = Color.RED }
+                        )
+                        previousXY = xy
+                    }
+            }
         }
     }
 

diff --git a/app/src/main/java/pl/marianjureczko/poszukiwacz/activity/facebook/ReportMapSummary.kt b/app/src/main/java/pl/marianjureczko/poszukiwacz/activity/facebook/ReportMapSummary.kt
@@ -29,9 +29,9 @@ class ReportMapSummary(
             val textPaint = ReportCommons.getTextPaint(font, Paint.Align.LEFT)
             var textY = currentTop + 50
             var x = ReportCommons.REPORT_MARGIN
-            canvas.drawText(distanceText(context, model.progress.hunterPath), x, textY, textPaint)
+            canvas.drawText(distanceText(context, model.hunterPath), x, textY, textPaint)
             textY += 40
-            canvas.drawText(timeText(context, model.progress.hunterPath), x, textY, textPaint)
+            canvas.drawText(timeText(context, model.hunterPath), x, textY, textPaint)
         }
     }
 
@@ -42,17 +42,18 @@ class ReportMapSummary(
             context.getResources().getConfiguration().locale
         }
 
-    private fun distanceText(context: Context, hunterPath: HunterPath): String {
-        val formattedDistance = "%.2f".format(hunterPath.pathLengthInKm())
+    private fun distanceText(context: Context, hunterPath: HunterPath?): String {
+        val distance = hunterPath?.pathLengthInKm() ?: 0.0
+        val formattedDistance = "%.2f".format(distance)
         return "${context.getString(R.string.walked_route)} $formattedDistance km."
     }
 
-    private fun timeText(context: Context, hunterPath: HunterPath): String {
+    private fun timeText(context: Context, hunterPath: HunterPath?): String {
         val loc = Locale("en", "US")
         val timeFormat = DateFormat.getTimeInstance(DateFormat.SHORT, loc)
         val dateFormat: DateFormat = DateFormat.getDateInstance(DateFormat.DEFAULT, loc)
 
-        hunterPath.getStartTime()?.let { start ->
+        hunterPath?.getStartTime()?.let { start ->
             val startDate = dateFormat.format(start)
             val startTime = timeFormat.format(start)
             hunterPath.getEndTime()?.let { end ->

diff --git a/app/src/main/java/pl/marianjureczko/poszukiwacz/activity/main/MainActivity.kt b/app/src/main/java/pl/marianjureczko/poszukiwacz/activity/main/MainActivity.kt
@@ -23,7 +23,7 @@ import pl.marianjureczko.poszukiwacz.shared.StorageHelper
 class MainActivity : PermissionActivity() {
 
     private val TAG = javaClass.simpleName
-    override fun getCurrentTreasuresProgress(): TreasuresProgress? {
+    override fun getTreasureProgress(): TreasuresProgress? {
         return null
     }
 

diff --git a/app/src/main/java/pl/marianjureczko/poszukiwacz/activity/map/MapActivity.kt b/app/src/main/java/pl/marianjureczko/poszukiwacz/activity/map/MapActivity.kt
@@ -41,7 +41,7 @@ class MapActivity : ActivityWithAdsAndBackButton() {
         setUpAds(binding.adView)
     }
 
-    override fun getCurrentTreasuresProgress(): TreasuresProgress? = model.progress
+    override fun getTreasureProgress(): TreasuresProgress? = model.progress
 
     override fun onResume() {
         super.onResume()

diff --git a/app/src/main/java/pl/marianjureczko/poszukiwacz/activity/photo/PhotoActivity.kt b/app/src/main/java/pl/marianjureczko/poszukiwacz/activity/photo/PhotoActivity.kt
@@ -33,7 +33,7 @@ class PhotoActivity : ActivityWithAdsAndBackButton() {
         setUpAds(binding.adView)
     }
 
-    override fun getCurrentTreasuresProgress(): TreasuresProgress =
+    override fun getTreasureProgress(): TreasuresProgress =
         model.progress
 
 }
diff --git a/app/src/main/java/pl/marianjureczko/poszukiwacz/activity/result/ResultActivity.kt b/app/src/main/java/pl/marianjureczko/poszukiwacz/activity/result/ResultActivity.kt
@@ -2,20 +2,49 @@ package pl.marianjureczko.poszukiwacz.activity.result
 
 import android.app.Activity
 import android.content.pm.ActivityInfo
+import android.net.Uri
 import android.os.Bundle
 import android.view.View
+import android.widget.Toast
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.activity.viewModels
+import androidx.core.view.isVisible
 import pl.marianjureczko.poszukiwacz.R
+import pl.marianjureczko.poszukiwacz.activity.commemorative.CommemorativeContract
+import pl.marianjureczko.poszukiwacz.activity.commemorative.CommemorativeInputData
 import pl.marianjureczko.poszukiwacz.databinding.ActivityResultBinding
 import pl.marianjureczko.poszukiwacz.model.TreasuresProgress
 import pl.marianjureczko.poszukiwacz.shared.ActivityWithAdsAndBackButton
+import pl.marianjureczko.poszukiwacz.shared.PhotoHelper
+import pl.marianjureczko.poszukiwacz.shared.StorageHelper
 
 class ResultActivity : ActivityWithAdsAndBackButton() {
 
     companion object {
-        const val RESULT = "pl.marianjureczko.poszukiwacz.activity.result";
+        const val RESULT_IN = "pl.marianjureczko.poszukiwacz.activity.result_in"
+        const val RESULT_OUT = "pl.marianjureczko.poszukiwacz.activity.result_out"
     }
 
+    private val model: ResultActivityViewModel by viewModels()
     private lateinit var binding: ActivityResultBinding
+    private val storageHelper = StorageHelper(this)
+    private val photoHelper = PhotoHelper(this, storageHelper)
+
+    private val showCommemorativeLauncher: ActivityResultLauncher<CommemorativeInputData> =
+        registerForActivityResult(CommemorativeContract()) {}
+
+    //TODO t: copied from CommemorativeActivity
+    private val doPhotoLauncher: ActivityResultLauncher<Uri> =
+        registerForActivityResult(ActivityResultContracts.TakePicture()) { result ->
+            if (result) {
+                model.addCommemorativePhoto(storageHelper, photoHelper.moveCommemorativePhotoToPermanentLocation())
+                configureDoPhotoButton()
+                Toast.makeText(this, R.string.photo_saved, Toast.LENGTH_SHORT).show()
+            } else {
+                Toast.makeText(this, R.string.photo_not_replaced, Toast.LENGTH_SHORT).show()
+            }
+        }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -24,24 +53,51 @@ class ResultActivity : ActivityWithAdsAndBackButton() {
         binding = ActivityResultBinding.inflate(layoutInflater)
 
         requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
-        val input = intent.getSerializableExtra(RESULT) as ResultActivityData
-        if (input.isError()) {
-            binding.resultDescription.text = input.error
+        val input = intent.getSerializableExtra(RESULT_IN) as ResultActivityInput
+        model.initialize(this, storageHelper, input.treasure, input.progress, input.treasureDescription)
+
+        configureView()
+        setContentView(binding.root)
+        setUpAds(binding.adView)
+    }
+
+    private fun configureView() {
+        if (model.isError()) {
+            binding.resultDescription.text = model.errorMsg
             binding.resultImg.visibility = View.GONE
         } else {
-            binding.resultDescription.text = input.treasure!!.quantity.toString()
-            binding.resultImg.setImageResource(input.treasure.type.image())
+            binding.resultDescription.text = model.treasure!!.quantity.toString()
+            binding.resultImg.setImageResource(model.treasure!!.type.image())
+        }
+
+        if (model.canMakeCommemorativePhoto()) {
+            configureDoPhotoButton()
+        } else {
+            binding.buttonsLayout.isVisible = false
+        }
+    }
+
+    private fun configureDoPhotoButton() {
+        binding.buttonsLayout.isVisible = true
+        if (model.currentTreasureHasCommemorativePhoto()) {
+            binding.doPhoto.setImageResource(R.drawable.camera_show_photo)
+            binding.doPhoto.setOnClickListener {
+                model.commemorativeInputData()?.let { showCommemorativeLauncher.launch(it) }
+            }
+        } else {
+            binding.doPhoto.setImageResource(R.drawable.camera_do_photo)
+            binding.doPhoto.setOnClickListener {
+                doPhotoLauncher.launch(photoHelper.createCommemorativePhotoTempUri())
+            }
         }
-        setContentView(binding.root)
-        setUpAds(binding.adView)
     }
 
-    override fun getCurrentTreasuresProgress(): TreasuresProgress? {
+    override fun getTreasureProgress(): TreasuresProgress? {
         return null
     }
 
     override fun onBackPressed() {
-        setResult(Activity.RESULT_OK, intent)
+        setResult(Activity.RESULT_OK, model.activityResult())
         super.onBackPressed()
     }
 }
diff --git a/app/src/main/java/pl/marianjureczko/poszukiwacz/activity/result/ResultActivityContract.kt b/app/src/main/java/pl/marianjureczko/poszukiwacz/activity/result/ResultActivityContract.kt
@@ -4,14 +4,14 @@ import android.content.Context
 import android.content.Intent
 import androidx.activity.result.contract.ActivityResultContract
 
-class ResultActivityContract : ActivityResultContract<ResultActivityData, ResultActivityData?>() {
-    override fun createIntent(context: Context, input: ResultActivityData?): Intent {
+class ResultActivityContract : ActivityResultContract<ResultActivityInput, ResultActivityOutput>() {
+    override fun createIntent(context: Context, input: ResultActivityInput?): Intent {
         return Intent(context, ResultActivity::class.java).apply {
-            putExtra(ResultActivity.RESULT, input)
+            putExtra(ResultActivity.RESULT_IN, input)
         }
     }
 
-    override fun parseResult(resultCode: Int, intent: Intent?): ResultActivityData? {
-        return intent?.getSerializableExtra(ResultActivity.RESULT) as ResultActivityData?
+    override fun parseResult(resultCode: Int, intent: Intent?): ResultActivityOutput {
+        return intent?.getSerializableExtra(ResultActivity.RESULT_OUT) as ResultActivityOutput
     }
 }
diff --git a/app/src/main/java/pl/marianjureczko/poszukiwacz/activity/result/ResultActivityData.kt b/app/src/main/java/pl/marianjureczko/poszukiwacz/activity/result/ResultActivityData.kt