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

New sensitive media design

Browse Source
This commit is contained in:
Grishka
2023-03-24 00:33:02 +03:00
parent 4492e940e5
commit e873dd7d0a
14 changed files with 180 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,6 +42,7 @@
<attr name="colorM3ErrorContainer" format="color"/>
<attr name="colorM3OnErrorContainer" format="color"/>
<attr name="colorM3PrimaryInverse" format="color"/>
<attr name="colorSensitiveOverlay" format="color"/>
<attr name="primaryLargeButtonStyle" format="reference"/>
<attr name="secondaryLargeButtonStyle" format="reference"/>

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

@@ -268,8 +268,7 @@
<string name="settings_app_version">Mastodon for Android v%1$s (%2$d)</string>
<string name="media_cache_cleared">Media cache cleared</string>
<string name="confirm_log_out">Are you sure you want to sign out?</string>
<string name="sensitive_content">Sensitive content</string>
<string name="sensitive_content_explain">The author marked this media as sensitive. Tap to reveal.</string>
<string name="sensitive_content_explain">The author marked this media as sensitive.</string>
<string name="media_hidden">Tap to reveal</string>
<string name="avatar_description">Go to %s\'s profile</string>
<string name="more_options">More options</string>
@@ -448,4 +447,6 @@
<string name="view_all">View all</string>
<string name="profile_endorsed_accounts">Accounts</string>
<string name="verified_link">Verified link</string>
<string name="show">Show</string>
<string name="hide">Hide</string>
</resources>

6
mastodon/src/main/res/values/styles.xml
View File

@@ -71,7 +71,8 @@
<item name="android:statusBarColor">?colorM3Background</item>
<item name="android:navigationBarColor">@color/navigation_bar_bg_light</item>
<item name="android:colorAccent">?colorM3Primary</item>
<item name="android:colorControlHighlight">@color/m3_primary_overlay</item>
<item name="android:colorControlHighlight">@color/m3_on_surface_overlay</item>
<item name="colorSensitiveOverlay">#a6ffffff</item>
</style>
<style name="Theme.Mastodon.Dark" parent="Theme.AppKit">
@@ -147,7 +148,8 @@
<item name="android:statusBarColor">?colorM3Background</item>
<item name="android:navigationBarColor">?colorM3Background</item>
<item name="android:colorAccent">?colorM3Primary</item>
<item name="android:colorControlHighlight">@color/m3_primary_overlay</item>
<item name="android:colorControlHighlight">@color/m3_on_surface_overlay</item>
<item name="colorSensitiveOverlay">#80000000</item>
</style>
<style name="Theme.Mastodon.Dark.TrueBlack">