Updated version and readjusted button sizes

roseacademies · Oct 11, 2018 · 41eb598 · 41eb598
1 parent 2b7254d
commit 41eb598
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 15 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,7 +7,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 26
         versionCode 1
-        versionName "1.0"
+        versionName "0.1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled true

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -2,10 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.roseacademies.hedhihelp">
 
-    <!-- To auto-complete the email text field in the login form with the user's emails
-    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-    <uses-permission android:name="android.permission.READ_PROFILE" />
-    <uses-permission android:name="android.permission.READ_CONTACTS" /> -->
 
     <application
         android:allowBackup="true"

diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
@@ -29,7 +29,7 @@
     <Button
         android:id="@+id/lesson_button"
         android:layout_width="0dp"
-        android:layout_height="131dp"
+        android:layout_height="120dp"
         android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="8dp"
@@ -50,9 +50,9 @@
     <Button
         android:id="@+id/calendar_button"
         android:layout_width="0dp"
-        android:layout_height="130dp"
-        android:layout_marginEnd="8dp"
+        android:layout_height="120dp"
         android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp"
         android:background="@drawable/rounded_button"
         android:backgroundTint="@color/coral"
         android:fontFamily="@font/raleway_bold"
@@ -66,7 +66,7 @@
     <Button
         android:id="@+id/resources_button"
         android:layout_width="0dp"
-        android:layout_height="130dp"
+        android:layout_height="120dp"
         android:layout_marginStart="8dp"
         android:layout_marginLeft="8dp"
         android:layout_marginTop="8dp"
@@ -86,7 +86,7 @@
     <Button
         android:id="@+id/about_button"
         android:layout_width="0dp"
-        android:layout_height="130dp"
+        android:layout_height="120dp"
         android:layout_marginStart="8dp"
         android:layout_marginLeft="8dp"
         android:layout_marginEnd="8dp"
@@ -104,13 +104,13 @@
     <Button
         android:id="@+id/survey_button"
         android:layout_width="0dp"
-        android:layout_height="130dp"
+        android:layout_height="120dp"
         android:layout_marginStart="8dp"
         android:layout_marginLeft="8dp"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="8dp"
         android:layout_marginRight="8dp"
-        android:layout_marginBottom="8dp"
+        android:layout_marginBottom="64dp"
         android:background="@drawable/rounded_button"
         android:backgroundTint="@color/cardview_dark_background"
         android:fontFamily="@font/raleway_bold"

diff --git a/app/src/main/res/layout/activity_lesson.xml b/app/src/main/res/layout/activity_lesson.xml
@@ -31,7 +31,7 @@
         android:layout_marginBottom="8dp"
         android:layout_marginEnd="8dp"
         android:layout_marginStart="8dp"
-        android:layout_marginTop="30dp"
+        android:layout_marginTop="40dp"
         android:orientation="vertical"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -41,7 +41,7 @@
         <Button
             android:id="@+id/lessonOneButton"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="80dp"
             android:background="@drawable/rounded_button"
             android:backgroundTint="@color/beige"
             android:text="@string/lesson_one"
@@ -51,7 +51,7 @@
         <Button
             android:id="@+id/lessonTwoButton"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="80dp"
             android:layout_marginTop="15dp"
             android:background="@drawable/rounded_button"
             android:backgroundTint="@color/coral"