Mastodon
/
mastodon-app-ufficiale-android
mirror of https://github.com/mastodon/mastodon-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Media attachments minor fixes

This commit is contained in:
Grishka 2023-03-23 22:36:52 +03:00
parent c833c03dc3
commit 4492e940e5
3 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mastodon/src/main/java/org/joinmastodon/android/AudioPlayerService.java
View File

@ -230,7 +230,7 @@ public class AudioPlayerService extends Service{
pause(false); pause(false);
} }
case AudioManager.AUDIOFOCUS_LOSS_TRANSIENT -> { case AudioManager.AUDIOFOCUS_LOSS_TRANSIENT -> {
resumeAfterAudioFocusGain=true; resumeAfterAudioFocusGain=isPlaying();
pause(false); pause(false);
} }
case AudioManager.AUDIOFOCUS_GAIN -> { case AudioManager.AUDIOFOCUS_GAIN -> {

27
mastodon/src/main/java/org/joinmastodon/android/ui/PhotoLayoutHelper.java
View File

@ -12,7 +12,8 @@ import androidx.annotation.NonNull;
public class PhotoLayoutHelper{ public class PhotoLayoutHelper{
public static final int MAX_WIDTH=1000; public static final int MAX_WIDTH=1000;
public static final int MAX_HEIGHT=1910; public static final int MAX_HEIGHT=1777; // 9:16
public static final int MIN_HEIGHT=563;
@NonNull @NonNull
public static TiledLayoutResult processThumbs(List<Attachment> thumbs){ public static TiledLayoutResult processThumbs(List<Attachment> thumbs){
@ -25,12 +26,13 @@ public class PhotoLayoutHelper{
result.rowSizes=result.columnSizes=new int[]{1}; result.rowSizes=result.columnSizes=new int[]{1};
if(att.getWidth()>att.getHeight()){ if(att.getWidth()>att.getHeight()){
result.width=_maxW; result.width=_maxW;
result.height=Math.round(att.getHeight()/(float)att.getWidth()*_maxW); result.height=Math.max(MIN_HEIGHT, Math.round(att.getHeight()/(float)att.getWidth()*_maxW));
}else{ }else{
result.height=_maxH; result.height=_maxH;
result.width=Math.round(att.getWidth()/(float)att.getHeight()*_maxH); result.width=Math.round(att.getWidth()/(float)att.getHeight()*_maxH);
} }
result.tiles=new TiledLayoutResult.Tile[]{new TiledLayoutResult.Tile(1, 1, result.width, result.height, 0, 0)}; result.tiles=new TiledLayoutResult.Tile[]{new TiledLayoutResult.Tile(1, 1, result.width, result.height, 0, 0)};
return result;
}else if(thumbs.size()==0){ }else if(thumbs.size()==0){
throw new IllegalArgumentException("Empty thumbs array"); throw new IllegalArgumentException("Empty thumbs array");
} }
@ -41,7 +43,6 @@ public class PhotoLayoutHelper{
for(Attachment thumb : thumbs){ for(Attachment thumb : thumbs){
// float ratio=thumb.isSizeKnown() ? thumb.getWidth()/(float) thumb.getHeight() : 1f;
float ratio=thumb.getWidth()/(float) thumb.getHeight(); float ratio=thumb.getWidth()/(float) thumb.getHeight();
char orient=ratio>1.2 ? 'w' : (ratio<0.8 ? 'n' : 'q'); char orient=ratio>1.2 ? 'w' : (ratio<0.8 ? 'n' : 'q');
orients+=orient; orients+=orient;
@ -58,7 +59,7 @@ public class PhotoLayoutHelper{
if(cnt==2){ if(cnt==2){
if(orients.equals("ww") && avgRatio>1.4*maxRatio && (ratios.get(1)-ratios.get(0))<0.2){ // two wide photos, one above the other if(orients.equals("ww") && avgRatio>1.4*maxRatio && (ratios.get(1)-ratios.get(0))<0.2){ // two wide photos, one above the other
float h=Math.min(maxW/ratios.get(0), Math.min(maxW/ratios.get(1), (maxH-marginH)/2.0f)); float h=Math.max(Math.min(maxW/ratios.get(0), Math.min(maxW/ratios.get(1), (maxH-marginH)/2.0f)), MIN_HEIGHT/2f);
result.width=Math.round(maxW); result.width=Math.round(maxW);
result.height=Math.round(h*2+marginH); result.height=Math.round(h*2+marginH);
@ -70,7 +71,7 @@ public class PhotoLayoutHelper{
}; };
}else if(orients.equals("ww") || orients.equals("qq")){ // next to each other, same ratio }else if(orients.equals("ww") || orients.equals("qq")){ // next to each other, same ratio
float w=((maxW-marginW)/2); float w=((maxW-marginW)/2);
float h=Math.min(w/ratios.get(0), Math.min(w/ratios.get(1), maxH)); float h=Math.max(Math.min(w/ratios.get(0), Math.min(w/ratios.get(1), maxH)), MIN_HEIGHT);
result.width=Math.round(maxW); result.width=Math.round(maxW);
result.height=Math.round(h); result.height=Math.round(h);
@ -83,7 +84,7 @@ public class PhotoLayoutHelper{
}else{ // next to each other, different ratios }else{ // next to each other, different ratios
float w0=((maxW-marginW)/ratios.get(1)/(1/ratios.get(0)+1/ratios.get(1))); float w0=((maxW-marginW)/ratios.get(1)/(1/ratios.get(0)+1/ratios.get(1)));
float w1=(maxW-w0-marginW); float w1=(maxW-w0-marginW);
float h=Math.min(maxH, Math.min(w0/ratios.get(0), w1/ratios.get(1))); float h=Math.max(Math.min(maxH, Math.min(w0/ratios.get(0), w1/ratios.get(1))), MIN_HEIGHT);
result.columnSizes=new int[]{Math.round(w0), Math.round(w1)}; result.columnSizes=new int[]{Math.round(w0), Math.round(w1)};
result.rowSizes=new int[]{Math.round(h)}; result.rowSizes=new int[]{Math.round(h)};
@ -95,10 +96,15 @@ public class PhotoLayoutHelper{
}; };
} }
}else if(cnt==3){ }else if(cnt==3){
if(/*(ratios.get(0) > 1.2 * maxRatio || avgRatio > 1.5 * maxRatio) &&*/ orients.equals("www") || true){ // 2nd and 3rd photos are on the next line if((ratios.get(0) > 1.2 * maxRatio || avgRatio > 1.5 * maxRatio) || orients.equals("www")){ // 2nd and 3rd photos are on the next line
float hCover=Math.min(maxW/ratios.get(0), (maxH-marginH)*0.66f); float hCover=Math.min(maxW/ratios.get(0), (maxH-marginH)*0.66f);
float w2=((maxW-marginW)/2); float w2=((maxW-marginW)/2);
float h=Math.min(maxH-hCover-marginH, Math.min(w2/ratios.get(1), w2/ratios.get(2))); float h=Math.min(maxH-hCover-marginH, Math.min(w2/ratios.get(1), w2/ratios.get(2)));
if(hCover+h<MIN_HEIGHT){
float prevTotalHeight=hCover+h;
hCover=MIN_HEIGHT*(hCover/prevTotalHeight);
h=MIN_HEIGHT*(h/prevTotalHeight);
}
result.width=Math.round(maxW); result.width=Math.round(maxW);
result.height=Math.round(hCover+h+marginH); result.height=Math.round(hCover+h+marginH);
result.columnSizes=new int[]{Math.round(w2), _maxW-Math.round(w2)}; result.columnSizes=new int[]{Math.round(w2), _maxW-Math.round(w2)};
@ -124,13 +130,18 @@ public class PhotoLayoutHelper{
}; };
} }
}else if(cnt==4){ }else if(cnt==4){
if(/*(ratios.get(0) > 1.2 * maxRatio || avgRatio > 1.5 * maxRatio) &&*/ orients.equals("wwww") || true /* temporary fix */){ // 2nd, 3rd and 4th photos are on the next line if((ratios.get(0) > 1.2 * maxRatio || avgRatio > 1.5 * maxRatio) || orients.equals("wwww")){ // 2nd, 3rd and 4th photos are on the next line
float hCover=Math.min(maxW/ratios.get(0), (maxH-marginH)*0.66f); float hCover=Math.min(maxW/ratios.get(0), (maxH-marginH)*0.66f);
float h=(maxW-2*marginW)/(ratios.get(1)+ratios.get(2)+ratios.get(3)); float h=(maxW-2*marginW)/(ratios.get(1)+ratios.get(2)+ratios.get(3));
float w0=h*ratios.get(1); float w0=h*ratios.get(1);
float w1=h*ratios.get(2); float w1=h*ratios.get(2);
float w2=h*ratios.get(3); float w2=h*ratios.get(3);
h=Math.min(maxH-hCover-marginH, h); h=Math.min(maxH-hCover-marginH, h);
if(hCover+h<MIN_HEIGHT){
float prevTotalHeight=hCover+h;
hCover=MIN_HEIGHT*(hCover/prevTotalHeight);
h=MIN_HEIGHT*(h/prevTotalHeight);
}
result.width=Math.round(maxW); result.width=Math.round(maxW);
result.height=Math.round(hCover+h+marginH); result.height=Math.round(hCover+h+marginH);
result.columnSizes=new int[]{Math.round(w0), Math.round(w1), _maxW-Math.round(w0)-Math.round(w1)}; result.columnSizes=new int[]{Math.round(w0), Math.round(w1), _maxW-Math.round(w0)-Math.round(w1)};

4
mastodon/src/main/res/layout/display_item_audio.xml
View File

@ -13,13 +13,13 @@
<TextView <TextView
android:id="@+id/time" android:id="@+id/time"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="20dp" android:layout_height="20dp"
android:layout_margin="8dp" android:layout_margin="8dp"
android:layout_gravity="bottom|start" android:layout_gravity="bottom|start"
android:textAppearance="@style/m3_label_large" android:textAppearance="@style/m3_label_large"
android:textColor="?colorButtonText" android:textColor="?colorButtonText"
android:gravity="center_vertical" android:gravity="center_vertical|start"
android:singleLine="true" android:singleLine="true"
android:fontFeatureSettings="'tnum'" android:fontFeatureSettings="'tnum'"
tools:text="1:23"/> tools:text="1:23"/>