Add the ShopFinder feature to the ui toolkit module (#61)

Author: rekire

.phrase.yml

@@ -49,37 +49,37 @@ phrase:
         params:
           <<: *defaults
           locale_id: b220db5757be359631c55ec54fb65ac6 # en-US
-          tags: Onboarding
+          tags: Onboarding,Shop
       - file: ./ui-toolkit/src/main/res/values-de/strings.xml
         params:
           <<: *defaults
           locale_id: 512f99f8cd03c80affd16303fb5de9c2 # de
-          tags: Onboarding
+          tags: Onboarding,Shop
       - file: ./ui-toolkit/src/main/res/values-fr/strings.xml
         params:
           <<: *defaults
           locale_id: edf0b29dd998221329199f185d360ae4 # fr
-          tags: Onboarding
+          tags: Onboarding,Shop
       - file: ./ui-toolkit/src/main/res/values-fr-rCH/strings.xml
         params:
           <<: *defaults
           locale_id: fae2e092d1704da2ed88f3f56eb6f219 # fr-CH
-          tags: Onboarding
+          tags: Onboarding,Shop
       - file: ./ui-toolkit/src/main/res/values-hu/strings.xml
         params:
           <<: *defaults
           locale_id: 8f797bd77008e27f6286531a5ad55f67 # hu
-          tags: Onboarding
+          tags: Onboarding,Shop
       - file: ./ui-toolkit/src/main/res/values-it/strings.xml
         params:
           <<: *defaults
           locale_id: a4dea5c3e2c77e7c6ea344e69db63ed9 # it
-          tags: Onboarding
+          tags: Onboarding,Shop
       - file: ./ui-toolkit/src/main/res/values-sk/strings.xml
         params:
           <<: *defaults
           locale_id: 9ee4c528e480d56878c98ee8bfbc521b # sk
-          tags: Onboarding
+          tags: Onboarding,Shop
 
       # kotlin-sample module
       - file: ./kotlin-sample/src/main/res/values/strings.xml

CHANGELOG.md

@@ -1,7 +1,7 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
-## [0.69.0]
+## [0.69.0] (not yet released)
 
 ### Changed
 - Added ui-toolkit for more realistic sample app with onboarding

core/src/main/java/io/snabble/sdk/Snabble.kt

@@ -245,13 +245,14 @@ object Snabble {
      */
     var checkedInShop: Shop? = null
         set(value) {
-            val currentShopId = this.checkedInShop?.id.orEmpty()
-            val newShopId = value?.id.orEmpty()
+            val currentShopId = this.checkedInShop?.id
+            val newShopId = value?.id
             if (currentShopId != newShopId) {
                 field = value
-                if (newShopId == "") {
+                if (newShopId.isNullOrEmpty()) {
                     userPreferences.lastCheckedInShopId = null
                     checkedInProject.value = null
+                    mutableCurrentCheckedInShop.value = null
                 } else {
                     userPreferences.lastCheckedInShopId = newShopId
 

core/src/main/java/io/snabble/sdk/UserAgentInterceptor.kt

@@ -22,7 +22,12 @@ internal class UserAgentInterceptor(context: Context) : Interceptor {
 
     init {
         val appName = (context.packageManager.getApplicationLabel(context.applicationInfo)).toString()
-        userAgent = "$appName/${Snabble.versionName} snabble/${Snabble.version} " +
+        val appVersion = try {
+            context.packageManager.getPackageInfo(context.packageName,0).versionName
+        } catch (e: Exception) {
+            "Unknown"
+        }
+        userAgent = "$appName/$appVersion snabble/${Snabble.version} " +
                     "(Android ${Build.VERSION.RELEASE}; ${Build.BRAND}; " +
                     "${Build.MODEL}) okhttp/${OkHttp.VERSION}"
     }

core/src/main/java/io/snabble/sdk/checkin/CheckInLocationManager.kt

@@ -4,14 +4,11 @@ import android.Manifest
 import android.annotation.SuppressLint
 import android.app.Application
 import android.content.Context
-import android.content.SharedPreferences
 import android.content.pm.PackageManager
 import android.location.*
 import android.os.Bundle
-import android.util.Log
 import androidx.core.app.ActivityCompat
 import androidx.lifecycle.MutableLiveData
-import com.google.android.gms.tasks.Task
 import io.snabble.sdk.Snabble
 import io.snabble.sdk.utils.Dispatch
 import io.snabble.sdk.utils.Logger

core/src/main/java/io/snabble/sdk/checkin/CheckInManager.kt

@@ -7,15 +7,13 @@ import android.os.Handler
 import android.os.Looper
 import androidx.annotation.RequiresPermission
 import androidx.lifecycle.Observer
-import com.google.android.gms.maps.model.LatLng
 import io.snabble.sdk.Project
 import io.snabble.sdk.Shop
 import io.snabble.sdk.Snabble
 import io.snabble.sdk.utils.Dispatch
 import io.snabble.sdk.utils.Logger
 import java.util.concurrent.CopyOnWriteArrayList
 import java.util.concurrent.TimeUnit
-import kotlin.collections.HashMap
 
 /**
  * Listener for check in states. Notifies about check in / check out and if multiple shops are
@@ -223,7 +221,6 @@ class CheckInManager(val snabble: Snabble,
 
                 if (lastCheckedInProject != newCheckedInProject) {
                     lastCheckedInProject = newCheckedInProject
-                    Snabble.checkedInShop = null
                 }
 
                 Snabble.checkedInShop = checkInShop

kotlin-compose-sample/build.gradle

@@ -4,12 +4,12 @@ plugins {
 }
 
 android {
-    compileSdk 32
+    compileSdk 33
 
     defaultConfig {
         applicationId "io.snabble.sdk.composesample"
         minSdk 21
-        targetSdk 32
+        targetSdk 33
         versionCode 1
         versionName "1.0"
 
@@ -58,12 +58,12 @@ dependencies {
     implementation "androidx.core:core-ktx:1.8.0"
     implementation "androidx.compose.ui:ui:$compose_version"
     implementation "androidx.compose.ui:ui-viewbinding:$compose_version"
-    implementation "androidx.compose.material3:material3:1.0.0-alpha13"
+    implementation "androidx.compose.material3:material3:1.0.0-beta01"
     implementation "com.google.android.material:material:1.6.1"
     implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
-    implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.4.1"
-    implementation "androidx.activity:activity-compose:1.4.0"
-    implementation "androidx.navigation:navigation-compose:2.5.0-rc01"
+    implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.5.1"
+    implementation "androidx.activity:activity-compose:1.5.1"
+    implementation "androidx.navigation:navigation-compose:2.5.1"
 
     testImplementation "junit:junit:4.13.2"
 

kotlin-customization-sample/src/main/java/io/snabble/sdk/customization/LoadingActivity.kt

@@ -4,6 +4,7 @@ import android.content.Intent
 import android.os.Bundle
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
+import io.snabble.sdk.BuildConfig
 import io.snabble.sdk.InitializationState
 import io.snabble.sdk.Snabble
 

kotlin-sample/build.gradle

@@ -2,12 +2,12 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 33
 
     defaultConfig {
         applicationId 'io.snabble.sdk.sample'
         minSdkVersion 21
-        targetSdkVersion 31
+        targetSdkVersion 33
         versionCode 1
         versionName '1.0'
 
@@ -31,6 +31,7 @@ android {
 }
 
 dependencies {
+    implementation 'androidx.preference:preference-ktx:1.2.0'
     coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:${project.desugarVersion}"
 
     implementation project(':core')

kotlin-sample/src/main/java/io/snabble/sdk/sample/HomeFragment.kt

@@ -1,33 +1,32 @@
 package io.snabble.sdk.sample
 
-import android.Manifest
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
-import android.widget.TextView
-import androidx.activity.result.contract.ActivityResultContracts
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
-import io.snabble.sdk.sample.R
+import io.snabble.sdk.sample.utils.PermissionSupport
 
 class HomeFragment : Fragment() {
+
     override fun onCreateView(
-            inflater: LayoutInflater,
-            container: ViewGroup?,
-            savedInstanceState: Bundle?
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
     ): View? {
         val root = inflater.inflate(R.layout.fragment_home, container, false)
 
         root.findViewById<Button>(R.id.show_payment_credentials).setOnClickListener {
             findNavController().navigate(R.id.navigation_payment_credentials)
         }
 
-        root.findViewById<Button>(R.id.request_location_permission).setOnClickListener {
-            (requireActivity() as MainActivity).locationPermission.launch(Manifest.permission.ACCESS_FINE_LOCATION)
-        }
+        root.findViewById<Button>(R.id.request_location_permission)
+            .setOnClickListener {
+                (requireActivity() as? PermissionSupport)?.startLocationPermissionRequest()
+            }
 
         return root
     }
-}
+}