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

Merge upstream redesign (#714)

Browse Source 
* merge toolbar fragment

* Fix store screenshot generator

* Fix alert color

* Fix #609

* Fix crash

* bigger hitbox for chips

* support mastodon languages

* merge ui utils

* merge stuff

* fix icon

* ensure 48dp touch target

* init local prefs, add helper function for enum values

* update compose action layout

* merge compose-adj files

* update extended footer

* fix poll wrong option checked

closes sk22#641

* no border when disabled

closes sk22#640

* Fix #610

* Minor fixes

* Fix alert color

* Fix #609

* Fix crash

* Fix #610

* Minor fixes

* add resources

* more compatible mastodon language

* fix html parser

* mark as read on refresh

* update tab bar

* tweak m3 buttons

* update compose-adj files

* tweak and update styles

* m3 expand button

* flag icon should be 18dp, actually

* More minor fixes

closes #612

* More minor fixes

closes #612

* Bump version

* fix no create status event when redrafting

* add material 3 assets

* New translations strings.xml (Greek)

* New translations strings.xml (Greek)

* New translations strings.xml (Italian)

* New translations strings.xml (Greek)

* New translations strings.xml (Italian)

* New translations strings.xml (Thai)

* New translations strings.xml (Thai)

* New translations strings.xml (Italian)

* New translations strings.xml (Thai)

* use new buttons for profile fragment

* merge compose fragment

* merge all the styles! oh dear

* New translations full_description.txt (Indonesian)

* New translations full_description.txt (Chinese Simplified)

* New translations strings.xml (Chinese Simplified)

* New translations full_description.txt (Chinese Simplified)

* Fix #615

* Minor fixes

* Fix #611

* A bunch of crash fixes

* New translations strings.xml (Greek)

* Make the default server configurable

* Pass the system timezone to server when signing up

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Japanese)

* Fix #615

* Minor fixes

* Fix #611

* A bunch of crash fixes

* Make the default server configurable

* Pass the system timezone to server when signing up

* oops. accidentally pasted the commit message in the code

* Remove unused code that caused a crash for some users ¯\_(ツ)_/¯

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* Remove unused code that caused a crash for some users ¯\_(ツ)_/¯

* New translations strings.xml (Polish)

* New translations strings.xml (Polish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Belarusian)

* prepare merging profile fragment

* merge profile fragment

* New translations strings.xml (Belarusian)

* New translations strings.xml (Greek)

* fix icon padding

* apply post header changes

* minor margin tweaks

* fix footer buttons

* fix header announcement buttons

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations strings.xml (Japanese)

* New translations full_description.txt (Japanese)

* New translations strings.xml (Icelandic)

* New translations strings.xml (Icelandic)

* New translations strings.xml (Icelandic)

* fix replying

* New translations strings.xml (Icelandic)

* fix translate button

* fix more button visibility

* fix counts label styling

* fix disabled boost button opacity

* fix tab layouts

* fix notification icon color crash

* New translations strings.xml (Greek)

* implement elevation listener in home tab

* fix elevation and listener in home tab

* add elevation scroll listener to notifications

* New translations strings.xml (Scottish Gaelic)

* Add editorconfig

So that PRs like #625 don't happen again

* Crash fix

* 🤔

* New translations strings.xml (Greek)

* New translations strings.xml (Japanese)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* fix notification elevation and integrate divider

* 🤔

* Crash fix

* Add editorconfig

So that PRs like #625 don't happen again

* New translations strings.xml (Turkish)

* save interactions in cache

* New translations strings.xml (Turkish)

* merge new discover/search

* New translations strings.xml (Bengali)

* New translations strings.xml (Scottish Gaelic)

* New translations strings.xml (Bengali)

* merge new settings fragments

* fix no auth callback always being executed

* allow opening server info from profile

closes sk22#593

* fix hide boosts icon color

closes sk22#676

* New translations strings.xml (Turkish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Turkish)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (Turkish)

* update fedinuke list

from source; doesn't contain any modifications regarding a recent issue

* New translations strings.xml (Turkish)

* remove unused class

* fix crash

* darken m3 outline color a bit

* use m3 outline again

* fix misalignment

closes sk22#682

* New translations strings.xml (Turkish)

* New translations full_description.txt (Turkish)

* New translations short_description.txt (Turkish)

* fix crash

* fix metadata sorting

* show pronouns in header/account lists

* fix broken divider line

closes sk22#679

* trim pronouns

* improve pronoun display

* New translations strings.xml (French)

* New translations strings.xml (Japanese)

* fix broken federated timeline

closes sk22#685

* fix broken -1 fallback behavior

closes sk22#681

* don't display nothing if server about request fails

closes sk22#678

* New translations strings.xml (Ukrainian)

* migrate global prefs to local prefs

* do confirm unfollow by default

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Ukrainian)

* New translations full_description.txt (Ukrainian)

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Russian)

* New translations strings.xml (Vietnamese)

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Vietnamese)

* New translations full_description.txt (Ukrainian)

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Vietnamese)

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Ukrainian)

* make sure list in prefs are always mutable and nut null

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Russian)

* fix pronouns edge case

* add back fix for stretched images

closes sk22#636

* fix null pointer on missing default posting language

* fix default posting language not being applied

* bigger username hitbox

closes sk22#688

* fix rtl header username alignment

closes sk22#689

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Ukrainian)

* hopefully fix crashes

closes sk22#692

* New translations strings.xml (Ukrainian)

* New translations full_description.txt (Ukrainian)

* fix pronoun crash

* New translations strings.xml (Persian)

* New translations strings.xml (Ukrainian)

* re-add true black mode

* asterisk can be a pronoun

* New translations strings.xml (Persian)

* true black mode fixes and clean-ups

* material 3 button background for switcher

* darker tab bar selected background

* better align follow/following button widths

* restore rainbow refresh colors

* fix search transition

* fix min width issue with switcher button

* fix no elevation when true black is enabled in light theme

* use statusForContent to determine spoilerRevealed

closes sk22#694

