Improved Starting ui

4 files changed, 34 insertions, 28 deletions

diff --git a/app/build.gradle b/app/build.gradle
index 33e2b78a..dff58f7d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.zeapo.pwdstore"
         minSdkVersion 14
         targetSdkVersion 19
-        versionCode 6
-        versionName "1.1-b1"
+        versionCode 7
+        versionName "1.1-b2"
     }
     buildTypes {
         release {
diff --git a/app/src/main/res/layout/activity_pwdstore.xml b/app/src/main/res/layout/activity_pwdstore.xml
index 89a4c122..1e6f1e41 100644
--- a/app/src/main/res/layout/activity_pwdstore.xml
+++ b/app/src/main/res/layout/activity_pwdstore.xml
@@ -13,7 +13,7 @@
     <LinearLayout
         android:id="@+id/main_layout"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:orientation="vertical"></LinearLayout>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_to_clone_or_not.xml b/app/src/main/res/layout/fragment_to_clone_or_not.xml
index d25819e4..e5c4172f 100644
--- a/app/src/main/res/layout/fragment_to_clone_or_not.xml
+++ b/app/src/main/res/layout/fragment_to_clone_or_not.xml
@@ -5,37 +5,43 @@
     android:background="#eee"
     tools:context="com.zeapo.pwdstore.ToCloneOrNot">
 
-    <LinearLayout
+    <RelativeLayout
         android:id="@+id/myRectangleView"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="18dp"
-        android:layout_marginRight="18dp"
-        android:background="@drawable/rectangle"
-        android:layout_gravity="center"
-        android:orientation="vertical">
+        android:layout_gravity="center_vertical"
+        android:paddingLeft="@dimen/activity_horizontal_margin"
+        android:paddingRight="@dimen/activity_horizontal_margin"
+        android:background="@drawable/rectangle">
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="8dp"
-            android:gravity="center"
-            android:text="@string/clone_fragment_text"/>
+            android:gravity="center_horizontal"
+            android:text="@string/clone_fragment_text"
+            android:id="@+id/textView" />
+
         <Button
-            android:id="@+id/main_clone_button"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginBottom="8dp"
-            android:background="@android:color/holo_green_light"
-            android:onClick="getClone"
-            android:text="@string/clone"/>
+            android:background="@android:color/transparent"
+            android:onClick="initRepository"
+            android:text="@string/initialize"
+            android:id="@+id/button"
+            android:layout_alignTop="@+id/main_clone_button"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true" />
         <Button
-            android:layout_width="match_parent"
+            android:id="@+id/main_clone_button"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:background="@android:color/holo_red_light"
-            android:onClick="initRepository"
-            android:text="@string/initialize"/>
-        </LinearLayout>
+            android:background="@android:color/transparent"
+            android:textColor="@android:color/holo_orange_dark"
+            android:onClick="getClone"
+            android:text="@string/clone"
+            android:layout_below="@+id/textView"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true" />
+    </RelativeLayout>
 
 </FrameLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9c874b12..78e25d2b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -15,9 +15,9 @@
     <string name="title_activity_git_clone">Clone repository</string>
 
     <!-- Clone fragment -->
-    <string name="clone_fragment_text">Password store empty</string>
-    <string name="clone">Clone a git repository</string>
-    <string name="initialize">Initialize a git repository</string>
+    <string name="clone_fragment_text">Welcome to Password Store\n\n In this screen you can either create a new repository or clone your git repository onto your device.</string>
+    <string name="clone">Clone existing</string>
+    <string name="initialize">Create new</string>
     <string name="hello_blank_fragment">Hello blank fragment</string>
 
     <!-- PGP Handler -->