mwarning/luna-tracker
1
0
Fork 0
forked from penguin86/luna-tracker
Code Pull Requests Activity

StatisticsActivity: rework all statistics

Browse Source 
Improve the overall code.
This commit is contained in:
Moritz Warning
2025-11-26 23:04:22 +01:00
parent 2f877bdec7
commit 646664afd6
4 changed files with 826 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

975
app/src/main/java/it/danieleverducci/lunatracker/StatisticsActivity.kt
View File

File diff suppressed because it is too large Load Diff

21
app/src/main/res/layout/activity_statistics.xml
View File

@@ -21,7 +21,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:visibility="gone" android:visibility="gone"
android:gravity="center" android:gravity="center"
android:text="No Data"/> android:text="@string/statistics_no_data"/>
</FrameLayout> </FrameLayout>
@@ -32,25 +32,18 @@
android:orientation="horizontal"> android:orientation="horizontal">
<Spinner <Spinner
android:id="@+id/type_selection" android:id="@+id/graph_type_selection"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:layout_weight="1"
android:layout_weight="1" /> android:gravity="center"/>
<Spinner <Spinner
android:id="@+id/data_selection" android:id="@+id/time_range_selection"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:layout_weight="1"
android:layout_weight="1"/> android:gravity="center"/>
<Spinner
android:id="@+id/time_selection"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_weight="1"/>
</LinearLayout> </LinearLayout>

27
app/src/main/res/values/arrays.xml
View File

@@ -8,23 +8,21 @@
</string-array> </string-array>
<string-array name="StatisticsTypeLabels"> <string-array name="StatisticsTypeLabels">
<item>Bottle</item> <item>@string/statistics_bottle_sum</item>
<item>Sleep</item> <item>@string/statistics_bottle_events</item>
<item>@string/statistics_sleep_sum</item>
<item>@string/statistics_sleep_events</item>
<item>@string/statistics_sleep_pattern</item>
<item>@string/statistics_medicine_events</item>
</string-array> </string-array>
<string-array name="StatisticsTypeValues"> <string-array name="StatisticsTypeValues">
<item>BOTTLE</item> <item>BOTTLE_SUM</item>
<item>SLEEP</item> <item>BOTTLE_EVENTS</item>
</string-array> <item>SLEEP_SUM</item>
<item>SLEEP_EVENTS</item>
<string-array name="StatisticsDataLabels"> <item>SLEEP_PATTERN</item>
<item>Event</item> <item>MEDICINE_EVENTS</item>
<item>Amount</item>
</string-array>
<string-array name="StatisticsDataValues">
<item>EVENT</item>
<item>AMOUNT</item>
</string-array> </string-array>
<string-array name="StatisticsTimeLabels"> <string-array name="StatisticsTimeLabels">
@@ -38,5 +36,4 @@
<item>WEEK</item> <item>WEEK</item>
<item>MONTH</item> <item>MONTH</item>
</string-array> </string-array>
</resources> </resources>

8
app/src/main/res/values/strings.xml
View File

@@ -89,6 +89,7 @@
<string name="no_connection_retry">Retry</string> <string name="no_connection_retry">Retry</string>
<string name="statistics_title">Statistics</string> <string name="statistics_title">Statistics</string>
<string name="statistics_no_data">No Data</string>
<string name="settings_dynamic_menu">Dynamic Menu</string> <string name="settings_dynamic_menu">Dynamic Menu</string>
<string name="settings_dynamic_menu_desc">Populate the header menu with the most used events.</string> <string name="settings_dynamic_menu_desc">Populate the header menu with the most used events.</string>
@@ -140,6 +141,13 @@
<string name="measurement_unit_temperature_base_imperial" translatable="false">°F</string> <string name="measurement_unit_temperature_base_imperial" translatable="false">°F</string>
<string name="measurement_unit_temperature_base_metric" translatable="false">°C</string> <string name="measurement_unit_temperature_base_metric" translatable="false">°C</string>
<string name="statistics_bottle_events">Bottle Events</string>
<string name="statistics_bottle_sum">Bottle Per Day</string>
<string name="statistics_medicine_events">Medicine Events</string>
<string name="statistics_sleep_sum">Sleep Per Day</string>
<string name="statistics_sleep_events">Sleep Events</string>
<string name="statistics_sleep_pattern">Sleep Pattern</string>
<string name="row_luna_event_description">Description</string> <string name="row_luna_event_description">Description</string>
<string name="row_luna_event_quantity">Qty</string> <string name="row_luna_event_quantity">Qty</string>
<string name="row_luna_event_time">Time</string> <string name="row_luna_event_time">Time</string>