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

chore(merge-upstream): still 21 things to do

Browse Source
This commit is contained in:
LucasGGamerM
2024-02-18 14:19:05 -03:00
parent 76867a971b
commit 64e82bdeed
4 changed files with 34 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/PhotoViewerInfoSheet.java
View File

@@ -147,7 +147,7 @@ public class PhotoViewerInfoSheet extends BottomSheet{
statusID=status.id;
boostBtn.setCompoundDrawablesWithIntrinsicBounds(0, switch(status.visibility){
case DIRECT -> R.drawable.ic_boost_disabled_24px;
case PUBLIC, UNLISTED -> R.drawable.ic_boost;
case PUBLIC, UNLISTED, LOCAL -> R.drawable.ic_boost;
case PRIVATE -> R.drawable.ic_boost_private;
}, 0, 0);
boostBtn.setEnabled(status.visibility!=StatusPrivacy.DIRECT);

4
mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposeLanguageAlertViewController.java
View File

@@ -115,8 +115,8 @@ public class ComposeLanguageAlertViewController{
int i=0;
boolean found=false;
for(SpecialLocaleInfo li:specialLocales){
if(null!=li.locale&&li.locale.equals(previouslySelected.locale)){
selectedLocale=li.locale;
if(null!=li.language&&li.language.equals(previouslySelected.language)){
selectedLocale=li.language;
selectedIndex=i;
found=true;
break;