diff options
author | Scott Jackson <daneren2005@gmail.com> | 2014-06-10 20:17:37 -0700 |
---|---|---|
committer | Scott Jackson <daneren2005@gmail.com> | 2014-06-10 20:17:37 -0700 |
commit | 2b079541a39f08be590cb2b37e2d401edcb4f13e (patch) | |
tree | 7b1e2b1cf90dd845a47d9d78f6906a2d9473878b /res | |
parent | f064378307cf651c1f0cb82a36b81099b4db7401 (diff) | |
download | dsub-2b079541a39f08be590cb2b37e2d401edcb4f13e.tar.gz dsub-2b079541a39f08be590cb2b37e2d401edcb4f13e.tar.bz2 dsub-2b079541a39f08be590cb2b37e2d401edcb4f13e.zip |
#171 Add ability to change email, email/password to UserFragment
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable-hdpi/ic_menu_password_dark.png | bin | 0 -> 843 bytes | |||
-rw-r--r-- | res/drawable-hdpi/ic_menu_password_light.png | bin | 0 -> 958 bytes | |||
-rw-r--r-- | res/drawable-mdpi/ic_menu_password_dark.png | bin | 0 -> 554 bytes | |||
-rw-r--r-- | res/drawable-mdpi/ic_menu_password_light.png | bin | 0 -> 676 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/ic_menu_password_dark.png | bin | 0 -> 1067 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/ic_menu_password_light.png | bin | 0 -> 1234 bytes | |||
-rw-r--r-- | res/drawable-xxhdpi/ic_menu_password_dark.png | bin | 0 -> 1610 bytes | |||
-rw-r--r-- | res/drawable-xxhdpi/ic_menu_password_light.png | bin | 0 -> 1852 bytes | |||
-rw-r--r-- | res/layout/change_email.xml | 28 | ||||
-rw-r--r-- | res/menu/admin_context.xml | 4 | ||||
-rw-r--r-- | res/menu/user.xml | 10 | ||||
-rw-r--r-- | res/menu/user_user.xml | 14 | ||||
-rw-r--r-- | res/values/attrs.xml | 1 | ||||
-rw-r--r-- | res/values/strings.xml | 5 | ||||
-rw-r--r-- | res/values/themes.xml | 3 |
15 files changed, 65 insertions, 0 deletions
diff --git a/res/drawable-hdpi/ic_menu_password_dark.png b/res/drawable-hdpi/ic_menu_password_dark.png Binary files differnew file mode 100644 index 00000000..67fa3e84 --- /dev/null +++ b/res/drawable-hdpi/ic_menu_password_dark.png diff --git a/res/drawable-hdpi/ic_menu_password_light.png b/res/drawable-hdpi/ic_menu_password_light.png Binary files differnew file mode 100644 index 00000000..bd99c01f --- /dev/null +++ b/res/drawable-hdpi/ic_menu_password_light.png diff --git a/res/drawable-mdpi/ic_menu_password_dark.png b/res/drawable-mdpi/ic_menu_password_dark.png Binary files differnew file mode 100644 index 00000000..74d0095a --- /dev/null +++ b/res/drawable-mdpi/ic_menu_password_dark.png diff --git a/res/drawable-mdpi/ic_menu_password_light.png b/res/drawable-mdpi/ic_menu_password_light.png Binary files differnew file mode 100644 index 00000000..159f7889 --- /dev/null +++ b/res/drawable-mdpi/ic_menu_password_light.png diff --git a/res/drawable-xhdpi/ic_menu_password_dark.png b/res/drawable-xhdpi/ic_menu_password_dark.png Binary files differnew file mode 100644 index 00000000..d1fc0a97 --- /dev/null +++ b/res/drawable-xhdpi/ic_menu_password_dark.png diff --git a/res/drawable-xhdpi/ic_menu_password_light.png b/res/drawable-xhdpi/ic_menu_password_light.png Binary files differnew file mode 100644 index 00000000..1cbf085c --- /dev/null +++ b/res/drawable-xhdpi/ic_menu_password_light.png diff --git a/res/drawable-xxhdpi/ic_menu_password_dark.png b/res/drawable-xxhdpi/ic_menu_password_dark.png Binary files differnew file mode 100644 index 00000000..a7cd1a6d --- /dev/null +++ b/res/drawable-xxhdpi/ic_menu_password_dark.png diff --git a/res/drawable-xxhdpi/ic_menu_password_light.png b/res/drawable-xxhdpi/ic_menu_password_light.png Binary files differnew file mode 100644 index 00000000..5670a209 --- /dev/null +++ b/res/drawable-xxhdpi/ic_menu_password_light.png diff --git a/res/layout/change_email.xml b/res/layout/change_email.xml new file mode 100644 index 00000000..8b74215c --- /dev/null +++ b/res/layout/change_email.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="horizontal"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content">
+
+ <TextView
+ android:id="@+id/new_email_label"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="4dp"
+ android:textSize="20dp"
+ android:text="@string/admin.change_email_label" />
+ <EditText
+ android:id="@+id/new_email"
+ android:inputType="textEmailAddress"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:layout_marginLeft="4dp" />
+ </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file diff --git a/res/menu/admin_context.xml b/res/menu/admin_context.xml index 8cd04859..922a24a9 100644 --- a/res/menu/admin_context.xml +++ b/res/menu/admin_context.xml @@ -3,6 +3,10 @@ xmlns:compat="http://schemas.android.com/apk/res-auto">
<item
+ android:id="@+id/admin_change_email"
+ android:title="@string/admin.change_email"/>
+
+ <item
android:id="@+id/admin_change_password"
android:title="@string/admin.change_password"/>
diff --git a/res/menu/user.xml b/res/menu/user.xml index ace011b1..aea881fc 100644 --- a/res/menu/user.xml +++ b/res/menu/user.xml @@ -9,6 +9,16 @@ compat:showAsAction="always|withText"/>
<item
+ android:id="@+id/menu_change_password"
+ android:title="@string/admin.change_password"
+ android:icon="?attr/password"
+ compat:showAsAction="always|withText"/>
+
+ <item
+ android:id="@+id/menu_change_email"
+ android:title="@string/admin.change_email"/>
+
+ <item
android:id="@+id/menu_exit"
android:title="@string/menu.exit"/>
</menu>
\ No newline at end of file diff --git a/res/menu/user_user.xml b/res/menu/user_user.xml new file mode 100644 index 00000000..f66aa793 --- /dev/null +++ b/res/menu/user_user.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:compat="http://schemas.android.com/apk/res-auto">
+
+ <item
+ android:id="@+id/menu_change_password"
+ android:title="@string/admin.change_password"
+ android:icon="?attr/password"
+ compat:showAsAction="always|withText"/>
+
+ <item
+ android:id="@+id/menu_exit"
+ android:title="@string/menu.exit"/>
+</menu>
\ No newline at end of file diff --git a/res/values/attrs.xml b/res/values/attrs.xml index b820c371..ac535487 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -22,5 +22,6 @@ <attr name="bookmark" format="reference"/> <attr name="share" format="reference"/> <attr name="add_person" format="reference"/> + <attr name="password" format="reference"/> <attr name="drawerItemsIcons" format="reference"/> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 460e46db..d43d8c7b 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -450,6 +450,11 @@ <string name="admin.update_permissions">Update Permissions</string>
<string name="admin.update_permissions_success">Successfully updated permission for %1$s</string>
<string name="admin.update_permissions_error">Failed to update permissions for %1$s</string>
+ <string name="admin.change_email">Change Email</string>
+ <string name="admin.change_email_success">Successfully changed email for %1$s</string>
+ <string name="admin.change_email_error">Failed to change email for %1$s</string>
+ <string name="admin.change_email_label">New Email:</string>
+ <string name="admin.change_email_invalid">Enter a valid email</string>
<string name="admin.change_password">Change Password</string>
<string name="admin.change_password_success">Successfully changed password for %1$s</string>
<string name="admin.change_password_error">Failed to change password for %1$s</string>
diff --git a/res/values/themes.xml b/res/values/themes.xml index 0f464baa..6611cff7 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -25,6 +25,7 @@ <item name="bookmark">@drawable/ic_menu_bookmark_light</item> <item name="share">@drawable/ic_menu_share_light</item> <item name="add_person">@drawable/ic_menu_add_person_light</item> + <item name="password">@drawable/ic_menu_password_light</item> <item name="drawerItemsIcons">@array/drawerItemIconsLight</item> <item name="android:textViewStyle">@style/DSub.TextViewStyle</item> <item name="android:buttonStyle">@style/DSub.ButtonStyle.Light</item> @@ -55,6 +56,7 @@ <item name="bookmark">@drawable/ic_menu_bookmark_dark</item> <item name="share">@drawable/ic_menu_share_dark</item> <item name="add_person">@drawable/ic_menu_add_person_dark</item> + <item name="password">@drawable/ic_menu_password_dark</item> <item name="drawerItemsIcons">@array/drawerItemIconsDark</item> <item name="android:textViewStyle">@style/DSub.TextViewStyle</item> <item name="android:buttonStyle">@style/DSub.ButtonStyle.Dark</item> @@ -88,6 +90,7 @@ <item name="bookmark">@drawable/ic_menu_bookmark_dark</item> <item name="share">@drawable/ic_menu_share_dark</item> <item name="add_person">@drawable/ic_menu_add_person_dark</item> + <item name="password">@drawable/ic_menu_password_dark</item> <item name="drawerItemsIcons">@array/drawerItemIconsDark</item> <item name="android:textViewStyle">@style/DSub.TextViewStyle</item> <item name="android:buttonStyle">@style/DSub.ButtonStyle.Dark</item> |