diff options
| -rw-r--r-- | app/src/main/res/drawable/bottom_line.xml | 14 | ||||
| -rw-r--r-- | app/src/main/res/layout/activity_git_clone.xml | 185 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 13 |
3 files changed, 183 insertions, 29 deletions
diff --git a/app/src/main/res/drawable/bottom_line.xml b/app/src/main/res/drawable/bottom_line.xml new file mode 100644 index 00000000..c24a04df --- /dev/null +++ b/app/src/main/res/drawable/bottom_line.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?> +<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> + <item> + <shape android:shape="rectangle"> + <solid android:color="@android:color/holo_orange_dark"/> + </shape> + </item> + + <item android:bottom="2dp"> + <shape android:shape="rectangle"> + <solid android:color="#FFFFFF" /> + </shape> + </item> +</layer-list> diff --git a/app/src/main/res/layout/activity_git_clone.xml b/app/src/main/res/layout/activity_git_clone.xml index b427ac8d..7aa9eea9 100644 --- a/app/src/main/res/layout/activity_git_clone.xml +++ b/app/src/main/res/layout/activity_git_clone.xml @@ -1,46 +1,175 @@ -<RelativeLayout 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="wrap_content" + android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin" android:paddingRight="@dimen/activity_horizontal_margin" android:paddingTop="@dimen/activity_vertical_margin" android:paddingBottom="@dimen/activity_vertical_margin" - tools:context="com.zeapo.pwdstore.GitHandler"> + tools:context="com.zeapo.pwdstore.GitHandler" + android:orientation="vertical"> - <LinearLayout - android:orientation="vertical" - android:layoutDirection="ltr" + <TextView android:layout_width="fill_parent" - android:layout_height="match_parent"> - <LinearLayout - android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/server_name" + android:textStyle="bold" + style="@android:style/TextAppearance.Large" + android:gravity="left" + android:paddingBottom="6dp" + android:textColor="@android:color/holo_orange_dark" + android:background="@drawable/bottom_line"/> + + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:layout_gravity="center_vertical"> + + + <TextView + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:orientation="horizontal"> - <Spinner - android:id="@+id/clone_protocol" - android:layout_width="wrap_content" - android:layout_height="wrap_content"></Spinner> - <EditText - android:hint="Repository URI" - android:id="@+id/clone_uri" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:inputType="textWebEmailAddress"/> - </LinearLayout> + android:text="@string/server_protocol" + android:id="@+id/label_server_protocol" + android:layout_centerVertical="true" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" /> <Spinner + android:id="@+id/clone_protocol" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_toEndOf="@+id/label_server_protocol" + android:layout_toRightOf="@+id/label_server_protocol" /> + </RelativeLayout> + + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:layout_gravity="center_vertical"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/server_url" + android:id="@+id/label_server_url" + android:layout_centerVertical="true" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" /> + + <EditText + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:hint="@string/server_url_hint" + android:id="@+id/server_url" + android:layout_toEndOf="@+id/label_server_url" + android:layout_toRightOf="@+id/label_server_url" + android:layout_toLeftOf="@+id/label_server_port" + android:layout_toStartOf="@+id/label_server_port" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text=":" + android:id="@+id/label_server_port" + android:layout_centerVertical="true" + android:layout_toLeftOf="@+id/server_port" + android:layout_toStartOf="@+id/server_port" /> + <EditText + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:hint="@string/server_port_hint" + android:id="@+id/server_port" + android:layout_alignParentRight="true"/> + + </RelativeLayout> + + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:layout_gravity="center_vertical"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/server_path" + android:id="@+id/label_server_path" + android:layout_centerVertical="true" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" /> + + <EditText android:layout_width="match_parent" android:layout_height="wrap_content" - android:id="@+id/connection_mode"></Spinner> + android:hint="@string/server_path_hint" + android:layout_toEndOf="@+id/label_server_path" + android:layout_toRightOf="@+id/label_server_path" + android:layout_alignParentRight="true" + android:layout_alignParentEnd="true"/> + </RelativeLayout> + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:layout_gravity="center_vertical"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/server_user" + android:id="@+id/label_server_user" + android:layout_centerVertical="true" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" /> - <Button - android:id="@+id/clone_button" - android:text="Clone!" + <EditText android:layout_width="match_parent" android:layout_height="wrap_content" - android:onClick="cloneRepository"/> - </LinearLayout> + android:hint="@string/server_user_hint" + android:id="@+id/editText" + android:layout_toEndOf="@+id/label_server_user" + android:layout_toRightOf="@+id/label_server_user" + android:layout_alignParentRight="true" + android:layout_alignParentEnd="true"/> + </RelativeLayout> + + + <TextView + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="@string/server_resulting_url" + android:textStyle="bold" + style="@android:style/TextAppearance.Large" + android:gravity="left" + android:paddingBottom="6dp" + android:textColor="@android:color/holo_orange_dark" + android:background="@drawable/bottom_line"/> + + <EditText + android:hint="Repository URI" + android:id="@+id/clone_uri" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:inputType="textWebEmailAddress"/> + + <Spinner + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:id="@+id/connection_mode" + android:layout_column="1" + android:layout_row="2"/> + + <Button + android:id="@+id/clone_button" + android:text="Clone!" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:onClick="cloneRepository" + android:layout_column="1" + android:layout_row="4"/> -</RelativeLayout> +</LinearLayout> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 78e25d2b..7e7e120b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -18,7 +18,18 @@ <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> + + <string name="server_name">Server</string> + <string name="server_protocol">Protocol</string> + <string name="server_url">Server URL</string> + <string name="server_url_hint">server.com</string> + <string name="server_port_hint">22</string> + <string name="server_path">Repo path</string> + <string name="server_path_hint">/path/to/pass</string> + <string name="server_user">Username</string> + <string name="server_user_hint">git_username</string> + + <string name="server_resulting_url">Resulting URL</string> <!-- PGP Handler --> <string name="title_activity_pgp_handler">PgpHandler</string> |