91 changelog

Currently translated at 100.0% (23 of 23 strings)

Translation: Moshidon/values
Translate-URL: https://translate.codeberg.org/projects/moshidon/values/pt_BR/
(cherry picked from commit 43c82ed99b)

mastodon/build.gradle

@@ -9,8 +9,8 @@ android {
 		applicationId "org.joinmastodon.android.moshinda"
 		minSdk 23
 		targetSdk 33
-		versionCode 90
+		versionCode 91
-		versionName "1.1.4+fork.90.moshinda"
+		versionName "1.1.4+fork.91.moshinda"
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 		resConfigs "ar-rSA", "be-rBY", "bn-rBD", "bs-rBA", "ca-rES", "cs-rCZ", "de-rDE", "el-rGR", "es-rES", "eu-rES", "fi-rFI", "fil-rPH", "fr-rFR", "ga-rIE", "gd-rGB", "gl-rES", "hi-rIN", "hr-rHR", "hu-rHU", "hy-rAM", "in-rID", "is-rIS", "it-rIT", "iw-rIL", "ja-rJP", "kab", "ko-rKR", "nl-rNL", "oc-rFR", "pl-rPL", "pt-rBR", "pt-rPT", "ro-rRO", "ru-rRU", "si-rLK", "sl-rSI", "sv-rSE", "th-rTH", "tr-rTR", "uk-rUA", "vi-rVN", "zh-rCN", "zh-rTW"
 	}

mastodon/src/github/java/org/joinmastodon/android/updater/GithubSelfUpdaterImpl.java

