aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/layout/activity_git_clone.xml22
-rw-r--r--app/src/main/res/layout/activity_pwdstore.xml6
-rw-r--r--app/src/main/res/menu/pwdstore.xml7
-rw-r--r--app/src/main/res/values/strings.xml10
4 files changed, 25 insertions, 20 deletions
diff --git a/app/src/main/res/layout/activity_git_clone.xml b/app/src/main/res/layout/activity_git_clone.xml
index 01b18d26..6587524b 100644
--- a/app/src/main/res/layout/activity_git_clone.xml
+++ b/app/src/main/res/layout/activity_git_clone.xml
@@ -13,21 +13,25 @@
android:layoutDirection="ltr"
android:layout_width="fill_parent"
android:layout_height="match_parent">
- <EditText
- android:hint="Repository"
- android:id="@+id/clone_uri"
+ <LinearLayout
android:layout_width="match_parent"
- android:layout_height="wrap_content" />
+ android:layout_height="wrap_content">
+ <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" />
+ </LinearLayout>
+
<Spinner
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/connection_mode"></Spinner>
- <LinearLayout
- android:id="@+id/config_layout"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"></LinearLayout>
-
<Button
android:id="@+id/clone_button"
android:text="Clone!"
diff --git a/app/src/main/res/layout/activity_pwdstore.xml b/app/src/main/res/layout/activity_pwdstore.xml
index 1420c906..a59ed394 100644
--- a/app/src/main/res/layout/activity_pwdstore.xml
+++ b/app/src/main/res/layout/activity_pwdstore.xml
@@ -8,10 +8,4 @@
android:paddingBottom="@dimen/activity_vertical_margin"
tools:context=".pwdstore">
- <Button
- android:text="@string/clone"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:onClick="getClone"/>
-
</RelativeLayout>
diff --git a/app/src/main/res/menu/pwdstore.xml b/app/src/main/res/menu/pwdstore.xml
index db164db6..97d4df5b 100644
--- a/app/src/main/res/menu/pwdstore.xml
+++ b/app/src/main/res/menu/pwdstore.xml
@@ -1,8 +1,9 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
tools:context=".pwdstore" >
- <item android:id="@+id/action_settings"
- android:title="@string/action_settings"
+ <item android:id="@+id/clone_setting"
+ android:title="@string/clone_setting"
android:orderInCategory="100"
- android:showAsAction="never" />
+ android:showAsAction="ifRoom"
+ android:onClick="getClone"/>
</menu>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 43246df8..7b9de7d3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,10 +3,10 @@
<string name="app_name">PwdStore</string>
<string name="clone">Clone!</string>
- <string name="action_settings">Settings</string>
+ <string name="clone_setting">Clone</string>
<string name="hello_world">Hello world!</string>
- <string name="dialog_delete_title">Remove dir</string>
+ <string name="dialog_delete_title">Directory already exist</string>
<string name="dialog_delete_msg">Target directory already exist. Current version support only a single store. Do you want to delete the current password store directory?</string>
<string name="dialog_delete">Delete directory</string>
<string name="dialog_do_not_delete">Cancel</string>
@@ -16,4 +16,10 @@
<item>ssh-key</item>
</string-array>
+ <string-array name="clone_protocols">
+ <item>ssh://</item>
+ <item>https://</item>
+ <item>http://</item>
+ </string-array>
+
</resources>