* New translations strings.xml (Persian)

* New translations strings.xml (Persian)

* New translations strings.xml (Persian)

* New translations strings.xml (Persian)

* New translations strings.xml (Persian)

* New translations strings.xml (Persian)

* fix profile tab bar in true black theme

* fix m3 default button style

closes sk22#697

* prettier role badges

closes sk22#663

* fix translate button spacing

closes sk22#655

* use m3 switches in dialogs

closes sk22#653

* implement color palette switcher

* fix color palettes being overwritten

* add display and notification settings

* clean up code

* per-account single notification setting

* add missing items to notification types

* add prefix replies setting

* add show replies/boosts and reply visibility

* add load/see new posts settings

* fix spectator mode missing spoiler padding

* add a bunch of display settings

* update fedinuke

* add content type settings

* add settings for local-onlu

* add missing settings items

* fix visibility button icon tint

* hopefully fix some crashes

* normalize padding above edit text

* apparently, some people don't like pills

closes sk22#706

* fix play button color

closes sk22#705
This commit is contained in:
sk22
2023-07-16 18:01:42 +02:00
committed by GitHub
parent 3cfea0e660
commit 7677ad39ca
744 changed files with 24873 additions and 13485 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mastodon/src/main/res/anim/fade_out_fast.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<alpha xmlns:android="http://schemas.android.com/apk/res/android"
android:duration="200"
android:interpolator="@android:anim/decelerate_interpolator"
android:interpolator="@interpolator/m3_sys_motion_easing_standard_decelerate"
android:fromAlpha="1.0"
android:toAlpha="0.0"/>

30
mastodon/src/main/res/animator/m3_button_elevation.xml Normal file
View File

@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false">
<set>
<objectAnimator
android:propertyName="elevation"
android:valueTo="0dp"
android:duration="0"
android:valueType="floatType" />
</set>
</item>
<item android:state_hovered="true">
<set>
<objectAnimator
android:propertyName="elevation"
android:valueTo="2dp"
android:duration="@android:integer/config_shortAnimTime"
android:valueType="floatType" />
</set>
</item>
<item>
<set>
<objectAnimator
android:propertyName="elevation"
android:valueTo="1dp"
android:duration="@android:integer/config_shortAnimTime"
android:valueType="floatType" />
</set>
</item>
</selector>

5
mastodon/src/main/res/color/action_bar_icons.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?colorM3OnSurfaceVariant" android:state_enabled="true"/>
<item android:color="?colorM3OnSurfaceVariant" android:alpha="0.38"/>
</selector>

6
mastodon/src/main/res/color/boost_icon.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?android:colorAccent" android:state_selected="true"/>
<item android:color="?android:textColorSecondary" android:state_enabled="true"/>
<item android:color="?colorIconDisabled" />
<item android:color="?colorM3Primary" android:state_selected="true"/>
<item android:color="?colorM3OnBackground" android:state_enabled="true"/>
<item android:color="@color/m3_on_background_alpha38" />
</selector>

5
mastodon/src/main/res/color/button_bg_primary_dark_on_light.xml
View File

@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?attr/colorButtonBackgroundPrimaryDarkOnLight" android:state_enabled="true"/>
<item android:color="?colorButtonBackgroundPrimaryDarkOnLightDisabled"/>
</selector>

5
mastodon/src/main/res/color/button_bg_primary_light_on_dark.xml
View File

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

5
mastodon/src/main/res/color/button_bg_secondary_dark_on_light.xml
View File

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

5
mastodon/src/main/res/color/button_bg_secondary_light_on_dark.xml
View File

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

5
mastodon/src/main/res/color/button_text_m3_tonal_error.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?colorM3OnErrorContainer" android:state_enabled="true"/>
<item android:color="?colorM3OnSurface" android:alpha="0.38"/>
</selector>

5
mastodon/src/main/res/color/button_text_primary_dark_on_light.xml
View File

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

5
mastodon/src/main/res/color/button_text_primary_light_on_dark.xml
View File

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

5
mastodon/src/main/res/color/button_text_secondary_dark_on_light.xml
View File

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

5
mastodon/src/main/res/color/compose_button.xml
View File

@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?android:textColorPrimary" android:alpha="0.3" android:state_enabled="false"/>
<item android:color="?android:textColorPrimary"/>
<item android:color="?colorM3OnSurfaceVariant" android:alpha="0.3" android:state_enabled="false"/>
<item android:color="?colorM3OnPrimary" android:state_selected="true"/>
<item android:color="?colorM3OnSurfaceVariant"/>
</selector>

4
mastodon/src/main/res/color/filter_chip_text.xml
View File

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

3
mastodon/src/main/res/color/poll_option_progress.xml → mastodon/src/main/res/color/m3_on_background_alpha38.xml
View File

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

4
mastodon/src/main/res/color/m3_on_primary_overlay.xml Normal file
View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?colorM3OnPrimary" android:alpha="@dimen/overlay_ripple_alpha"/>
</selector>

2
mastodon/src/main/res/color/m3_on_secondary_container_overlay.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?colorM3OnSecondaryContainer" android:alpha="0.12"/>
<item android:color="?colorM3OnSecondaryContainer" android:alpha="@dimen/overlay_ripple_alpha"/>
</selector>

4
mastodon/src/main/res/color/m3_on_surface_alpha38.xml Normal file
View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?colorM3OnSurface" android:alpha="0.38"/>
</selector>

2
mastodon/src/main/res/color/m3_on_surface_overlay.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?colorM3OnSurface" android:alpha="0.12"/>
<item android:color="?colorM3OnSurface" android:alpha="@dimen/overlay_ripple_alpha"/>
</selector>

2
mastodon/src/main/res/color/m3_on_surface_variant_overlay.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?colorM3OnSurfaceVariant" android:alpha="0.12"/>
<item android:color="?colorM3OnSurfaceVariant" android:alpha="@dimen/overlay_ripple_alpha"/>
</selector>

