From 421cecca3c0509d8ce7615054352a12b86ad70ab Mon Sep 17 00:00:00 2001 From: Fup Duck Date: Thu, 8 Feb 2018 17:02:01 +0100 Subject: 8833 - consume click in drawer --- app/src/main/res/layout/drawer_main.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'app') 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"> Date: Thu, 8 Feb 2018 19:39:37 +0100 Subject: \#8554 * show only first error of error array * show loading screenin credentials activities * render link in error message correctly --- app/src/main/AndroidManifest.xml | 6 +-- .../ProviderCredentialsBaseActivity.java | 27 +++++++++-- app/src/main/res/layout/a_provider_credentials.xml | 53 ++++++++++++---------- app/src/main/res/layout/provider_credentials.xml | 1 + 4 files changed, 57 insertions(+), 30 deletions(-) (limited to 'app') diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6a1d40aa..029e9fdb 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -102,10 +102,8 @@ android:label="@string/provider_details_title" android:launchMode="singleTop" /> - - + + = VERSION_CODES.N) { + userMessage.setText(Html.fromHtml(userMessageString, Html.FROM_HTML_MODE_LEGACY)); + } else { + userMessage.setText(Html.fromHtml(userMessageString)); + } + Linkify.addLinks(userMessage, Linkify.ALL); + userMessage.setMovementMethod(LinkMovementMethod.getInstance()); userMessage.setVisibility(VISIBLE); } else if (userMessage.getVisibility() != VISIBLE) { userMessage.setVisibility(GONE); 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 @@ - - - - - - + android:layout_height="wrap_content" /> + - + + + android:orientation="vertical"> + + + - - + + + 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" /> Date: Fri, 9 Feb 2018 21:04:13 +0100 Subject: 8554 - show Loading screen on bigger screens --- .../layout-sw600dp-port/a_provider_credentials.xml | 52 ++++++++++++---------- .../res/layout-xlarge/a_provider_credentials.xml | 52 ++++++++++++---------- 2 files changed, 58 insertions(+), 46 deletions(-) (limited to 'app') 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" /> - + android:layout_height="match_parent" + android:id="@+id/content" + android:orientation="vertical"> + - - - + android:isScrollContainer="true" + > - + android:orientation="vertical"> + + + - - + + + \ 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" /> - + android:layout_height="match_parent" + android:id="@+id/content" + android:orientation="vertical"> + - - - + android:isScrollContainer="true" + > - + android:orientation="vertical"> + + + - - + + + \ No newline at end of file -- cgit v1.2.3