Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Thomas 2022-12-30 18:00:15 +01:00
parent a859f3cbef 7b84049014
commit b1c22713b1
11 changed files with 103 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/app/fedilab/android/helper/SpannableHelper.java
View File

@ -52,6 +52,7 @@ import androidx.lifecycle.ViewModelStoreOwner;
import androidx.preference.PreferenceManager;
import com.bumptech.glide.Glide;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
@ -289,10 +290,10 @@ public class SpannableHelper {
@Override
public void onLongClick(View view) {
Context mContext = view.getContext();
AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(mContext);
MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(mContext);
PopupLinksBinding popupLinksBinding = PopupLinksBinding.inflate(LayoutInflater.from(context));
dialogBuilder.setView(popupLinksBinding.getRoot());
AlertDialog alertDialog = dialogBuilder.create();
materialAlertDialogBuilder.setView(popupLinksBinding.getRoot());
AlertDialog alertDialog = materialAlertDialogBuilder.create();
alertDialog.show();
String finalURl = newURL;
String uniqueUrl = newURL.endsWith("…") ? newURL : newURL + "…";

9
app/src/main/res/drawable/ic_check_redirect.xml Normal file
View File

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/white"
android:pathData="M21.71,11.29l-9,-9c-0.39,-0.39 -1.02,-0.39 -1.41,0l-9,9c-0.39,0.39 -0.39,1.02 0,1.41l9,9c0.39,0.39 1.02,0.39 1.41,0l9,-9c0.39,-0.38 0.39,-1.01 0,-1.41zM14,14.5V12h-4v2c0,0.55 -0.45,1 -1,1s-1,-0.45 -1,-1v-3c0,-0.55 0.45,-1 1,-1h5V7.5l3.15,3.15c0.2,0.2 0.2,0.51 0,0.71L14,14.5z" />
</vector>

9
app/src/main/res/drawable/ic_copy_link.xml Normal file
View File

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/white"
android:pathData="M15,20H5V7c0,-0.55 -0.45,-1 -1,-1h0C3.45,6 3,6.45 3,7v13c0,1.1 0.9,2 2,2h10c0.55,0 1,-0.45 1,-1v0C16,20.45 15.55,20 15,20zM20,16V4c0,-1.1 -0.9,-2 -2,-2H9C7.9,2 7,2.9 7,4v12c0,1.1 0.9,2 2,2h9C19.1,18 20,17.1 20,16zM18,16H9V4h9V16z" />
</vector>

9
app/src/main/res/drawable/ic_full_link.xml Normal file
View File

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/white"
android:pathData="M17,7h-3c-0.55,0 -1,0.45 -1,1s0.45,1 1,1h3c1.65,0 3,1.35 3,3s-1.35,3 -3,3h-3c-0.55,0 -1,0.45 -1,1c0,0.55 0.45,1 1,1h3c2.76,0 5,-2.24 5,-5S19.76,7 17,7zM8,12c0,0.55 0.45,1 1,1h6c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1H9C8.45,11 8,11.45 8,12zM10,15H7c-1.65,0 -3,-1.35 -3,-3s1.35,-3 3,-3h3c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1H7c-2.76,0 -5,2.24 -5,5s2.24,5 5,5h3c0.55,0 1,-0.45 1,-1C11,15.45 10.55,15 10,15z" />
</vector>

10
app/src/main/res/drawable/ic_open_external.xml Normal file
View File

@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:autoMirrored="true"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/white"
android:pathData="M18,19H6c-0.55,0 -1,-0.45 -1,-1V6c0,-0.55 0.45,-1 1,-1h5c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1H5c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2v-6c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v5c0,0.55 -0.45,1 -1,1zM14,4c0,0.55 0.45,1 1,1h2.59l-9.13,9.13c-0.39,0.39 -0.39,1.02 0,1.41 0.39,0.39 1.02,0.39 1.41,0L19,6.41V9c0,0.55 0.45,1 1,1s1,-0.45 1,-1V4c0,-0.55 -0.45,-1 -1,-1h-5c-0.55,0 -1,0.45 -1,1z" />
</vector>

9
app/src/main/res/drawable/ic_share_link.xml Normal file
View File

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/white"
android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92s2.92,-1.31 2.92,-2.92 -1.31,-2.92 -2.92,-2.92z" />
</vector>

59
app/src/main/res/layout/popup_links.xml
View File

@ -3,67 +3,52 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/fab_margin"
android:orientation="vertical"
android:padding="@dimen/fab_margin">
android:padding="12dp">
<androidx.appcompat.widget.AppCompatTextView
<com.google.android.material.button.MaterialButton
android:id="@+id/display_full_link"
style="@style/Widget.Material3.Button.TextButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:drawableEnd="@drawable/ic_baseline_navigate_next_24"
android:text="@string/display_full_link"
android:textColor="?colorPrimary"
android:textSize="16sp"
app:drawableTint="?colorPrimary" />
android:textAlignment="textStart"
app:icon="@drawable/ic_full_link" />
<androidx.appcompat.widget.AppCompatTextView
<com.google.android.material.button.MaterialButton
android:id="@+id/share_link"
style="@style/Widget.Material3.Button.TextButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:drawableEnd="@drawable/ic_baseline_navigate_next_24"
android:text="@string/share_link"
android:textColor="?colorPrimary"
android:textSize="16sp"
app:drawableTint="?colorPrimary" />
android:textAlignment="textStart"
app:icon="@drawable/ic_share_link" />
<androidx.appcompat.widget.AppCompatTextView
<com.google.android.material.button.MaterialButton
android:id="@+id/open_other_app"
style="@style/Widget.Material3.Button.TextButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:drawableEnd="@drawable/ic_baseline_navigate_next_24"
android:text="@string/open_other_app"
android:textColor="?colorPrimary"
android:textSize="16sp"
app:drawableTint="?colorPrimary" />
android:textAlignment="textStart"
app:icon="@drawable/ic_open_external" />
<androidx.appcompat.widget.AppCompatTextView
<com.google.android.material.button.MaterialButton
android:id="@+id/copy_link"
style="@style/Widget.Material3.Button.TextButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:drawableEnd="@drawable/ic_baseline_navigate_next_24"
android:text="@string/copy_link"
android:textColor="?colorPrimary"
android:textSize="16sp"
app:drawableTint="?colorPrimary" />
android:textAlignment="textStart"
app:icon="@drawable/ic_copy_link" />
<androidx.appcompat.widget.AppCompatTextView
<com.google.android.material.button.MaterialButton
android:id="@+id/check_redirect"
style="@style/Widget.Material3.Button.TextButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:drawableEnd="@drawable/ic_baseline_navigate_next_24"
android:text="@string/check_redirect"
android:textColor="?colorPrimary"
android:textSize="16sp"
app:drawableTint="?colorPrimary" />
android:textAlignment="textStart"
app:icon="@drawable/ic_check_redirect" />
</LinearLayout>

18
app/src/main/res/values-pt/strings.xml
View File

@ -257,7 +257,7 @@
<string name="delete">Remover</string>
<!-- About lists -->
<string name="action_lists">Listas</string>
<string name="action_lists_confirm_delete">Tem certeza de que deseja excluir permanentemente esta lista?</string>
<string name="action_lists_confirm_delete">Você tem certeza que deseja excluir permanentemente esta lista\?</string>
<string name="action_lists_add_to">Adicionar à lista</string>
<string name="action_lists_delete">Excluir lista</string>
<string name="action_lists_title_placeholder">Nome da nova lista</string>
@ -314,9 +314,9 @@
<string name="channel_notif_media">Baixar mídia</string>
<string name="select_sound">Selecionar toque</string>
<string name="set_enable_time_slot">Ativar definição de momento</string>
<string name="block_domain_confirm_message">Tem certeza que deseja bloquear %s\?
<string name="block_domain_confirm_message">Você tem certeza que deseja bloquear %s\?
\n
\nVocê não verá nenhum conteúdo dessa instância em nenhuma linha do tempo pública ou em suas notificações. Seus seguidores dessa instância serão removidos.</string>
\nVocê não verá nenhum conteúdo dessa instância em nenhuma timeline pública ou em suas notificações. Seus seguidores dessa instância serão removidos.</string>
<string name="block_domain">Bloquear instância</string>
<string name="toast_block_domain">Instância bloqueada</string>
<string name="retrieve_remote_status">Obtendo status remoto</string>
@ -704,4 +704,16 @@
<string name="set_unlisted_replies_indication">Diz respeito apenas a respostas \"públicas\". Quando ativado, suas respostas terão automaticamente a visibilidade \"não listada\" em vez de \"pública\"</string>
<string name="delete_cache_message">Você tem certeza que deseja excluir o cache\? Se você tiver rascunhos com mídia, a mídia anexada será perdida.</string>
<string name="import_settings">Importar configurações</string>
<string name="about_mastodon">\"O Mastodon não é um site único como o Twitter ou o Facebook, é uma rede de milhares de comunidades operadas por diferentes organizações e indivíduos que fornecem uma experiência de mídia social perfeita.\"</string>
<string name="unpin_timeline">Remover timeline fixada\?</string>
<string name="unblock_domain_confirm">Você tem certeza que deseja desbloquear %1$s\?</string>
<string name="clear_all_notif">Limpar todas as notificações</string>
<string name="invite_join_the_fediverse">OIá! Convidamos você a se juntar ao Fediverso.</string>
<string name="dont_have_an_account">Não possui uma conta\?</string>
<string name="display_all_categories">Exibir todas as categorias</string>
<string name="delete_notification_all_warning">Você tem certeza que deseja excluir todas as notificações\? Essa ação não pode ser desfeita.</string>
<string name="mark_all_as_read">Marcar todas as notificações como lidas</string>
<string name="join_the_fediverse">Junte-se ao Fediverso</string>
<string name="unpin_timeline_description">Você tem certeza que deseja desafixar essa timeline\?</string>
<string name="action_pinned_delete">Excluir as timelines fixadas\?</string>
</resources>

2
src/fdroid/fastlane/metadata/android/pt/changelogs/395.txt Normal file
View File

@ -0,0 +1,2 @@
- Corrigidos alguns bugs
- Permite compartilhar com o aplicativo

13
src/fdroid/fastlane/metadata/android/pt/changelogs/396.txt Normal file
View File

@ -0,0 +1,13 @@
Adicionado:
- Permite definir um ponto de foco em nas prévias (editor de mídia)
- Respeite o ponto de foco com prévias
- Paginação com o suporte ao botão buscar mais leitura para cima ou para baixo
- Adicionar tendências
Fixo:
- Somente a última notificação por push é exibida (não agrupada)
- Mau comportamento com a rolagem direita/esquerda
- Corrigir perfis longos não totalmente exibidos
- Problemas com algumas enquetes
- Algumas falhas
- Alguns maus comportamentos

1
src/fdroid/fastlane/metadata/android/pt/changelogs/397.txt Normal file
View File

@ -0,0 +1 @@
- Corrigidos alguns bugs relatados.