owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'megalodon_main/main' into m3-merger

Browse Source 
# Conflicts:
#	mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverAccountsFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/CustomWelcomeFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/AccountCardStatusDisplayItem.java
This commit is contained in:
LucasGGamerM
2023-08-27 13:51:42 -03:00
parent c48606c48e c3d9147705
commit 6318745fe7
28 changed files with 311 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,6 +35,7 @@
<attr name="colorProfileHeaderBackground" format="color"/>
<attr name="colorM3DarkOnSurface" format="color" />
<attr name="colorTabBarAlpha" format="color" />
<attr name="colorFilledCardAlpha" format="color" />
<attr name="colorPrimary25" format="color" />
<attr name="colorPrimary50" format="color" />

2
mastodon/src/main/res/values/colors.xml
View File

@@ -126,7 +126,7 @@
<color name="m3_neutral2_100">@color/gray_100</color>
<color name="m3_neutral2_50t">@color/gray_50t</color>
<color name="m3_neutral2_50">@color/gray_50</color>
<color name="m3_neutral2_25">@color/gray_25</color>
<color name="m3_neutral2_10">@color/gray_25</color>
<color name="m3_accent1_25">@color/primary_25</color>
<color name="m3_accent1_50">@color/primary_50</color>

5
mastodon/src/main/res/values/palettes.xml
View File

@@ -31,6 +31,7 @@
</style>
<style name="ColorPalette">
<!-- https://m3.material.io/styles/color/the-color-system/tokens -->
<item name="colorM3Primary">?colorPrimary600</item>
<item name="colorM3OnPrimary">@color/white</item>
<item name="colorM3PrimaryContainer">?colorPrimary100</item>
@@ -59,6 +60,7 @@
<item name="colorBoost">?colorM3Primary</item>
<item name="colorPoll">@color/bookmark_selected</item>
<item name="colorTabBarAlpha">#14000000</item>
<item name="colorFilledCardAlpha">#22000000</item>
<item name="colorM3DisabledBackground">#1F1F1F1F</item>
<item name="colorM3Error">#B3261E</item>
@@ -154,6 +156,7 @@
<item name="colorM3SurfaceVariant">?colorNeutral900</item>
<item name="colorM3SecondaryContainer">?colorNeutral800</item>
<item name="colorTabBarAlpha">#00000000</item>
<item name="colorFilledCardAlpha">#00000000</item>
</style>
<style name="ColorPalette.Material3">
@@ -241,7 +244,7 @@
<item name="colorNeutral100">@color/m3_neutral2_100</item>
<item name="colorNeutral50t">@color/m3_neutral2_50t</item>
<item name="colorNeutral50">@color/m3_neutral2_50</item>
<item name="colorNeutral25">@color/m3_neutral2_25</item>
<item name="colorNeutral25">@color/m3_neutral2_10</item>
</style>
<style name="ColorPalette.Material3.Dark">

4
mastodon/src/main/res/values/strings_sk.xml
View File

@@ -372,4 +372,8 @@
<string name="sk_duration_days_3">3 days</string>
<string name="sk_duration_days_7">7 days</string>
<string name="sk_notification_mention">You were mentioned by %s</string>
<plurals name="sk_posts_count_label">
<item quantity="one">post</item>
<item quantity="other">posts</item>
</plurals>
</resources>