@@ -115,7 +115,7 @@ public class GithubSelfUpdaterImpl extends GithubSelfUpdater{
 
 	private void actuallyCheckForUpdates(){
 		Request req=new Request.Builder()
-				.url("https://api.github.com/repos/LucasGGamerM/moshidon/releases/latest")
+				.url("https://api.github.com/repos/LucasGGamerM/moshidon/releases")
 				.build();
 		Call call=MastodonAPIController.getHttpClient().newCall(req);
 		try(Response resp=call.execute()){

mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java

@@ -41,7 +41,6 @@ public class GlobalUserPreferences{
 	public static boolean disableAltTextReminder;
 	public static boolean showAltIndicator;
 	public static boolean showNoAltIndicator;
-	public static boolean enablePreReleases;
 	public static String publishButtonText;
 	public static ThemePreference theme;
 	public static ColorPreference color;
@@ -55,8 +54,9 @@ public class GlobalUserPreferences{
 
 	private final static Type recentEmojisType = new TypeToken<Map<String, Integer>>() {}.getType();
 	public static Map<String, Integer> recentEmojis;
+    public static boolean enablePreReleases;
 
-	private static SharedPreferences getPrefs(){
+    private static SharedPreferences getPrefs(){
 		return MastodonApp.context.getSharedPreferences("global", Context.MODE_PRIVATE);
 	}
 
@@ -88,9 +88,9 @@ public class GlobalUserPreferences{
 		keepOnlyLatestNotification=prefs.getBoolean("keepOnlyLatestNotification", false);
 		enableFabAutoHide=prefs.getBoolean("enableFabAutoHide", true);
 		disableAltTextReminder=prefs.getBoolean("disableAltTextReminder", false);
-		showAltIndicator=prefs.getBoolean("showAltIndicator", true);
+		showAltIndicator =prefs.getBoolean("showAltIndicator", true);
-		showNoAltIndicator=prefs.getBoolean("showNoAltIndicator", true);
+		showNoAltIndicator =prefs.getBoolean("showNoAltIndicator", true);
-		enablePreReleases=prefs.getBoolean("enablePreReleases", false);
+		enablePreReleases =prefs.getBoolean("enablePreReleases", false);
 		publishButtonText=prefs.getString("publishButtonText", "");
 		theme=ThemePreference.values()[prefs.getInt("theme", 0)];
 		recentLanguages=fromJson(prefs.getString("recentLanguages", "{}"), recentLanguagesType, new HashMap<>());

mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java

@@ -514,26 +514,6 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 		updateImagesSpoilerState(status, itemID);
 	}
 
-//	public void onRevealFilteredClick(TextStatusDisplayItem.Holder holder){
-//		Status status=holder.getItem().status;
-//		revealFiltered(status, holder.getItemID());
-//	}
-
-	public void onRevealFilteredClick(WarningFilteredStatusDisplayItem.Holder holder){
-		Status status=holder.getItem().status;
-//		revealFiltered(status, holder.getItemID());
-	}
-
-	protected void revealFiltered(Status status, ArrayList<StatusDisplayItem> showedItems){
-		status.filterRevealed=true;
-
-	}
-
-//	public void notifyItemsChanged(int adapterPosition){
-//		adapter.notifyItemChanged(adapterPosition);
-//	}
-
-
 	public void onVisibilityIconClick(HeaderStatusDisplayItem.Holder holder){
 		Status status=holder.getItem().status;
 		status.spoilerRevealed=!status.spoilerRevealed;
@@ -566,11 +546,11 @@ public abstract class BaseStatusListFragment<T extends DisplayItemsParent> exten
 
 	public void onWarningClick(WarningFilteredStatusDisplayItem.Holder warningItem){
 		int i = warningItem.getAbsoluteAdapterPosition();
-		displayItems.remove(warningItem.getAbsoluteAdapterPosition());
 		for(StatusDisplayItem item:warningItem.filteredItems){
-			displayItems.add(i, item);
 			i++;
+			displayItems.add(i, item);
 		}
+		displayItems.remove(warningItem.getAbsoluteAdapterPosition());
 		adapter.notifyItemChanged(warningItem.getAbsoluteAdapterPosition());
 	}
 

mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java

@@ -14,6 +14,7 @@ import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.PollUpdatedEvent;
 import org.joinmastodon.android.events.RemoveAccountPostsEvent;
 import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.Notification;
 import org.joinmastodon.android.model.PaginatedResponse;
 import org.joinmastodon.android.model.Status;
@@ -91,7 +92,7 @@ public class NotificationsListFragment extends BaseStatusListFragment<Notificati
 		};
 		HeaderStatusDisplayItem titleItem=extraText!=null ? new HeaderStatusDisplayItem(n.id, n.account, n.createdAt, this, accountID, n.status, extraText, n, null) : null;
 		if(n.status!=null){
-			ArrayList<StatusDisplayItem> items=StatusDisplayItem.buildItems(this, n.status, accountID, n, knownAccounts, titleItem!=null, titleItem==null, n);
+			ArrayList<StatusDisplayItem> items=StatusDisplayItem.buildItems(this, n.status, accountID, n, knownAccounts, titleItem!=null, titleItem==null, n, Filter.FilterContext.NOTIFICATIONS);
 			if(titleItem!=null){
 				for(StatusDisplayItem item:items){
 					if(item instanceof ImageStatusDisplayItem imgItem){

mastodon/src/main/java/org/joinmastodon/android/fragments/ScheduledStatusListFragment.java

@@ -13,6 +13,7 @@ import org.joinmastodon.android.api.requests.statuses.CreateStatus;
 import org.joinmastodon.android.api.requests.statuses.GetScheduledStatuses;
 import org.joinmastodon.android.events.ScheduledStatusCreatedEvent;
 import org.joinmastodon.android.events.ScheduledStatusDeletedEvent;
+import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.HeaderPaginationList;
 import org.joinmastodon.android.model.ScheduledStatus;
 import org.joinmastodon.android.model.Status;
@@ -69,7 +70,7 @@ public class ScheduledStatusListFragment extends BaseStatusListFragment<Schedule
 
 	@Override
 	protected List<StatusDisplayItem> buildDisplayItems(ScheduledStatus s) {
-		return StatusDisplayItem.buildItems(this, s.toStatus(), accountID, s, knownAccounts, false, false, null, true);
+		return StatusDisplayItem.buildItems(this, s.toStatus(), accountID, s, knownAccounts, false, false, null, true, Filter.FilterContext.HOME);
 	}
 
 	@Override

mastodon/src/main/java/org/joinmastodon/android/fragments/StatusEditHistoryFragment.java

@@ -6,6 +6,7 @@ import android.view.View;
 
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.statuses.GetStatusEditHistory;
+import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.displayitems.ReblogOrReplyLineStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
@@ -55,7 +56,7 @@ public class StatusEditHistoryFragment extends StatusListFragment{
 
 	@Override
 	protected List<StatusDisplayItem> buildDisplayItems(Status s){
-		List<StatusDisplayItem> items=StatusDisplayItem.buildItems(this, s, accountID, s, knownAccounts, true, false, null);
+		List<StatusDisplayItem> items=StatusDisplayItem.buildItems(this, s, accountID, s, knownAccounts, true, false, null, Filter.FilterContext.HOME);
 		int idx=data.indexOf(s);
 		if(idx>=0){
 			String date=UiUtils.DATE_TIME_FORMATTER.format(s.createdAt.atZone(ZoneId.systemDefault()));

mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java

@@ -12,6 +12,7 @@ import org.joinmastodon.android.events.StatusCountersUpdatedEvent;
 import org.joinmastodon.android.events.StatusCreatedEvent;
 import org.joinmastodon.android.events.StatusDeletedEvent;
 import org.joinmastodon.android.events.StatusUpdatedEvent;
+import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.displayitems.ExtendedFooterStatusDisplayItem;
 import org.joinmastodon.android.ui.displayitems.FooterStatusDisplayItem;
@@ -30,7 +31,7 @@ public abstract class StatusListFragment extends BaseStatusListFragment<Status>{
 	protected EventListener eventListener=new EventListener();
 
 	protected List<StatusDisplayItem> buildDisplayItems(Status s){
-		return StatusDisplayItem.buildItems(this, s, accountID, s, knownAccounts, false, true, null);
+		return StatusDisplayItem.buildItems(this, s, accountID, s, knownAccounts, false, true, null, Filter.FilterContext.HOME);
 	}
 
 	@Override
@@ -56,6 +57,7 @@ public abstract class StatusListFragment extends BaseStatusListFragment<Status>{
 		Status status=getContentStatusByID(id);
 		if(status==null)
 			return;
+		status.filterRevealed = true;
 		Bundle args=new Bundle();
 		args.putString("account", accountID);
 		args.putParcelable("status", Parcels.wrap(status));

mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java

@@ -14,6 +14,7 @@ import org.joinmastodon.android.fragments.BaseStatusListFragment;
 import org.joinmastodon.android.fragments.ProfileFragment;
 import org.joinmastodon.android.fragments.ThreadFragment;
 import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.Hashtag;
 import org.joinmastodon.android.model.SearchResult;
 import org.joinmastodon.android.model.SearchResults;
@@ -80,7 +81,7 @@ public class SearchFragment extends BaseStatusListFragment<SearchResult>{
 		return switch(s.type){
 			case ACCOUNT -> Collections.singletonList(new AccountStatusDisplayItem(s.id, this, s.account));
 			case HASHTAG -> Collections.singletonList(new HashtagStatusDisplayItem(s.id, this, s.hashtag));
-			case STATUS -> StatusDisplayItem.buildItems(this, s.status, accountID, s, knownAccounts, false, true, null);
+			case STATUS -> StatusDisplayItem.buildItems(this, s.status, accountID, s, knownAccounts, false, true, null, Filter.FilterContext.PUBLIC);
 		};
 	}
 

mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportAddPostsChoiceFragment.java

@@ -21,6 +21,7 @@ import org.joinmastodon.android.api.requests.accounts.GetAccountStatuses;
 import org.joinmastodon.android.events.FinishReportFragmentsEvent;
 import org.joinmastodon.android.fragments.StatusListFragment;
 import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.PhotoLayoutHelper;
 import org.joinmastodon.android.ui.displayitems.AudioStatusDisplayItem;
@@ -238,7 +239,7 @@ public class ReportAddPostsChoiceFragment extends StatusListFragment{
 
 	@Override
 	protected List<StatusDisplayItem> buildDisplayItems(Status s){
-		List<StatusDisplayItem> items=StatusDisplayItem.buildItems(this, s, accountID, s, knownAccounts, true, false, null);
+		List<StatusDisplayItem> items=StatusDisplayItem.buildItems(this, s, accountID, s, knownAccounts, true, false, null, Filter.FilterContext.HOME);
 		for(StatusDisplayItem item:items){
 			if(item instanceof ImageStatusDisplayItem isdi){
 				isdi.horizontalInset=V.dp(40+32);

mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ImageStatusDisplayItem.java

@@ -73,7 +73,6 @@ public abstract class ImageStatusDisplayItem extends StatusDisplayItem{
 			photo.setImageDrawable(crossfadeDrawable);
 			photo.setContentDescription(TextUtils.isEmpty(item.attachment.description) ? item.parentFragment.getString(R.string.media_no_description) : item.attachment.description);
 			didClear=false;
-
 		}
 
 		@Override

mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/LinkCardStatusDisplayItem.java

@@ -73,6 +73,7 @@ public class LinkCardStatusDisplayItem extends StatusDisplayItem{
 
 			photo.setImageDrawable(null);
 			if(item.imgRequest!=null){
+				crossfadeDrawable.setSize(card.width, card.height);
 				if (card.width > 0) {
 					// akkoma servers don't provide width and height
 					crossfadeDrawable.setSize(card.width, card.height);
@@ -84,7 +85,6 @@ public class LinkCardStatusDisplayItem extends StatusDisplayItem{
 				photo.setImageDrawable(crossfadeDrawable);
 				didClear=false;
 			}
-
 		}
 
 		@Override
@@ -105,3 +105,4 @@ public class LinkCardStatusDisplayItem extends StatusDisplayItem{
 		}
 	}
 }
+

mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java

@@ -86,11 +86,11 @@ public abstract class StatusDisplayItem{
 		};
 	}
 
-	public static ArrayList<StatusDisplayItem> buildItems(BaseStatusListFragment fragment, Status status, String accountID, DisplayItemsParent parentObject, Map<String, Account> knownAccounts, boolean inset, boolean addFooter, Notification notification){
+	public static ArrayList<StatusDisplayItem> buildItems(BaseStatusListFragment fragment, Status status, String accountID, DisplayItemsParent parentObject, Map<String, Account> knownAccounts, boolean inset, boolean addFooter, Notification notification, Filter.FilterContext filterContext){
-		return buildItems(fragment, status, accountID, parentObject, knownAccounts, inset, addFooter, notification, false);
+		return buildItems(fragment, status, accountID, parentObject, knownAccounts, inset, addFooter, notification, false, filterContext);
 	}
 
-	public static ArrayList<StatusDisplayItem> buildItems(BaseStatusListFragment fragment, Status status, String accountID, DisplayItemsParent parentObject, Map<String, Account> knownAccounts, boolean inset, boolean addFooter, Notification notification, boolean disableTranslate){
+	public static ArrayList<StatusDisplayItem> buildItems(BaseStatusListFragment fragment, Status status, String accountID, DisplayItemsParent parentObject, Map<String, Account> knownAccounts, boolean inset, boolean addFooter, Notification notification, boolean disableTranslate, Filter.FilterContext filterContext){
 		String parentID=parentObject.getID();
 		ArrayList<StatusDisplayItem> items=new ArrayList<>();
 
@@ -101,10 +101,13 @@ public abstract class StatusDisplayItem{
 		args.putString("account", accountID);
 		ScheduledStatus scheduledStatus = parentObject instanceof ScheduledStatus ? (ScheduledStatus) parentObject : null;
 
-		List<Filter> filters=AccountSessionManager.getInstance().getAccount(accountID).wordFilters.stream().filter(f->f.context.contains(Filter.FilterContext.HOME)).collect(Collectors.toList());
+		List<Filter> filters=AccountSessionManager.getInstance().getAccount(accountID).wordFilters.stream().filter(f->f.context.contains(filterContext)).collect(Collectors.toList());
 		StatusFilterPredicate filterPredicate = new StatusFilterPredicate(filters);
 
-		statusForContent.filterRevealed = filterPredicate.testWithWarning(status);
+		if(!statusForContent.filterRevealed){
+			statusForContent.filterRevealed = filterPredicate.testWithWarning(status);
+		}
+
 
 		if(status.reblog!=null){
 			boolean isOwnPost = AccountSessionManager.getInstance().isSelf(fragment.getAccountID(), status.account);

mastodon/src/main/res/layout/item_settings_update.xml

@@ -33,46 +33,39 @@
 
 			<FrameLayout
 				android:layout_width="wrap_content"
-				android:layout_height="wrap_content">
+				android:layout_height="wrap_content"
+				android:layout_marginEnd="16dp">
 
 				<Button
 					android:id="@+id/button"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:layout_gravity="center_vertical|end"
-					android:background="?android:selectableItemBackground"
-					android:paddingLeft="16dp"
-					android:paddingRight="16dp"
 					android:stateListAnimator="@null"
-					android:textAllCaps="true"
+					tools:text="@string/install_update"/>
-					android:textColor="?android:textColorPrimary"
-					android:textSize="14dp"
-					tools:text="@string/install_update" />
 
 				<ImageButton
 					android:id="@+id/cancel_btn"
 					android:layout_width="40dp"
 					android:layout_height="40dp"
 					android:layout_gravity="end|center_vertical"
-					android:layout_marginEnd="16dp"
 					android:background="@drawable/bg_update_download_progress"
-					android:contentDescription="@string/cancel"
-					android:src="@drawable/ic_fluent_dismiss_16_filled"
 					android:tint="?colorSearchHint"
-					android:visibility="gone" />
+					android:contentDescription="@string/cancel"
+					android:visibility="gone"
+					android:src="@drawable/ic_fluent_dismiss_16_filled"/>
 
 				<ProgressBar
 					android:id="@+id/progress"
 					android:layout_width="40dp"
 					android:layout_height="40dp"
 					android:layout_gravity="end|center_vertical"
-					android:layout_marginEnd="16dp"
+					android:progressDrawable="@drawable/update_progress"
-					android:indeterminate="false"
-					android:indeterminateOnly="false"
 					android:max="1000"
 					android:padding="0dp"
-					android:progressDrawable="@drawable/update_progress"
+					android:visibility="gone"
-					android:visibility="gone" />
+					android:indeterminateOnly="false"
+					android:indeterminate="false"/>
 
 			</FrameLayout>
 

mastodon/src/main/res/values-pt-rBR/strings_mo.xml

@@ -18,4 +18,6 @@
     <string name="mo_disable_relocate_publish_button_to_enable_customization">Desabilite Relocalizar botão de postagem para permitir modificações</string>
     <string name="mo_fab_compose">Compor</string>
     <string name="mo_sending_error">Erro ao publicar</string>
+    <string name="mo_poll_option_add">Adicionar nova opção de enquete</string>
+    <string name="mo_filtered">Filtrado: %s</string>
 </resources>

metadata/en-US/changelogs/91.txt

@@ -0,0 +1,5 @@
+New things for release 91:
+- The ability to have filtered posts show with a warning
+- Fixed included auto updater
+- Fixed a few crashes with the filtering system
+- Minor quality of life improvements

metadata/es-ES/changelogs/73.txt

@@ -0,0 +1,9 @@
+- Las cronologías pueden ser ancladas y reordenadas
+- Soporte para publicaciones locales
+- Indicador de ausencia de texto alternativo
+- Editor de textos alternativos mejorado
+- Encabezado en la cronología para hashtags que sigues
+- Más categorías de notificaciones
+- Soporte para selector de archivos nuevo
+- Aviso cuando se guarda un borrador
+- Opción para desactivar el botón "Ver nuevas publicaciones"

metadata/es-ES/changelogs/88.txt

@@ -0,0 +1,6 @@
+Nuevas características de la versión 88:
+- Mejor comportamiento del botón flotante
+- Mejor manejo de los textos alternativos
+- Soporte para publicaciones sólo locales en instancias que lo soportan
+- Se arreglan algunos cierres inesperados
+- Pequeñas mejoras

metadata/es-ES/changelogs/89.txt

@@ -0,0 +1 @@
+La versión 89 es una versión dedicada a arreglar fallos. Se han arreglado varios fallos y configuraciones.