summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2013-04-22 18:07:07 +0200
committerParménides GV <parmegv@sdf.org>2013-04-29 17:09:12 +0200
commit75728462433b19567710f54a9d4767681b10be95 (patch)
treeca6208f300c740a249a8b74fe343154be1bc96c9 /res
parent5c05094401d6ed3c69ab8f64e47278973bc87425 (diff)
Coded dialog (now there is a button in the Dashboard), time to test.
I need to implement bypass for dev.bitmask.net, because bitmask.net is down.
Diffstat (limited to 'res')
-rw-r--r--res/layout/log_in_dialog.xml32
-rw-r--r--res/menu/client_dashboard.xml1
-rwxr-xr-xres/values/strings.xml4
3 files changed, 37 insertions, 0 deletions
diff --git a/res/layout/log_in_dialog.xml b/res/layout/log_in_dialog.xml
new file mode 100644
index 0000000..6f28118
--- /dev/null
+++ b/res/layout/log_in_dialog.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ tools:context=".LogInDialog" >
+
+ <EditText
+ android:id="@+id/username_entered"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="4dp"
+ android:layout_marginLeft="4dp"
+ android:layout_marginRight="4dp"
+ android:layout_marginTop="16dp"
+ android:ems="10"
+ android:hint="@string/username_ask"
+ android:inputType="textUri" >
+
+ <requestFocus />
+ </EditText>
+
+ <EditText
+ android:id="@+id/password_entered"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:ems="10"
+ android:hint="@string/password_ask"
+ android:inputType="textPassword" />
+
+</LinearLayout> \ No newline at end of file
diff --git a/res/menu/client_dashboard.xml b/res/menu/client_dashboard.xml
index 87e7ae6..fffd4e2 100644
--- a/res/menu/client_dashboard.xml
+++ b/res/menu/client_dashboard.xml
@@ -7,5 +7,6 @@
android:title="@string/menu_settings"/>
<item android:id="@+id/about_leap" android:title="@string/about" android:orderInCategory="110" />
<item android:id="@+id/legacy_interface" android:title="ICS OpenVPN Interface" android:orderInCategory="500" />
+ <item android:id="@+id/login_button" android:title="@string/login_button" android:visible="true"></item>
</menu> \ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2deb23f..6e84bed 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -265,5 +265,9 @@
<string name="introduce_new_provider">Introduce new provider</string>
<string name="save">Save</string>
<string name="new_provider_uri">New provider\'s main URL</string>
+ <string name="username_ask">Introduce your username</string>
+ <string name="password_ask">Enter your password</string>
+ <string name="log_in_button">Log in</string>
+ <string name="login_button">Log In</string>
</resources> \ No newline at end of file