From 296dbb16aac91af78e2f1238f5145cfb722d73a8 Mon Sep 17 00:00:00 2001
From: vanous <petr@linuks.cz>
Date: Sat, 20 Nov 2021 17:04:39 +0100
Subject: [PATCH] Add Activity info into Device Card: make cards center alighed
 with shorter text

---
 .../gadgetbridge/adapter/GBDeviceAdapterv2.java |  7 ++++---
 app/src/main/res/layout/device_itemv2.xml       | 17 +++++++++--------
 app/src/main/res/values/strings.xml             |  2 --
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapterv2.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapterv2.java
index 021c2d528..05869ab45 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapterv2.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapterv2.java
@@ -872,13 +872,13 @@ public class GBDeviceAdapterv2 extends RecyclerView.Adapter<GBDeviceAdapterv2.Vi
         holder.cardViewActivityCardDistanceProgress.setProgress(steps * stepLength);
 
         setUpChart(holder.TotalStepsChart);
-        setChartsData(holder.TotalStepsChart, steps, stepGoal, context.getString(R.string.live_activity_total_steps), context);
+        setChartsData(holder.TotalStepsChart, steps, stepGoal, context.getString(R.string.steps), context);
 
         setUpChart(holder.TotalDistanceChart);
-        setChartsData(holder.TotalDistanceChart, steps * stepLength, distanceGoal, context.getString(R.string.live_activity_total_distance), context);
+        setChartsData(holder.TotalDistanceChart, steps * stepLength, distanceGoal, context.getString(R.string.distance), context);
 
         setUpChart(holder.SleepTimeChart);
-        setChartsData(holder.SleepTimeChart, sleep, sleepGoalMinutes, context.getString(R.string.live_activity_sleep_duration), context);
+        setChartsData(holder.SleepTimeChart, sleep, sleepGoalMinutes, context.getString(R.string.prefs_activity_in_device_card_sleep_title), context);
 
         boolean showActivityCard = GBApplication.getDeviceSpecificSharedPrefs(device.getAddress()).getBoolean(DeviceSettingsPreferenceConst.PREFS_ACTIVITY_IN_DEVICE_CARD, true);
         holder.cardViewActivityCardLayout.setVisibility(showActivityCard ? View.VISIBLE : View.GONE);
@@ -900,6 +900,7 @@ public class GBDeviceAdapterv2 extends RecyclerView.Adapter<GBDeviceAdapterv2.Vi
         return DateTimeUtils.formatDurationHoursMinutes(value, TimeUnit.MINUTES);
     }
     private void setUpChart(PieChart DashboardChart) {
+        DashboardChart.setTouchEnabled(false);
         DashboardChart.setNoDataText("");
         DashboardChart.getLegend().setEnabled(false);
         DashboardChart.setDrawHoleEnabled(true);
diff --git a/app/src/main/res/layout/device_itemv2.xml b/app/src/main/res/layout/device_itemv2.xml
index 88b829c56..6acecdab5 100644
--- a/app/src/main/res/layout/device_itemv2.xml
+++ b/app/src/main/res/layout/device_itemv2.xml
@@ -477,8 +477,8 @@
                     android:layout_height="wrap_content"
                     android:gravity="center_horizontal"
                     android:orientation="horizontal"
-                    android:paddingLeft="3dp"
-                    android:paddingRight="3dp"
+                    android:paddingLeft="0dp"
+                    android:paddingRight="0dp"
                     android:paddingBottom="15dp">
 
                     <LinearLayout
@@ -488,17 +488,18 @@
                         android:layout_gravity="bottom|center"
                         android:layout_marginBottom="0dp"
                         android:layout_weight="1"
-                        android:orientation="horizontal">
+                        android:orientation="vertical">
 
                         <ImageView
                             android:id="@+id/card_view_activity_card_steps_icon"
                             android:layout_width="20dp"
                             android:layout_height="20dp"
-                            android:layout_gravity="start|bottom"
+                            android:layout_gravity="center|bottom"
                             android:background="@drawable/ic_shoe_prints_many"
                             android:contentDescription="@string/icon_placeholder"
                             android:padding="0dp" />
 
+
                         <LinearLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
@@ -531,13 +532,13 @@
                         android:layout_gravity="bottom|center"
                         android:layout_marginBottom="0dp"
                         android:layout_weight="1"
-                        android:orientation="horizontal">
+                        android:orientation="vertical">
 
                         <ImageView
                             android:id="@+id/card_view_activity_card_distance_icon"
                             android:layout_width="20dp"
                             android:layout_height="20dp"
-                            android:layout_gravity="start|bottom"
+                            android:layout_gravity="center|bottom"
                             android:background="@drawable/ic_distance_total"
                             android:contentDescription="@string/icon_placeholder"
                             android:padding="0dp" />
@@ -574,13 +575,13 @@
                         android:layout_gravity="bottom|center"
                         android:layout_marginBottom="0dp"
                         android:layout_weight="1"
-                        android:orientation="horizontal">
+                        android:orientation="vertical">
 
                         <ImageView
                             android:id="@+id/card_view_activity_card_sleep_icon"
                             android:layout_width="20dp"
                             android:layout_height="20dp"
-                            android:layout_gravity="start|bottom"
+                            android:layout_gravity="center|bottom"
                             android:background="@drawable/ic_activity_sleep"
                             android:contentDescription="@string/icon_placeholder" />
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bd200ea39..c75086b28 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -561,8 +561,6 @@
     <string name="live_activity_steps_history">Steps history</string>
     <string name="live_activity_current_steps_per_minute">Current steps/min</string>
     <string name="live_activity_total_steps">Total steps</string>
-    <string name="live_activity_total_distance">Total distance</string>
-    <string name="live_activity_sleep_duration">Sleep time</string>
     <string name="live_activity_steps_per_minute_history">Steps per minute history</string>
     <string name="live_activity_start_your_activity">Start your activity</string>
     <string name="live_activity_max_heart_rate">Current / Max heart rate: %1$d / %2$d</string>