diff --git a/twidere/src/main/java/org/mariotaku/twidere/view/PreferencesItemTextView.java b/twidere/src/main/java/org/mariotaku/twidere/view/PreferencesItemTextView.java new file mode 100644 index 000000000..06eef86c0 --- /dev/null +++ b/twidere/src/main/java/org/mariotaku/twidere/view/PreferencesItemTextView.java @@ -0,0 +1,35 @@ +package org.mariotaku.twidere.view; + +import android.content.Context; +import android.content.res.ColorStateList; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.util.AttributeSet; + +import org.jetbrains.annotations.NotNull; +import org.mariotaku.chameleon.Chameleon; +import org.mariotaku.chameleon.ChameleonUtils; + +/** + * Created by mariotaku on 2016/12/23. + */ + +public class PreferencesItemTextView extends FixedTextView { + + private static final int[] ACTIVATED_STATE_SET = {android.R.attr.state_activated}; + private static final int[] EMPTY_STATE_SET = {0}; + + public PreferencesItemTextView(@NotNull final Context context, @Nullable final AttributeSet attrs) { + super(context, attrs); + } + + @Nullable + @Override + public Appearance createAppearance(@NonNull Context context, @NonNull AttributeSet attributeSet, @NonNull Chameleon.Theme theme) { + Appearance appearance = new Appearance(); + final int activatedColor = ChameleonUtils.getColorDependent(theme.getColorControlActivated()); + final int defaultColor = theme.getTextColorPrimary(); + appearance.setTextColor(new ColorStateList(new int[][]{ACTIVATED_STATE_SET, EMPTY_STATE_SET}, new int[]{activatedColor, defaultColor})); + return appearance; + } +} diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/SettingsActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/SettingsActivity.kt index 526756950..ccf4881fc 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/SettingsActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/SettingsActivity.kt @@ -177,9 +177,7 @@ class SettingsActivity : BaseActivity(), OnItemClickListener, OnPreferenceStartF } - private val isTopSettings: Boolean - get() = java.lang.Boolean.parseBoolean("true") - + private val isTopSettings: Boolean = true private fun initEntries() { entriesAdapter.addHeader(getString(R.string.appearance)) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/FixedTextView.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/FixedTextView.kt index 16064b236..b493137e8 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/FixedTextView.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/FixedTextView.kt @@ -8,7 +8,7 @@ import org.mariotaku.chameleon.view.ChameleonTextView * Created by mariotaku on 2017/2/3. */ -class FixedTextView(context: Context, attrs: AttributeSet? = null) : ChameleonTextView(context, attrs) { +open class FixedTextView(context: Context, attrs: AttributeSet? = null) : ChameleonTextView(context, attrs) { override fun onTextContextMenuItem(id: Int): Boolean { try { diff --git a/twidere/src/main/res/layout/list_item_preference_header_item.xml b/twidere/src/main/res/layout/list_item_preference_header_item.xml index fcaba8a55..60c2da59c 100644 --- a/twidere/src/main/res/layout/list_item_preference_header_item.xml +++ b/twidere/src/main/res/layout/list_item_preference_header_item.xml @@ -42,7 +42,7 @@ app:iabColor="?android:colorForeground" tools:src="@drawable/ic_action_settings"/> -