2
mastodon/src/main/res/color/m3_pressed_overlay.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?colorM3PressedOverlay" android:alpha="0.12"/>
<item android:color="?colorM3PressedOverlay" android:alpha="@dimen/overlay_ripple_alpha"/>
</selector>

2
mastodon/src/main/res/color/button_text_secondary_light_on_dark.xml → mastodon/src/main/res/color/m3_primary_alpha11.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?colorGray50"/>
<item android:color="?colorM3Primary" android:alpha="0.11"/>
</selector>

4
mastodon/src/main/res/color/m3_primary_alpha5.xml Normal file
View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?colorM3Primary" android:alpha="0.05"/>
</selector>

4
mastodon/src/main/res/color/m3_primary_alpha8.xml Normal file
View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?colorM3Primary" android:alpha="0.08"/>
</selector>

2
mastodon/src/main/res/color/m3_primary_overlay.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?colorM3Primary" android:alpha="0.12"/>
<item android:color="?colorM3Primary" android:alpha="@dimen/overlay_ripple_alpha"/>
</selector>

5
mastodon/src/main/res/color/m3_primary_selector.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/m3_on_surface_alpha38" android:state_enabled="false" />
<item android:color="?colorM3Primary" />
</selector>

4
mastodon/src/main/res/color/m3_white_overlay.xml Normal file
View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="#FFF" android:alpha="@dimen/overlay_ripple_alpha"/>
</selector>

41
mastodon/src/main/res/color/mtrl_switch_thumb_tint.xml Normal file
View File

@@ -0,0 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2022 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- State Disabled, Unchecked -->
<item
android:alpha="@dimen/m3_comp_switch_disabled_unselected_handle_opacity"
android:color="@macro/m3_comp_switch_disabled_unselected_handle_color"
android:state_enabled="false" android:state_checked="false"/>
<!-- State Disabled, Checked -->
<item
android:alpha="@dimen/m3_comp_switch_disabled_selected_handle_opacity"
android:color="@macro/m3_comp_switch_disabled_selected_handle_color"
android:state_enabled="false" android:state_checked="true"/>
<!-- State Checked, Pressed -->
<item android:color="@macro/m3_comp_switch_selected_pressed_handle_color" android:state_checked="true" android:state_pressed="true"/>
<!-- State Checked -->
<item android:color="@macro/m3_comp_switch_selected_handle_color" android:state_checked="true"/>
<!-- State Unchecked, Pressed -->
<item android:color="@macro/m3_comp_switch_unselected_pressed_handle_color" android:state_pressed="true"/>
<!-- State Unchecked -->
<item android:color="@macro/m3_comp_switch_unselected_handle_color"/>
</selector>

24
mastodon/src/main/res/drawable/tab_indicator_inset.xml → mastodon/src/main/res/color/mtrl_switch_track_decoration_tint.xml
View File

@@ -1,26 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright 2018 The Android Open Source Project
~ Copyright (C) 2022 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ https://www.apache.org/licenses/LICENSE-2.0
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:left="12dp" android:right="12dp">
<shape
android:shape="rectangle">
<solid android:color="@android:color/white"/>
<size android:height="2dp"/>
</shape>
</item>
</layer-list>
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/transparent" android:state_checked="true"/>
<item
android:alpha="@dimen/m3_comp_switch_disabled_track_opacity"
android:color="@macro/m3_comp_switch_disabled_unselected_track_outline_color"
android:state_enabled="false"/>
<item android:color="@macro/m3_comp_switch_unselected_track_outline_color"/>
</selector>

26
mastodon/src/main/res/color/mtrl_switch_track_tint.xml Normal file
View File

@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2022 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:alpha="@dimen/m3_comp_switch_disabled_track_opacity"
android:color="@macro/m3_comp_switch_disabled_unselected_track_color"
android:state_enabled="false" android:state_checked="false"/>
<item android:alpha="@dimen/m3_comp_switch_disabled_track_opacity"
android:color="@macro/m3_comp_switch_disabled_selected_track_color"
android:state_enabled="false" android:state_checked="true"/>
<item android:color="@macro/m3_comp_switch_selected_track_color" android:state_checked="true"/>
<item android:color="@macro/m3_comp_switch_unselected_track_color"/>
</selector>

4
mastodon/src/main/res/color/discover_tab.xml → mastodon/src/main/res/color/poll_option_progress_inset.xml
View File

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

5
mastodon/src/main/res/color/poll_option_text_inset.xml Normal file
View File

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

5
mastodon/src/main/res/color/selectable_icon_tint.xml Normal file
View File

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

5
mastodon/src/main/res/color/tab_bar_icon.xml Normal file
View File

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

5
mastodon/src/main/res/color/text_on_surface_disableable.xml Normal file
View File

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

5
mastodon/src/main/res/color/text_segmented_button.xml Normal file
View File

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

2
mastodon/src/main/res/color/window_bg_alpha95.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?colorWindowBackground" android:alpha="0.95"/>
<item android:color="?colorM3Surface" android:alpha="0.95"/>
</selector>

21
mastodon/src/main/res/drawable-anydpi-v26/ic_launcher_background.xml Normal file
View File

@@ -0,0 +1,21 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<path
android:pathData="M0,0h108v108h-108z">
<aapt:attr name="android:fillColor">
<gradient
android:startX="54"
android:startY="0"
android:endX="54"
android:endY="108"
android:type="linear">
<item android:offset="0" android:color="#FF6364FF"/>
<item android:offset="1" android:color="#FF563ACC"/>
</gradient>
</aapt:attr>
</path>
</vector>

21
mastodon/src/main/res/drawable-anydpi-v26/ic_launcher_foreground.xml Normal file
View File

