Improved Starting ui

This commit is contained in:
knuthy 2014-09-06 18:14:39 +02:00
parent 7972154bd1
commit 34f288290d
4 changed files with 34 additions and 28 deletions

View file

@ -8,8 +8,8 @@ android {
applicationId "com.zeapo.pwdstore" applicationId "com.zeapo.pwdstore"
minSdkVersion 14 minSdkVersion 14
targetSdkVersion 19 targetSdkVersion 19
versionCode 6 versionCode 7
versionName "1.1-b1" versionName "1.1-b2"
} }
buildTypes { buildTypes {
release { release {

View file

@ -13,7 +13,7 @@
<LinearLayout <LinearLayout
android:id="@+id/main_layout" android:id="@+id/main_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:orientation="vertical"></LinearLayout> android:orientation="vertical"></LinearLayout>
</RelativeLayout> </RelativeLayout>

View file

@ -5,37 +5,43 @@
android:background="#eee" android:background="#eee"
tools:context="com.zeapo.pwdstore.ToCloneOrNot"> tools:context="com.zeapo.pwdstore.ToCloneOrNot">
<LinearLayout <RelativeLayout
android:id="@+id/myRectangleView" android:id="@+id/myRectangleView"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="18dp" android:layout_gravity="center_vertical"
android:layout_marginRight="18dp" android:paddingLeft="@dimen/activity_horizontal_margin"
android:background="@drawable/rectangle" android:paddingRight="@dimen/activity_horizontal_margin"
android:layout_gravity="center" android:background="@drawable/rectangle">
android:orientation="vertical">
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:gravity="center" android:gravity="center_horizontal"
android:text="@string/clone_fragment_text"/> android:text="@string/clone_fragment_text"
android:id="@+id/textView" />
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
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 <Button
android:id="@+id/main_clone_button" android:id="@+id/main_clone_button"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:background="@android:color/transparent"
android:layout_marginBottom="8dp" android:textColor="@android:color/holo_orange_dark"
android:background="@android:color/holo_green_light"
android:onClick="getClone" android:onClick="getClone"
android:text="@string/clone"/> android:text="@string/clone"
<Button android:layout_below="@+id/textView"
android:layout_width="match_parent" android:layout_alignParentRight="true"
android:layout_height="wrap_content" android:layout_alignParentEnd="true" />
android:layout_gravity="center_horizontal" </RelativeLayout>
android:background="@android:color/holo_red_light"
android:onClick="initRepository"
android:text="@string/initialize"/>
</LinearLayout>
</FrameLayout> </FrameLayout>

View file

@ -15,9 +15,9 @@
<string name="title_activity_git_clone">Clone repository</string> <string name="title_activity_git_clone">Clone repository</string>
<!-- Clone fragment --> <!-- Clone fragment -->
<string name="clone_fragment_text">Password store empty</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 a git repository</string> <string name="clone">Clone existing</string>
<string name="initialize">Initialize a git repository</string> <string name="initialize">Create new</string>
<string name="hello_blank_fragment">Hello blank fragment</string> <string name="hello_blank_fragment">Hello blank fragment</string>
<!-- PGP Handler --> <!-- PGP Handler -->