Skip to content

Commit 35efe4f

Browse files
Docile-AlligatorDocile-Alligator
committed
ThemedMaterialSwitch.
1 parent 4da3215 commit 35efe4f

19 files changed

+81
-97
lines changed

‎app/src/main/java/ml/docilealligator/infinityforreddit/Infinity.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,10 @@ public AppComponent getAppComponent() {
236236
return mAppComponent;
237237
}
238238

239+
public CustomThemeWrapper getCustomThemeWrapper() {
240+
return customThemeWrapper;
241+
}
242+
239243
@Subscribe
240244
public void onToggleSecureModeEvent(ToggleSecureModeEvent secureModeEvent) {
241245
isSecureMode = secureModeEvent.isSecureMode;

‎app/src/main/java/ml/docilealligator/infinityforreddit/customviews/ThemedMaterialSwitch.kt

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
package ml.docilealligator.infinityforreddit.customviews
2+
3+
import android.R
4+
import android.content.Context
5+
import android.content.res.ColorStateList
6+
import android.util.AttributeSet
7+
import com.google.android.material.materialswitch.MaterialSwitch
8+
import ml.docilealligator.infinityforreddit.Infinity
9+
10+
class ThemedMaterialSwitch @JvmOverloads constructor(
11+
context: Context,
12+
attrs: AttributeSet? = null,
13+
defStyleAttr: Int = com.google.android.material.R.attr.materialSwitchStyle
14+
): MaterialSwitch(context, attrs, defStyleAttr) {
15+
init {
16+
val app = context.applicationContext
17+
if (app is Infinity) {
18+
val customThemeWrapper = (context.applicationContext as Infinity).customThemeWrapper
19+
setThumbTintList(ColorStateList.valueOf(customThemeWrapper.colorAccent))
20+
val states = arrayOf(
21+
intArrayOf(R.attr.state_checked)
22+
)
23+
val colors = intArrayOf(
24+
customThemeWrapper.colorPrimary
25+
)
26+
setTrackTintList(ColorStateList(states, colors))
27+
}
28+
}
29+
}

‎app/src/main/java/ml/docilealligator/infinityforreddit/customviews/preference/CustomFontSwitchPreference.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package ml.docilealligator.infinityforreddit.customviews.preference;
22

33
import android.content.Context;
4-
import android.content.res.ColorStateList;
54
import android.graphics.Typeface;
65
import android.util.AttributeSet;
76
import android.view.View;
@@ -66,15 +65,6 @@ public void onBindViewHolder(@NonNull PreferenceViewHolder holder) {
6665
});
6766