@@ -0,0 +1,21 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<path
android:pathData="M63.51,35.47C67.74,36.09 71.31,39.31 71.86,43.39C72.1,45.82 71.98,49.47 71.92,51.24C71.9,51.68 71.89,52.01 71.89,52.17C71.89,52.41 71.86,54.58 71.85,54.81C71.48,60.65 67.83,62.95 64,63.69C63.95,63.7 63.91,63.71 63.86,63.72C63.85,63.72 63.83,63.72 63.82,63.72C61.39,64.2 58.79,64.32 56.32,64.39C55.73,64.41 55.14,64.41 54.55,64.41L54.55,64.41C52.1,64.41 49.65,64.12 47.26,63.54C47.25,63.54 47.24,63.54 47.22,63.54C47.21,63.55 47.2,63.55 47.19,63.56C47.18,63.57 47.17,63.58 47.17,63.59C47.16,63.6 47.16,63.62 47.16,63.63C47.23,64.4 47.39,65.17 47.66,65.9C47.99,66.74 49.15,68.78 53.44,68.78C55.94,68.78 58.42,68.49 60.85,67.91C60.86,67.91 60.88,67.91 60.89,67.91C60.9,67.92 60.91,67.92 60.92,67.93C60.93,67.94 60.94,67.95 60.95,67.96C60.95,67.97 60.95,67.98 60.95,67.99L60.95,70.86C60.95,70.87 60.95,70.89 60.94,70.9C60.94,70.91 60.93,70.92 60.92,70.93C60.16,71.48 59.14,71.8 58.25,72.08C58.21,72.09 58.17,72.11 58.12,72.12C57.72,72.25 57.31,72.36 56.89,72.46C53.1,73.32 49.15,73.11 45.47,71.85C42.04,70.65 38.53,67.71 37.67,64.17C37.2,62.25 36.88,60.3 36.69,58.34C36.5,56.19 36.43,54.04 36.36,51.89C36.34,51.08 36.31,50.27 36.28,49.45C36.2,47.38 36.25,45.13 36.69,43.09C37.6,38.96 41.35,36.07 45.46,35.47C45.55,35.45 45.64,35.44 45.75,35.42C46.56,35.28 48.26,34.98 53.78,34.98L53.83,34.98C60.09,34.98 62.8,35.36 63.51,35.47ZM65.64,58L65.64,47.91C65.64,45.85 65.11,44.21 64.06,43C62.96,41.79 61.54,41.16 59.76,41.16C57.72,41.16 56.16,41.95 55.13,43.52L54.13,45.19L53.13,43.52C52.1,41.95 50.55,41.16 48.5,41.16C46.72,41.16 45.3,41.79 44.21,43C43.15,44.21 42.62,45.85 42.62,47.91L42.62,58L46.63,58L46.63,48.21C46.63,46.15 47.5,45.1 49.24,45.1C51.17,45.1 52.14,46.34 52.14,48.8L52.14,54.16L56.12,54.16L56.12,48.8C56.12,46.34 57.09,45.1 59.01,45.1C60.77,45.1 61.63,46.15 61.63,48.21L61.63,58L65.64,58Z">
<aapt:attr name="android:fillColor">
<gradient
android:startX="54.12"
android:startY="34.98"
android:endX="54.12"
android:endY="72.98"
android:type="linear">
<item android:offset="0" android:color="#FFF0F3FE"/>
<item android:offset="1" android:color="#FFDAE0FB"/>
</gradient>
</aapt:attr>
</path>
</vector>

10
mastodon/src/main/res/drawable-anydpi-v26/ic_launcher_monochrome.xml Normal file
View File

@@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<path
android:pathData="M63.26,36.4C67.49,37.02 71.06,40.24 71.61,44.32C71.85,46.75 71.73,50.4 71.67,52.17C71.65,52.61 71.64,52.94 71.64,53.1C71.64,53.34 71.61,55.51 71.6,55.74C71.22,61.58 67.58,63.88 63.75,64.62C63.7,64.63 63.66,64.64 63.61,64.65C63.6,64.65 63.58,64.65 63.57,64.65C61.14,65.13 58.54,65.25 56.07,65.32C55.48,65.34 54.89,65.34 54.3,65.34C51.85,65.34 49.4,65.05 47.01,64.47C47,64.47 46.99,64.47 46.97,64.47C46.96,64.48 46.95,64.48 46.94,64.49C46.93,64.5 46.92,64.51 46.92,64.52C46.91,64.53 46.91,64.55 46.91,64.56C46.98,65.33 47.14,66.1 47.41,66.83C47.74,67.68 48.9,69.71 53.19,69.71C55.69,69.71 58.17,69.42 60.6,68.84C60.61,68.84 60.63,68.84 60.64,68.84C60.65,68.85 60.66,68.85 60.67,68.86C60.68,68.87 60.69,68.88 60.7,68.89C60.7,68.9 60.7,68.91 60.7,68.93V71.79C60.7,71.8 60.7,71.82 60.69,71.83C60.69,71.84 60.68,71.85 60.67,71.86C59.91,72.41 58.89,72.73 58,73.01C57.96,73.02 57.91,73.04 57.88,73.05C57.47,73.18 57.06,73.29 56.64,73.39C52.85,74.25 48.9,74.04 45.22,72.79C41.79,71.58 38.28,68.64 37.42,65.1C36.95,63.18 36.63,61.23 36.44,59.27C36.25,57.12 36.18,54.97 36.11,52.82C36.09,52.01 36.06,51.2 36.03,50.38C35.95,48.32 36,46.06 36.44,44.03C37.35,39.89 41.1,37 45.21,36.4C45.3,36.38 45.39,36.37 45.5,36.35C46.31,36.21 48.01,35.91 53.53,35.91H53.58C59.84,35.91 62.55,36.29 63.26,36.4ZM65.39,58.94V48.84C65.39,46.78 64.86,45.14 63.81,43.93C62.71,42.72 61.29,42.09 59.51,42.09C57.47,42.09 55.92,42.88 54.88,44.45L53.88,46.12L52.88,44.45C51.85,42.88 50.3,42.09 48.25,42.09C46.47,42.09 45.05,42.72 43.96,43.93C42.9,45.14 42.37,46.78 42.37,48.84V58.94H46.38V49.14C46.38,47.08 47.25,46.03 48.99,46.03C50.92,46.03 51.89,47.27 51.89,49.73V55.09H55.87V49.73C55.87,47.27 56.84,46.03 58.76,46.03C60.52,46.03 61.38,47.08 61.38,49.14V58.94H65.39Z"
android:fillColor="#4A454E"
android:fillType="evenOdd"/>
</vector>

