From 2a3341b5be27ba39c0ddca190ea461c1ff41b35a Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 25 Apr 2022 14:55:30 +0200
Subject: [PATCH] Food xml cleanup

---
 .../plugins/general/food/FoodFragment.kt      |  27 +--
 app/src/main/res/layout/food_fragment.xml     |  44 ++--
 app/src/main/res/layout/food_item.xml         | 192 +++++++-----------
 3 files changed, 97 insertions(+), 166 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodFragment.kt
index 3cba103783..392adda03d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodFragment.kt
@@ -17,7 +17,6 @@ import info.nightscout.androidaps.database.AppRepository
 import info.nightscout.androidaps.database.entities.Food
 import info.nightscout.androidaps.database.entities.UserEntry.Action
 import info.nightscout.androidaps.database.entities.UserEntry.Sources
-import info.nightscout.androidaps.database.entities.ValueWithUnit
 import info.nightscout.androidaps.database.transactions.InvalidateFoodTransaction
 import info.nightscout.androidaps.databinding.FoodFragmentBinding
 import info.nightscout.androidaps.databinding.FoodItemBinding
@@ -26,7 +25,6 @@ import info.nightscout.androidaps.events.EventFoodDatabaseChanged
 import info.nightscout.androidaps.extensions.toVisibility
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.bus.RxBus
-import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientRestart
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.protection.ProtectionCheck
@@ -35,10 +33,8 @@ import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.androidaps.utils.ui.UIRunnable
 import info.nightscout.shared.logging.AAPSLogger
 import info.nightscout.shared.logging.LTag
