MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-12-27 19:15:50 +01:00
Code Releases Wiki Activity

Refactor PAI / vitality score charts

Browse Source
This commit is contained in:
José Rebelo 2024-09-19 19:21:50 +01:00
parent 50d5a532d1
commit 822836a61c
2 changed files with 218 additions and 230 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/PaiChartFragment.java
View File

@ -138,6 +138,12 @@ public class PaiChartFragment extends AbstractChartFragment<PaiChartFragment.Pai
mTodayPieChart.setEntryLabelColor(DESCRIPTION_COLOR); mTodayPieChart.setEntryLabelColor(DESCRIPTION_COLOR);
mTodayPieChart.getDescription().setText(""); mTodayPieChart.getDescription().setText("");
mTodayPieChart.setNoDataText(""); 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); mTodayPieChart.getLegend().setEnabled(false);
} }

156
app/src/main/res/layout/fragment_pai_chart.xml
View File

@ -1,129 +1,112 @@
<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" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
tools:context="nodomain.freeyourgadget.gadgetbridge.activities.charts.ActivityChartsActivity$PlaceholderFragment" tools:context="nodomain.freeyourgadget.gadgetbridge.activities.charts.ActivityChartsActivity$PlaceholderFragment"
tools:ignore="UselessParent"> tools:ignore="UselessParent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:orientation="vertical">
<TextView <TextView
android:id="@+id/pai_date_view" android:id="@+id/pai_date_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAlignment="center" android:layout_marginTop="15dp"
android:textAllCaps="false"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textStyle="bold" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"
android:orientation="horizontal"> android:textSize="20sp" />
<com.github.mikephil.charting.charts.PieChart <com.github.mikephil.charting.charts.PieChart
android:id="@+id/pai_chart_today" android:id="@+id/pai_chart_today"
android:layout_width="0dp" android:layout_width="200dp"
android:layout_height="210dp" android:layout_height="200dp"
android:layout_gravity="bottom|center" android:layout_gravity="bottom|center"
android:layout_marginBottom="0dp" android:layout_marginBottom="0dp"
android:layout_weight="1" /> android:layout_weight="1" />
</LinearLayout>
<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:weightSum="2">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="wrap_content" 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_height="wrap_content"
android:layout_gravity="center|top"
android:layout_marginStart="1dp"
android:layout_marginEnd="1dp"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center|top" android:orientation="vertical"
android:orientation="vertical"> android:paddingLeft="20dip"
android:paddingTop="20dip"
android:paddingRight="20dip">
<TextView <View
android:layout_width="wrap_content" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="5dp"
android:layout_gravity="center" android:background="@color/chart_activity_dark" />
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" />
<TextView <TextView
android:id="@+id/pai_line_today" android:id="@+id/pai_line_today"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="start"
android:fontFamily="sans-serif-black" android:layout_marginTop="20dip"
android:gravity="center" android:text="@string/stats_empty_value"
android:maxLines="1" android:textSize="20sp" />
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">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" 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:gravity="center"
android:maxLines="2" android:orientation="vertical"
android:scrollHorizontally="false" android:paddingLeft="20dip"
android:text="@string/step_streak_total" android:paddingTop="20dip"
android:textAllCaps="true" android:paddingRight="20dip">
android:textColor="@color/accent"
android:textStyle="bold" /> <View
android:layout_width="fill_parent"
android:layout_height="5dp"
android:background="@color/chart_deep_sleep_light" />
<TextView <TextView
android:id="@+id/pai_line_total" android:id="@+id/pai_line_total"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="start"
android:fontFamily="sans-serif-black" android:layout_marginTop="20dip"
android:gravity="center" android:text="@string/stats_empty_value"
android:maxLines="1" android:textSize="20sp" />
android:scrollHorizontally="false"
android:text="100"
android:textSize="24sp" />
<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> </LinearLayout>
</TableRow>
</LinearLayout> </TableLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -280,14 +263,13 @@
</LinearLayout> </LinearLayout>
</LinearLayout>
<com.github.mikephil.charting.charts.BarChart <com.github.mikephil.charting.charts.BarChart
android:id="@+id/pai_chart_week" android:id="@+id/pai_chart_week"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="300dp"
android:layout_weight="20" /> android:layout_marginBottom="25dp"
android:layout_weight="2" />
</LinearLayout> </LinearLayout>
</RelativeLayout> </ScrollView>