BIN
mastodon/src/main/res/drawable-mdpi/theme_auto.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 10 KiB

BIN
mastodon/src/main/res/drawable-mdpi/theme_auto_trueblack.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 10 KiB

BIN
mastodon/src/main/res/drawable-mdpi/theme_dark.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 9.8 KiB

BIN
mastodon/src/main/res/drawable-mdpi/theme_dark_trueblack.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 9.7 KiB

BIN
mastodon/src/main/res/drawable-mdpi/theme_light.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 9.8 KiB

BIN
mastodon/src/main/res/drawable-nodpi/default_avatar.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.6 KiB

BIN
mastodon/src/main/res/drawable-nodpi/poof.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.4 KiB

BIN
mastodon/src/main/res/drawable-xhdpi/theme_auto.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 32 KiB

BIN
mastodon/src/main/res/drawable-xhdpi/theme_auto_trueblack.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 31 KiB

BIN
mastodon/src/main/res/drawable-xhdpi/theme_dark.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 31 KiB

BIN
mastodon/src/main/res/drawable-xhdpi/theme_dark_trueblack.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 31 KiB

BIN
mastodon/src/main/res/drawable-xhdpi/theme_light.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 31 KiB

BIN
mastodon/src/main/res/drawable-xxhdpi/theme_auto.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 61 KiB

BIN
mastodon/src/main/res/drawable-xxhdpi/theme_auto_trueblack.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 61 KiB

BIN
mastodon/src/main/res/drawable-xxhdpi/theme_dark.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 60 KiB

BIN
mastodon/src/main/res/drawable-xxhdpi/theme_dark_trueblack.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 60 KiB

BIN
mastodon/src/main/res/drawable-xxhdpi/theme_light.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 60 KiB

6
mastodon/src/main/res/drawable/bg_alert.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<inset xmlns:android="http://schemas.android.com/apk/res/android" android:inset="16dp">
<shape>
<solid android:color="?android:attr/colorBackground"/>
<corners android:radius="16dp"/>
<shape android:tint="@color/m3_primary_alpha11" android:tintMode="src_atop">
<solid android:color="?colorM3Surface"/>
<corners android:radius="28dp"/>
</shape>
</inset>

2
mastodon/src/main/res/drawable/bg_alert_button.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="?android:attr/colorControlHighlight">
<item android:id="@android:id/mask">
<item android:id="@android:id/mask" android:height="40dp" android:gravity="center_vertical">
<shape>
<solid android:color="#000"/>
<corners android:radius="100dp"/>

14
mastodon/src/main/res/drawable/bg_update_download_progress.xml → mastodon/src/main/res/drawable/bg_audio_play_button.xml
View File

@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="?android:colorForeground">
<item android:id="@android:id/mask">
<shape android:shape="oval">
<solid android:color="#18000000"/>
</shape>
</item>
<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="@color/highlight_over_dark">
<item>
<shape android:shape="oval">
<solid android:color="?android:colorBackground"/>
<solid android:color="#80000000"/>
</shape>
</item>
<item android:id="@android:id/mask">
<shape android:shape="oval">
<solid android:color="#ff000000"/>
</shape>
</item>
</ripple>

6
mastodon/src/main/res/drawable/bg_inline_button.xml → mastodon/src/main/res/drawable/bg_button_borderless_rounded.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="?android:colorControlHighlight">
<item>
<item android:id="@android:id/mask" android:height="36dp" android:gravity="center_vertical">
<shape>
<solid android:color="?colorPollVoted"/>
<corners android:radius="4dp"/>
<corners android:radius="100dp"/>
<solid android:color="#000"/>
</shape>
</item>
</ripple>

13
mastodon/src/main/res/drawable/bg_button_green.xml
View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<ripple android:color="@color/highlight_over_dark">
<item>
<shape>
<solid android:color="#58AC81"/>
<corners android:radius="10dp"/>
</shape>
</item>
</ripple>
</item>
</selector>

14
mastodon/src/main/res/drawable/bg_button_m3_filled.xml
View File

@@ -2,7 +2,7 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="true">
<ripple android:color="@color/m3_pressed_overlay">
<item>
<item android:gravity="center_vertical" android:height="40dp">
<shape>
<solid android:color="?colorM3Primary"/>
<corners android:radius="20dp"/>
@@ -11,9 +11,13 @@
</ripple>
</item>
<item>
<shape>
<solid android:color="?colorM3DisabledBackground"/>
<corners android:radius="20dp"/>
</shape>
<layer-list>
<item android:gravity="center_vertical" android:height="40dp">
<shape>
<solid android:color="@color/m3_on_surface_overlay"/>
<corners android:radius="20dp"/>
</shape>
</item>
</layer-list>
</item>
</selector>

19
mastodon/src/main/res/drawable/bg_button_m3_filled_outlined.xml Normal file
View File

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple android:color="@color/m3_pressed_overlay" xmlns:android="http://schemas.android.com/apk/res/android">
<item android:gravity="center_vertical" android:height="40dp">
<selector>
<item android:state_enabled="true">
<shape>
<solid android:color="?colorM3Primary"/>
<corners android:radius="20dp"/>
</shape>
</item>
<item>
<shape>
<stroke android:color="@color/m3_on_surface_overlay" android:width="1dp"/>
<corners android:radius="20dp"/>
</shape>
</item>
</selector>
</item>
</ripple>

4
mastodon/src/main/res/drawable/bg_button_m3_outlined.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple android:color="@color/m3_primary_overlay" xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<item android:gravity="center_vertical" android:height="40dp">
<selector>
<item android:state_enabled="true">
<shape>
@@ -16,7 +16,7 @@
</item>
</selector>
</item>
<item android:id="@android:id/mask">
<item android:id="@android:id/mask" android:gravity="center_vertical" android:height="40dp">
<shape>
<solid android:color="#000"/>
<corners android:radius="20dp"/>