6867
if (customThemeWrapper != null) {
69-
materialSwitch.setThumbTintList(ColorStateList.valueOf(customThemeWrapper.getColorAccent()));
70-
int[][] states = new int[][] {
71-
new int[] { android.R.attr.state_checked }
72-
};
73-
int[] colors = new int[] {
74-
customThemeWrapper.getColorPrimary()
75-
};
76-
materialSwitch.setTrackTintList(new ColorStateList(states, colors));
77-
7868
if (iconImageView instanceof ImageView) {
7969
if (isEnabled()) {
8070
((ImageView) iconImageView).setColorFilter(customThemeWrapper.getPrimaryIconColor(), android.graphics.PorterDuff.Mode.SRC_IN);

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
android:fontFamily="?attr/font_default"
153153
android:textSize="?attr/font_default" />
154154

155-
<com.google.android.material.materialswitch.MaterialSwitch
155+
<ml.docilealligator.infinityforreddit.customviews.ThemedMaterialSwitch
156156
android:id="@+id/post_type_text_switch_customize_post_filter_activity"
157157
android:layout_width="wrap_content"
158158
android:layout_height="wrap_content"
@@ -183,7 +183,7 @@
183183
android:fontFamily="?attr/font_default"
184184
android:textSize="?attr/font_default" />
185185

186-
<com.google.android.material.materialswitch.MaterialSwitch
186+
<ml.docilealligator.infinityforreddit.customviews.ThemedMaterialSwitch
187187
android:id="@+id/post_type_link_switch_customize_post_filter_activity"
188188
android:layout_width="wrap_content"
189189
android:layout_height="wrap_content"
@@ -214,7 +214,7 @@
214214
android:fontFamily="?attr/font_default"
215215
android:textSize="?attr/font_default" />
216216

217-
<com.google.android.material.materialswitch.MaterialSwitch
217+
<ml.docilealligator.infinityforreddit.customviews.ThemedMaterialSwitch
218218
android:id="@+id/post_type_image_switch_customize_post_filter_activity"
219219
android:layout_width="wrap_content"
220220
android:layout_height="wrap_content"
@@ -245,7 +245,7 @@
245245
android:fontFamily="?attr/font_default"
246246
android:textSize="?attr/font_default" />
247247

248-
<com.google.android.material.materialswitch.MaterialSwitch
248+
<ml.docilealligator.infinityforreddit.customviews.ThemedMaterialSwitch
249249
android:id="@+id/post_type_gif_switch_customize_post_filter_activity"
250250
android:layout_width="wrap_content"
251251
android:layout_height="wrap_content"
@@ -276,7 +276,7 @@
276276
android:fontFamily="?attr/font_default"
277277
android:textSize="?attr/font_default" />
278278

279-
<com.google.android.material.materialswitch.MaterialSwitch
279+
<ml.docilealligator.infinityforreddit.customviews.ThemedMaterialSwitch
280280
android:id="@+id/post_type_video_switch_customize_post_filter_activity"
281281
android:layout_width="wrap_content"
282282
android:layout_height="wrap_content"
@@ -307,7 +307,7 @@
307307
android:fontFamily="?attr/font_default"
308308
android:textSize="?attr/font_default" />
309309

310-
<com.google.android.material.materialswitch.MaterialSwitch
310+
<ml.docilealligator.infinityforreddit.customviews.ThemedMaterialSwitch
311311
android:id="@+id/post_type_gallery_switch_customize_post_filter_activity"
312312
android:layout_width="wrap_content"
313313
android:layout_height="wrap_content"
@@ -369,7 +369,7 @@
369369
android:fontFamily="?attr/font_default"
370370
android:textSize="?attr/font_default" />
371371

372-
<com.google.android.material.materialswitch.MaterialSwitch
372+
<ml.docilealligator.infinityforreddit.customviews.ThemedMaterialSwitch
373373
android:id="@+id/only_nsfw_switch_customize_post_filter_activity"
374374
android:layout_width="wrap_content"
375375
android:layout_height="wrap_content"
@@ -400,7 +400,7 @@
400400
android:fontFamily="?attr/font_default"
401401
android:textSize="?attr/font_default" />
402402

403-
<com.google.android.material.materialswitch.MaterialSwitch
403+
<ml.docilealligator.infinityforreddit.customviews.ThemedMaterialSwitch
404404
android:id="@+id/only_spoiler_switch_customize_post_filter_activity"
405405
android:layout_width="wrap_content"
406406
android:layout_height="wrap_content"

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
android:fontFamily="?attr/font_default"
153153
android:textSize="?attr/font_default" />
154154

155-
<com.google.android.material.materialswitch.MaterialSwitch
155+
<ml.docilealligator.infinityforreddit.customviews.ThemedMaterialSwitch
156156
android:id="@+id/post_type_text_switch_customize_post_filter_activity"
157157
android:layout_width="wrap_content"
158158
android:layout_height="wrap_content"
@@ -183,7 +183,7 @@
183183
android:fontFamily="?attr/font_default"
184184
android:textSize="?attr/font_default" />
185185

186-
<com.google.android.material.materialswitch.MaterialSwitch
186+
<ml.docilealligator.infinityforreddit.customviews.ThemedMaterialSwitch
187187
android:id="@+id/post_type_link_switch_customize_post_filter_activity"
188188
android:layout_width="wrap_content"
189189
android:layout_height="wrap_content"
@@ -214,7 +214,7 @@
214214
android:fontFamily="?attr/font_default"
215215
android:textSize="?attr/font_default" />
216216

217-
<com.google.android.material.materialswitch.MaterialSwitch
217+
<ml.docilealligator.infinityforreddit.customviews.ThemedMaterialSwitch
218218
android:id="@+id/post_type_image_switch_customize_post_filter_activity"
219219
android:layout_width="wrap_content"
220220
android:layout_height="wrap_content"
@@ -245,7 +245,7 @@
245245
android:fontFamily="?attr/font_default"
246246
android:textSize="?attr/font_default" />
247247

248-
<com.google.android.material.materialswitch.MaterialSwitch
248+
<ml.docilealligator.infinityforreddit.customviews.ThemedMaterialSwitch
249249
android:id="@+id/post_type_gif_switch_customize_post_filter_activity"
250250
android:layout_width="wrap_content"
251251
android:layout_height="wrap_content"
@@ -276,7 +276,7 @@
276276
android:fontFamily="?attr/font_default"
277277
android:textSize="?attr/font_default" />
278278

279-
<com.google.android.material.materialswitch.MaterialSwitch
279+
<ml.docilealligator.infinityforreddit.customviews.ThemedMaterialSwitch
280280
android:id="@+id/post_type_video_switch_customize_post_filter_activity"
281281
android:layout_width="wrap_content"
282282
android:layout_height="wrap_content"
@@ -307,7 +307,7 @@
307307
android:fontFamily="?attr/font_default"
308308
android:textSize="?attr/font_default" />
309309

310-
<com.google.android.material.materialswitch.MaterialSwitch
310+
<ml.docilealligator.infinityforreddit.customviews.ThemedMaterialSwitch
311311
android:id="@+id/post_type_gallery_switch_customize_post_filter_activity"
312312
android:layout_width="wrap_content"
313313
android:layout_height="wrap_content"
@@ -369,7 +369,7 @@
369369
android:fontFamily="?attr/font_default"
370370
android:textSize="?attr/font_default" />
371371

372-
<com.google.android.material.materialswitch.MaterialSwitch
372+
<ml.docilealligator.infinityforreddit.customviews.ThemedMaterialSwitch
373373
android:id="@+id/only_nsfw_switch_customize_post_filter_activity"
374374
android:layout_width="wrap_content"
375375
android:layout_height="wrap_content"
@@ -400,7 +400,7 @@
400400
android:fontFamily="?attr/font_default"
401401
android:textSize="?attr/font_default" />
402402

403-
<com.google.android.material.materialswitch.MaterialSwitch
403+
<ml.docilealligator.infinityforreddit.customviews.ThemedMaterialSwitch
404404
android:id="@+id/only_spoiler_switch_customize_post_filter_activity"
405405
android:layout_width="wrap_content"
406406
android:layout_height="wrap_content"

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

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -147,45 +147,6 @@
147147

148148
</com.google.android.material.chip.ChipGroup>
149149

150-
<!--<LinearLayout
151-
android:id="@+id/visibility_wrapper_linear_layout_create_multi_reddit_activity"
152-
android:layout_width="match_parent"
153-
android:layout_height="wrap_content"
154-
android:paddingStart="16dp"
155-
android:paddingEnd="16dp"
156-
android:clickable="true"
157-
android:focusable="true"
158-
android:background="?attr/selectableItemBackground">
159-
160-
<TextView
161-
android:id="@+id/visibility_text_view_create_multi_reddit_activity"
162-
android:layout_width="0dp"
163-
android:layout_height="wrap_content"
164-
android:layout_weight="1"
165-
android:text="@string/private_multi_reddit"
166-
android:textSize="?attr/font_default"
167-
android:fontFamily="?attr/font_family" />
168-
169-
<com.google.android.material.materialswitch.MaterialSwitch
170-
android:id="@+id/visibility_switch_create_multi_reddit_activity"
171-
android:layout_width="wrap_content"
172-
android:layout_height="wrap_content"
173-
android:checked="true" />
174-
175-
</LinearLayout>
176-
177-
<TextView
178-
android:id="@+id/select_subreddit_text_view_create_multi_reddit_activity"
179-
android:layout_width="match_parent"
180-
android:layout_height="wrap_content"
181-
android:padding="16dp"
182-
android:text="@string/select_subreddits_and_users"
183-
android:textSize="?attr/font_default"
184-
android:fontFamily="?attr/font_family"
185-
android:clickable="true"
186-
android:focusable="true"
187-
android:background="?attr/selectableItemBackground" />-->
188-
189150
</LinearLayout>
190151

191152
</androidx.core.widget.NestedScrollView>

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@
149149
android:fontFamily="?attr/font_default"
150150
android:textSize="?attr/font_default" />
151151

152-
<com.google.android.material.materialswitch.MaterialSwitch
152+
<ml.docilealligator.infinityforreddit.customviews.ThemedMaterialSwitch
153153
android:id="@+id/post_type_text_switch_customize_post_filter_activity"
154154
android:layout_width="wrap_content"
155155
android:layout_height="wrap_content"
@@ -180,7 +180,7 @@
180180
android:fontFamily="?attr/font_default"
181181
android:textSize="?attr/font_default" />
182182

183-
<com.google.android.material.materialswitch.MaterialSwitch
183+
<ml.docilealligator.infinityforreddit.customviews.ThemedMaterialSwitch
184184
android:id="@+id/post_type_link_switch_customize_post_filter_activity"
185185
android:layout_width="wrap_content"
186186
android:layout_height="wrap_content"
@@ -211,7 +211,7 @@
211211
android:fontFamily="?attr/font_default"
212212
android:textSize="?attr/font_default" />
213213

214-
<com.google.android.material.materialswitch.MaterialSwitch
214+
<ml.docilealligator.infinityforreddit.customviews.ThemedMaterialSwitch
215215
android:id="@+id/post_type_image_switch_customize_post_filter_activity"
216216
android:layout_width="wrap_content"
217217
android:layout_height="wrap_content"
@@ -242,7 +242,7 @@
242242
android:fontFamily="?attr/font_default"
243243
android:textSize="?attr/font_default" />
244244

245-
<com.google.android.material.materialswitch.MaterialSwitch
245+
<ml.docilealligator.infinityforreddit.customviews.ThemedMaterialSwitch
246246
android:id="@+id/post_type_gif_switch_customize_post_filter_activity"
247247
android:layout_width="wrap_content"
248248
android:layout_height="wrap_content"
@@ -273,7 +273,7 @@
273273
android:fontFamily="?attr/font_default"
274274
android:textSize="?attr/font_default" />
275275

276-
<com.google.android.material.materialswitch.MaterialSwitch
276+
<ml.docilealligator.infinityforreddit.customviews.ThemedMaterialSwitch
277277
android:id="@+id/post_type_video_switch_customize_post_filter_activity"
278278
android:layout_width="wrap_content"
279279
android:layout_height="wrap_content"
@@ -304,7 +304,7 @@
304304
android:fontFamily="?attr/font_default"
305305
android:textSize="?attr/font_default" />
306306

307-
<com.google.android.material.materialswitch.MaterialSwitch
307+
<ml.docilealligator.infinityforreddit.customviews.ThemedMaterialSwitch
308308
android:id="@+id/post_type_gallery_switch_customize_post_filter_activity"
309309
android:layout_width="wrap_content"
310310
android:layout_height="wrap_content"
@@ -368,7 +368,7 @@
368368
android:fontFamily="?attr/font_default"
369369
android:textSize="?attr/font_default" />
370370

371-
<com.google.android.material.materialswitch.MaterialSwitch
371+
<ml.docilealligator.infinityforreddit.customviews.ThemedMaterialSwitch
372372
android:id="@+id/only_nsfw_switch_customize_post_filter_activity"
373373
android:layout_width="wrap_content"
374374
android:layout_height="wrap_content"
@@ -399,7 +399,7 @@
399399
android:fontFamily="?attr/font_default"
400400
android:textSize="?attr/font_default" />
401401

402-
<com.google.android.material.materialswitch.MaterialSwitch
402+
<ml.docilealligator.infinityforreddit.customviews.ThemedMaterialSwitch
403403
android:id="@+id/only_spoiler_switch_customize_post_filter_activity"
404404
android:layout_width="wrap_content"
405405
android:layout_height="wrap_content"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@
183183
android:textSize="?attr/font_default"
184184
android:fontFamily="?attr/font_family" />
185185

186-
<com.google.android.material.materialswitch.MaterialSwitch
186+
<ml.docilealligator.infinityforreddit.customviews.ThemedMaterialSwitch
187187
android:id="@+id/receive_post_reply_notifications_switch_material_post_gallery_activity"
188188
android:layout_width="wrap_content"
189189
android:layout_height="wrap_content"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@
183183
android:textSize="?attr/font_default"
184184
android:fontFamily="?attr/font_family" />
185185

186-
<com.google.android.material.materialswitch.MaterialSwitch
186+
<ml.docilealligator.infinityforreddit.customviews.ThemedMaterialSwitch
187187
android:id="@+id/receive_post_reply_notifications_switch_material_post_image_activity"
188188
android:layout_width="wrap_content"
189189
android:layout_height="wrap_content"

0 commit comments

Comments
 (0)