aboutsummaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDocile-Alligator <25734209+Docile-Alligator@users.noreply.github.com>2023-10-15 15:14:09 +0000
committerDocile-Alligator <25734209+Docile-Alligator@users.noreply.github.com>2023-10-15 15:14:09 +0000
commit23c353275c16ff1d92723343c6e0197f204c7349 (patch)
tree9efb7367d64d838e368eeb20ba301a85b6dd93a0 /app
parentdb4f416d4be8ba5769bef9e03cebdf2173ea2ef2 (diff)
downloadinfinity-for-reddit-23c353275c16ff1d92723343c6e0197f204c7349.tar
infinity-for-reddit-23c353275c16ff1d92723343c6e0197f204c7349.tar.gz
infinity-for-reddit-23c353275c16ff1d92723343c6e0197f204c7349.tar.bz2
infinity-for-reddit-23c353275c16ff1d92723343c6e0197f204c7349.tar.lz
infinity-for-reddit-23c353275c16ff1d92723343c6e0197f204c7349.tar.xz
infinity-for-reddit-23c353275c16ff1d92723343c6e0197f204c7349.tar.zst
infinity-for-reddit-23c353275c16ff1d92723343c6e0197f204c7349.zip
Continue implementing showing post filter usages in PostFilterPreferenceActivity.
Diffstat (limited to 'app')
-rw-r--r--app/src/main/java/ml/docilealligator/infinityforreddit/adapters/navigationdrawer/PostFilterUsageEmbeddedRecyclerViewAdapter.java9
-rw-r--r--app/src/main/java/ml/docilealligator/infinityforreddit/customviews/InterceptTouchEventLinearLayout.java31
-rw-r--r--app/src/main/res/layout/item_post_filter_usage_embedded.xml3
-rw-r--r--app/src/main/res/layout/item_post_filter_with_usage.xml50
4 files changed, 61 insertions, 32 deletions
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/navigationdrawer/PostFilterUsageEmbeddedRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/navigationdrawer/PostFilterUsageEmbeddedRecyclerViewAdapter.java
index 050afbd2..c13e548a 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/navigationdrawer/PostFilterUsageEmbeddedRecyclerViewAdapter.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/navigationdrawer/PostFilterUsageEmbeddedRecyclerViewAdapter.java
@@ -85,7 +85,14 @@ public class PostFilterUsageEmbeddedRecyclerViewAdapter extends RecyclerView.Ada
public EntryViewHolder(@NonNull ItemPostFilterUsageEmbeddedBinding binding) {
super(binding.getRoot());
- this.textView = binding.getRoot();
+ textView = binding.getRoot();
+
+ textView.setTextColor(baseActivity.customThemeWrapper.getSecondaryTextColor());
+
+ if (baseActivity.typeface != null) {
+ textView.setTypeface(baseActivity.typeface);
+ }
+
textView.setOnClickListener(view -> {
Toast.makeText(baseActivity, textView.getText(), Toast.LENGTH_SHORT).show();
});
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/customviews/InterceptTouchEventLinearLayout.java b/app/src/main/java/ml/docilealligator/infinityforreddit/customviews/InterceptTouchEventLinearLayout.java
new file mode 100644
index 00000000..ebc7ce5b
--- /dev/null
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/customviews/InterceptTouchEventLinearLayout.java
@@ -0,0 +1,31 @@
+package ml.docilealligator.infinityforreddit.customviews;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.widget.LinearLayout;
+
+import androidx.annotation.Nullable;
+
+public class InterceptTouchEventLinearLayout extends LinearLayout {
+ public InterceptTouchEventLinearLayout(Context context) {
+ super(context);
+ }
+
+ public InterceptTouchEventLinearLayout(Context context, @Nullable AttributeSet attrs) {
+ super(context, attrs);
+ }
+
+ public InterceptTouchEventLinearLayout(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+ super(context, attrs, defStyleAttr);
+ }
+
+ @Override
+ public boolean onInterceptTouchEvent(MotionEvent ev) {
+ return true;
+ }
+
+ public InterceptTouchEventLinearLayout(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+ super(context, attrs, defStyleAttr, defStyleRes);
+ }
+}
diff --git a/app/src/main/res/layout/item_post_filter_usage_embedded.xml b/app/src/main/res/layout/item_post_filter_usage_embedded.xml
index bfec3dbb..e156e968 100644
--- a/app/src/main/res/layout/item_post_filter_usage_embedded.xml
+++ b/app/src/main/res/layout/item_post_filter_usage_embedded.xml
@@ -2,7 +2,8 @@
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:padding="16dp"
+ android:paddingTop="8dp"
+ android:layout_marginStart="24dp"
android:textColor="?attr/primaryTextColor"
android:textSize="?attr/font_default"
android:fontFamily="?attr/font_family" /> \ No newline at end of file
diff --git a/app/src/main/res/layout/item_post_filter_with_usage.xml b/app/src/main/res/layout/item_post_filter_with_usage.xml
index 8a083caa..74699ed4 100644
--- a/app/src/main/res/layout/item_post_filter_with_usage.xml
+++ b/app/src/main/res/layout/item_post_filter_with_usage.xml
@@ -1,38 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
+<ml.docilealligator.infinityforreddit.customviews.InterceptTouchEventLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="8dp"
- android:layout_marginBottom="8dp"
- android:layout_marginStart="16dp"
- android:layout_marginEnd="16dp"
- app:cardBackgroundColor="#FBEEFC"
- style="?attr/materialCardViewFilledStyle">
+ android:orientation="vertical"
+ android:paddingTop="16dp"
+ android:paddingBottom="16dp"
+ android:paddingStart="72dp"
+ android:paddingEnd="16dp"
+ android:clickable="true"
+ android:focusable="true"
+ android:background="?attr/selectableItemBackground">
- <LinearLayout
+ <TextView
+ android:id="@+id/post_filter_name_text_view_item_post_filter"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="vertical">
+ android:fontFamily="?attr/font_family"
+ android:textColor="?attr/primaryTextColor"
+ android:textSize="?attr/font_16" />
- <TextView
- android:id="@+id/post_filter_name_text_view_item_post_filter"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingTop="16dp"
- android:paddingBottom="16dp"
- android:paddingStart="72dp"
- android:paddingEnd="16dp"
- android:textColor="?attr/primaryTextColor"
- android:textSize="?attr/font_16"
- android:fontFamily="?attr/font_family" />
-
- <androidx.recyclerview.widget.RecyclerView
- android:id="@+id/post_filter_usage_recycler_view_item_post_filter"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:nestedScrollingEnabled="false" />
-
- </LinearLayout>
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/post_filter_usage_recycler_view_item_post_filter"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:nestedScrollingEnabled="false" />
-</com.google.android.material.card.MaterialCardView> \ No newline at end of file
+</ml.docilealligator.infinityforreddit.customviews.InterceptTouchEventLinearLayout> \ No newline at end of file