diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactsPreference.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactsPreference.kt
index 254d34978..e985ba6d4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactsPreference.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactsPreference.kt
@@ -9,20 +9,15 @@ import androidx.preference.PreferenceViewHolder
class BlockedContactsPreference @JvmOverloads constructor(
context: Context,
- attributeSet: AttributeSet? = null) : PreferenceCategory(context, attributeSet), View.OnClickListener {
-
- override fun onClick(v: View?) {
- if (v is BlockedContactsLayout) {
- val intent = Intent(context, BlockedContactsActivity::class.java)
- context.startActivity(intent)
- }
- }
+ attributeSet: AttributeSet? = null
+) : PreferenceCategory(context, attributeSet) {
override fun onBindViewHolder(holder: PreferenceViewHolder) {
super.onBindViewHolder(holder)
- val itemView = holder.itemView
- itemView.setOnClickListener(this)
+ holder.itemView.setOnClickListener {
+ val intent = Intent(context, BlockedContactsActivity::class.java)
+ context.startActivity(intent)
+ }
}
-
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/GeneralUtilities.kt b/app/src/main/java/org/thoughtcrime/securesms/util/GeneralUtilities.kt
index 00e3e4441..a38c93831 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/GeneralUtilities.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/GeneralUtilities.kt
@@ -3,6 +3,8 @@ package org.thoughtcrime.securesms.util
import android.content.res.Resources
import android.os.Build
import androidx.annotation.ColorRes
+import androidx.recyclerview.widget.RecyclerView
+import kotlin.math.max
import kotlin.math.roundToInt
fun Resources.getColorWithID(@ColorRes id: Int, theme: Resources.Theme?): Int {
@@ -30,3 +32,8 @@ fun toDp(px: Float, resources: Resources): Float {
val scale = resources.displayMetrics.density
return (px / scale)
}
+
+val RecyclerView.isScrolledToBottom: Boolean
+ get() = computeVerticalScrollOffset().coerceAtLeast(0) +
+ computeVerticalScrollExtent() +
+ toPx(50, resources) >= computeVerticalScrollRange()
diff --git a/app/src/main/res/color/prominent_button_color.xml b/app/src/main/res/color/prominent_button_color.xml
new file mode 100644
index 000000000..8f2e692fd
--- /dev/null
+++ b/app/src/main/res/color/prominent_button_color.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/borderless_button_medium_background.xml b/app/src/main/res/drawable/borderless_button_medium_background.xml
new file mode 100644
index 000000000..6c72f9e72
--- /dev/null
+++ b/app/src/main/res/drawable/borderless_button_medium_background.xml
@@ -0,0 +1,11 @@
+
+
+
+ -
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/destructive_dialog_text_button_background.xml b/app/src/main/res/drawable/destructive_dialog_text_button_background.xml
index 1eff84a69..f3e13c800 100644
--- a/app/src/main/res/drawable/destructive_dialog_text_button_background.xml
+++ b/app/src/main/res/drawable/destructive_dialog_text_button_background.xml
@@ -1,11 +1,10 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+ -
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/filled_button_medium_background.xml b/app/src/main/res/drawable/filled_button_medium_background.xml
new file mode 100644
index 000000000..10eb6de67
--- /dev/null
+++ b/app/src/main/res/drawable/filled_button_medium_background.xml
@@ -0,0 +1,10 @@
+
+
+ -
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/prominent_filled_button_medium_background.xml b/app/src/main/res/drawable/prominent_filled_button_medium_background.xml
index a06a0d11e..698a67c0a 100644
--- a/app/src/main/res/drawable/prominent_filled_button_medium_background.xml
+++ b/app/src/main/res/drawable/prominent_filled_button_medium_background.xml
@@ -1,11 +1,10 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+ -
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/unimportant_dialog_text_button_background.xml b/app/src/main/res/drawable/unimportant_dialog_text_button_background.xml
index 1eff84a69..f3e13c800 100644
--- a/app/src/main/res/drawable/unimportant_dialog_text_button_background.xml
+++ b/app/src/main/res/drawable/unimportant_dialog_text_button_background.xml
@@ -1,11 +1,10 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+ -
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/unimportant_outline_button_medium_background.xml b/app/src/main/res/drawable/unimportant_outline_button_medium_background.xml
index 6e0de35a5..d12f7408d 100644
--- a/app/src/main/res/drawable/unimportant_outline_button_medium_background.xml
+++ b/app/src/main/res/drawable/unimportant_outline_button_medium_background.xml
@@ -1,11 +1,13 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+ -
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout-sw400dp/activity_landing.xml b/app/src/main/res/layout-sw400dp/activity_landing.xml
index 1e89cd967..5e5a36704 100644
--- a/app/src/main/res/layout-sw400dp/activity_landing.xml
+++ b/app/src/main/res/layout-sw400dp/activity_landing.xml
@@ -52,6 +52,7 @@
android:text="@string/activity_landing_restore_button_title" />
diff --git a/app/src/main/res/layout-sw400dp/activity_seed.xml b/app/src/main/res/layout-sw400dp/activity_seed.xml
index 09927d168..97b63ede5 100644
--- a/app/src/main/res/layout-sw400dp/activity_seed.xml
+++ b/app/src/main/res/layout-sw400dp/activity_seed.xml
@@ -50,15 +50,14 @@
android:textAlignment="center"
tools:text="nautical novelty populate onion awkward bent etiquette plant submarine itches vipers september axis maximum populate" />
-
diff --git a/app/src/main/res/layout/activity_pn_mode.xml b/app/src/main/res/layout/activity_pn_mode.xml
index 956c8d18d..0cdbeb992 100644
--- a/app/src/main/res/layout/activity_pn_mode.xml
+++ b/app/src/main/res/layout/activity_pn_mode.xml
@@ -42,7 +42,7 @@
android:layout_marginRight="@dimen/very_large_spacing"
android:padding="12dp"
android:orientation="vertical"
- android:background="@drawable/pn_option_background">
+ android:background="@color/pn_option_border">
-
@@ -190,6 +192,7 @@
-
-
\ No newline at end of file
+
diff --git a/app/src/main/res/layout/export_logs_widget.xml b/app/src/main/res/layout/export_logs_widget.xml
index 683648154..95c681d39 100644
--- a/app/src/main/res/layout/export_logs_widget.xml
+++ b/app/src/main/res/layout/export_logs_widget.xml
@@ -5,9 +5,7 @@
android:layout_height="match_parent">
-
-
-
-
-
@@ -68,6 +70,7 @@
android:text="@string/dialog_new_message_title"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/medium_font_size"
+ android:background="?selectableItemBackground"
app:drawableStartCompat="@drawable/ic_message"
app:layout_constraintBottom_toTopOf="@+id/new_message_divider"
app:layout_constraintEnd_toEndOf="parent"
@@ -94,6 +97,7 @@
android:text="@string/activity_create_group_title"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/medium_font_size"
+ android:background="?selectableItemBackground"
app:drawableStartCompat="@drawable/ic_group"
app:layout_constraintBottom_toTopOf="@+id/create_group_divider"
app:layout_constraintEnd_toEndOf="parent"
@@ -120,6 +124,7 @@
android:text="@string/dialog_join_community_title"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/medium_font_size"
+ android:background="?selectableItemBackground"
app:drawableStartCompat="@drawable/ic_globe"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_new_message.xml b/app/src/main/res/layout/fragment_new_message.xml
index 226a869eb..8a53b0195 100644
--- a/app/src/main/res/layout/fragment_new_message.xml
+++ b/app/src/main/res/layout/fragment_new_message.xml
@@ -21,6 +21,8 @@
-
- @drawable/prominent_filled_button_medium_background
- @color/black
- - ?android:textColorPrimary
+
+
+
-
-
-