Final UI-Update Benedikt

Author: Bene0202

.gradle/8.2/fileHashes/fileHashes.lock

@@ -580,7 +580,7 @@ class PlaceDetailsActivity : AppCompatActivity(), PlaceDetailsItemCallback {
      * Three functions handling the google maps place search.
      */
     /**
-     * Just launches the intent. It wrapped in function to be called from the different fragments.
+     * Just launches the intent. It is  wrapped in function to be called from the different fragments.
      *
      * TODO: Make country flexible
      */

app/src/main/java/com/nlinterface/activities/PlaceDetailsActivity.kt

@@ -55,7 +55,8 @@ class GroceryListScreen1 : Fragment(), SwipeAction {
     override fun onSwipeRight() {}
 
     /**
-     * Swiping down makes the app read out the current grocery list.
+     * Swiping down makes the app read out the current grocery list and the items in the cart.
+     *
      */
     override fun onSwipeUp() {
         val activityViewmodel = (activity as GroceryListActivity).viewModel
@@ -70,7 +71,8 @@ class GroceryListScreen1 : Fragment(), SwipeAction {
     }
 
     /**
-     * Swiping up clears the grocery list and removes all corresponding fragments.
+     *
+     * Swiping down makes the app read out all item that are not yet in the cart.
      */
     override fun onSwipeDown() {
         for ((itemName, _, inCart) in (activity as GroceryListActivity).groceryItemList) {

app/src/main/java/com/nlinterface/fragments/GroceryListScreen1.kt

@@ -90,7 +90,7 @@ class GroceryListScreen2 : Fragment(), SwipeAction {
     }
 
     /**
-     * Swiping down makes the app read out all item that are not yet in the cart.
+     * Swiping up clears the grocery list and removes all corresponding fragments.
      */
     override fun onSwipeDown() {
         (activity as? GroceryListActivity)?.let {

app/src/main/java/com/nlinterface/fragments/GroceryListScreen2.kt

@@ -158,16 +158,7 @@ class GroceryListScreenBase : Fragment(), SwipeAction {
         }
         else {
             (activity as? GroceryListActivity)?.let {
-                Log.i(
-                    "GroceryList",
-                    it.viewModel.groceryList.toString()
-                )
                 it.addItemToCart(itemTop)
-                it.deleteGroceryItem(itemTop)
-                Log.i(
-                    "GroceryList",
-                    it.viewModel.groceryList.toString()
-                )
                 itemTop = default
                 viewModel.updateButtonTexts(itemTop, itemBottom)
                 val fragmentList = it.groceryListFragmentAdapter.fragmentList
@@ -209,16 +200,7 @@ class GroceryListScreenBase : Fragment(), SwipeAction {
         }
         else {
             (activity as? GroceryListActivity)?.let {
-                Log.i(
-                    "GroceryList",
-                    it.viewModel.groceryList.toString()
-                )
                 it.addItemToCart(itemBottom)
-                it.deleteGroceryItem(itemBottom)
-                Log.i(
-                    "GroceryList",
-                    it.viewModel.groceryList.toString()
-                )
                 itemBottom = default
                 viewModel.updateButtonTexts(itemTop, itemBottom)
                 val fragmentList = it.groceryListFragmentAdapter.fragmentList

app/src/main/java/com/nlinterface/fragments/GroceryListScreenBase.kt

@@ -92,7 +92,8 @@ class PlaceDetailsScreen1 : Fragment(), SwipeAction {
         }
         else {
             for (place in activityViewmodel.placeDetailsItemList) {
-                (activity as PlaceDetailsActivity).viewModel.say(place.storeName, TextToSpeech.QUEUE_ADD)
+                (activity as PlaceDetailsActivity).viewModel.say(
+                    place.storeName + place.address, TextToSpeech.QUEUE_ADD)
             }
         }
     }

app/src/main/java/com/nlinterface/fragments/PlaceDetailsScreen1.kt

@@ -133,7 +133,7 @@
         android:id="@+id/option_left"
         android:layout_width="130dp"
         android:layout_height="wrap_content"
-        android:text="@string/main_menu"
+        android:text="@string/list_view"
         android:backgroundTint="?colorPrimary"
         android:textColor="?android:textColorPrimary"
         app:autoSizeMaxTextSize="100sp"

app/src/main/res/layout/grocerylist_screen1.xml

@@ -264,6 +264,7 @@
     <string name="grocery_items">Artikel</string>
     <string name="remove_item">Entferne einen Artikel</string>
     <string name="more_items">Weitere Artikel</string>
+    <string name="list_view">Listen Ansicht</string>
 
     <!--    Place Details   -->
 

app/src/main/res/values-de/strings.xml

@@ -292,6 +292,7 @@
     <string name="grocery_items">Grocery items</string>
     <string name="remove_item">Remove an item</string>
     <string name="more_items">More items</string>
+    <string name="list_view">List view</string>
 
     <!--    Place Details   -->