mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-27 02:05:26 +02:00
Code Issues Releases Wiki Activity

Add some space to the statistics view

Browse Source
This commit is contained in:
Erik Johansson
2018-01-21 22:37:14 +01:00
parent ca070558e4
commit ad4ad76974
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android_app/app/src/main/java/com/health/openscale/gui/fragments/StatisticsFragment.java
View File

@@ -104,6 +104,8 @@ public class StatisticsFragment extends Fragment implements FragmentUpdateListen
viewMeasurementsListWeek.add(new WaistMeasurementView(statisticsView.getContext())); viewMeasurementsListWeek.add(new WaistMeasurementView(statisticsView.getContext()));
viewMeasurementsListWeek.add(new HipMeasurementView(statisticsView.getContext())); viewMeasurementsListWeek.add(new HipMeasurementView(statisticsView.getContext()));
final int paddingBottom = 10;
int i=0; int i=0;
for (MeasurementView measurement : viewMeasurementsListWeek) { for (MeasurementView measurement : viewMeasurementsListWeek) {
@@ -111,6 +113,7 @@ public class StatisticsFragment extends Fragment implements FragmentUpdateListen
measurement.updatePreferences(prefs); measurement.updatePreferences(prefs);
if (measurement.isVisible()) { if (measurement.isVisible()) {
measurement.setPadding(-1, -1, -1, paddingBottom);
if ((i % 2) == 0) { if ((i % 2) == 0) {
tableWeekAveragesLayoutColumnA.addView(measurement); tableWeekAveragesLayoutColumnA.addView(measurement);
} else { } else {
@@ -138,6 +141,7 @@ public class StatisticsFragment extends Fragment implements FragmentUpdateListen
measurement.updatePreferences(prefs); measurement.updatePreferences(prefs);
if (measurement.isVisible()) { if (measurement.isVisible()) {
measurement.setPadding(-1, -1, -1, paddingBottom);
if ((i % 2) == 0) { if ((i % 2) == 0) {
tableMonthAveragesLayoutColumnA.addView(measurement); tableMonthAveragesLayoutColumnA.addView(measurement);
} else { } else {

17
android_app/app/src/main/res/layout/fragment_statistics.xml
View File

@@ -178,29 +178,28 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="10dp"
android:layout_weight="90"> android:layout_weight="90">
<TableLayout <TableLayout
android:id="@+id/tableWeekAveragesLayoutColumnA" android:id="@+id/tableWeekAveragesLayoutColumnA"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="50" android:layout_weight="50"
android:stretchColumns="1"> android:stretchColumns="1" />
</TableLayout>
<TableLayout <TableLayout
android:id="@+id/tableWeekAveragesLayoutColumnB" android:id="@+id/tableWeekAveragesLayoutColumnB"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="50" android:layout_weight="50"
android:stretchColumns="1"> android:stretchColumns="1" />
</TableLayout>
</LinearLayout> </LinearLayout>
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="10dp"
android:text="@string/label_last_month" android:text="@string/label_last_month"
android:textSize="20dp" android:textSize="20dp"
android:typeface="monospace" /> android:typeface="monospace" />
@@ -213,22 +212,22 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="10dp"
android:layout_weight="90"> android:layout_weight="90">
<TableLayout <TableLayout
android:id="@+id/tableMonthAveragesLayoutColumnA" android:id="@+id/tableMonthAveragesLayoutColumnA"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="50" android:layout_weight="50"
android:stretchColumns="1"> android:stretchColumns="1" />
</TableLayout>
<TableLayout <TableLayout
android:id="@+id/tableMonthAveragesLayoutColumnB" android:id="@+id/tableMonthAveragesLayoutColumnB"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="50" android:layout_weight="50"
android:stretchColumns="1"> android:stretchColumns="1" />
</TableLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>