From 822836a61c133e10ea68ef3a9fd8719bebac1049 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Thu, 19 Sep 2024 19:21:50 +0100
Subject: [PATCH] Refactor PAI / vitality score charts

---
 .../activities/charts/PaiChartFragment.java   |   6 +
 .../main/res/layout/fragment_pai_chart.xml    | 442 +++++++++---------
 2 files changed, 218 insertions(+), 230 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/PaiChartFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/PaiChartFragment.java
index 29a4f8e93..7f78991ec 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/PaiChartFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/PaiChartFragment.java
@@ -138,6 +138,12 @@ public class PaiChartFragment extends AbstractChartFragment<PaiChartFragment.Pai
         mTodayPieChart.setEntryLabelColor(DESCRIPTION_COLOR);
         mTodayPieChart.getDescription().setText("");
         mTodayPieChart.setNoDataText("");
+        mTodayPieChart.setTouchEnabled(false);
+        mTodayPieChart.setCenterTextColor(GBApplication.getTextColor(requireContext()));
+        mTodayPieChart.setCenterTextSize(18f);
+        mTodayPieChart.setHoleColor(requireContext().getResources().getColor(R.color.transparent));
+        mTodayPieChart.setHoleRadius(85);
+        mTodayPieChart.setDrawEntryLabels(false);
         mTodayPieChart.getLegend().setEnabled(false);
     }
 
diff --git a/app/src/main/res/layout/fragment_pai_chart.xml b/app/src/main/res/layout/fragment_pai_chart.xml
index 49a4bc5c0..2586de9fb 100644
--- a/app/src/main/res/layout/fragment_pai_chart.xml
+++ b/app/src/main/res/layout/fragment_pai_chart.xml
@@ -1,282 +1,263 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:orientation="vertical"
         tools:context="nodomain.freeyourgadget.gadgetbridge.activities.charts.ActivityChartsActivity$PlaceholderFragment"
         tools:ignore="UselessParent">
 
-        <LinearLayout
+        <TextView
+            android:id="@+id/pai_date_view"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="10dp"
-            android:orientation="vertical">
+            android:layout_marginTop="15dp"
+            android:gravity="center"
+            android:textSize="20sp" />
 
-            <TextView
-                android:id="@+id/pai_date_view"
-                android:layout_width="match_parent"
+        <com.github.mikephil.charting.charts.PieChart
+            android:id="@+id/pai_chart_today"
+            android:layout_width="200dp"
+            android:layout_height="200dp"
+            android:layout_gravity="bottom|center"
+            android:layout_marginBottom="0dp"
+            android:layout_weight="1" />
+
+        <TableLayout
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:layout_marginTop="5dp"
+            android:layout_marginBottom="30dp"
+            android:layout_weight="3"
+            android:shrinkColumns="*"
+            android:stretchColumns="*">
+
+            <TableRow
+                android:id="@+id/tableRow1"
+                android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:textAlignment="center"
-                android:textAllCaps="false"
-                android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-                android:textStyle="bold" />
+                android:weightSum="2">
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:orientation="horizontal">
-
-                <com.github.mikephil.charting.charts.PieChart
-                    android:id="@+id/pai_chart_today"
-                    android:layout_width="0dp"
-                    android:layout_height="210dp"
-                    android:layout_gravity="bottom|center"
-                    android:layout_marginBottom="0dp"
-                    android:layout_weight="1" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="0dp"
-                android:layout_marginBottom="10dp"
-                android:baselineAligned="false"
-                android:gravity="bottom|center"
-                android:orientation="horizontal"
-                android:paddingLeft="60dp"
-                android:paddingRight="60dp">
 
                 <LinearLayout
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center|top"
-                    android:layout_marginStart="1dp"
-                    android:layout_marginEnd="1dp"
                     android:layout_weight="1"
-                    android:gravity="center|top"
-                    android:orientation="vertical">
+                    android:orientation="vertical"
+                    android:paddingLeft="20dip"
+                    android:paddingTop="20dip"
+                    android:paddingRight="20dip">
 
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:gravity="center"
-                        android:maxLines="2"
-                        android:scrollHorizontally="false"
-                        android:text="@string/activity_summary_today"
-                        android:textAllCaps="true"
-                        android:textColor="@color/accent"
-                        android:textStyle="bold" />
+                    <View
+                        android:layout_width="fill_parent"
+                        android:layout_height="5dp"
+                        android:background="@color/chart_activity_dark" />
 
                     <TextView
                         android:id="@+id/pai_line_today"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:fontFamily="sans-serif-black"
