Fixes for UI toolkit (#66)

1. Fix Shoplist, distance is now visible if location permission is
granted.
2. Fix broken tos link
3. Fix location bug for Api < 30

Author: Fabtron

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

@@ -5,7 +5,9 @@ import android.annotation.SuppressLint
 import android.app.Application
 import android.content.Context
 import android.content.pm.PackageManager
-import android.location.*
+import android.location.Location
+import android.location.LocationListener
+import android.location.LocationManager
 import android.os.Bundle
 import androidx.core.app.ActivityCompat
 import androidx.lifecycle.MutableLiveData
@@ -60,6 +62,10 @@ class CheckInLocationManager(val application: Application) {
         override fun onProviderEnabled(provider: String) {}
 
         override fun onProviderDisabled(provider: String) {}
+
+        @Deprecated("Deprecated in Java")
+        override fun onStatusChanged(provider: String?, status: Int, extras: Bundle?) {
+        }
     }
 
     /**

kotlin-sample/src/main/AndroidManifest.xml

@@ -41,5 +41,9 @@
         <meta-data
             android:name="snabble_network_interceptor"
             android:value="io.snabble.sdk.sample.LoggingInterceptor" />
+
+        <meta-data
+            android:name="com.google.android.geo.API_KEY"
+            android:value=""/>
     </application>
 </manifest>

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

@@ -1,7 +1,9 @@
 package io.snabble.sdk.sample
 
 import android.Manifest
+import android.content.SharedPreferences
 import android.content.pm.PackageManager
+import android.net.Uri
 import android.os.Bundle
 import android.widget.Toast
 import androidx.activity.result.ActivityResultLauncher
@@ -13,10 +15,12 @@ import androidx.core.os.bundleOf
 import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.NavController
+import androidx.navigation.NavDeepLinkRequest
 import androidx.navigation.findNavController
 import androidx.navigation.ui.AppBarConfiguration
 import androidx.navigation.ui.setupActionBarWithNavController
 import androidx.navigation.ui.setupWithNavController
+import androidx.preference.PreferenceManager
 import com.google.android.material.navigation.NavigationBarView
 import com.google.gson.Gson
 import io.snabble.sdk.Shop
@@ -36,6 +40,15 @@ class MainActivity : AppCompatActivity(), PermissionSupport {
 
     private lateinit var locationManager: CheckInLocationManager
 
+    private val sharedPreferences: SharedPreferences
+        get() = PreferenceManager.getDefaultSharedPreferences(this)
+
+    private var onboardingSeen: Boolean
+        get() = sharedPreferences.getBoolean(ONBOARDING_SEEN, false)
+        set(onboardingSeen) = sharedPreferences.edit()
+            .putBoolean(ONBOARDING_SEEN, onboardingSeen)
+            .apply()
+
     private val onboardingRepo: OnboardingRepository by lazy {
         OnboardingRepositoryImpl(assets, Gson())
     }
@@ -55,7 +68,7 @@ class MainActivity : AppCompatActivity(), PermissionSupport {
         val toolbar: Toolbar = findViewById(R.id.toolbar)
         setupToolbar(toolbar, navController, navBarView)
 
-        if (savedInstanceState == null) {
+        if (savedInstanceState == null && !onboardingSeen) {
             lifecycleScope.launch {
                 val model = onboardingRepo.getOnboardingModel()
                 SnabbleUiToolkit.executeAction(
@@ -211,19 +224,27 @@ class MainActivity : AppCompatActivity(), PermissionSupport {
             this@MainActivity,
             SnabbleUiToolkit.Event.DETAILS_SHOP_BUTTON_ACTION
         ) { _, _ ->
-            popBackStack()
+            navBarView.selectedItemId = R.id.navigation_scanner
         }
         SnabbleUiToolkit.setUiAction(
             this@MainActivity,
-            SnabbleUiToolkit.Event.SHOW_DETAILS_SHOP_LIST
+            SnabbleUiToolkit.Event.SHOW_DEEPLINK
         ) { _, args ->
-            navigate(R.id.navigation_shops_details, args)
+            val uri = Uri.parse(requireNotNull(args?.getString(SnabbleUiToolkit.DEEPLINK)))
+            navigate(NavDeepLinkRequest.Builder.fromUri(uri).build())
         }
         SnabbleUiToolkit.setUiAction(
             this@MainActivity,
-            SnabbleUiToolkit.Event.DETAILS_SHOP_BUTTON_ACTION
+            SnabbleUiToolkit.Event.SHOW_ONBOARDING
+        ) { _, args ->
+            navigate(R.id.frag_onboarding, args)
+        }
+        SnabbleUiToolkit.setUiAction(
+            this@MainActivity,
+            SnabbleUiToolkit.Event.SHOW_ONBOARDING_DONE
         ) { _, _ ->
-            navBarView.selectedItemId = R.id.navigation_scanner
+            popBackStack()
+            onboardingSeen = true
         }
 
         // listens to permission result and start tracking if permission is granted
@@ -311,4 +332,8 @@ class MainActivity : AppCompatActivity(), PermissionSupport {
             }
         }
     }
+
+    companion object {
+        private const val ONBOARDING_SEEN = "onboarding_seen"
+    }
 }

kotlin-sample/src/main/res/navigation/mobile_navigation.xml

@@ -21,6 +21,10 @@
             android:name="headerTitle"
             android:defaultValue="@string/Sample.Onboarding.message3"
             app:argType="reference" />
+        <argument
+            android:name="hideBottomNavigation"
+            android:defaultValue="true"
+            app:argType="boolean" />
         <deepLink
             android:id="@+id/deepLink"
             app:uri="kotlin-sample://terms" />

ui-toolkit/src/main/kotlin/io/snabble/sdk/SnabbleUiToolkit.kt

@@ -2,7 +2,6 @@ package io.snabble.sdk
 
 import android.content.Context
 import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
 import androidx.annotation.RestrictTo
 import androidx.appcompat.app.AppCompatActivity
@@ -122,10 +121,7 @@ object SnabbleUiToolkit {
                     args,
                     true
                 )
-                SHOW_DEEPLINK -> {
-                    val deeplink = Uri.parse(requireNotNull(args?.getString(DEEPLINK)))
-                    context.startActivity(Intent(Intent.ACTION_VIEW).apply { data = deeplink })
-                }
+                SHOW_DEEPLINK,
                 GO_BACK,
                 DETAILS_SHOP_BUTTON_ACTION,
                 START_NAVIGATION,

ui-toolkit/src/main/kotlin/io/snabble/sdk/onboarding/OnboardingStepView.kt

@@ -80,7 +80,7 @@ class OnboardingStepView @JvmOverloads constructor(
     private fun showDeeplink(context: Context, url: String) =
         SnabbleUiToolkit.executeAction(
             context,
-            SnabbleUiToolkit.Event.SHOW_ONBOARDING_DONE,
+            SnabbleUiToolkit.Event.SHOW_DEEPLINK,
             bundleOf(SnabbleUiToolkit.DEEPLINK to url)
         )
 

ui-toolkit/src/main/kotlin/io/snabble/sdk/shopfinder/ShopListView.kt

@@ -45,7 +45,7 @@ class ShopListView @JvmOverloads constructor(
         )
         youAreHereContainer.isVisible = item.isCheckedIn
 
-        val label = if (item.isCheckedIn) item.distanceLabel else null
+        val label = if (!item.isCheckedIn) item.distanceLabel else null
         distance.setTextOrHide(label)
 
         setOnClickListener {