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

Merge branch 'master' into m3_redesign

This commit is contained in:
Grishka 2023-04-07 23:16:53 +03:00
parent 849888d128 924ea2d03a
commit 42a7c324fa
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
View File

@ -1059,7 +1059,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
if(att.isUploadingOrProcessing()) if(att.isUploadingOrProcessing())
att.cancelUpload(); att.cancelUpload();
attachments.remove(att); attachments.remove(att);
uploadNextQueuedAttachment(); if(!areThereAnyUploadingAttachments())
uploadNextQueuedAttachment();
attachmentsView.removeView(att.view); attachmentsView.removeView(att.view);
if(getMediaAttachmentsCount()==0) if(getMediaAttachmentsCount()==0)
attachmentsView.setVisibility(View.GONE); attachmentsView.setVisibility(View.GONE);

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

@ -335,6 +335,13 @@
<item name="android:paddingRight">24dp</item> <item name="android:paddingRight">24dp</item>
</style> </style>
<style name="Widget.Mastodon.M3.Button.Outlined">
<item name="android:background">@drawable/bg_button_m3_outlined</item>
<item name="android:textColor">@color/button_text_m3_text</item>
<item name="android:paddingLeft">24dp</item>
<item name="android:paddingRight">24dp</item>
</style>
<style name="Widget.Mastodon.M3.EditText" parent="android:Widget.Material.EditText"> <style name="Widget.Mastodon.M3.EditText" parent="android:Widget.Material.EditText">
<item name="android:background">@drawable/bg_m3_outlined_text_field_nopad</item> <item name="android:background">@drawable/bg_m3_outlined_text_field_nopad</item>
<item name="android:textAppearance">@style/m3_body_large</item> <item name="android:textAppearance">@style/m3_body_large</item>