diff options
| author | Fup Duck <fupduck@sacknagel.com> | 2018-02-11 12:54:29 +0100 |
|---|---|---|
| committer | Fup Duck <fupduck@sacknagel.com> | 2018-02-11 12:54:29 +0100 |
| commit | df4bf064a8c9310ed887d80bf6cd6328d1363f49 (patch) | |
| tree | c739a9ab1ec88641d8d643667f695a266994a5a1 /app/src/main/res/layout | |
| parent | 02738271daa9457e5f4e97508301bb11a612fb24 (diff) | |
| parent | b37575a680cd1e345339bdc5c4c4bc1137b2e4f1 (diff) | |
Merge branch 'leap_0.9.8' into 8827_handle_switch_provider
Diffstat (limited to 'app/src/main/res/layout')
| -rw-r--r-- | app/src/main/res/layout/a_provider_credentials.xml | 53 | ||||
| -rw-r--r-- | app/src/main/res/layout/drawer_main.xml | 4 | ||||
| -rw-r--r-- | app/src/main/res/layout/provider_credentials.xml | 1 |
3 files changed, 34 insertions, 24 deletions
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/drawer_main.xml b/app/src/main/res/layout/drawer_main.xml index 41498617..26267bbb 100644 --- a/app/src/main/res/layout/drawer_main.xml +++ b/app/src/main/res/layout/drawer_main.xml @@ -5,7 +5,9 @@ android:layout_height="match_parent" android:orientation="vertical" android:background="@color/colorBackground" - tools:context="se.leap.bitmaskclient.drawer.NavigationDrawerFragment"> + tools:context="se.leap.bitmaskclient.drawer.NavigationDrawerFragment" + android:clickable="true" + android:focusable="true"> <FrameLayout android:layout_width="match_parent" 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 |