-                        android:gravity="center"
-                        android:maxLines="1"
-                        android:scrollHorizontally="false"
-                        android:text="+10"
-                        android:textSize="24sp" />
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center|top"
-                    android:layout_marginStart="1dp"
-                    android:layout_marginEnd="1dp"
-                    android:layout_weight="1"
-                    android:gravity="center|top"
-                    android:orientation="vertical">
+                        android:layout_gravity="start"
+                        android:layout_marginTop="20dip"
+                        android:text="@string/stats_empty_value"
+                        android:textSize="20sp" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:gravity="center"
-                        android:maxLines="2"
-                        android:scrollHorizontally="false"
-                        android:text="@string/step_streak_total"
-                        android:textAllCaps="true"
-                        android:textColor="@color/accent"
-                        android:textStyle="bold" />
+                        android:layout_gravity="left"
+                        android:text="@string/activity_summary_today"
+                        android:textSize="12sp" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:orientation="vertical"
+                    android:paddingLeft="20dip"
+                    android:paddingTop="20dip"
+                    android:paddingRight="20dip">
+
+                    <View
+                        android:layout_width="fill_parent"
+                        android:layout_height="5dp"
+                        android:background="@color/chart_deep_sleep_light" />
 
                     <TextView
                         android:id="@+id/pai_line_total"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:fontFamily="sans-serif-black"
-                        android:gravity="center"
-                        android:maxLines="1"
-                        android:scrollHorizontally="false"
-                        android:text="100"
-                        android:textSize="24sp" />
+                        android:layout_gravity="start"
+                        android:layout_marginTop="20dip"
+                        android:text="@string/stats_empty_value"
+                        android:textSize="20sp" />
 
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="start"
+                        android:text="@string/step_streak_total"
+                        android:textSize="12sp" />
                 </LinearLayout>
+            </TableRow>
+
+        </TableLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dp"
+            android:layout_marginBottom="5dp"
+            android:baselineAligned="false"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center|top"
+                android:layout_marginStart="1dp"
+                android:layout_marginEnd="1dp"
+                android:layout_weight="1"
+                android:gravity="center|top"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:gravity="center"
+                    android:maxLines="2"
+                    android:scrollHorizontally="false"
+                    android:text="@string/sony_speak_to_chat_sensitivity_low"
+                    android:textAllCaps="true"
+                    android:textColor="@color/accent"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/pai_line_low_inc"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:fontFamily="sans-serif-black"
+                    android:gravity="center"
+                    android:maxLines="1"
+                    android:scrollHorizontally="false"
+                    android:text="5"
+                    android:textSize="24sp" />
+
+                <TextView
+                    android:id="@+id/pai_line_low_time"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:fontFamily="sans-serif"
+                    android:gravity="center"
+                    android:maxLines="1"
+                    android:scrollHorizontally="false"
+                    android:text="10 min"
+                    android:textSize="16sp" />
 
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="5dp"
-                android:layout_marginBottom="5dp"
-                android:baselineAligned="false"
-                android:gravity="center"
-                android:orientation="horizontal">
+                android:layout_gravity="center|top"
+                android:layout_marginStart="1dp"
+                android:layout_marginEnd="1dp"
+                android:layout_weight="1"
+                android:gravity="center|top"
+                android:orientation="vertical">
 
