Skip to content

Commit 55bae7a

Browse files
Docile-AlligatorDocile-Alligator
committed
Refine UI in CustomizePostFilterActivity.
1 parent 6a67354 commit 55bae7a

File tree

3 files changed

+74
-44
lines changed

3 files changed

+74
-44
lines changed

‎app/src/main/java/ml/docilealligator/infinityforreddit/activities/CustomizePostFilterActivity.java

Lines changed: 26 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -101,27 +101,27 @@ protected void onCreate(Bundle savedInstanceState) {
101101
fromSettings = getIntent().getBooleanExtra(EXTRA_FROM_SETTINGS, false);
102102

103103
binding.postTypeTextLinearLayoutCustomizePostFilterActivity.setOnClickListener(view -> {
104-
binding.postTypeTextCheckBoxCustomizePostFilterActivity.performClick();
104+
binding.postTypeTextSwitchCustomizePostFilterActivity.performClick();
105105
});
106106

107107
binding.postTypeLinkLinearLayoutCustomizePostFilterActivity.setOnClickListener(view -> {
108-
binding.postTypeLinkCheckBoxCustomizePostFilterActivity.performClick();
108+
binding.postTypeLinkSwitchCustomizePostFilterActivity.performClick();
109109
});
110110

111111
binding.postTypeImageLinearLayoutCustomizePostFilterActivity.setOnClickListener(view -> {
112-
binding.postTypeImageCheckBoxCustomizePostFilterActivity.performClick();
112+
binding.postTypeImageSwitchCustomizePostFilterActivity.performClick();
113113
});
114114

115115
binding.postTypeGifLinearLayoutCustomizePostFilterActivity.setOnClickListener(view -> {
116-
binding.postTypeGifCheckBoxCustomizePostFilterActivity.performClick();
116+
binding.postTypeGifSwitchCustomizePostFilterActivity.performClick();
117117
});
118118

119119
binding.postTypeVideoLinearLayoutCustomizePostFilterActivity.setOnClickListener(view -> {
120-
binding.postTypeVideoCheckBoxCustomizePostFilterActivity.performClick();
120+
binding.postTypeVideoSwitchCustomizePostFilterActivity.performClick();
121121
});
122122

123123
binding.postTypeGalleryLinearLayoutCustomizePostFilterActivity.setOnClickListener(view -> {
124-
binding.postTypeGalleryCheckBoxCustomizePostFilterActivity.performClick();
124+
binding.postTypeGallerySwitchCustomizePostFilterActivity.performClick();
125125
});
126126

127127
binding.onlyNsfwLinearLayoutCustomizePostFilterActivity.setOnClickListener(view -> {
@@ -172,12 +172,12 @@ protected void onCreate(Bundle savedInstanceState) {
172172

173173
private void bindView() {
174174
binding.nameTextInputEditTextCustomizePostFilterActivity.setText(postFilter.name);
175-
binding.postTypeTextCheckBoxCustomizePostFilterActivity.setChecked(postFilter.containTextType);
176-
binding.postTypeLinkCheckBoxCustomizePostFilterActivity.setChecked(postFilter.containLinkType);
177-
binding.postTypeImageCheckBoxCustomizePostFilterActivity.setChecked(postFilter.containImageType);
178-
binding.postTypeGifCheckBoxCustomizePostFilterActivity.setChecked(postFilter.containGifType);
179-
binding.postTypeVideoCheckBoxCustomizePostFilterActivity.setChecked(postFilter.containVideoType);
180-
binding.postTypeGalleryCheckBoxCustomizePostFilterActivity.setChecked(postFilter.containGalleryType);
175+
binding.postTypeTextSwitchCustomizePostFilterActivity.setChecked(postFilter.containTextType);
176+
binding.postTypeLinkSwitchCustomizePostFilterActivity.setChecked(postFilter.containLinkType);
177+
binding.postTypeImageSwitchCustomizePostFilterActivity.setChecked(postFilter.containImageType);
178+
binding.postTypeGifSwitchCustomizePostFilterActivity.setChecked(postFilter.containGifType);
179+
binding.postTypeVideoSwitchCustomizePostFilterActivity.setChecked(postFilter.containVideoType);
180+
binding.postTypeGallerySwitchCustomizePostFilterActivity.setChecked(postFilter.containGalleryType);
181181
binding.onlyNsfwSwitchCustomizePostFilterActivity.setChecked(postFilter.onlyNSFW);
182182
binding.onlySpoilerSwitchCustomizePostFilterActivity.setChecked(postFilter.onlySpoiler);
183183
binding.titleExcludesStringsTextInputEditTextCustomizePostFilterActivity.setText(postFilter.postTitleExcludesStrings);
@@ -266,13 +266,21 @@ protected void applyCustomTheme() {
266266
binding.nameTextInputLayoutCustomizePostFilterActivity.setBoxStrokeColor(primaryTextColor);
267267
binding.nameTextInputLayoutCustomizePostFilterActivity.setDefaultHintTextColor(ColorStateList.valueOf(primaryTextColor));
268268
binding.nameTextInputEditTextCustomizePostFilterActivity.setTextColor(primaryTextColor);
269+
binding.postTypeTextTextViewCustomizePostFilterActivity.setCompoundDrawablesWithIntrinsicBounds(Utils.getTintedDrawable(this, R.drawable.ic_text_24dp, primaryIconColor), null, null, null);
269270
binding.postTypeTextTextViewCustomizePostFilterActivity.setTextColor(primaryTextColor);
271+
binding.postTypeLinkTextViewCustomizePostFilterActivity.setCompoundDrawablesWithIntrinsicBounds(Utils.getTintedDrawable(this, R.drawable.ic_link, primaryIconColor), null, null, null);
270272
binding.postTypeLinkTextViewCustomizePostFilterActivity.setTextColor(primaryTextColor);
273+
binding.postTypeImageTextViewCustomizePostFilterActivity.setCompoundDrawablesWithIntrinsicBounds(Utils.getTintedDrawable(this, R.drawable.ic_image_24dp, primaryIconColor), null, null, null);
271274
binding.postTypeImageTextViewCustomizePostFilterActivity.setTextColor(primaryTextColor);
275+
binding.postTypeGifTextViewCustomizePostFilterActivity.setCompoundDrawablesWithIntrinsicBounds(Utils.getTintedDrawable(this, R.drawable.ic_image_24dp, primaryIconColor), null, null, null);
272276
binding.postTypeGifTextViewCustomizePostFilterActivity.setTextColor(primaryTextColor);
277+
binding.postTypeVideoTextViewCustomizePostFilterActivity.setCompoundDrawablesWithIntrinsicBounds(Utils.getTintedDrawable(this, R.drawable.ic_outline_video_24dp, primaryIconColor), null, null, null);
273278
binding.postTypeVideoTextViewCustomizePostFilterActivity.setTextColor(primaryTextColor);
279+
binding.postTypeGalleryTextViewCustomizePostFilterActivity.setCompoundDrawablesWithIntrinsicBounds(Utils.getTintedDrawable(this, R.drawable.ic_gallery_24dp, primaryIconColor), null, null, null);
274280
binding.postTypeGalleryTextViewCustomizePostFilterActivity.setTextColor(primaryTextColor);
281+
binding.onlyNsfwTextViewCustomizePostFilterActivity.setCompoundDrawablesWithIntrinsicBounds(Utils.getTintedDrawable(this, R.drawable.ic_nsfw_on_24dp, primaryIconColor), null, null, null);
275282
binding.onlyNsfwTextViewCustomizePostFilterActivity.setTextColor(primaryTextColor);
283+
binding.onlySpoilerTextViewCustomizePostFilterActivity.setCompoundDrawablesWithIntrinsicBounds(Utils.getTintedDrawable(this, R.drawable.ic_spoiler_black_24dp, primaryIconColor), null, null, null);
276284
binding.onlySpoilerTextViewCustomizePostFilterActivity.setTextColor(primaryTextColor);
277285
binding.titleExcludesStringsTextInputLayoutCustomizePostFilterActivity.setBoxStrokeColor(primaryTextColor);
278286
binding.titleExcludesStringsTextInputLayoutCustomizePostFilterActivity.setDefaultHintTextColor(ColorStateList.valueOf(primaryTextColor));
@@ -523,12 +531,12 @@ private void constructPostFilter() throws PatternSyntaxException {
523531
postFilter.containFlairs = binding.containsFlairsTextInputEditTextCustomizePostFilterActivity.getText().toString();
524532
postFilter.excludeDomains = binding.excludeDomainsTextInputEditTextCustomizePostFilterActivity.getText().toString();
525533
postFilter.containDomains = binding.containDomainsTextInputEditTextCustomizePostFilterActivity.getText().toString();
526-
postFilter.containTextType = binding.postTypeTextCheckBoxCustomizePostFilterActivity.isChecked();
527-
postFilter.containLinkType = binding.postTypeLinkCheckBoxCustomizePostFilterActivity.isChecked();
528-
postFilter.containImageType = binding.postTypeImageCheckBoxCustomizePostFilterActivity.isChecked();
529-
postFilter.containGifType = binding.postTypeGifCheckBoxCustomizePostFilterActivity.isChecked();
530-
postFilter.containVideoType = binding.postTypeVideoCheckBoxCustomizePostFilterActivity.isChecked();
531-
postFilter.containGalleryType = binding.postTypeGalleryCheckBoxCustomizePostFilterActivity.isChecked();
534+
postFilter.containTextType = binding.postTypeTextSwitchCustomizePostFilterActivity.isChecked();
535+
postFilter.containLinkType = binding.postTypeLinkSwitchCustomizePostFilterActivity.isChecked();
536+
postFilter.containImageType = binding.postTypeImageSwitchCustomizePostFilterActivity.isChecked();
537+
postFilter.containGifType = binding.postTypeGifSwitchCustomizePostFilterActivity.isChecked();
538+
postFilter.containVideoType = binding.postTypeVideoSwitchCustomizePostFilterActivity.isChecked();
539+
postFilter.containGalleryType = binding.postTypeGallerySwitchCustomizePostFilterActivity.isChecked();
532540
postFilter.onlyNSFW = binding.onlyNsfwSwitchCustomizePostFilterActivity.isChecked();
533541
postFilter.onlySpoiler = binding.onlySpoilerSwitchCustomizePostFilterActivity.isChecked();
534542
}

‎app/src/main/res/layout/activity_customize_post_filter.xml

Lines changed: 47 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,27 @@
6464

6565
</com.google.android.material.textfield.TextInputLayout>
6666

67+
<TextView
68+
android:id="@+id/post_type_explanation_text_view_customize_post_filter_activity"
69+
android:layout_width="match_parent"
70+
android:layout_height="wrap_content"
71+
android:paddingTop="8dp"
72+
android:paddingBottom="8dp"
73+
android:paddingStart="16dp"
74+
android:paddingEnd="16dp"
75+
android:text="@string/post_filter_post_type_explanation"
76+
android:textSize="?attr/font_default"
77+
android:textColor="?attr/primaryTextColor"
78+
android:fontFamily="?attr/font_family" />
79+
6780
<LinearLayout
6881
android:id="@+id/post_type_text_linear_layout_customize_post_filter_activity"
6982
android:layout_width="match_parent"
7083
android:layout_height="wrap_content"
7184
android:paddingTop="4dp"
7285
android:paddingBottom="4dp"
73-
android:paddingStart="32dp"
74-
android:paddingEnd="8dp"
86+
android:paddingStart="16dp"
87+
android:paddingEnd="16dp"
7588
android:clickable="true"
7689
android:focusable="true"
7790
android:background="?attr/selectableItemBackground">
@@ -82,12 +95,13 @@
8295
android:layout_height="wrap_content"
8396
android:layout_weight="1"
8497
android:layout_gravity="center_vertical"
98+
android:drawablePadding="32dp"
8599
android:text="@string/bottom_sheet_post_text"
86100
android:fontFamily="?attr/font_default"
87101
android:textSize="?attr/font_default" />
88102

89-
<com.google.android.material.checkbox.MaterialCheckBox
90-
android:id="@+id/post_type_text_check_box_customize_post_filter_activity"
103+
<com.google.android.material.materialswitch.MaterialSwitch
104+
android:id="@+id/post_type_text_switch_customize_post_filter_activity"
91105
android:layout_width="wrap_content"
92106
android:layout_height="wrap_content"
93107
android:layout_gravity="center_vertical" />
@@ -100,8 +114,8 @@
100114
android:layout_height="wrap_content"
101115
android:paddingTop="4dp"
102116
android:paddingBottom="4dp"
103-
android:paddingStart="32dp"
104-
android:paddingEnd="8dp"
117+
android:paddingStart="16dp"
118+
android:paddingEnd="16dp"
105119
android:clickable="true"
106120
android:focusable="true"
107121
android:background="?attr/selectableItemBackground">
@@ -112,12 +126,13 @@
112126
android:layout_height="wrap_content"
113127
android:layout_weight="1"
114128
android:layout_gravity="center_vertical"
129+
android:drawablePadding="32dp"
115130
android:text="@string/bottom_sheet_post_link"
116131
android:fontFamily="?attr/font_default"
117132
android:textSize="?attr/font_default" />
118133

119-
<com.google.android.material.checkbox.MaterialCheckBox
120-
android:id="@+id/post_type_link_check_box_customize_post_filter_activity"
134+
<com.google.android.material.materialswitch.MaterialSwitch
135+
android:id="@+id/post_type_link_switch_customize_post_filter_activity"
121136
android:layout_width="wrap_content"
122137
android:layout_height="wrap_content"
123138
android:layout_gravity="center_vertical" />
@@ -130,8 +145,8 @@
130145
android:layout_height="wrap_content"
131146
android:paddingTop="4dp"
132147
android:paddingBottom="4dp"
133-
android:paddingStart="32dp"
134-
android:paddingEnd="8dp"
148+
android:paddingStart="16dp"
149+
android:paddingEnd="16dp"
135150
android:clickable="true"
136151
android:focusable="true"
137152
android:background="?attr/selectableItemBackground">
@@ -142,12 +157,13 @@
142157
android:layout_height="wrap_content"
143158
android:layout_weight="1"
144159
android:layout_gravity="center_vertical"
160+
android:drawablePadding="32dp"
145161
android:text="@string/bottom_sheet_post_image"
146162
android:fontFamily="?attr/font_default"
147163
android:textSize="?attr/font_default" />
148164

149-
<com.google.android.material.checkbox.MaterialCheckBox
150-
android:id="@+id/post_type_image_check_box_customize_post_filter_activity"
165+
<com.google.android.material.materialswitch.MaterialSwitch
166+
android:id="@+id/post_type_image_switch_customize_post_filter_activity"
151167
android:layout_width="wrap_content"
152168
android:layout_height="wrap_content"
153169
android:layout_gravity="center_vertical" />
@@ -160,8 +176,8 @@
160176
android:layout_height="wrap_content"
161177
android:paddingTop="4dp"
162178
android:paddingBottom="4dp"
163-
android:paddingStart="32dp"
164-
android:paddingEnd="8dp"
179+
android:paddingStart="16dp"
180+
android:paddingEnd="16dp"
165181
android:clickable="true"
166182
android:focusable="true"
167183
android:background="?attr/selectableItemBackground">
@@ -172,12 +188,13 @@
172188
android:layout_height="wrap_content"
173189
android:layout_weight="1"
174190
android:layout_gravity="center_vertical"
191+
android:drawablePadding="32dp"
175192
android:text="@string/post_type_gif"
176193
android:fontFamily="?attr/font_default"
177194
android:textSize="?attr/font_default" />
178195

179-
<com.google.android.material.checkbox.MaterialCheckBox
180-
android:id="@+id/post_type_gif_check_box_customize_post_filter_activity"
196+
<com.google.android.material.materialswitch.MaterialSwitch
197+
android:id="@+id/post_type_gif_switch_customize_post_filter_activity"
181198
android:layout_width="wrap_content"
182199
android:layout_height="wrap_content"
183200
android:layout_gravity="center_vertical" />
@@ -190,8 +207,8 @@
190207
android:layout_height="wrap_content"
191208
android:paddingTop="4dp"
192209
android:paddingBottom="4dp"
193-
android:paddingStart="32dp"
194-
android:paddingEnd="8dp"
210+
android:paddingStart="16dp"
211+
android:paddingEnd="16dp"
195212
android:clickable="true"
196213
android:focusable="true"
197214
android:background="?attr/selectableItemBackground">
@@ -202,12 +219,13 @@
202219
android:layout_height="wrap_content"
203220
android:layout_weight="1"
204221
android:layout_gravity="center_vertical"
222+
android:drawablePadding="32dp"
205223
android:text="@string/bottom_sheet_post_video"
206224
android:fontFamily="?attr/font_default"
207225
android:textSize="?attr/font_default" />
208226

209-
<com.google.android.material.checkbox.MaterialCheckBox
210-
android:id="@+id/post_type_video_check_box_customize_post_filter_activity"
227+
<com.google.android.material.materialswitch.MaterialSwitch
228+
android:id="@+id/post_type_video_switch_customize_post_filter_activity"
211229
android:layout_width="wrap_content"
212230
android:layout_height="wrap_content"
213231
android:layout_gravity="center_vertical" />
@@ -220,8 +238,8 @@
220238
android:layout_height="wrap_content"
221239
android:paddingTop="4dp"
222240
android:paddingBottom="4dp"
223-
android:paddingStart="32dp"
224-
android:paddingEnd="8dp"
241+
android:paddingStart="16dp"
242+
android:paddingEnd="16dp"
225243
android:clickable="true"
226244
android:focusable="true"
227245
android:background="?attr/selectableItemBackground">
@@ -232,12 +250,13 @@
232250
android:layout_height="wrap_content"
233251
android:layout_weight="1"
234252
android:layout_gravity="center_vertical"
253+
android:drawablePadding="32dp"
235254
android:text="@string/post_type_gallery"
236255
android:fontFamily="?attr/font_default"
237256
android:textSize="?attr/font_default" />
238257

239-
<com.google.android.material.checkbox.MaterialCheckBox
240-
android:id="@+id/post_type_gallery_check_box_customize_post_filter_activity"
258+
<com.google.android.material.materialswitch.MaterialSwitch
259+
android:id="@+id/post_type_gallery_switch_customize_post_filter_activity"
241260
android:layout_width="wrap_content"
242261
android:layout_height="wrap_content"
243262
android:layout_gravity="center_vertical" />
@@ -250,7 +269,7 @@
250269
android:layout_height="wrap_content"
251270
android:paddingTop="4dp"
252271
android:paddingBottom="4dp"
253-
android:paddingStart="32dp"
272+
android:paddingStart="16dp"
254273
android:paddingEnd="16dp"
255274
android:clickable="true"
256275
android:focusable="true"
@@ -262,6 +281,7 @@
262281
android:layout_height="wrap_content"
263282
android:layout_weight="1"
264283
android:layout_gravity="center_vertical"
284+
android:drawablePadding="32dp"
265285
android:text="@string/only_nsfw"
266286
android:fontFamily="?attr/font_default"
267287
android:textSize="?attr/font_default" />
@@ -280,7 +300,7 @@
280300
android:layout_height="wrap_content"
281301
android:paddingTop="4dp"
282302
android:paddingBottom="4dp"
283-
android:paddingStart="32dp"
303+
android:paddingStart="16dp"
284304
android:paddingEnd="16dp"
285305
android:clickable="true"
286306
android:focusable="true"
@@ -292,6 +312,7 @@
292312
android:layout_height="wrap_content"
293313
android:layout_weight="1"
294314
android:layout_gravity="center_vertical"
315+
android:drawablePadding="32dp"
295316
android:text="@string/only_spoiler"
296317
android:fontFamily="?attr/font_default"
297318
android:textSize="?attr/font_default" />

0 commit comments

Comments
 (0)