New Overview/Graph design.

Paolo Rotolo · Paolo Rotolo · commit 55dddce1c76b · 2016-03-13T19:49:05.000+01:00
diff --git a/app/src/main/java/org/glucosio/android/fragment/HistoryFragment.java b/app/src/main/java/org/glucosio/android/fragment/HistoryFragment.java
@@ -186,7 +186,9 @@ public void notifyAdapter(){
     }
 
     public void reloadFragmentAdapter(){
-        ((MainActivity)getActivity()).reloadFragmentAdapter();
-        ((MainActivity)getActivity()).checkIfEmptyLayout();
+        if (getActivity()!= null) {
+            ((MainActivity) getActivity()).reloadFragmentAdapter();
+            ((MainActivity) getActivity()).checkIfEmptyLayout();
+        }
     }
 }
diff --git a/app/src/main/java/org/glucosio/android/fragment/OverviewFragment.java b/app/src/main/java/org/glucosio/android/fragment/OverviewFragment.java
@@ -433,21 +433,17 @@ private LineDataSet createLineDataSet(ArrayList<Entry> yVals, int color, String
         // create a dataset and give it a type
         LineDataSet set1 = new LineDataSet(yVals, label);
         set1.setColor(color);
-        set1.setLineWidth(2.5f);
+        set1.setDrawFilled(false);
+        set1.setLineWidth(1f);
         set1.setCircleColor(color);
         set1.setCircleSize(4f);
         set1.setDrawCircleHole(true);
         set1.disableDashedLine();
-        set1.setDrawFilled(false);
+        set1.setDrawCubic(true);
+        set1.setCubicIntensity(0.2f);
         set1.setValueTextSize(0);
         set1.setValueTextColor(Color.parseColor("#FFFFFF"));
 
-        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.JELLY_BEAN_MR2){
-            set1.setDrawFilled(false);
-            set1.setLineWidth(3f);
-            set1.setCircleSize(4.5f);
-            set1.setDrawCircleHole(true);
-        }
         return  set1;
     }
 
diff --git a/app/src/main/res/drawable/circle_high.xml b/app/src/main/res/drawable/circle_high.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval" >
-    <solid android:color="@color/glucosio_reading_high"/>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+android:shape="oval">
+<corners android:radius="10dip"/>
+<stroke android:color="@color/glucosio_reading_high" android:width="2dip"/>
+<solid android:color="@android:color/transparent"/>
 </shape>
diff --git a/app/src/main/res/drawable/circle_high_filled.xml b/app/src/main/res/drawable/circle_high_filled.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval" >
+    <solid android:color="@color/glucosio_reading_high"/>
+</shape>
diff --git a/app/src/main/res/drawable/circle_hyper_filled.xml b/app/src/main/res/drawable/circle_hyper_filled.xml
diff --git a/app/src/main/res/drawable/circle_hypo_filled.xml b/app/src/main/res/drawable/circle_hypo_filled.xml
diff --git a/app/src/main/res/drawable/circle_low.xml b/app/src/main/res/drawable/circle_low.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval" >
-    <solid android:color="@color/glucosio_reading_low"/>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <corners android:radius="10dip"/>
+    <stroke android:color="@color/glucosio_reading_low" android:width="2dip"/>
+    <solid android:color="@android:color/transparent"/>
 </shape>
diff --git a/app/src/main/res/drawable/circle_low_filled.xml b/app/src/main/res/drawable/circle_low_filled.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval" >
+    <solid android:color="@color/glucosio_reading_low"/>
+</shape>
diff --git a/app/src/main/res/drawable/circle_ok.xml b/app/src/main/res/drawable/circle_ok.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval" >
-    <solid android:color="@color/glucosio_reading_ok"/>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <corners android:radius="10dip"/>
+    <stroke android:color="@color/glucosio_reading_ok" android:width="2dip"/>
+    <solid android:color="@android:color/transparent"/>
 </shape>
diff --git a/app/src/main/res/drawable/circle_ok_filled.xml b/app/src/main/res/drawable/circle_ok_filled.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval" >
+    <solid android:color="@color/glucosio_reading_ok"/>
+</shape>
diff --git a/app/src/main/res/layout/fragment_history.xml b/app/src/main/res/layout/fragment_history.xml
@@ -39,7 +39,7 @@
                     android:layout_width="8dp"
                     android:layout_height="8dp"
                     android:layout_marginRight="4dp"
-                    android:background="@drawable/circle_hypo" />
+                    android:background="@drawable/circle_hypo_filled" />
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -62,7 +62,7 @@
                     android:layout_width="8dp"
                     android:layout_height="8dp"
                     android:layout_marginRight="4dp"
-                    android:background="@drawable/circle_low" />
+                    android:background="@drawable/circle_low_filled" />
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -85,7 +85,7 @@
                     android:layout_width="8dp"
                     android:layout_height="8dp"
                     android:layout_marginRight="4dp"
-                    android:background="@drawable/circle_ok" />
+                    android:background="@drawable/circle_ok_filled" />
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -108,7 +108,7 @@
                     android:layout_width="8dp"
                     android:layout_height="8dp"
                     android:layout_marginRight="4dp"
