Compare commits

...

3 Commits

Author SHA1 Message Date
LucasGGamerM
c1f9a88ef4 Bump version number 2022-12-24 11:48:44 -03:00
LucasGGamerM
e6200e186b Merge pull request #10
feat(theme/nord): add favourite and bookmark icon
2022-12-24 11:25:03 -03:00
FineFindus
5564502125 feat(theme/nord): add favourite and bookmark icon 2022-12-24 13:40:06 +01:00
6 changed files with 14 additions and 4 deletions

View File

@@ -9,8 +9,8 @@ android {
applicationId "org.joinmastodon.android.moshinda" applicationId "org.joinmastodon.android.moshinda"
minSdk 23 minSdk 23
targetSdk 33 targetSdk 33
versionCode 75 versionCode 76
versionName "1.1.4+fork.75.moshinda" versionName "1.1.4+fork.76.moshinda"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
resConfigs "ar-rSA", "be-rBY", "bn-rBD", "bs-rBA", "ca-rES", "cs-rCZ", "de-rDE", "el-rGR", "es-rES", "eu-rES", "fi-rFI", "fil-rPH", "fr-rFR", "ga-rIE", "gd-rGB", "gl-rES", "hi-rIN", "hr-rHR", "hu-rHU", "hy-rAM", "in-rID", "is-rIS", "it-rIT", "iw-rIL", "ja-rJP", "kab", "ko-rKR", "nl-rNL", "oc-rFR", "pl-rPL", "pt-rBR", "pt-rPT", "ro-rRO", "ru-rRU", "si-rLK", "sl-rSI", "sv-rSE", "th-rTH", "tr-rTR", "uk-rUA", "vi-rVN", "zh-rCN", "zh-rTW" resConfigs "ar-rSA", "be-rBY", "bn-rBD", "bs-rBA", "ca-rES", "cs-rCZ", "de-rDE", "el-rGR", "es-rES", "eu-rES", "fi-rFI", "fil-rPH", "fr-rFR", "ga-rIE", "gd-rGB", "gl-rES", "hi-rIN", "hr-rHR", "hu-rHU", "hy-rAM", "in-rID", "is-rIS", "it-rIT", "iw-rIL", "ja-rJP", "kab", "ko-rKR", "nl-rNL", "oc-rFR", "pl-rPL", "pt-rBR", "pt-rPT", "ro-rRO", "ru-rRU", "si-rLK", "sl-rSI", "sv-rSE", "th-rTH", "tr-rTR", "uk-rUA", "vi-rVN", "zh-rCN", "zh-rTW"
} }

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/bookmark_selected" android:state_selected="true"/> <item android:color="?bookmark_selected" android:state_selected="true"/>
<item android:color="?android:textColorSecondary"/> <item android:color="?android:textColorSecondary"/>
</selector> </selector>

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/favorite_selected" android:state_selected="true"/> <item android:color="?favorite_selected" android:state_selected="true"/>
<item android:color="?android:textColorSecondary"/> <item android:color="?android:textColorSecondary"/>
</selector> </selector>

View File

@@ -16,6 +16,8 @@
<attr name="colorSearchHint" format="color"/> <attr name="colorSearchHint" format="color"/>
<attr name="colorTabInactive" format="color"/> <attr name="colorTabInactive" format="color"/>
<attr name="colorAccentLightest" format="color"/> <attr name="colorAccentLightest" format="color"/>
<attr name="favorite_selected" format="color"/>
<attr name="bookmark_selected" format="color"/>
<attr name="profileHeaderBackground" format="color"/> <attr name="profileHeaderBackground" format="color"/>
<attr name="toolbarBackground" format="color"/> <attr name="toolbarBackground" format="color"/>

View File

@@ -312,6 +312,9 @@
<color name="nord_gray_600">#404C5C</color> <color name="nord_gray_600">#404C5C</color>
<color name="nord_gray_500">#8C96B4</color> <color name="nord_gray_500">#8C96B4</color>
<color name="nord_favorite_selected">#ebcb8b</color>
<color name="nord_bookmark_selected">#a3be8c</color>
<color name="nord_gray_400">#8C96B4</color> <color name="nord_gray_400">#8C96B4</color>
<color name="nord_gray_300">#c5c6d0</color> <color name="nord_gray_300">#c5c6d0</color>
<color name="nord_gray_200">#D5DCE6</color> <color name="nord_gray_200">#D5DCE6</color>

View File

@@ -12,6 +12,8 @@
<item name="colorPrimary700">@color/primary_700</item> <item name="colorPrimary700">@color/primary_700</item>
<item name="colorPrimary800">@color/primary_800</item> <item name="colorPrimary800">@color/primary_800</item>
<item name="colorPrimary900">@color/primary_900</item> <item name="colorPrimary900">@color/primary_900</item>
<item name="bookmark_selected">@color/bookmark_selected</item>
<item name="favorite_selected">@color/favorite_selected</item>
<item name="colorGray900">@color/gray_900</item> <item name="colorGray900">@color/gray_900</item>
<item name="colorGray800t">@color/gray_800t</item> <item name="colorGray800t">@color/gray_800t</item>
@@ -246,6 +248,9 @@
<item name="colorPrimary800">@color/nord_primary_800</item> <item name="colorPrimary800">@color/nord_primary_800</item>
<item name="colorPrimary900">@color/nord_primary_900</item> <item name="colorPrimary900">@color/nord_primary_900</item>
<item name="bookmark_selected">@color/nord_bookmark_selected</item>
<item name="favorite_selected">@color/nord_favorite_selected</item>
<item name="colorGray900">@color/nord_gray_900</item> <item name="colorGray900">@color/nord_gray_900</item>
<item name="colorGray800t">@color/nord_gray_800t</item> <item name="colorGray800t">@color/nord_gray_800t</item>
<item name="colorGray800">@color/nord_gray_800</item> <item name="colorGray800">@color/nord_gray_800</item>