Merge pull request #30 from mjureczko/maly-poszukiwacz-skarbow-27

Maly poszukiwacz skarbow 27
mjureczko · Jan 30, 2024 · 2737ab8 · 2737ab8
2 parents a09d9d6 + a34324e
commit 2737ab8
Show file tree

Hide file tree

Showing 41 changed files with 631 additions and 260 deletions.
diff --git a/...est/java/pl/marianjureczko/poszukiwacz/activity/facebook/ReportCommemorativePhotosTest.kt b/...est/java/pl/marianjureczko/poszukiwacz/activity/facebook/ReportCommemorativePhotosTest.kt
@@ -37,7 +37,7 @@ internal class ReportCommemorativePhotosTest : ReportAbstractTest() {
         treasuresProgress.commemorativePhotosByTreasuresDescriptionIds.put(2, tempPhoto(600, 600))
 
         StorageHelper(context).save(Route(treasuresProgress.routeName))
-        model.initialize(treasuresProgress, context)
+        model.initialize(context, null, treasuresProgress)
         val reportPhotos = ReportCommemorativePhotos(model, font, seed)
 
         //when
@@ -59,7 +59,7 @@ internal class ReportCommemorativePhotosTest : ReportAbstractTest() {
         treasuresProgress.commemorativePhotosByTreasuresDescriptionIds.put(2, tempPhoto(600, 600))
         treasuresProgress.commemorativePhotosByTreasuresDescriptionIds.put(3, tempPhoto(400, 800))
         treasuresProgress.commemorativePhotosByTreasuresDescriptionIds.put(4, tempPhoto(600, 500))
-        model.initialize(treasuresProgress, context)
+        model.initialize(context, null, treasuresProgress)
         val reportPhotos = ReportCommemorativePhotos(model, font, seed)
 
         //when

diff --git a/...c/androidTest/java/pl/marianjureczko/poszukiwacz/activity/facebook/ReportGeneratorTest.kt b/...c/androidTest/java/pl/marianjureczko/poszukiwacz/activity/facebook/ReportGeneratorTest.kt
@@ -9,6 +9,7 @@ import androidx.test.platform.app.InstrumentationRegistry
 import org.junit.Test
 import org.junit.runner.RunWith
 import pl.marianjureczko.poszukiwacz.activity.treasureselector.Coordinates
+import pl.marianjureczko.poszukiwacz.model.HunterPath
 import pl.marianjureczko.poszukiwacz.model.Route
 import pl.marianjureczko.poszukiwacz.model.Treasure
 import pl.marianjureczko.poszukiwacz.model.TreasureType
@@ -33,14 +34,15 @@ class ReportGeneratorTest {
         treasuresProgress.commemorativePhotosByTreasuresDescriptionIds.put(3, photos[2])
         treasuresProgress.commemorativePhotosByTreasuresDescriptionIds.put(13, photos[4])
         treasuresProgress.commemorativePhotosByTreasuresDescriptionIds.put(0, photos[5])
-        treasuresProgress.hunterPath.addLocation(Coordinates(10.0, 10.0), Date(1))
-        treasuresProgress.hunterPath.addLocation(Coordinates(10.0, 11.0), Date(1_000_000))
-        treasuresProgress.hunterPath.addLocation(Coordinates(10.0, 11.0), Date(2_000_000))
+        val hunterPath = HunterPath()
+        hunterPath.addLocation(Coordinates(10.0, 10.0), Date(1))
+        hunterPath.addLocation(Coordinates(10.0, 11.0), Date(1_000_000))
+        hunterPath.addLocation(Coordinates(10.0, 11.0), Date(2_000_000))
         StorageHelper(context).save(Route(treasuresProgress.routeName))
 
         //when
         val model = FacebookViewModel(SavedStateHandle(mapOf()))
-        model.initialize(treasuresProgress, context)
+        model.initialize(context, hunterPath, treasuresProgress)
         //MapBox doesn't work in tests
         model.getMap()?.isSelected = false
         val actual = report.create(context, model) {

diff --git a/...c/androidTest/java/pl/marianjureczko/poszukiwacz/activity/facebook/ReportMapHeaderTest.kt b/...c/androidTest/java/pl/marianjureczko/poszukiwacz/activity/facebook/ReportMapHeaderTest.kt
@@ -19,7 +19,7 @@ class ReportMapHeaderTest : ReportAbstractTest() {
         val bitmap = Bitmap.createBitmap(ReportCommons.REPORT_WIDTH, 200, Bitmap.Config.ARGB_8888)
         val canvas = Canvas(bitmap)
         canvas.drawColor(Color.WHITE)
-        model.initialize(treasuresProgress, context)
+        model.initialize(context, null, treasuresProgress)
 
         //when
         reportMapHeader.draw(context, canvas, 0f)

diff --git a/.../androidTest/java/pl/marianjureczko/poszukiwacz/activity/facebook/ReportMapSummaryTest.kt b/.../androidTest/java/pl/marianjureczko/poszukiwacz/activity/facebook/ReportMapSummaryTest.kt
@@ -8,6 +8,7 @@ import junit.framework.TestCase
 import org.junit.Test
 import org.junit.runner.RunWith
 import pl.marianjureczko.poszukiwacz.activity.treasureselector.Coordinates
+import pl.marianjureczko.poszukiwacz.model.HunterPath
 import java.io.File
 import java.util.Date
 
@@ -22,10 +23,11 @@ class ReportMapSummaryTest : ReportAbstractTest() {
         val bitmap = Bitmap.createBitmap(ReportCommons.REPORT_WIDTH, 200, Bitmap.Config.ARGB_8888)
         val canvas = Canvas(bitmap)
         canvas.drawColor(Color.WHITE)
-        treasuresProgress.hunterPath.addLocation(Coordinates(10.0, 10.0), Date(1))
-        treasuresProgress.hunterPath.addLocation(Coordinates(10.0, 11.0), Date(1_000_000))
-        treasuresProgress.hunterPath.addLocation(Coordinates(10.0, 11.0), Date(2_000_000))
-        model.initialize(treasuresProgress, context)
+        val hunterPath = HunterPath()
+        hunterPath.addLocation(Coordinates(10.0, 10.0), Date(1))
+        hunterPath.addLocation(Coordinates(10.0, 11.0), Date(1_000_000))
+        hunterPath.addLocation(Coordinates(10.0, 11.0), Date(2_000_000))
+        model.initialize(context, hunterPath, treasuresProgress)
 
         //when
         reportMapHeader.draw(context, canvas, 0f)

diff --git a/...src/androidTest/java/pl/marianjureczko/poszukiwacz/activity/facebook/ReportSummaryTest.kt b/...src/androidTest/java/pl/marianjureczko/poszukiwacz/activity/facebook/ReportSummaryTest.kt
@@ -25,7 +25,7 @@ internal class ReportSummaryTest : ReportAbstractTest() {
 
         val treasure = Treasure("1", 17, TreasureType.GOLD)
         treasuresProgress.collect(treasure)
-        model.initialize(treasuresProgress, context)
+        model.initialize(context, null, treasuresProgress)
 
         //when
         reportSummary.draw(context, canvas, 0f)

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
@@ -26,7 +27,8 @@ class CommemorativeActivity : ActivityWithAdsAndBackButton() {
     private val model: CommemorativeViewModel by viewModels()
     private val storageHelper = StorageHelper(this)
     private val photoHelper = PhotoHelper(this, storageHelper)
-    private val doPhotoLauncher: ActivityResultLauncher<Uri> = registerForActivityResult(ActivityResultContracts.TakePicture()) { result ->
+    private val doPhotoLauncher: ActivityResultLauncher<Uri> =
+        registerForActivityResult(ActivityResultContracts.TakePicture()) { result ->
         if (result) {
             photoHelper.moveCommemorativePhotoToPermanentLocation(target = model.commemorativePhotoAbsolutePath)
             reloadImage(model.commemorativePhotoUri())
@@ -58,7 +60,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
 
 }