8
mastodon/src/main/res/drawable/bg_button_m3_outlined_white.xml
View File

@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple android:color="#1effffff" xmlns:android="http://schemas.android.com/apk/res/android">
<ripple android:color="@color/m3_white_overlay" xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<selector>
<item android:state_enabled="true">
<item android:state_enabled="true" android:gravity="center_vertical" android:height="40dp">
<shape>
<stroke android:color="?colorM3Outline" android:width="1dp"/>
<corners android:radius="20dp"/>
</shape>
</item>
<item>
<item android:gravity="center_vertical" android:height="40dp">
<shape>
<stroke android:color="@color/m3_on_surface_overlay" android:width="1dp"/>
<corners android:radius="20dp"/>
@@ -16,7 +16,7 @@
</item>
</selector>
</item>
<item android:id="@android:id/mask">
<item android:id="@android:id/mask" android:gravity="center_vertical" android:height="40dp">
<shape>
<solid android:color="#000"/>
<corners android:radius="20dp"/>

2
mastodon/src/main/res/drawable/bg_button_m3_text.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple android:color="@color/m3_primary_overlay" xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@android:id/mask">
<item android:id="@android:id/mask" android:gravity="center_vertical" android:height="40dp">
<shape>
<solid android:color="#000"/>
<corners android:radius="20dp"/>

9
mastodon/src/main/res/drawable/bg_button_m3_text_circle.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple android:color="@color/m3_primary_overlay" xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@android:id/mask" android:gravity="center" android:height="40dp" android:width="40dp">
<shape>
<solid android:color="#000"/>
<corners android:radius="20dp"/>
</shape>
</item>
</ripple>

4
mastodon/src/main/res/drawable/bg_button_m3_text_white.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple android:color="#1effffff" xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@android:id/mask">
<ripple android:color="@color/m3_white_overlay" xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@android:id/mask" android:gravity="center_vertical" android:height="40dp">
<shape>
<solid android:color="#000"/>
<corners android:radius="20dp"/>

29
mastodon/src/main/res/drawable/bg_button_m3_tonal.xml
View File

@@ -1,19 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="true">
<ripple android:color="@color/m3_on_secondary_container_overlay">
<item>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/m3_primary_overlay">
<item android:gravity="center_vertical" android:height="40dp">
<selector>
<item android:state_enabled="true" android:state_selected="true">
<shape>
<solid android:color="?colorM3SecondaryContainer"/>
<corners android:radius="20dp"/>
</shape>
</item>
</ripple>
<item android:state_selected="false">
<shape>
<stroke android:color="@color/m3_on_surface_overlay" android:width="1dp"/>
<corners android:radius="20dp"/>
</shape>
</item>
<item android:state_enabled="false">
<shape>
<solid android:color="?colorM3DisabledBackground"/>
<corners android:radius="20dp"/>
</shape>
</item>
</selector>
</item>
<item>
<item android:id="@android:id/mask" android:gravity="center_vertical" android:height="40dp">
<shape>
<solid android:color="?colorM3DisabledBackground"/>
<solid android:color="#000"/>
<corners android:radius="20dp"/>
</shape>
</item>
</selector>
</ripple>

32
mastodon/src/main/res/drawable/bg_button_m3_tonal_circle.xml Normal file
View File

@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/m3_primary_overlay">
<item android:gravity="center" android:height="40dp" android:width="40dp">
<selector>
<item android:state_enabled="true" android:state_selected="true">
<shape>
<solid android:color="?colorM3SecondaryContainer"/>
<corners android:radius="20dp"/>
</shape>
</item>
<item android:state_selected="false">
<shape>
<stroke android:color="@color/m3_on_surface_overlay" android:width="1dp"/>
<corners android:radius="20dp"/>
</shape>
</item>
<item android:state_enabled="false">
<shape>
<solid android:color="?colorM3DisabledBackground"/>
<corners android:radius="20dp"/>
</shape>
</item>
</selector>
</item>
<item android:id="@android:id/mask" android:gravity="center" android:height="40dp" android:width="40dp">
<shape>
<solid android:color="#000"/>
<corners android:radius="20dp"/>
</shape>
</item>
</ripple>

19
mastodon/src/main/res/drawable/bg_button_m3_tonal_error.xml Normal file
View File

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="true">
<ripple android:color="@color/m3_on_secondary_container_overlay">
<item>
<shape>
<solid android:color="?colorM3ErrorContainer"/>
<corners android:radius="20dp"/>
</shape>
</item>
</ripple>
</item>
<item>
<shape>
<solid android:color="?colorM3DisabledBackground"/>
<corners android:radius="20dp"/>
</shape>
</item>
</selector>

13
mastodon/src/main/res/drawable/bg_button_primary_dark_on_light.xml
View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<ripple android:color="@color/highlight_over_dark">
<item>
<shape>
<solid android:color="@color/button_bg_primary_dark_on_light"/>
<corners android:radius="10dp"/>
</shape>
</item>
</ripple>
</item>
</selector>

13
mastodon/src/main/res/drawable/bg_button_primary_light_on_dark.xml
View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<ripple android:color="@color/highlight_over_light">
<item>
<shape>
<solid android:color="@color/button_bg_primary_light_on_dark"/>
<corners android:radius="10dp"/>
</shape>
</item>
</ripple>
</item>
</selector>

13
mastodon/src/main/res/drawable/bg_button_secondary_dark_on_light.xml
View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<ripple android:color="@color/highlight_over_light">
<item>
<shape>
<solid android:color="@color/button_bg_secondary_dark_on_light"/>
<corners android:radius="10dp"/>
</shape>
</item>
</ripple>
</item>
</selector>

13
mastodon/src/main/res/drawable/bg_button_secondary_light_on_dark.xml
View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<ripple android:color="@color/highlight_over_dark">
<item>
<shape>
<solid android:color="@color/button_bg_secondary_light_on_dark"/>
<corners android:radius="10dp"/>
</shape>
</item>
</ripple>
</item>
</selector>

