Fixed navigation and cart related bugs (#90)

* Fixed navigation bugs when trying to add a product by manual search.
* Emptying the cart lead to an app crash, that's not the case anymore.

Author: cmaier

CHANGELOG.md

@@ -3,6 +3,11 @@ All notable changes to this project will be documented in this file.
 
 ## UNRELEASED
 
+## [0.69.1-beta07]
+### Fixed
+* Fixed navigation when using manual product search
+* Fixed app crash when removing the last item from the cart
+
 ## [0.69.1-beta06]
 ### Added
 * ui-toolkit: Add VersionWidget to display the app and sdk version (#87)

build.gradle

@@ -37,7 +37,7 @@ allprojects {
     }
 
     project.ext {
-        sdkVersion = '0.69.1-beta06'
+        sdkVersion = '0.69.1-beta07'
         versionCode = 1
 
         compileSdkVersion = 31

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

@@ -216,6 +216,9 @@ class MainActivity : AppCompatActivity() {
             val isBottomNavigationVisible = arguments?.getBoolean("hideBottomNavigation") != true
             navBarView.isVisible = isBottomNavigationVisible
             navBarView.isEnabled = isBottomNavigationVisible
+            if (destination.id == R.id.not_checked_in && Snabble.checkedInProject.value != null) {
+                navigate(R.id.navigation_scanner)
+            }
         }
     }
 

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

@@ -71,6 +71,7 @@ fun setUpUiEvents(activity: AppCompatActivity, navController: NavController, bot
         activity,
         SnabbleUI.Event.GO_BACK
     ) { _, _ ->
+        navController.popBackStack()
     }
 
     SnabbleUiToolkit.setUiAction(

ui/src/main/java/io/snabble/sdk/ui/cart/ShoppingCartView.java

@@ -594,7 +594,7 @@ public static class ShoppingCartAdapter extends RecyclerView.Adapter<RecyclerVie
         private static final int TYPE_SIMPLE = 1;
         private List<Row> list = Collections.emptyList();
         private final Context context;
-        private final ShoppingCart cart;
+        private ShoppingCart cart;
         private final View parentView;
         private boolean hasAnyImages = false;
 
@@ -626,6 +626,8 @@ public int getItemCount() {
 
         // for fetching the data from outside of this view
         public void fetchFrom(ShoppingCart cart) {
+            this.cart = cart;
+
             hasAnyImages = false;
 
             for (int i = 0; i < cart.size(); i++) {
@@ -737,4 +739,4 @@ public void removeAndShowUndoSnackbar(int adapterPosition, ShoppingCart.Item ite
             fetchFrom(cart);
         }
     }
-}
+}