-import io.reactivex.rxjava3.core.Completable
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
-import io.reactivex.rxjava3.kotlin.subscribeBy
 import java.util.*
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
@@ -73,27 +69,7 @@ class FoodFragment : DaggerFragment() {
         binding.recyclerview.setHasFixedSize(true)
         binding.recyclerview.layoutManager = LinearLayoutManager(view.context)
 
-        binding.refreshFromNightscout.setOnClickListener {
-            context?.let { context ->
-                OKDialog.showConfirmation(context, rh.gs(R.string.refresheventsfromnightscout) + " ?", {
-                    uel.log(
-                        Action.FOOD, Sources.Food, rh.gs(R.string.refresheventsfromnightscout),
-                        ValueWithUnit.SimpleString(rh.gsNotLocalised(R.string.refresheventsfromnightscout))
-                    )
-                    disposable += Completable.fromAction { repository.deleteAllFoods() }
-                        .subscribeOn(aapsSchedulers.io)
-                        .observeOn(aapsSchedulers.main)
-                        .subscribeBy(
-                            onError = { aapsLogger.error("Error removing foods", it) },
-                            onComplete = { rxBus.send(EventFoodDatabaseChanged()) }
-                        )
-
-                    rxBus.send(EventNSClientRestart())
-                })
-            }
-        }
-
-        binding.filterinputLayout.setEndIconOnClickListener {
+        binding.filterInputLayout.setEndIconOnClickListener {
             binding.filter.setText("")
             binding.categoryList.setText(rh.gs(R.string.none), false)
             binding.subcategoryList.setText(rh.gs(R.string.none), false)
@@ -220,7 +196,6 @@ class FoodFragment : DaggerFragment() {
             holder.binding.energy.text = rh.gs(R.string.shortenergy) + ": " + food.energy + rh.gs(R.string.shortkilojoul)
             holder.binding.energy.visibility = food.energy.isNotZero().toVisibility()
             holder.binding.icRemove.tag = food
-            holder.binding.foodItem.tag = food
             holder.binding.icCalculator.tag = food
         }
 
diff --git a/app/src/main/res/layout/food_fragment.xml b/app/src/main/res/layout/food_fragment.xml
index a64274ad54..7eb642a540 100644
--- a/app/src/main/res/layout/food_fragment.xml
+++ b/app/src/main/res/layout/food_fragment.xml
@@ -6,39 +6,29 @@
     android:orientation="vertical"
     tools:context="info.nightscout.androidaps.plugins.general.food.FoodFragment">
 
-    <info.nightscout.androidaps.utils.ui.SingleClickButton
-        android:id="@+id/refresh_from_nightscout"
-        style="@style/GrayButton"
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/filter_input_layout"
+        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:drawableStart="@drawable/ic_refresh"
-        android:text="@string/refresheventsfromnightscout"
-        tools:visibility="visible" />
+        android:hint="@string/filter"
+        app:endIconMode="clear_text"
+        app:startIconDrawable="@android:drawable/ic_menu_search">
 
-        <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/filterinputLayout"
-            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/filter"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:hint="@string/filter"
-            app:startIconDrawable="@android:drawable/ic_menu_search"
-            app:endIconMode="clear_text">
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="5dp"
+            android:layout_marginEnd="5dp"
+            android:layout_weight="1"
+            android:autofillHints="@string/notes_label"
+            android:gravity="start"
+            android:inputType="text|textCapSentences"
+            android:textStyle="bold" />
 
-            <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/filter"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="5dp"
-                android:layout_marginEnd="5dp"
-                android:layout_gravity="center_vertical"
-                android:layout_weight="1"
-                android:autofillHints="@string/notes_label"
-                android:gravity="start"
-                android:textStyle="bold"
-                android:inputType="text|textCapSentences" />
-
-        </com.google.android.material.textfield.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>
 
     <com.google.android.material.textfield.TextInputLayout
         style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
diff --git a/app/src/main/res/layout/food_item.xml b/app/src/main/res/layout/food_item.xml
index fd529084aa..dc54cd7eab 100644
--- a/app/src/main/res/layout/food_item.xml
+++ b/app/src/main/res/layout/food_item.xml
@@ -1,148 +1,114 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.card.MaterialCardView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    style="@style/Widget.MaterialComponents.CardView"
     android:id="@+id/food_card"
+    style="@style/Widget.MaterialComponents.CardView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginStart="4dp"
-    android:layout_marginEnd="4dp"
-    android:layout_marginTop="4dp"
-    app:strokeWidth="1dp"
+    android:layout_gravity="center"
     app:cardCornerRadius="4dp"
-    app:contentPadding="2dp"
     app:cardElevation="4dp"
     app:cardUseCompatPadding="true"
-    android:layout_gravity="center">
+    app:contentPadding="2dp"
+    app:strokeWidth="1dp">
 
     <LinearLayout
-        android:id="@+id/food_item"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:baselineAligned="false"
+        android:orientation="horizontal"
+        android:paddingStart="3dp"
+        android:paddingEnd="3dp">
 
         <LinearLayout
-            android:id="@+id/left_right_split"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:paddingStart="3dp"
-            android:paddingEnd="3dp">
+            android:layout_weight="1"
+            android:gravity="start"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/name"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="Name"
+                android:textSize="@dimen/twenty_four_dp"
+                android:textStyle="bold"
+                tools:ignore="HardcodedText" />
 
             <LinearLayout
-                android:id="@+id/name_and_info_container"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:layout_weight="1"
-                android:gravity="start">
+                android:layout_marginStart="5dp"
+                android:gravity="start"
+                android:orientation="horizontal">
 
-                <LinearLayout
-                    android:id="@+id/name_container"
-                    android:layout_width="match_parent"
+                <TextView
+                    android:id="@+id/carbs"
+                    android:layout_width="50dp"
                     android:layout_height="wrap_content"
                     android:gravity="center"
-                    android:orientation="horizontal">
+                    android:text="Carbs"
+                    tools:ignore="HardcodedText" />
 
-                    <TextView
-                        android:id="@+id/name"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:text="Name"
-                        android:textStyle="bold"
-                        android:textSize="@dimen/twenty_four_dp"
-                        tools:ignore="HardcodedText" />
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/info_container"
-                    android:layout_width="match_parent"
+                <TextView
+                    android:id="@+id/portion"
+                    android:layout_width="50dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:gravity="start"
-                    android:orientation="horizontal"
-                    android:layout_marginStart="5dp">
+                    android:gravity="center"
+                    android:text="Portion"
+                    tools:ignore="HardcodedText" />
 
-                    <TextView
-                        android:id="@+id/carbs"
-                        android:layout_width="50dp"
-                        android:layout_height="wrap_content"
-                        android:gravity="center"
-                        android:text="Carbs"
-                        tools:ignore="HardcodedText" />
+                <TextView
+                    android:id="@+id/fat"
+                    android:layout_width="50dp"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:text="Fat"
+                    tools:ignore="HardcodedText" />
 
-                    <TextView
-                        android:id="@+id/portion"
-                        android:layout_width="50dp"
-                        android:layout_height="wrap_content"
-                        android:gravity="center"
-                        android:text="Portion"
-                        tools:ignore="HardcodedText" />
+                <TextView
+                    android:id="@+id/protein"
+                    android:layout_width="50dp"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:text="Protein"
+                    tools:ignore="HardcodedText" />
 
-                    <TextView
-                        android:id="@+id/fat"
-                        android:layout_width="50dp"
-                        android:layout_height="wrap_content"
-                        android:gravity="center"
-                        android:text="Fat"
-                        tools:ignore="HardcodedText" />
-
-                    <TextView
-                        android:id="@+id/protein"
-                        android:layout_width="50dp"
-                        android:layout_height="wrap_content"
-                        android:gravity="center"
-                        android:text="Protein"
-                        tools:ignore="HardcodedText" />
-
-                    <TextView
-                        android:id="@+id/energy"
-                        android:layout_width="50dp"
-                        android:layout_height="wrap_content"
-                        android:gravity="center"
-                        android:text="Energy"
-                        tools:ignore="HardcodedText" />
-                </LinearLayout>
+                <TextView
+                    android:id="@+id/energy"
+                    android:layout_width="50dp"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:text="Energy"
+                    tools:ignore="HardcodedText" />
             </LinearLayout>
 
-            <LinearLayout
-                android:id="@+id/buttons_container"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:orientation="horizontal"
-                android:gravity="end">
-
-                <ImageView
-                    android:id="@+id/ic_calculator"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="center"
-                    android:padding="2dp"
-                    android:orientation="horizontal"
-                    android:src="@drawable/ic_calculator" />
-                <ImageView
-                    android:id="@+id/ic_remove"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="center"
-                    android:padding="2dp"
-                    android:orientation="horizontal"
-                    android:src="@drawable/ic_trash_outline" />
-
-            </LinearLayout>
         </LinearLayout>
 
+        <ImageView
+            android:id="@+id/ic_calculator"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"
+            android:contentDescription="@string/overview_calculator_label"
+            android:orientation="horizontal"
+            android:paddingLeft="-5dp"
+            android:paddingTop="-5dp"
+            android:scaleX=".5"
+            android:scaleY=".5"
+            android:src="@drawable/ic_calculator" />
 
-        <View
-            android:layout_width="fill_parent"
-            android:layout_height="2dip"
-            android:layout_marginBottom="5dp"
-            android:layout_marginTop="5dp"
-            android:background="?android:attr/dividerHorizontal" />
+        <ImageView
+            android:id="@+id/ic_remove"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"
+            android:contentDescription="@string/remove_label"
+            android:orientation="horizontal"
+            android:padding="2dp"
+            android:src="@drawable/ic_trash_outline" />
 
     </LinearLayout>