diff options
| author | knuthy <knuthy@gmail.com> | 2014-10-01 23:20:51 +0200 |
|---|---|---|
| committer | knuthy <knuthy@gmail.com> | 2014-10-01 23:20:51 +0200 |
| commit | 34999c2bd5cb324f6cef5a4fae080cd4311878ce (patch) | |
| tree | 7de31ae2549985b5f4dcea3fe4b8cbddce0d633e /app/src/main/res | |
| parent | ff3c3f94d1066b568921c8879076b0348d8410e9 (diff) | |
Improved clone screen and added preliminary support for custom ports, fix #14
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/layout/activity_git_clone.xml | 37 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 3 |
2 files changed, 33 insertions, 7 deletions
diff --git a/app/src/main/res/layout/activity_git_clone.xml b/app/src/main/res/layout/activity_git_clone.xml index 721980cb..12182238 100644 --- a/app/src/main/res/layout/activity_git_clone.xml +++ b/app/src/main/res/layout/activity_git_clone.xml @@ -137,6 +137,13 @@ android:layout_alignParentEnd="true"/> </RelativeLayout> + <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"/> <TextView android:layout_width="fill_parent" @@ -156,21 +163,37 @@ android:layout_height="wrap_content" android:inputType="textWebEmailAddress"/> - <Spinner + + <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:id="@+id/connection_mode" - android:layout_column="1" - android:layout_row="2"/> + 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" /> + + <Spinner + android:layout_width="match_parent" + android:layout_height="wrap_content" + 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" - android:layout_column="1" - android:layout_row="4"/> + android:onClick="cloneRepository"/> </LinearLayout> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7e7e120b..c35514ec 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -30,6 +30,9 @@ <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> |