From cf27af7b351bea7d0728bdc86191e9a617b29282 Mon Sep 17 00:00:00 2001
From: OliE <olie.xdev@googlemail.com>
Date: Sun, 9 Apr 2017 18:10:43 +0200
Subject: [PATCH] various minor layout improvements

---
 .../gui/activities/DataEntryActivity.java     | 15 ++++++++++--
 .../main/res/layout/activity_dataentry.xml    |  7 +++---
 .../main/res/layout/fragment_statistics.xml   | 23 ++++++++-----------
 3 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java b/android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java
index c8e812a6..df6bac79 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java
@@ -217,6 +217,7 @@ public class DataEntryActivity extends Activity {
         if (!OpenScale.getInstance(this).getScaleDataList().isEmpty())
         {
             setViewMode(MeasurementView.MeasurementViewMode.ADD);
+            txtDataNr.setText(DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.SHORT).format(new Date()));
             ScaleData lastScaleData = OpenScale.getInstance(this).getScaleDataList().get(0);
 
             // show as default last scale data
@@ -238,13 +239,23 @@ public class DataEntryActivity extends Activity {
     {
         switch (viewMode) {
             case VIEW:
+                btnOk.setVisibility(View.VISIBLE);
+                btnAdd.setVisibility(View.GONE);
+                imageViewDelete.setVisibility(View.VISIBLE);
+                btnLeft.setVisibility(View.VISIBLE);
+                btnRight.setVisibility(View.VISIBLE);
+                expandButton.setVisibility(View.VISIBLE);
+                switchEditMode.setVisibility(View.VISIBLE);
+                dateMeasurement.setVisibility(View.GONE);
+                timeMeasurement.setVisibility(View.GONE);
+                break;
             case EDIT:
                 btnOk.setVisibility(View.VISIBLE);
                 btnAdd.setVisibility(View.GONE);
                 imageViewDelete.setVisibility(View.VISIBLE);
                 btnLeft.setVisibility(View.VISIBLE);
                 btnRight.setVisibility(View.VISIBLE);
-                txtDataNr.setVisibility(View.VISIBLE);
+                expandButton.setVisibility(View.VISIBLE);
                 switchEditMode.setVisibility(View.VISIBLE);
                 dateMeasurement.setVisibility(View.VISIBLE);
                 timeMeasurement.setVisibility(View.VISIBLE);
@@ -255,7 +266,7 @@ public class DataEntryActivity extends Activity {
                 imageViewDelete.setVisibility(View.GONE);
                 btnLeft.setVisibility(View.GONE);
                 btnRight.setVisibility(View.GONE);
-                txtDataNr.setVisibility(View.GONE);
+                expandButton.setVisibility(View.GONE);
                 switchEditMode.setVisibility(View.GONE);
                 dateMeasurement.setVisibility(View.GONE);
                 timeMeasurement.setVisibility(View.GONE);
diff --git a/android_app/app/src/main/res/layout/activity_dataentry.xml b/android_app/app/src/main/res/layout/activity_dataentry.xml
index 1bdc108b..f759569f 100644
--- a/android_app/app/src/main/res/layout/activity_dataentry.xml
+++ b/android_app/app/src/main/res/layout/activity_dataentry.xml
@@ -89,7 +89,8 @@
 
     <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="0dp"
+        android:layout_weight="1">
 
         <TableLayout
             android:id="@+id/tableLayoutDataEntry"
@@ -100,9 +101,7 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_gravity="bottom"
-        android:gravity="bottom"
+        android:layout_height="wrap_content"
         android:padding="5dp">
 
         <Button
diff --git a/android_app/app/src/main/res/layout/fragment_statistics.xml b/android_app/app/src/main/res/layout/fragment_statistics.xml
index 3f4d4486..05f225b0 100644
--- a/android_app/app/src/main/res/layout/fragment_statistics.xml
+++ b/android_app/app/src/main/res/layout/fragment_statistics.xml
@@ -1,25 +1,23 @@
-<RelativeLayout 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"
-    android:padding="5dp" >
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical"
+    android:padding="5dp">
 
     <ScrollView
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
         android:id="@+id/scrollView"
-        android:layout_weight="100">
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
 
         <LinearLayout
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
             <TextView
                 android:id="@+id/txtTitleGoal"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="25dp"
                 android:autoText="false"
                 android:text="@string/label_title_goal"
                 android:textSize="25dp"
@@ -167,7 +165,6 @@
                 android:id="@+id/txtTitleStatistics"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="25dp"
                 android:autoText="false"
                 android:text="@string/label_title_statistics"
                 android:textSize="25dp"
@@ -269,4 +266,4 @@
             </TableLayout>
         </LinearLayout>
     </ScrollView>
-</RelativeLayout>
+</LinearLayout>