diff options
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/layout-xlarge/a_provider_detail.xml (renamed from app/src/main/res/layout-xlarge/provider_detail_fragment.xml) | 0 | ||||
| -rw-r--r-- | app/src/main/res/layout/a_login.xml | 38 | ||||
| -rw-r--r-- | app/src/main/res/layout/a_provider_credentials.xml | 54 | ||||
| -rw-r--r-- | app/src/main/res/layout/a_provider_detail.xml (renamed from app/src/main/res/layout/provider_detail_fragment.xml) | 1 | ||||
| -rw-r--r-- | app/src/main/res/layout/a_signup.xml | 38 | ||||
| -rw-r--r-- | app/src/main/res/layout/provider_credentials.xml (renamed from app/src/main/res/layout/provider_credentials_login.xml) | 28 | ||||
| -rw-r--r-- | app/src/main/res/layout/provider_credentials_signup.xml | 24 | ||||
| -rw-r--r-- | app/src/main/res/values-v21/styles.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/values-v21/themes.xml | 2 |
9 files changed, 84 insertions, 103 deletions
diff --git a/app/src/main/res/layout-xlarge/provider_detail_fragment.xml b/app/src/main/res/layout-xlarge/a_provider_detail.xml index 31538f9f..31538f9f 100644 --- a/app/src/main/res/layout-xlarge/provider_detail_fragment.xml +++ b/app/src/main/res/layout-xlarge/a_provider_detail.xml diff --git a/app/src/main/res/layout/a_login.xml b/app/src/main/res/layout/a_login.xml deleted file mode 100644 index 5b33ec16..00000000 --- a/app/src/main/res/layout/a_login.xml +++ /dev/null @@ -1,38 +0,0 @@ -<?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" - style="@style/BitmaskActivity"> - - <include layout="@layout/loading_screen" /> - - <LinearLayout - android:id="@+id/content" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> - - <include - layout="@layout/provider_header" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> - - <include layout="@layout/provider_credentials_login" - android:layout_width="match_parent" - android:layout_height="wrap_content"/> - - <RelativeLayout - android:layout_width="match_parent" - android:layout_height="wrap_content"> - - <android.support.v7.widget.AppCompatButton - android:id="@+id/button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/login_button" - android:layout_alignParentRight="true" - android:layout_alignParentEnd="true"/> - - </RelativeLayout> - </LinearLayout> -</LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/a_provider_credentials.xml b/app/src/main/res/layout/a_provider_credentials.xml new file mode 100644 index 00000000..85d9d3cb --- /dev/null +++ b/app/src/main/res/layout/a_provider_credentials.xml @@ -0,0 +1,54 @@ +<?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="wrap_content" + style="@style/BitmaskActivity"> + + <include layout="@layout/loading_screen" /> + + <LinearLayout + android:id="@+id/content" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <include + layout="@layout/provider_header" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + + + <ScrollView + android:layout_height="match_parent" + android:layout_width="match_parent" + android:isScrollContainer="true" + > + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> + <include + layout="@layout/provider_credentials" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <android.support.v7.widget.AppCompatButton + android:id="@+id/button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentEnd="true" + android:layout_alignParentRight="true" + android:text="@string/login_button" /> + + </RelativeLayout> + </LinearLayout> + </ScrollView> + </LinearLayout> +</LinearLayout> diff --git a/app/src/main/res/layout/provider_detail_fragment.xml b/app/src/main/res/layout/a_provider_detail.xml index e4ee1cca..5f07b87c 100644 --- a/app/src/main/res/layout/provider_detail_fragment.xml +++ b/app/src/main/res/layout/a_provider_detail.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/provider_detail_fragment" android:layout_width="match_parent" android:layout_height="match_parent" diff --git a/app/src/main/res/layout/a_signup.xml b/app/src/main/res/layout/a_signup.xml deleted file mode 100644 index b0c8dc47..00000000 --- a/app/src/main/res/layout/a_signup.xml +++ /dev/null @@ -1,38 +0,0 @@ -<?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" - style="@style/BitmaskActivity"> - - <include layout="@layout/loading_screen" /> - - <LinearLayout - android:id="@+id/content" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> - - <include - layout="@layout/provider_header" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> - - <include layout="@layout/provider_credentials_signup" - android:layout_width="match_parent" - android:layout_height="wrap_content"/> - - <RelativeLayout - android:layout_width="match_parent" - android:layout_height="wrap_content"> - - <android.support.v7.widget.AppCompatButton - android:id="@+id/button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/login_button" - android:layout_alignParentRight="true" - android:layout_alignParentEnd="true"/> - - </RelativeLayout> - </LinearLayout> -</LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/provider_credentials_login.xml b/app/src/main/res/layout/provider_credentials.xml index 915ac231..6e4dff95 100644 --- a/app/src/main/res/layout/provider_credentials_login.xml +++ b/app/src/main/res/layout/provider_credentials.xml @@ -2,7 +2,16 @@ <merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto"> + <android.support.v7.widget.AppCompatTextView + android:id="@+id/provider_credentials_user_message" + android:layout_width="match_parent" + android:layout_height="wrap_content" + style="@style/TextAppearance.Design.Error" + android:visibility="gone" + /> + <android.support.design.widget.TextInputLayout + android:id="@+id/provider_credentials_username_error" android:layout_width="match_parent" android:layout_height="wrap_content" android:hint="@string/auth_username" @@ -20,6 +29,7 @@ </android.support.design.widget.TextInputLayout> <android.support.design.widget.TextInputLayout + android:id="@+id/provider_credentials_password_error" android:layout_width="match_parent" android:layout_height="wrap_content" app:passwordToggleEnabled="true" @@ -35,4 +45,22 @@ </android.support.design.widget.TextInputLayout> + <android.support.design.widget.TextInputLayout + android:id="@+id/provider_credentials_password_verification_error" + android:layout_width="match_parent" + android:layout_height="wrap_content" + app:passwordToggleEnabled="true" + android:hint="@string/password" + app:errorEnabled="true" + android:visibility="gone"> + + <android.support.design.widget.TextInputEditText + android:id="@+id/provider_credentials_password_verification" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:inputType="textPassword" + android:visibility="gone" + /> + + </android.support.design.widget.TextInputLayout> </merge>
\ No newline at end of file diff --git a/app/src/main/res/layout/provider_credentials_signup.xml b/app/src/main/res/layout/provider_credentials_signup.xml deleted file mode 100644 index c2e3dcd3..00000000 --- a/app/src/main/res/layout/provider_credentials_signup.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<merge xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" > - - <include layout="@layout/provider_credentials_login" /> - - <android.support.design.widget.TextInputLayout - android:id="@+id/provider_credentials_password_verification_layout" - android:layout_width="match_parent" - android:layout_height="wrap_content" - app:passwordToggleEnabled="true" - android:hint="@string/password" - app:errorEnabled="true"> - - <android.support.design.widget.TextInputEditText - android:id="@+id/provider_credentials_password_verification" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:inputType="textPassword" - /> - - </android.support.design.widget.TextInputLayout> - -</merge>
\ No newline at end of file diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml index b42c7554..b928a79b 100644 --- a/app/src/main/res/values-v21/styles.xml +++ b/app/src/main/res/values-v21/styles.xml @@ -28,7 +28,7 @@ <style name="BitmaskButton" parent="android:Widget.Button"> <item name="android:textAllCaps">true</item> - <item name="android:backgroundTint">@color/colorPrimaryDark</item> + <item name="android:backgroundTint">@color/colorPrimary</item> </style> </resources> diff --git a/app/src/main/res/values-v21/themes.xml b/app/src/main/res/values-v21/themes.xml index ac62b94c..d6145217 100644 --- a/app/src/main/res/values-v21/themes.xml +++ b/app/src/main/res/values-v21/themes.xml @@ -11,7 +11,7 @@ <!-- button and controls --> <item name="android:buttonStyle">@style/BitmaskButton</item> - <item name="android:colorButtonNormal">@color/colorPrimaryDark</item> + <item name="android:colorButtonNormal">@color/colorPrimary</item> <item name="android:colorControlHighlight">@color/colorPrimaryDark</item> </style> |