From 98e581f9ed78cf25a55460781192c12d71edcd50 Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Wed, 2 Jan 2019 12:54:12 +0100
Subject: [PATCH] Fixes #177
---
.../missingfeatures/MissingFeaturesDialog.kt | 4 +-
.../res/layout/dialog_missing_features.xml | 56 ++++++++++---------
2 files changed, 33 insertions(+), 27 deletions(-)
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/missingfeatures/MissingFeaturesDialog.kt b/app/src/main/java/de/kuschku/quasseldroid/util/missingfeatures/MissingFeaturesDialog.kt
index 81da93c8d..dfd82291f 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/missingfeatures/MissingFeaturesDialog.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/missingfeatures/MissingFeaturesDialog.kt
@@ -53,8 +53,8 @@ class MissingFeaturesDialog : DialogFragment() {
.customView(R.layout.dialog_missing_features, true)
.title(R.string.label_missing_features)
.also {
- it.positiveText(if (builder?.readOnly == true) R.string.label_accept
- else R.string.label_close)
+ it.positiveText(if (builder?.readOnly == true) R.string.label_close
+ else R.string.label_accept)
builder?.positiveListener?.let(it::onPositive)
}
.build()
diff --git a/app/src/main/res/layout/dialog_missing_features.xml b/app/src/main/res/layout/dialog_missing_features.xml
index 8f7720ffd..248baf48d 100644
--- a/app/src/main/res/layout/dialog_missing_features.xml
+++ b/app/src/main/res/layout/dialog_missing_features.xml
@@ -17,34 +17,40 @@
with this program. If not, see <http://www.gnu.org/licenses/>.
-->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical"
- android:paddingBottom="8dp"
- android:paddingTop="8dp">
-
- <TextView
- android:id="@+id/message"
- style="@style/Widget.RtlConformTextView"
+ android:layout_height="match_parent">
+
+ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingBottom="8dp"
- android:paddingEnd="?listPreferredItemPaddingRight"
- android:paddingLeft="?listPreferredItemPaddingLeft"
- android:paddingRight="?listPreferredItemPaddingRight"
- android:paddingStart="?listPreferredItemPaddingLeft"
+ android:orientation="vertical"
android:paddingTop="8dp"
- android:textColor="?colorTextPrimary"
- android:textSize="16sp" />
+ android:paddingBottom="8dp">
- <androidx.recyclerview.widget.RecyclerView
- android:id="@+id/list"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:nestedScrollingEnabled="false"
- tools:ignore="UnusedAttribute"
- tools:itemCount="3"
- tools:listitem="@layout/widget_missing_feature" />
-</LinearLayout>
+ <TextView
+ android:id="@+id/message"
+ style="@style/Widget.RtlConformTextView"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingStart="?listPreferredItemPaddingLeft"
+ android:paddingLeft="?listPreferredItemPaddingLeft"
+ android:paddingTop="8dp"
+ android:paddingEnd="?listPreferredItemPaddingRight"
+ android:paddingRight="?listPreferredItemPaddingRight"
+ android:paddingBottom="8dp"
+ android:textColor="?colorTextPrimary"
+ android:textSize="16sp" />
+
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/list"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:nestedScrollingEnabled="false"
+ tools:ignore="UnusedAttribute"
+ tools:itemCount="3"
+ tools:listitem="@layout/widget_missing_feature" />
+ </LinearLayout>
+</androidx.core.widget.NestedScrollView>
--
GitLab