improved theme color
This commit is contained in:
parent
253e46a5b1
commit
ca1ccec481
|
@ -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;
|
||||||
|
}
|
||||||
|
}
|
|
@ -177,9 +177,7 @@ class SettingsActivity : BaseActivity(), OnItemClickListener, OnPreferenceStartF
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private val isTopSettings: Boolean
|
private val isTopSettings: Boolean = true
|
||||||
get() = java.lang.Boolean.parseBoolean("true")
|
|
||||||
|
|
||||||
|
|
||||||
private fun initEntries() {
|
private fun initEntries() {
|
||||||
entriesAdapter.addHeader(getString(R.string.appearance))
|
entriesAdapter.addHeader(getString(R.string.appearance))
|
||||||
|
|
|
@ -8,7 +8,7 @@ import org.mariotaku.chameleon.view.ChameleonTextView
|
||||||
* Created by mariotaku on 2017/2/3.
|
* 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 {
|
override fun onTextContextMenuItem(id: Int): Boolean {
|
||||||
try {
|
try {
|
||||||
|
|
|
@ -42,7 +42,7 @@
|
||||||
app:iabColor="?android:colorForeground"
|
app:iabColor="?android:colorForeground"
|
||||||
tools:src="@drawable/ic_action_settings"/>
|
tools:src="@drawable/ic_action_settings"/>
|
||||||
|
|
||||||
<org.mariotaku.twidere.view.FixedTextView
|
<org.mariotaku.twidere.view.PreferencesItemTextView
|
||||||
android:id="@android:id/title"
|
android:id="@android:id/title"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
|
Loading…
Reference in New Issue