From d77c78249cf3519cf8e39303eab611483ce7a1e0 Mon Sep 17 00:00:00 2001
From: Alinson Xavier <axavier@uwaterloo.ca>
Date: Fri, 29 Apr 2016 11:48:06 -0400
Subject: [PATCH] Tweak layout to work with older phones with smaller screen

---
 .../java/org/isoron/uhabits/BaseActivity.java |  3 +++
 app/src/main/res/layout/show_habit.xml        | 20 +++++++++++--------
 app/src/main/res/values/styles.xml            |  4 ++--
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/org/isoron/uhabits/BaseActivity.java b/app/src/main/java/org/isoron/uhabits/BaseActivity.java
index 2e8281312..1444f228a 100644
--- a/app/src/main/java/org/isoron/uhabits/BaseActivity.java
+++ b/app/src/main/java/org/isoron/uhabits/BaseActivity.java
@@ -197,5 +197,8 @@ abstract public class BaseActivity extends AppCompatActivity implements Thread.U
     {
         View view = findViewById(R.id.toolbarShadow);
         if(view != null) view.setVisibility(View.GONE);
+
+        view = findViewById(R.id.headerShadow);
+        if(view != null) view.setVisibility(View.GONE);
     }
 }
diff --git a/app/src/main/res/layout/show_habit.xml b/app/src/main/res/layout/show_habit.xml
index 436da76fa..fe3369181 100644
--- a/app/src/main/res/layout/show_habit.xml
+++ b/app/src/main/res/layout/show_habit.xml
@@ -106,6 +106,10 @@
             </LinearLayout>
         </LinearLayout>
 
+        <View
+            android:id="@+id/headerShadow"
+            style="@style/ToolbarShadow"/>
+
         <LinearLayout
             style="@style/Card"
             android:paddingTop="12dp"
@@ -124,9 +128,9 @@
                 android:orientation="horizontal">
 
                 <FrameLayout
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:minWidth="100dp">
+                    android:layout_weight="5">
 
                     <org.isoron.uhabits.views.RingView
                         android:id="@+id/scoreRing"
@@ -140,9 +144,9 @@
                 </FrameLayout>
 
                 <LinearLayout
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:minWidth="80dp"
+                    android:layout_weight="4"
                     android:orientation="vertical">
 
                     <TextView
@@ -159,9 +163,9 @@
                 </LinearLayout>
 
                 <LinearLayout
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:minWidth="80dp"
+                    android:layout_weight="4"
                     android:orientation="vertical">
 
                     <TextView
@@ -178,9 +182,9 @@
                 </LinearLayout>
 
                 <LinearLayout
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:minWidth="80dp"
+                    android:layout_weight="4"
                     android:orientation="vertical">
 
                     <TextView
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index a62b90d2e..62c365e09 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -249,9 +249,9 @@
 
     <style name="ToolbarShadow">
         <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">3dp</item>
+        <item name="android:layout_height">2dp</item>
         <item name="android:background">@drawable/toolbar_shadow</item>
-        <item name="android:alpha">0.25</item>
+        <item name="android:alpha">0.2</item>
         <item name="android:layout_below">@id/toolbar</item>
     </style>
 </resources>