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

Merge remote-tracking branch 'megalodon_main/main'

Browse Source 
# Conflicts:
#	mastodon/build.gradle
#	mastodon/src/main/java/org/joinmastodon/android/ExternalShareActivity.java
#	mastodon/src/main/java/org/joinmastodon/android/MainActivity.java
#	mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/FollowRequestsListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/FollowedHashtagsFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/FollowerListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/FollowingListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/StatusFavoritesListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/StatusReblogsListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverAccountsFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverHashtagsFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverNewsFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/discover/FederatedTimelineFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/discover/LocalTimelineFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/AccountActivationFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/model/TimelineDefinition.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HashtagStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
#	mastodon/src/main/res/layout/item_account_switcher.xml
#	mastodon/src/main/res/values-ar-rDZ/strings_sk.xml
#	mastodon/src/main/res/values-es-rES/strings_sk.xml
#	mastodon/src/main/res/values-nl-rNL/strings_sk.xml
#	mastodon/src/main/res/values-pt-rPT/strings_sk.xml
#	mastodon/src/main/res/values-v31/colors.xml
#	mastodon/src/main/res/values/colors.xml
#	mastodon/src/main/res/values/styles.xml
This commit is contained in:
LucasGGamerM
2023-06-03 19:56:16 -03:00
parent 04fdea0296 fb8764bcd7
commit 14175a9140
113 changed files with 4439 additions and 1513 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -108,4 +108,42 @@
<attr name="colorGray800" format="color" />
<attr name="colorGray800t" format="color" />
<attr name="colorGray900" format="color" />
<attr name="colorSecondary25" format="color" />
<attr name="colorSecondary50" format="color" />
<attr name="colorSecondary100" format="color" />
<attr name="colorSecondary200" format="color" />
<attr name="colorSecondary300" format="color" />
<attr name="colorSecondary400" format="color" />
<attr name="colorSecondary500" format="color" />
<attr name="colorSecondary600" format="color" />
<attr name="colorSecondary700" format="color" />
<attr name="colorSecondary800" format="color" />
<attr name="colorSecondary900" format="color" />
<attr name="colorTertiary25" format="color" />
<attr name="colorTertiary50" format="color" />
<attr name="colorTertiary100" format="color" />
<attr name="colorTertiary200" format="color" />
<attr name="colorTertiary300" format="color" />
<attr name="colorTertiary400" format="color" />
<attr name="colorTertiary500" format="color" />
<attr name="colorTertiary600" format="color" />
<attr name="colorTertiary700" format="color" />
<attr name="colorTertiary800" format="color" />
<attr name="colorTertiary900" format="color" />
<attr name="colorNeutral25" format="color" />
<attr name="colorNeutral50" format="color" />
<attr name="colorNeutral50t" format="color" />
<attr name="colorNeutral100" format="color" />
<attr name="colorNeutral200" format="color" />
<attr name="colorNeutral300" format="color" />
<attr name="colorNeutral400" format="color" />
<attr name="colorNeutral500" format="color" />
<attr name="colorNeutral600" format="color" />
<attr name="colorNeutral700" format="color" />
<attr name="colorNeutral800" format="color" />
<attr name="colorNeutral800t" format="color" />
<attr name="colorNeutral900" format="color" />
</resources>