-                <LinearLayout
-                    android:layout_width="match_parent"
+                <TextView
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center|top"
-                    android:layout_marginStart="1dp"
-                    android:layout_marginEnd="1dp"
-                    android:layout_weight="1"
-                    android:gravity="center|top"
-                    android:orientation="vertical">
+                    android:layout_gravity="center"
+                    android:gravity="center"
+                    android:maxLines="2"
+                    android:scrollHorizontally="false"
+                    android:text="@string/stress_moderate"
+                    android:textAllCaps="true"
+                    android:textColor="@color/accent"
+                    android:textStyle="bold" />
 
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:gravity="center"
-                        android:maxLines="2"
-                        android:scrollHorizontally="false"
-                        android:text="@string/sony_speak_to_chat_sensitivity_low"
-                        android:textAllCaps="true"
-                        android:textColor="@color/accent"
-                        android:textStyle="bold" />
-
-                    <TextView
-                        android:id="@+id/pai_line_low_inc"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:fontFamily="sans-serif-black"
-                        android:gravity="center"
-                        android:maxLines="1"
-                        android:scrollHorizontally="false"
-                        android:text="5"
-                        android:textSize="24sp" />
-
-                    <TextView
-                        android:id="@+id/pai_line_low_time"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:fontFamily="sans-serif"
-                        android:gravity="center"
-                        android:maxLines="1"
-                        android:scrollHorizontally="false"
-                        android:text="10 min"
-                        android:textSize="16sp" />
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
+                <TextView
+                    android:id="@+id/pai_line_moderate_inc"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center|top"
-                    android:layout_marginStart="1dp"
-                    android:layout_marginEnd="1dp"
-                    android:layout_weight="1"
-                    android:gravity="center|top"
-                    android:orientation="vertical">
+                    android:layout_gravity="center"
+                    android:fontFamily="sans-serif-black"
+                    android:gravity="center"
+                    android:maxLines="1"
+                    android:scrollHorizontally="false"
+                    android:text="5"
+                    android:textSize="24sp" />
 
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:gravity="center"
-                        android:maxLines="2"
-                        android:scrollHorizontally="false"
-                        android:text="@string/stress_moderate"
-                        android:textAllCaps="true"
-                        android:textColor="@color/accent"
-                        android:textStyle="bold" />
-
-                    <TextView
-                        android:id="@+id/pai_line_moderate_inc"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:fontFamily="sans-serif-black"
-                        android:gravity="center"
-                        android:maxLines="1"
-                        android:scrollHorizontally="false"
-                        android:text="5"
-                        android:textSize="24sp" />
-
-                    <TextView
-                        android:id="@+id/pai_line_moderate_time"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:fontFamily="sans-serif"
-                        android:gravity="center"
-                        android:maxLines="1"
-                        android:scrollHorizontally="false"
-                        android:text="10 min"
-                        android:textSize="16sp" />
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
+                <TextView
+                    android:id="@+id/pai_line_moderate_time"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center|top"
-                    android:layout_marginStart="1dp"
-                    android:layout_marginEnd="1dp"
-                    android:layout_weight="1"
-                    android:gravity="center|top"
-                    android:orientation="vertical">
+                    android:layout_gravity="center"
+                    android:fontFamily="sans-serif"
+                    android:gravity="center"
+                    android:maxLines="1"
+                    android:scrollHorizontally="false"
+                    android:text="10 min"
+                    android:textSize="16sp" />
 
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:gravity="center"
-                        android:maxLines="2"
-                        android:scrollHorizontally="false"
-                        android:text="@string/stress_high"
-                        android:textAllCaps="true"
-                        android:textColor="@color/accent"
-                        android:textStyle="bold" />
+            </LinearLayout>
 
-                    <TextView
-                        android:id="@+id/pai_line_high_inc"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:fontFamily="sans-serif-black"
-                        android:gravity="center"
-                        android:maxLines="1"
-                        android:scrollHorizontally="false"
-                        android:text="5"
-                        android:textSize="24sp" />
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center|top"
+                android:layout_marginStart="1dp"
+                android:layout_marginEnd="1dp"
+                android:layout_weight="1"
+                android:gravity="center|top"
+                android:orientation="vertical">
 
-                    <TextView
-                        android:id="@+id/pai_line_high_time"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:fontFamily="sans-serif"
-                        android:gravity="center"
-                        android:maxLines="1"
-                        android:scrollHorizontally="false"
-                        android:text="10 min"
-                        android:textSize="16sp" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:gravity="center"
+                    android:maxLines="2"
+                    android:scrollHorizontally="false"
+                    android:text="@string/stress_high"
+                    android:textAllCaps="true"
+                    android:textColor="@color/accent"
+                    android:textStyle="bold" />
 
-                </LinearLayout>
+                <TextView
+                    android:id="@+id/pai_line_high_inc"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:fontFamily="sans-serif-black"
+                    android:gravity="center"
+                    android:maxLines="1"
+                    android:scrollHorizontally="false"
+                    android:text="5"
+                    android:textSize="24sp" />
+
+                <TextView
+                    android:id="@+id/pai_line_high_time"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:fontFamily="sans-serif"
+                    android:gravity="center"
+                    android:maxLines="1"
+                    android:scrollHorizontally="false"
+                    android:text="10 min"
+                    android:textSize="16sp" />
 
             </LinearLayout>
 
@@ -285,9 +266,10 @@
         <com.github.mikephil.charting.charts.BarChart
             android:id="@+id/pai_chart_week"
             android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:layout_weight="20" />
+            android:layout_height="300dp"
+            android:layout_marginBottom="25dp"
+            android:layout_weight="2" />
 
     </LinearLayout>
 
-</RelativeLayout>
+</ScrollView>