aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res/layout
diff options
context:
space:
mode:
authorMohamed Zenadi <mohamed@zenadi.com>2015-03-14 23:38:44 +0100
committerMohamed Zenadi <mohamed@zenadi.com>2015-03-14 23:38:44 +0100
commitcff4fcb707068eaa5faac8d938887747786ea7d7 (patch)
treefb721dc612139a5783fdd9a9c593fae512d349ac /app/src/main/res/layout
parent878922cf1103d59afbdc2968731e2eda4276fa2d (diff)
version bump and some style update
Diffstat (limited to 'app/src/main/res/layout')
-rw-r--r--app/src/main/res/layout/activity_git_clone.xml5
-rw-r--r--app/src/main/res/layout/fragment_to_clone_or_not.xml61
2 files changed, 55 insertions, 11 deletions
diff --git a/app/src/main/res/layout/activity_git_clone.xml b/app/src/main/res/layout/activity_git_clone.xml
index d53a2201..d923350a 100644
--- a/app/src/main/res/layout/activity_git_clone.xml
+++ b/app/src/main/res/layout/activity_git_clone.xml
@@ -8,6 +8,7 @@
android:paddingBottom="@dimen/activity_vertical_margin"
tools:context="com.zeapo.pwdstore.git.GitActivity"
android:background="@android:color/white">
+
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -21,7 +22,7 @@
style="@android:style/TextAppearance.Large"
android:gravity="left"
android:paddingBottom="6dp"
- android:textColor="@color/blue_grey_700"
+ android:textColor="@color/blue_grey_500"
android:background="@drawable/bottom_line"/>
<RelativeLayout
@@ -161,7 +162,7 @@
style="@android:style/TextAppearance.Large"
android:gravity="left"
android:paddingBottom="6dp"
- android:textColor="@color/blue_grey_700"
+ android:textColor="@color/blue_grey_500"
android:background="@drawable/bottom_line"/>
<EditText
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 3aed7df4..f1f8cdd9 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
@@ -1,19 +1,62 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_marginLeft="@dimen/activity_horizontal_margin"
- android:layout_marginRight="@dimen/activity_horizontal_margin"
+ android:background="@color/blue_grey_500"
+ android:orientation="vertical"
tools:context="com.zeapo.pwdstore.ToCloneOrNot">
<RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="4">
+
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/imageView"
+ android:layout_gravity="center"
+ android:src="@drawable/ic_launcher"
+ android:layout_centerVertical="true"
+ android:layout_centerHorizontal="true" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textAppearance="?android:attr/textAppearanceLarge"
+ android:text="@string/app_name"
+ android:layout_below="@+id/imageView"
+ android:layout_centerHorizontal="true"
+ android:textColor="@android:color/white"
+ android:textStyle="bold"/>
+
+ <Button
+ android:id="@+id/main_settings_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:onClick="openSettings"
+ android:background="@android:color/transparent"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:text="@string/action_settings"
+ android:textColor="@android:color/white"
+ android:layout_alignParentTop="true"
+ android:layout_alignParentRight="true"
+ android:layout_alignParentEnd="true"
+ android:layout_marginRight="@dimen/activity_horizontal_margin"
+ android:layout_marginEnd="@dimen/activity_horizontal_margin"
+ android:layout_marginTop="@dimen/activity_vertical_margin"
+ android:textStyle="bold"
+ android:textAllCaps="true"/>
+ </RelativeLayout>
+
+ <RelativeLayout
android:id="@+id/myRectangleView"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="2"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
- android:background="@drawable/rectangle">
+ android:background="@android:color/white">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -42,9 +85,9 @@
android:textStyle="bold"
android:onClick="getClone"
android:text="@string/clone"
- android:layout_below="@+id/textView"
+ android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true" />
</RelativeLayout>
-</FrameLayout>
+</LinearLayout>