cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make main text color themeable

Browse Source
This commit is contained in:
Thialfihar
2015-06-26 13:14:20 +02:00
parent 0af7d3c50b
commit b60842a35b
4 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
View File

@@ -244,7 +244,7 @@ public class ImportKeysAdapter extends ArrayAdapter<ImportKeysListEntry> {
if (entry.isRevoked() || entry.isExpired()) { if (entry.isRevoked() || entry.isExpired()) {
uidView.setTextColor(getContext().getResources().getColor(R.color.key_flag_gray)); uidView.setTextColor(getContext().getResources().getColor(R.color.key_flag_gray));
} else { } else {
uidView.setTextColor(getContext().getResources().getColor(R.color.black)); uidView.setTextColor(FormattingUtils.getColorFromAttr(getContext(), R.attr.colorText));
} }
holder.userIdsList.addView(uidView); holder.userIdsList.addView(uidView);
@@ -260,7 +260,7 @@ public class ImportKeysAdapter extends ArrayAdapter<ImportKeysListEntry> {
if (entry.isRevoked() || entry.isExpired()) { if (entry.isRevoked() || entry.isExpired()) {
emailView.setTextColor(getContext().getResources().getColor(R.color.key_flag_gray)); emailView.setTextColor(getContext().getResources().getColor(R.color.key_flag_gray));
} else { } else {
emailView.setTextColor(getContext().getResources().getColor(R.color.black)); emailView.setTextColor(FormattingUtils.getColorFromAttr(getContext(), R.attr.colorText));
} }
holder.userIdsList.addView(emailView); holder.userIdsList.addView(emailView);

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java
View File

@@ -160,7 +160,7 @@ public class KeyAdapter extends CursorAdapter {
} else { } else {
mSlinger.setVisibility(View.GONE); mSlinger.setVisibility(View.GONE);
} }
textColor = R.color.black; textColor = FormattingUtils.getColorFromAttr(context, R.attr.colorText);
} else { } else {
// this is a public key - show if it's verified // this is a public key - show if it's verified
if (item.mIsVerified) { if (item.mIsVerified) {
@@ -171,7 +171,7 @@ public class KeyAdapter extends CursorAdapter {
mStatus.setVisibility(View.VISIBLE); mStatus.setVisibility(View.VISIBLE);
} }
mSlinger.setVisibility(View.GONE); mSlinger.setVisibility(View.GONE);
textColor = R.color.black; textColor = FormattingUtils.getColorFromAttr(context, R.attr.colorText);
} }
if (!enabled) { if (!enabled) {

1
OpenKeychain/src/main/res/values/attrs.xml
View File

@@ -11,5 +11,6 @@
<attr name="colorButtonRow" format="color" /> <attr name="colorButtonRow" format="color" />
<attr name="colorLogBackground" format="color" /> <attr name="colorLogBackground" format="color" />
<attr name="colorCardViewHeaderDivider" format="color" /> <attr name="colorCardViewHeaderDivider" format="color" />
<attr name="colorText" format="color" />
</declare-styleable> </declare-styleable>
</resources> </resources>

12
OpenKeychain/src/main/res/values/themes.xml
View File

@@ -12,12 +12,14 @@
<item name="colorFabText">#fafafa</item> <item name="colorFabText">#fafafa</item>
<item name="colorEmphasis">#2196f3</item> <item name="colorEmphasis">#2196f3</item>
<item name="colorHeaderText">#212121</item>
<item name="colorTertiaryText">#808080</item>
<item name="colorButtonRow">#33cccccc</item> <item name="colorButtonRow">#33cccccc</item>
<item name="colorLogBackground">#cecbce</item> <item name="colorLogBackground">#cecbce</item>
<item name="colorCardViewHeaderDivider">#808080</item> <item name="colorCardViewHeaderDivider">#808080</item>
<item name="colorText">#000000</item>
<item name="colorHeaderText">#212121</item>
<item name="colorTertiaryText">#808080</item>
<!-- remove actionbar and title, we use toolbar! --> <!-- remove actionbar and title, we use toolbar! -->
<item name="windowNoTitle">true</item> <item name="windowNoTitle">true</item>
<item name="windowActionBar">false</item> <item name="windowActionBar">false</item>
@@ -37,12 +39,14 @@
<item name="colorFabText">#fafafa</item> <item name="colorFabText">#fafafa</item>
<item name="colorEmphasis">#2196f3</item> <item name="colorEmphasis">#2196f3</item>
<item name="colorHeaderText">#a0a0a0</item>
<item name="colorTertiaryText">#808080</item>
<item name="colorButtonRow">#33cccccc</item> <item name="colorButtonRow">#33cccccc</item>
<item name="colorLogBackground">#303030</item> <item name="colorLogBackground">#303030</item>
<item name="colorCardViewHeaderDivider">#808080</item> <item name="colorCardViewHeaderDivider">#808080</item>
<item name="colorText">#ffffff</item>
<item name="colorHeaderText">#d0d0d0</item>
<item name="colorTertiaryText">#808080</item>
<!-- remove actionbar and title, we use toolbar! --> <!-- remove actionbar and title, we use toolbar! -->
<item name="windowNoTitle">true</item> <item name="windowNoTitle">true</item>
<item name="windowActionBar">false</item> <item name="windowActionBar">false</item>