-                    android:background="@drawable/circle_high" />
+                    android:background="@drawable/circle_high_filled" />
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -131,7 +131,7 @@
                     android:layout_width="8dp"
                     android:layout_height="8dp"
                     android:layout_marginRight="4dp"
-                    android:background="@drawable/circle_hyper" />
+                    android:background="@drawable/circle_hyper_filled" />
 
                 <TextView
                     android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/fragment_overview.xml b/app/src/main/res/layout/fragment_overview.xml
@@ -74,9 +74,103 @@
             android:layout_marginTop="16dp"
             android:background="#DADADA" />
 
+        <LinearLayout
+            android:id="@+id/fragment_history_legend"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:paddingTop="16dp">
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="8dp"
+                    android:layout_height="8dp"
+                    android:layout_marginRight="4dp"
+                    android:background="@drawable/circle_low" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textSize="12sp"
+                    android:textStyle="bold"
+                    android:paddingTop="2px"
+                    android:textColor="@color/glucosio_reading_low"
+                    android:paddingRight="8dp"
+                    android:text="@string/reading_low" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="8dp"
+                    android:layout_height="8dp"
+                    android:layout_marginRight="4dp"
+                    android:background="@drawable/circle_ok" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/glucosio_reading_ok"
+                    android:textStyle="bold"
+                    android:paddingRight="8dp"
+                    android:paddingTop="2px"
+                    android:textSize="12sp"
+                    android:text="@string/reading_ok" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
 
+                <ImageView
+                    android:layout_width="8dp"
+                    android:layout_height="8dp"
+                    android:layout_marginRight="4dp"
+                    android:background="@drawable/circle_high" />
 
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/glucosio_reading_high"
+                    android:textSize="12sp"
+                    android:textStyle="bold"
+                    android:paddingTop="2px"
+                    android:paddingRight="8dp"
+                    android:text="@string/reading_high" />
+            </LinearLayout>
 
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+            </LinearLayout>
+        </LinearLayout>
+        <TextView
+            android:layout_width="fill_parent"
+            android:layout_height="2px"
+            android:layout_marginTop="16dp"
+            android:background="#DADADA" />
         <LinearLayout
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
@@ -106,28 +200,16 @@
                     android:layout_marginTop="16dp"
                     android:text="100 mg/dL"
                     android:textColor="@color/glucosio_text" />
-            </LinearLayout>
-            <LinearLayout
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-                <TextView
-                    fontPath="fonts/lato-bold.ttf"
-                    android:visibility="invisible"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="4dp"
-                    android:text="@string/fragment_overview_last_reading" />
                 <TextView
                     fontPath="fonts/lato.ttf"
                     android:id="@+id/fragment_overview_last_date"
-                    android:layout_marginTop="4dp"
+                    android:layout_marginTop="16dp"
                     android:layout_marginLeft="8dp"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:textColor="@color/glucosio_text_light"
                     android:text="Thu, 22 dic 2016"/>
-                </LinearLayout>
+            </LinearLayout>
             <LinearLayout
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
@@ -203,10 +285,12 @@
                     android:layout_marginTop="4dp"
                     android:text="@string/dialog_add_hb1ac" />
                 <TextView
+                    android:visibility="visible"
                     fontPath="fonts/lato.ttf"
                     android:id="@+id/fragment_overview_hb1ac_date"
                     android:layout_marginTop="4dp"
                     android:layout_marginLeft="8dp"
+                    android:layout_marginBottom="16dp"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:textColor="@color/glucosio_text_light"
@@ -217,7 +301,6 @@
         <TextView
             android:layout_width="fill_parent"
             android:layout_height="2px"
-            android:layout_marginTop="16dp"
             android:background="#DADADA" />
 
         <TextView
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -115,7 +115,7 @@
     <string name="preferences_about">About</string>
     <string translatable="false" name="preferences_experimental_title">Here be dragons :/</string>
     <string name="preferences_experimental">These features are experimental and may not fully work and are for early testing by users. Remember that you can shake your phone to send us feedback.</string>
-    <string name="version" translatable="false">0.10.1 (Imli)</string>
+    <string name="version" translatable="false">0.10.2 (Imli)</string>
     <string name="preferences_version">Version</string>
     <string name="preferences_terms">Terms of use</string>
     <string name="glucose_reading_type">Type</string>

Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,9 @@ public void notifyAdapter(){`
`186`	`186`	`}`
`187`	`187`
`188`	`188`	`public void reloadFragmentAdapter(){`
`189`		`- ((MainActivity)getActivity()).reloadFragmentAdapter();`
`190`		`- ((MainActivity)getActivity()).checkIfEmptyLayout();`
	`189`	`+ if (getActivity()!= null) {`
	`190`	`+ ((MainActivity) getActivity()).reloadFragmentAdapter();`
	`191`	`+ ((MainActivity) getActivity()).checkIfEmptyLayout();`
	`192`	`+ }`
`191`	`193`	`}`
`192`	`194`	`}`