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/GlobalUserPreferences.java
#	mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetAccountByHandle.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BaseAccountListFragment.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/PaginatedAccountListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/model/Account.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/text/ClickableLinksDelegate.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
#	mastodon/src/main/res/layout/display_item_footer.xml
#	mastodon/src/main/res/values/dimens.xml
This commit is contained in:
LucasGGamerM
2023-06-09 18:09:23 -03:00
parent 161c19b628 35bf858a83
commit e2c62aa76b
81 changed files with 1549 additions and 819 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,6 +28,7 @@
<item name="android:colorBackground">?colorGray100</item>
<item name="android:textColorPrimary">?colorGray800</item>
<item name="android:textColorSecondary">?colorGray500</item>
<item name="colorIconDisabled">?colorGray300</item>
<item name="colorButtonText">?colorGray50</item>
<item name="colorSecondary">?colorGray200</item>
<item name="colorBackgroundLight">?colorGray50</item>
@@ -127,6 +128,7 @@
<item name="android:colorBackground">?colorGray700</item>
<item name="android:textColorPrimary">?colorGray50</item>
<item name="android:textColorSecondary">?colorGray400</item>
<item name="colorIconDisabled">?colorGray500</item>
<item name="colorButtonText">?colorGray800</item>
<item name="colorSecondary">?colorGray200</item>
<item name="colorBackgroundLight">?colorGray700</item>