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/ui/displayitems/FooterStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
#	metadata/de-DE/changelogs/83.txt
#	metadata/en-US/changelogs/83.txt
This commit is contained in:
LucasGGamerM
2023-04-12 13:04:31 -03:00
parent 2cea6a9df5 6ec43a6f86
commit 64e681c227
47 changed files with 898 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mastodon/src/main/res/values/dimens.xml
View File

@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="text_max_height">220dp</dimen>
<dimen name="text_collapsed_height">150dp</dimen>
<dimen name="text_collapsed_height">145dp</dimen>
<dimen name="layout_max_width">450dp</dimen>
</resources>

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

@@ -272,4 +272,5 @@
<string name="sk_reply_line_above_avatar">“In reply to” line above avatar</string>
<string name="sk_show_thread">Show thread</string>
<string name="sk_compact_reblog_reply_line">Compact reblog/reply line</string>
<string name="sk_settings_confirm_before_reblog">Confirm before reblogging</string>
</resources>