25
mastodon/src/main/res/drawable/bg_compose_button.xml Normal file
View File

@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<inset xmlns:android="http://schemas.android.com/apk/res/android" android:inset="2dp">
<selector>
<item android:state_selected="true">
<ripple android:color="@color/m3_on_primary_overlay">
<item>
<shape>
<corners android:radius="4dp"/>
<solid android:color="?colorM3Primary"/>
</shape>
</item>
</ripple>
</item>
<item>
<ripple android:color="@color/m3_on_surface_variant_overlay">
<item android:id="@android:id/mask">
<shape>
<solid android:color="#000"/>
<corners android:radius="4dp"/>
</shape>
</item>
</ripple>
</item>
</selector>
</inset>

8
mastodon/src/main/res/drawable/bg_custom_emoji.xml Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="@color/m3_on_surface_variant_overlay">
<item android:id="@android:id/mask" android:gravity="center" android:width="40dp" android:height="40dp">
<shape android:shape="oval">
<solid android:color="#000"/>
</shape>
</item>
</ripple>

20
mastodon/src/main/res/drawable/bg_cw_edit.xml
View File

@@ -1,22 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<color android:color="?colorSearchField"/>
<color android:color="?colorM3SurfaceVariant"/>
</item>
<item android:gravity="left" android:width="8dp">
<item android:height="1dp" android:gravity="bottom">
<selector>
<item android:state_focused="true">
<color android:color="?colorM3Primary"/>
</item>
<item>
<color android:color="?colorM3OnSurfaceVariant"/>
</item>
</selector>
</item>
<item android:gravity="left" android:width="5dp">
<shape>
<gradient android:type="linear" android:angle="270" android:startColor="#FEC84B" android:endColor="#F79009"/>
</shape>
</item>
<item android:id="@+id/left_drawable" android:width="8dp" android:gravity="left">
<item android:id="@+id/left_drawable" android:width="5dp" android:gravity="left">
<color android:color="#0f0"/>
</item>
<item android:gravity="right" android:width="8dp">
<item android:gravity="right" android:width="5dp">
<shape>
<gradient android:type="linear" android:angle="270" android:startColor="#FEC84B" android:endColor="#F79009"/>
</shape>
</item>
<item android:id="@+id/right_drawable" android:width="8dp" android:gravity="right">
<item android:id="@+id/right_drawable" android:width="5dp" android:gravity="right">
<color android:color="#0f0"/>
</item>
</layer-list>

6
mastodon/src/main/res/drawable/bg_edittext_dark.xml
View File

@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="?colorGray800"/>
<corners android:radius="10dp"/>
<padding android:top="16dp" android:left="16dp" android:right="16dp" android:bottom="16dp"/>
</shape>

16
mastodon/src/main/res/drawable/bg_fab.xml
View File

@@ -1,9 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?android:colorControlHighlight">
android:color="@color/m3_primary_overlay">
<item android:id="@android:id/mask">
<shape>
<solid android:color="#000"/>
<corners android:radius="16dp"/>
</shape>
</item>
<item>
<shape>
<solid android:color="?attr/colorComposeButtonBackground"/>
<solid android:color="?colorM3Background"/>
<corners android:radius="16dp"/>
</shape>
</item>
<item>
<shape android:tint="?colorM3Primary">
<solid android:color="#1C000000"/>
<corners android:radius="16dp"/>
</shape>
</item>

18
mastodon/src/main/res/drawable/bg_filter_chip.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true">
<item android:state_selected="true" android:height="32dp" android:gravity="center_vertical">
<ripple android:color="@color/m3_on_secondary_container_overlay">
<item>
<shape>
@@ -10,15 +10,25 @@
</item>
</ripple>
</item>
<item>
<item android:state_enabled="false">
<layer-list>
<item android:height="32dp" android:gravity="center_vertical">
<shape>
<corners android:radius="8dp"/>
<stroke android:color="@color/m3_on_surface_overlay" android:width="1dp" />
</shape>
</item>
</layer-list>
</item>
<item android:state_enabled="true">
<ripple android:color="@color/m3_on_surface_variant_overlay">
<item android:id="@android:id/mask">
<item android:id="@android:id/mask" android:height="32dp" android:gravity="center_vertical">
<shape>
<corners android:radius="8dp"/>
<solid android:color="#000"/>
</shape>
</item>
<item>
<item android:id="@+id/stroke" android:height="32dp" android:gravity="center_vertical">
<shape>
<corners android:radius="8dp"/>
<stroke android:color="?colorM3Outline" android:width="1dp"/>

4
mastodon/src/main/res/drawable/bg_icon_button.xml Normal file
View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?android:colorControlHighlight"
android:radius="18dp" />

2
mastodon/src/main/res/drawable/bg_image_alt_overlay.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#D9000000"/>
<solid android:color="#B2000000"/>
<corners android:radius="4dp"/>
</shape>

6
mastodon/src/main/res/drawable/bg_discover_tabs.xml → mastodon/src/main/res/drawable/bg_m3_bottom_bar.xml
View File

@@ -2,12 +2,12 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape>
<solid android:color="?android:statusBarColor"/>
<solid android:color="?colorWhite"/>
</shape>
</item>
<item android:height="2dp" android:gravity="bottom">
<item android:gravity="top" android:height="0.5dp">
<shape>
<solid android:color="?colorPollVoted"/>
<solid android:color="?colorM3OutlineVariant"/>
</shape>
</item>
</layer-list>

5
mastodon/src/main/res/drawable/bg_catalog_tabs.xml → mastodon/src/main/res/drawable/bg_m3_outlined_text_field_error_nopad.xml
View File

@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:height="2dp" android:gravity="bottom">
<item>
<shape>
<solid android:color="?colorPollVoted"/>
<stroke android:color="?colorM3Error" android:width="2dp"/>
<corners android:radius="4dp"/>
</shape>
</item>
</layer-list>

