diff options
Diffstat (limited to 'app/src/main/res')
4 files changed, 89 insertions, 69 deletions
diff --git a/app/src/main/res/layout-sw600dp-port/a_provider_credentials.xml b/app/src/main/res/layout-sw600dp-port/a_provider_credentials.xml index 4555343c..0cbb08f6 100644 --- a/app/src/main/res/layout-sw600dp-port/a_provider_credentials.xml +++ b/app/src/main/res/layout-sw600dp-port/a_provider_credentials.xml @@ -43,7 +43,6 @@ app:layout_constraintGuide_percent="0.725" /> <LinearLayout - android:id="@+id/content" android:orientation="vertical" style="@style/BitmaskActivity" android:layout_width="0dp" @@ -61,35 +60,42 @@ <include layout="@layout/loading_screen" /> - <include - layout="@layout/provider_header" + <LinearLayout android:layout_width="match_parent" - android:layout_height="wrap_content" /> + android:layout_height="match_parent" + android:id="@+id/content" + 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 + <ScrollView + android:layout_height="match_parent" 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" /> + android:isScrollContainer="true" + > - <android.support.v7.widget.AppCompatButton - android:id="@+id/button" - android:layout_width="wrap_content" + <LinearLayout + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_gravity="end" - android:text="@string/login_button" /> + android:orientation="vertical"> + <include + layout="@layout/provider_credentials" + 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_gravity="end" + android:text="@string/login_button" /> - </LinearLayout> - </ScrollView> + </LinearLayout> + </ScrollView> + </LinearLayout> </LinearLayout> </android.support.constraint.ConstraintLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout-xlarge/a_provider_credentials.xml b/app/src/main/res/layout-xlarge/a_provider_credentials.xml index 82abb5cb..2184aeb8 100644 --- a/app/src/main/res/layout-xlarge/a_provider_credentials.xml +++ b/app/src/main/res/layout-xlarge/a_provider_credentials.xml @@ -43,7 +43,6 @@ app:layout_constraintGuide_percent="0.85" /> <LinearLayout - android:id="@+id/content" android:orientation="vertical" style="@style/BitmaskActivity" android:layout_width="0dp" @@ -60,35 +59,42 @@ <include layout="@layout/loading_screen" /> - <include - layout="@layout/provider_header" + <LinearLayout android:layout_width="match_parent" - android:layout_height="wrap_content" /> + android:layout_height="match_parent" + android:id="@+id/content" + 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 + <ScrollView + android:layout_height="match_parent" 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" /> + android:isScrollContainer="true" + > - <android.support.v7.widget.AppCompatButton - android:id="@+id/button" - android:layout_width="wrap_content" + <LinearLayout + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_gravity="end" - android:text="@string/login_button" /> + android:orientation="vertical"> + <include + layout="@layout/provider_credentials" + 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_gravity="end" + android:text="@string/login_button" /> - </LinearLayout> - </ScrollView> + </LinearLayout> + </ScrollView> + </LinearLayout> </LinearLayout> </android.support.constraint.ConstraintLayout>
\ 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 index 4998effa..6667d905 100644 --- a/app/src/main/res/layout/a_provider_credentials.xml +++ b/app/src/main/res/layout/a_provider_credentials.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/content" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -10,34 +9,42 @@ <include layout="@layout/loading_screen" /> - <include - layout="@layout/provider_header" + <LinearLayout + android:id="@+id/content" + android:orientation="vertical" 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 + <include + layout="@layout/provider_header" 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" /> + android:layout_height="wrap_content" /> + - <android.support.v7.widget.AppCompatButton - android:id="@+id/button" - android:layout_width="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:layout_gravity="end" - android:text="@string/login_button" /> + android:orientation="vertical"> + <include + layout="@layout/provider_credentials" + 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_gravity="end" + android:text="@string/login_button" /> - </LinearLayout> - </ScrollView> + </LinearLayout> + </ScrollView> + </LinearLayout> </LinearLayout> diff --git a/app/src/main/res/layout/provider_credentials.xml b/app/src/main/res/layout/provider_credentials.xml index 6e4dff95..0bfdcc47 100644 --- a/app/src/main/res/layout/provider_credentials.xml +++ b/app/src/main/res/layout/provider_credentials.xml @@ -8,6 +8,7 @@ android:layout_height="wrap_content" style="@style/TextAppearance.Design.Error" android:visibility="gone" + android:linksClickable="true" /> <android.support.design.widget.TextInputLayout |