diff options
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/drawable/bottom_line.xml | 14 | ||||
| -rw-r--r-- | app/src/main/res/layout/activity_git_clone.xml | 209 | ||||
| -rw-r--r-- | app/src/main/res/layout/decrypt_layout.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/menu/pwdstore.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 16 |
5 files changed, 212 insertions, 31 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..a173f6f6 100644 --- a/app/src/main/res/layout/activity_git_clone.xml +++ b/app/src/main/res/layout/activity_git_clone.xml @@ -1,46 +1,199 @@ -<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_user" + android:id="@+id/label_server_user" + 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_user_hint" + android:id="@+id/server_user" + android:layout_toEndOf="@+id/label_server_user" + android:layout_toRightOf="@+id/label_server_user" + 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_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:id="@+id/server_path" + android:layout_toEndOf="@+id/label_server_path" + android:layout_toRightOf="@+id/label_server_path" + 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"/> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@drawable/red_rectangle" + android:textColor="@android:color/white" + android:visibility="gone" + android:id="@+id/warn_url"/> + + <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/connection_mode" + android:id="@+id/label_connection_mode" + android:layout_centerVertical="true" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" /> - <Button - android:id="@+id/clone_button" - android:text="Clone!" + <Spinner android:layout_width="match_parent" android:layout_height="wrap_content" - android:onClick="cloneRepository"/> - </LinearLayout> + android:id="@+id/connection_mode" + android:layout_toEndOf="@+id/label_connection_mode" + android:layout_toRightOf="@+id/label_connection_mode" /> + </RelativeLayout> + + <Button + android:id="@+id/clone_button" + android:text="Clone!" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:onClick="cloneRepository"/> -</RelativeLayout> +</LinearLayout> diff --git a/app/src/main/res/layout/decrypt_layout.xml b/app/src/main/res/layout/decrypt_layout.xml index 300e1d49..6169dd19 100644 --- a/app/src/main/res/layout/decrypt_layout.xml +++ b/app/src/main/res/layout/decrypt_layout.xml @@ -77,7 +77,7 @@ <ProgressBar android:id="@+id/pbLoading" android:layout_width="match_parent" - android:layout_height="2dp" + android:layout_height="8dp" android:layout_marginTop="8dp" android:layout_marginBottom="8dp" style="?android:attr/progressBarStyleHorizontal" diff --git a/app/src/main/res/menu/pwdstore.xml b/app/src/main/res/menu/pwdstore.xml index 65bc0272..a3f44f73 100644 --- a/app/src/main/res/menu/pwdstore.xml +++ b/app/src/main/res/menu/pwdstore.xml @@ -17,7 +17,7 @@ <item android:id="@+id/referesh" android:title="Refresh list" - android:showAsAction="ifRoom" + android:showAsAction="never" android:icon="@drawable/ico_sync"/> <item android:id="@+id/user_pref" diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 78e25d2b..c35514ec 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -18,7 +18,21 @@ <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> + <string name="connection_mode">Authentication Mode</string> + + <string name="warn_malformed_url_port">When using custom ports, provide an absolute path (starts with "/")</string> <!-- PGP Handler --> <string name="title_activity_pgp_handler">PgpHandler</string> |