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

chore(merge-upstream): use extended footer from upstream for now

Browse Source
This commit is contained in:
LucasGGamerM
2024-03-03 10:23:38 -03:00
parent cf31a1be57
commit e71232ad40
2 changed files with 297 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ExtendedFooterStatusDisplayItem.java
View File

@@ -66,8 +66,8 @@ public class ExtendedFooterStatusDisplayItem extends StatusDisplayItem{
public static class Holder extends StatusDisplayItem.Holder<ExtendedFooterStatusDisplayItem>{ public static class Holder extends StatusDisplayItem.Holder<ExtendedFooterStatusDisplayItem>{
private final TextView time, date, app, dateAppSeparator; private final TextView time, date, app, dateAppSeparator;
private final Button favorites, reblogs, editHistory, applicationName; private final TextView favorites, reblogs, editHistory;
private final ImageView visibility; // private final ImageView visibility;
private final Context context; private final Context context;
public Holder(Context context, ViewGroup parent){ public Holder(Context context, ViewGroup parent){
@@ -76,12 +76,10 @@ public class ExtendedFooterStatusDisplayItem extends StatusDisplayItem{
reblogs=findViewById(R.id.reblogs); reblogs=findViewById(R.id.reblogs);
favorites=findViewById(R.id.favorites); favorites=findViewById(R.id.favorites);
editHistory=findViewById(R.id.edit_history); editHistory=findViewById(R.id.edit_history);
applicationName=findViewById(R.id.application_name);
visibility=findViewById(R.id.visibility);
time=findViewById(R.id.time); time=findViewById(R.id.time);
// date=findViewById(R.id.date); date=findViewById(R.id.date);
// app=findViewById(R.id.app_name); app=findViewById(R.id.app_name);
// dateAppSeparator=findViewById(R.id.date_app_separator); dateAppSeparator=findViewById(R.id.date_app_separator);
reblogs.setOnClickListener(v->startAccountListFragment(StatusReblogsListFragment.class)); reblogs.setOnClickListener(v->startAccountListFragment(StatusReblogsListFragment.class));
favorites.setOnClickListener(v->startAccountListFragment(StatusFavoritesListFragment.class)); favorites.setOnClickListener(v->startAccountListFragment(StatusFavoritesListFragment.class));
@@ -94,39 +92,67 @@ public class ExtendedFooterStatusDisplayItem extends StatusDisplayItem{
@Override @Override
public void onBind(ExtendedFooterStatusDisplayItem item){ public void onBind(ExtendedFooterStatusDisplayItem item){
Status s=item.status; Status s=item.status;
favorites.setCompoundDrawablesRelativeWithIntrinsicBounds(GlobalUserPreferences.likeIcon ? R.drawable.ic_fluent_heart_20_regular : R.drawable.ic_fluent_star_20_regular, 0, 0, 0); favorites.setText(getFormattedPlural(R.plurals.x_favorites, item.status.favouritesCount));
favorites.setText(context.getResources().getQuantityString(R.plurals.x_favorites, (int)(s.favouritesCount%1000), s.favouritesCount)); reblogs.setText(getFormattedPlural(R.plurals.x_reblogs, item.status.reblogsCount));
reblogs.setText(context.getResources().getQuantityString(R.plurals.x_reblogs, (int) (s.reblogsCount % 1000), s.reblogsCount));
reblogs.setVisibility(s.visibility != StatusPrivacy.DIRECT ? View.VISIBLE : View.GONE);
if(s.editedAt!=null){ if(s.editedAt!=null){
editHistory.setVisibility(View.VISIBLE); editHistory.setVisibility(View.VISIBLE);
editHistory.setText(UiUtils.formatRelativeTimestampAsMinutesAgo(itemView.getContext(), s.editedAt, false)); ZonedDateTime dt=s.editedAt.atZone(ZoneId.systemDefault());
String time=TIME_FORMATTER.format(dt);
if(!dt.toLocalDate().equals(LocalDate.now())){
time+=" · "+DATE_FORMATTER.format(dt);
}
editHistory.setText(getFormattedSubstitutedString(R.string.last_edit_at_x, time));
}else{ }else{
editHistory.setVisibility(View.GONE); editHistory.setVisibility(View.GONE);
} }
String timeStr=item.status.createdAt != null ? TIME_FORMATTER.format(item.status.createdAt.atZone(ZoneId.systemDefault())) : null; ZonedDateTime dt=item.status.createdAt.atZone(ZoneId.systemDefault());
time.setText(TIME_FORMATTER.format(dt));
date.setText(DATE_FORMATTER.format(dt));
if(item.status.application!=null && !TextUtils.isEmpty(item.status.application.name)){ if(item.status.application!=null && !TextUtils.isEmpty(item.status.application.name)){
time.setText(timeStr != null ? item.parentFragment.getString(R.string., timeStr, "") : ""); app.setVisibility(View.VISIBLE);
applicationName.setText(item.status.application.name); dateAppSeparator.setVisibility(View.VISIBLE);
if (item.status.application.website != null && item.status.application.website.toLowerCase().startsWith("https://")) { app.setText(item.status.application.name);
applicationName.setOnClickListener(e -> UiUtils.openURL(context, null, item.status.application.website)); app.setEnabled(!TextUtils.isEmpty(item.status.application.website));
}else{ }else{
applicationName.setEnabled(false); app.setVisibility(View.GONE);
} dateAppSeparator.setVisibility(View.GONE);
} else {
time.setText(timeStr);
applicationName.setVisibility(View.GONE);
} }
visibility.setImageResource(switch (s.visibility) { //This is the old implementation. TODO: I gotta readd the things missing
case PUBLIC -> R.drawable.ic_fluent_earth_20_regular; // Status s=item.status;
case UNLISTED -> R.drawable.ic_fluent_lock_open_20_regular; // favorites.setCompoundDrawablesRelativeWithIntrinsicBounds(GlobalUserPreferences.likeIcon ? R.drawable.ic_fluent_heart_20_regular : R.drawable.ic_fluent_star_20_regular, 0, 0, 0);
case PRIVATE -> R.drawable.ic_fluent_lock_closed_20_filled; // favorites.setText(context.getResources().getQuantityString(R.plurals.x_favorites, (int)(s.favouritesCount%1000), s.favouritesCount));
case DIRECT -> R.drawable.ic_fluent_mention_20_regular; // reblogs.setText(context.getResources().getQuantityString(R.plurals.x_reblogs, (int) (s.reblogsCount % 1000), s.reblogsCount));
case LOCAL -> R.drawable.ic_fluent_eye_20_regular; // reblogs.setVisibility(s.visibility != StatusPrivacy.DIRECT ? View.VISIBLE : View.GONE);
}); //
// if(s.editedAt!=null){
// editHistory.setVisibility(View.VISIBLE);
// editHistory.setText(UiUtils.formatRelativeTimestampAsMinutesAgo(itemView.getContext(), s.editedAt, false));
// }else{
// editHistory.setVisibility(View.GONE);
// }
// String timeStr=item.status.createdAt != null ? TIME_FORMATTER.format(item.status.createdAt.atZone(ZoneId.systemDefault())) : null;
//
// if (item.status.application!=null && !TextUtils.isEmpty(item.status.application.name)) {
// time.setText(timeStr != null ? item.parentFragment.getString(R.string., timeStr, "") : "");
// applicationName.setText(item.status.application.name);
// if (item.status.application.website != null && item.status.application.website.toLowerCase().startsWith("https://")) {
// applicationName.setOnClickListener(e -> UiUtils.openURL(context, null, item.status.application.website));
// } else {
// applicationName.setEnabled(false);
// }
// } else {
// time.setText(timeStr);
// applicationName.setVisibility(View.GONE);
// }
//
// visibility.setImageResource(switch (s.visibility) {
// case PUBLIC -> R.drawable.ic_fluent_earth_20_regular;
// case UNLISTED -> R.drawable.ic_fluent_lock_open_20_regular;
// case PRIVATE -> R.drawable.ic_fluent_lock_closed_20_filled;
// case DIRECT -> R.drawable.ic_fluent_mention_20_regular;
// case LOCAL -> R.drawable.ic_fluent_eye_20_regular;
// });
} }
@Override @Override

336
mastodon/src/main/res/layout/display_item_extended_footer.xml
View File

@@ -2,116 +2,254 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical" android:orientation="vertical"
android:padding="8dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/bg_m3_surface3"> android:paddingBottom="8dp"
android:divider="@drawable/divider_inset_16dp"
android:showDividers="middle">
<org.joinmastodon.android.ui.views.AutoOrientationLinearLayout <org.joinmastodon.android.ui.views.WrappingLinearLayout
android:id="@+id/button_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<Button
android:id="@+id/reblogs"
style="@style/Widget.Mastodon.M3.Button.Text.Icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingStart="8dp"
android:paddingEnd="12dp"
android:minHeight="48dp"
android:textColor="?colorM3OnSurfaceVariant"
android:fontFamily="sans-serif"
android:drawableStart="@drawable/ic_fluent_arrow_repeat_all_20_regular"
android:drawablePadding="8dp"
android:drawableTint="?colorM3OnSurfaceVariant"
tools:text="4 reblogs"/>
<Button
android:id="@+id/favorites"
style="@style/Widget.Mastodon.M3.Button.Text.Icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingStart="8dp"
android:paddingEnd="12dp"
android:minHeight="48dp"
android:textColor="?colorM3OnSurfaceVariant"
android:fontFamily="sans-serif"
android:drawableStart="@drawable/ic_fluent_star_20_regular"
android:drawablePadding="8dp"
android:drawableTint="?colorM3OnSurfaceVariant"
tools:text="12 favorites"/>
</LinearLayout>
<Button
android:id="@+id/edit_history"
style="@style/Widget.Mastodon.M3.Button.Text.Icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingStart="8dp"
android:paddingEnd="12dp"
android:minHeight="48dp"
android:textColor="?colorM3OnSurfaceVariant"
android:fontFamily="sans-serif"
android:drawableStart="@drawable/ic_fluent_history_20_regular"
android:drawablePadding="8dp"
android:drawableTint="?colorM3OnSurfaceVariant"
tools:text="Dec 12, 2021, 12:42 PM"/>
</org.joinmastodon.android.ui.views.AutoOrientationLinearLayout>
<LinearLayout
android:orientation="horizontal"
android:gravity="start|center"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="8dp" android:paddingHorizontal="16dp"
android:minHeight="48dp"> android:paddingVertical="8dp"
android:horizontalGap="8dp"
<ImageView android:verticalGap="8dp"
android:id="@+id/visibility" android:clipToPadding="false">
android:layout_height="20dp"
android:layout_width="20dp"
android:src="@drawable/ic_fluent_earth_20_regular"
android:tint="?colorM3OnSurfaceVariant" />
<TextView <TextView
android:id="@+id/timestamp" android:id="@+id/time"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp" android:textAppearance="@style/m3_label_large"
android:minHeight="20dp" android:textColor="?colorM3Secondary"
android:gravity="center_vertical" android:background="@drawable/bg_button_borderless_rounded"
android:textSize="14sp" android:backgroundTint="?colorM3Secondary"
android:textColor="?android:textColorSecondary"
tools:text="Dec 12, 2021, 12:42 PM via "/>
<Button
android:id="@+id/application_name"
style="@style/Widget.Mastodon.M3.Button.Text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_marginStart="-12dp"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:padding="0dp"
android:minWidth="0dp"
android:minHeight="48dp"
android:textColor="?colorM3OnSurfaceVariant"
android:fontFamily="sans-serif"
android:singleLine="true" android:singleLine="true"
android:ellipsize="end" android:ellipsize="end"
tools:text="Megalodon"/> android:paddingVertical="4dp"
android:paddingHorizontal="8dp"
android:layout_marginVertical="-4dp"
android:layout_marginHorizontal="-8dp"
tools:text="8:24 AM"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/m3_label_large"
android:textColor="?colorM3Secondary"
android:importantForAccessibility="no"
android:text="·"/>
<TextView
android:id="@+id/date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/m3_label_large"
android:textColor="?colorM3Secondary"
android:singleLine="true"
android:ellipsize="end"
tools:text="2023-11-08"/>
<TextView
android:id="@+id/date_app_separator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/m3_label_large"
android:textColor="?colorM3Secondary"
android:importantForAccessibility="no"
android:text="·"/>
<TextView
android:id="@+id/app_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/m3_label_large"
android:textColor="?colorM3Secondary"
android:singleLine="true"
android:ellipsize="end"
android:paddingVertical="4dp"
android:paddingHorizontal="8dp"
android:layout_marginVertical="-4dp"
android:layout_marginHorizontal="-8dp"
android:background="@drawable/bg_button_borderless_rounded"
android:backgroundTint="?colorM3Secondary"
tools:text="Mastodon for Android dfjklafjdsalkfjdslakfjdsaklfjdslak"/>
</org.joinmastodon.android.ui.views.WrappingLinearLayout>
<TextView
android:id="@+id/edit_history"
android:layout_width="match_parent"
android:layout_height="36dp"
android:paddingStart="16dp"
android:paddingEnd="24dp"
android:background="?android:selectableItemBackground"
android:textAppearance="@style/m3_label_large"
android:textColor="?colorM3Secondary"
android:gravity="center_vertical"
tools:text="Last edit bla bla"/>
<org.joinmastodon.android.ui.views.WrappingLinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="16dp"
android:paddingVertical="8dp"
android:horizontalGap="8dp"
android:verticalGap="8dp"
android:clipToPadding="false">
<TextView
android:id="@+id/reblogs"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/m3_label_large"
android:textColor="?colorM3Secondary"
android:background="@drawable/bg_button_borderless_rounded"
android:backgroundTint="?colorM3Secondary"
android:singleLine="true"
android:ellipsize="end"
android:paddingVertical="4dp"
android:paddingHorizontal="8dp"
android:layout_marginVertical="-4dp"
android:layout_marginHorizontal="-8dp"
tools:text="123 boosts"/>
<TextView
android:id="@+id/favorites"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/m3_label_large"
android:textColor="?colorM3Secondary"
android:background="@drawable/bg_button_borderless_rounded"
android:backgroundTint="?colorM3Secondary"
android:singleLine="true"
android:ellipsize="end"
android:paddingVertical="4dp"
android:paddingHorizontal="8dp"
android:layout_marginVertical="-4dp"
android:layout_marginHorizontal="-8dp"
tools:text="123 favorites"/>
</org.joinmastodon.android.ui.views.WrappingLinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> <!--TODO: merge things here too-->
<!--<?xml version="1.0" encoding="utf-8"?>-->
<!--<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"-->
<!-- xmlns:tools="http://schemas.android.com/tools"-->
<!-- android:orientation="vertical"-->
<!-- android:padding="8dp"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:background="@drawable/bg_m3_surface3">-->
<!-- <org.joinmastodon.android.ui.views.AutoOrientationLinearLayout-->
<!-- android:id="@+id/button_bar"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content">-->
<!-- <LinearLayout-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content">-->
<!-- <Button-->
<!-- android:id="@+id/reblogs"-->
<!-- style="@style/Widget.Mastodon.M3.Button.Text.Icon"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:gravity="center"-->
<!-- android:paddingStart="8dp"-->
<!-- android:paddingEnd="12dp"-->
<!-- android:minHeight="48dp"-->
<!-- android:textColor="?colorM3OnSurfaceVariant"-->
<!-- android:fontFamily="sans-serif"-->
<!-- android:drawableStart="@drawable/ic_fluent_arrow_repeat_all_20_regular"-->
<!-- android:drawablePadding="8dp"-->
<!-- android:drawableTint="?colorM3OnSurfaceVariant"-->
<!-- tools:text="4 reblogs"/>-->
<!-- <Button-->
<!-- android:id="@+id/favorites"-->
<!-- style="@style/Widget.Mastodon.M3.Button.Text.Icon"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:gravity="center"-->
<!-- android:paddingStart="8dp"-->
<!-- android:paddingEnd="12dp"-->
<!-- android:minHeight="48dp"-->
<!-- android:textColor="?colorM3OnSurfaceVariant"-->
<!-- android:fontFamily="sans-serif"-->
<!-- android:drawableStart="@drawable/ic_fluent_star_20_regular"-->
<!-- android:drawablePadding="8dp"-->
<!-- android:drawableTint="?colorM3OnSurfaceVariant"-->
<!-- tools:text="12 favorites"/>-->
<!-- </LinearLayout>-->
<!-- <Button-->
<!-- android:id="@+id/edit_history"-->
<!-- style="@style/Widget.Mastodon.M3.Button.Text.Icon"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:gravity="center"-->
<!-- android:paddingStart="8dp"-->
<!-- android:paddingEnd="12dp"-->
<!-- android:minHeight="48dp"-->
<!-- android:textColor="?colorM3OnSurfaceVariant"-->
<!-- android:fontFamily="sans-serif"-->
<!-- android:drawableStart="@drawable/ic_fluent_history_20_regular"-->
<!-- android:drawablePadding="8dp"-->
<!-- android:drawableTint="?colorM3OnSurfaceVariant"-->
<!-- tools:text="Dec 12, 2021, 12:42 PM"/>-->
<!-- </org.joinmastodon.android.ui.views.AutoOrientationLinearLayout>-->
<!-- <LinearLayout-->
<!-- android:orientation="horizontal"-->
<!-- android:gravity="start|center"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginHorizontal="8dp"-->
<!-- android:minHeight="48dp">-->
<!-- <ImageView-->
<!-- android:id="@+id/visibility"-->
<!-- android:layout_height="20dp"-->
<!-- android:layout_width="20dp"-->
<!-- android:src="@drawable/ic_fluent_earth_20_regular"-->
<!-- android:tint="?colorM3OnSurfaceVariant" />-->
<!-- <TextView-->
<!-- android:id="@+id/timestamp"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginLeft="8dp"-->
<!-- android:minHeight="20dp"-->
<!-- android:gravity="center_vertical"-->
<!-- android:textSize="14sp"-->
<!-- android:textColor="?android:textColorSecondary"-->
<!-- tools:text="Dec 12, 2021, 12:42 PM via "/>-->
<!-- <Button-->
<!-- android:id="@+id/application_name"-->
<!-- style="@style/Widget.Mastodon.M3.Button.Text"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:gravity="center"-->
<!-- android:layout_marginStart="-12dp"-->
<!-- android:paddingStart="12dp"-->
<!-- android:paddingEnd="12dp"-->
<!-- android:padding="0dp"-->
<!-- android:minWidth="0dp"-->
<!-- android:minHeight="48dp"-->
<!-- android:textColor="?colorM3OnSurfaceVariant"-->
<!-- android:fontFamily="sans-serif"-->
<!-- android:singleLine="true"-->
<!-- android:ellipsize="end"-->
<!-- tools:text="Megalodon"/>-->
<!-- </LinearLayout>-->
<!--</LinearLayout>-->