6
mastodon/src/main/res/drawable/bg_m3_surface1.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:tint="@color/m3_primary_alpha5"
android:tintMode="src_over">
<solid android:color="?colorM3Surface" />
</shape>

6
mastodon/src/main/res/drawable/bg_m3_surface2.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:tint="@color/m3_primary_alpha8"
android:tintMode="src_over">
<solid android:color="?colorM3Surface" />
</shape>

6
mastodon/src/main/res/drawable/bg_m3_surface3.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:tint="@color/m3_primary_alpha11"
android:tintMode="src_over">
<solid android:color="?colorM3Surface" />
</shape>

4
mastodon/src/main/res/drawable/bg_onboarding_panel.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<color android:color="?colorWindowBackground"/>
<color android:color="?colorM3Background"/>
</item>
<item android:id="@+id/color_overlay">
<color android:color="?toolbarBackground"/>
<color android:color="?colorM3Primary"/>
</item>
</layer-list>

8
mastodon/src/main/res/drawable/bg_pill.xml
View File

@@ -1,8 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:dither="true"
android:shape="rectangle">
<corners android:radius="4sp" />
<solid android:color="?colorBackgroundLight" />
<stroke android:width="2dp" android:color="?android:colorAccent" />
</shape>

12
mastodon/src/main/res/drawable/bg_poll_option_clickable.xml
View File

@@ -1,9 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="?android:colorControlHighlight">
<item>
<item android:gravity="center_vertical" android:height="40dp">
<shape>
<solid android:color="?android:colorBackground"/>
<corners android:radius="10dp"/>
<stroke android:width="1dp" android:color="?colorM3Outline"/>
<corners android:radius="20dp"/>
</shape>
</item>
<item android:id="@android:id/mask" android:gravity="center_vertical" android:height="40dp">
<shape>
<solid android:color="#000"/>
<corners android:radius="20dp"/>
</shape>
</item>
</ripple>

16
mastodon/src/main/res/drawable/bg_poll_option_clickable_inset.xml Normal file
View File

@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="?android:colorControlHighlight">
<item android:gravity="center_vertical" android:height="40dp">
<shape>
<stroke android:width="1dp" android:color="?colorM3Outline"/>
<solid android:color="?colorM3Surface"/>
<corners android:radius="20dp"/>
</shape>
</item>
<item android:id="@android:id/mask" android:gravity="center_vertical" android:height="40dp">
<shape>
<solid android:color="#000"/>
<corners android:radius="20dp"/>
</shape>
</item>
</ripple>

22
mastodon/src/main/res/drawable/bg_poll_option_voted.xml
View File

@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<item android:gravity="center_vertical" android:height="40dp">
<scale android:scaleGravity="start|fill_vertical" android:scaleWidth="100%">
<shape>
<solid android:color="?colorM3SecondaryContainer"/>
<corners android:radius="20dp"/>
</shape>
</scale>
</item>
<item android:gravity="center_vertical" android:height="40dp">
<shape>
<solid android:color="?android:colorBackground"/>
<corners android:radius="10dp"/>
<stroke android:width="1dp" android:color="?colorM3OutlineVariant"/>
<corners android:radius="20dp"/>
</shape>
</item>
<item>
<clip android:clipOrientation="horizontal" android:gravity="start">
<shape>
<solid android:color="@color/poll_option_progress"/>
<corners android:radius="10dp"/>
</shape>
</clip>
</item>
</layer-list>

23
mastodon/src/main/res/drawable/bg_poll_option_voted_inset.xml Normal file
View File

@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:gravity="center_vertical" android:height="40dp">
<shape>
<solid android:color="?colorM3Surface"/>
<corners android:radius="20dp"/>
</shape>
</item>
<item android:gravity="center_vertical" android:height="40dp">
<scale android:scaleGravity="start|fill_vertical" android:scaleWidth="100%">
<shape>
<solid android:color="@color/poll_option_progress_inset"/>
<corners android:radius="20dp"/>
</shape>
</scale>
</item>
<item android:gravity="center_vertical" android:height="40dp">
<shape>
<stroke android:width="1dp" android:color="?colorM3Outline"/>
<corners android:radius="20dp"/>
</shape>
</item>
</layer-list>

20
mastodon/src/main/res/drawable/bg_popup.xml
View File

@@ -1,6 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="?colorBackgroundPopup"/>
<corners android:radius="10dp"/>
<padding android:top="8dp" android:bottom="8dp"/>
</shape>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape>
<solid android:color="?colorM3Surface"/>
<corners android:radius="4dp"/>
</shape>
</item>
<item>
<shape android:tint="?colorM3Primary">
<solid android:color="#14000000"/>
<corners android:radius="4dp"/>
<padding android:top="8dp" android:bottom="8dp"/>
</shape>
</item>
</layer-list>

13
mastodon/src/main/res/drawable/bg_profile_field_edit_text.xml
View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_focused="true">
<layer-list>
<item android:gravity="bottom">
<shape>
<size android:height="1dp"/>
<solid android:color="?android:colorAccent"/>
</shape>
</item>
</layer-list>
</item>
</selector>

9
mastodon/src/main/res/drawable/bg_rect_12dp_ripple.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="@color/m3_on_surface_overlay">
<item android:id="@android:id/mask">
<shape>
<solid android:color="#000"/>
<corners android:radius="12dp"/>
</shape>
</item>
</ripple>

2
mastodon/src/main/res/drawable/bg_text_button.xml → mastodon/src/main/res/drawable/bg_rect_4dp_ripple.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="?android:attr/colorControlHighlight">
<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="@color/m3_on_surface_overlay">
<item android:id="@android:id/mask">
<shape>
<solid android:color="#000"/>

6
mastodon/src/main/res/drawable/bg_reported_stamp.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="?colorM3PrimaryContainer"/>
<stroke android:width="4dp" android:color="?colorM3OnPrimaryContainer"/>
<corners android:radius="6dp"/>
</shape>

Some files were not shown because too many files have changed in this diff Show More