Release V1.3

jainakshansh · Jan 19, 2018 · 6a07efc · 6a07efc
1 parent c2efae1
commit 6a07efc
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 12 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "me.akshanshjain.manage"
         minSdkVersion 21
         targetSdkVersion 26
-        versionCode 2
-        versionName "1.1"
+        versionCode 3
+        versionName "1.2"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

diff --git a/app/release/Manage V1.2.apk b/app/release/Manage V1.2.apk
diff --git a/app/release/output.json b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":2},"path":"app-release.apk","properties":{"packageId":"me.akshanshjain.manage","split":"","minSdkVersion":"21"}}]
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":3},"path":"app-release.apk","properties":{"packageId":"me.akshanshjain.manage","split":"","minSdkVersion":"21"}}]
diff --git a/app/src/main/java/me/akshanshjain/manage/LandingActivity.java b/app/src/main/java/me/akshanshjain/manage/LandingActivity.java
@@ -28,6 +28,7 @@
 
 import com.github.mikephil.charting.charts.PieChart;
 import com.github.mikephil.charting.components.Description;
+import com.github.mikephil.charting.components.Legend;
 import com.github.mikephil.charting.data.PieData;
 import com.github.mikephil.charting.data.PieDataSet;
 import com.github.mikephil.charting.data.PieEntry;
@@ -411,7 +412,9 @@ private void storeData(double incomeMonth, double expenseMonth, double monthTota
         pieChart.getLegend().setTypeface(quicksand_bold);
         pieChart.getLegend().setTextSize(12);
         pieChart.getLegend().setXOffset(10);
-        pieChart.getLegend().setYOffset(10);
+        pieChart.getLegend().setYOffset(20);
+        pieChart.getLegend().setDrawInside(true);
+        pieChart.getLegend().setOrientation(Legend.LegendOrientation.VERTICAL);
         pieChart.getLegend().setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.colorPrimary));
     }
 

diff --git a/app/src/main/res/layout/activity_landing.xml b/app/src/main/res/layout/activity_landing.xml
@@ -10,6 +10,7 @@
     tools:context=".LandingActivity">
 
     <ScrollView
+        android:id="@+id/scroll_parent_landing"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scrollbars="none"
@@ -101,7 +102,6 @@
 
             </LinearLayout>
 
-
             <android.support.v7.widget.CardView
                 android:id="@+id/middle_parent_landing"
                 android:layout_width="match_parent"
@@ -226,8 +226,8 @@
                     <com.github.mikephil.charting.charts.PieChart
                         android:id="@+id/pie_chart_landing"
                         android:layout_width="match_parent"
-                        android:layout_height="300dp"
-                        android:layout_marginBottom="16dp"
+                        android:layout_height="400dp"
+                        android:layout_marginBottom="32dp"
                         android:layout_marginTop="12dp"
                         app:layout_constraintLeft_toLeftOf="parent"
                         app:layout_constraintRight_toRightOf="parent"
@@ -237,6 +237,13 @@
 
             </android.support.v7.widget.CardView>
 
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/middle_parent_landing" />
+
         </android.support.constraint.ConstraintLayout>
 
     </ScrollView>
@@ -245,19 +252,22 @@
     <LinearLayout
         android:id="@+id/fixed_bottom_parent"
         android:layout_width="match_parent"
-        android:layout_height="48dp"
+        android:layout_height="108dp"
         android:background="@color/colorPrimary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent">
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/scroll_parent_landing">
 
         <Button
+            style="?attr/buttonBarButtonStyle"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
             android:background="@android:color/transparent" />
 
         <Button
+            style="?attr/buttonBarButtonStyle"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"

diff --git a/app/src/main/res/layout/activity_new_expense.xml b/app/src/main/res/layout/activity_new_expense.xml
@@ -11,6 +11,7 @@
         android:id="@+id/app_bar_new_expense"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        app:layout_constraintBottom_toTopOf="@id/expense_type_parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent">
@@ -117,14 +118,15 @@
     <LinearLayout
         android:id="@+id/expense_details_parent"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="48dp"
         android:layout_marginEnd="8dp"
         android:layout_marginStart="8dp"
         android:layout_marginTop="16dp"
         android:orientation="horizontal"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/expense_amount_input">
+        app:layout_constraintTop_toBottomOf="@id/expense_amount_input"
+        app:layout_constraintVertical_chainStyle="packed">
 
         <Button
             android:id="@+id/date_picker_new_expense"
@@ -181,7 +183,6 @@
         android:maxLines="5"
         android:textColor="@color/colorPrimary"
         android:textSize="16sp"
-        android:textStyle="italic"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toBottomOf="@id/expense_location_input" />