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

Merge branch 'develop'

This commit is contained in:
stom79 2018-10-03 09:22:24 +02:00
parent d23acc49a0 17fa167a86
commit f15274ac60
6 changed files with 113 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -7,8 +7,8 @@ android {
applicationId "fr.gouv.etalab.mastodon" applicationId "fr.gouv.etalab.mastodon"
minSdkVersion 15 minSdkVersion 15
targetSdkVersion 28 targetSdkVersion 28
versionCode 146 versionCode 147
versionName "1.14.1" versionName "1.14.2"
} }
flavorDimensions "default" flavorDimensions "default"
buildTypes { buildTypes {

19
app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
View File

@ -616,14 +616,19 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
public void onClick(View v) { public void onClick(View v) {
if( type != RetrieveFeedsAsyncTask.Type.CACHE_BOOKMARKS) { if( type != RetrieveFeedsAsyncTask.Type.CACHE_BOOKMARKS) {
status.setBookmarked(!status.isBookmarked()); status.setBookmarked(!status.isBookmarked());
if (status.isBookmarked()) { try {
new StatusCacheDAO(context, db).insertStatus(StatusCacheDAO.BOOKMARK_CACHE, status); if (status.isBookmarked()) {
Toast.makeText(context, R.string.status_bookmarked, Toast.LENGTH_LONG).show(); new StatusCacheDAO(context, db).insertStatus(StatusCacheDAO.BOOKMARK_CACHE, status);
} else { Toast.makeText(context, R.string.status_bookmarked, Toast.LENGTH_LONG).show();
new StatusCacheDAO(context, db).remove(StatusCacheDAO.BOOKMARK_CACHE, status); } else {
Toast.makeText(context, R.string.status_unbookmarked, Toast.LENGTH_LONG).show(); new StatusCacheDAO(context, db).remove(StatusCacheDAO.BOOKMARK_CACHE, status);
Toast.makeText(context, R.string.status_unbookmarked, Toast.LENGTH_LONG).show();
}
notifyStatusChanged(status);
}catch (Exception e){
e.printStackTrace();
Toast.makeText(context, R.string.toast_error, Toast.LENGTH_LONG).show();
} }
notifyStatusChanged(status);
}else { }else {
int position = 0; int position = 0;
for (Status statustmp : statuses) { for (Status statustmp : statuses) {

2
app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java
View File

@ -122,7 +122,7 @@ public class SettingsFragment extends Fragment {
}); });
boolean enabledCrash = sharedpreferences.getBoolean(ACRA.PREF_ENABLE_ACRA, true); boolean enabledCrash = sharedpreferences.getBoolean(ACRA.PREF_ENABLE_ACRA, false);
final CheckBox set_crash_report = rootView.findViewById(R.id.set_crash_report); final CheckBox set_crash_report = rootView.findViewById(R.id.set_crash_report);
set_crash_report.setChecked(enabledCrash); set_crash_report.setChecked(enabledCrash);
set_crash_report.setOnClickListener(new View.OnClickListener() { set_crash_report.setOnClickListener(new View.OnClickListener() {

91
app/src/main/res/layout-sw600dp/activity_show_account.xml
View File

@ -237,17 +237,29 @@
android:minHeight="20dp" android:minHeight="20dp"
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center" android:gravity="center"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:textSize="16sp" android:textSize="16sp"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="1" android:layout_weight="1"
android:layout_height="match_parent" /> android:layout_height="match_parent" />
<TextView <LinearLayout
android:id="@+id/value1"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_gravity="center"
android:gravity="center"
android:layout_weight="2" android:layout_weight="2"
android:layout_height="match_parent" />
android:id="@+id/value1BG"
android:layout_height="match_parent"
android:orientation="vertical">
<TextView
android:id="@+id/value1"
android:layout_gravity="center"
android:gravity="center"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/field2" android:id="@+id/field2"
@ -257,21 +269,33 @@
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
android:id="@+id/label2" android:id="@+id/label2"
android:padding="5dp" android:padding="10dp"
android:minHeight="20dp" android:minHeight="20dp"
android:layout_width="0dp" android:layout_width="0dp"
android:textSize="16sp" android:textSize="16sp"
android:paddingTop="5dp"
android:paddingBottom="5dp"
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center" android:gravity="center"
android:layout_weight="1" android:layout_weight="1"
android:layout_height="match_parent" /> android:layout_height="match_parent" />
<TextView <LinearLayout
android:id="@+id/value2"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_gravity="center"
android:gravity="center"
android:layout_weight="2" android:layout_weight="2"
android:layout_height="match_parent" />
android:id="@+id/value2BG"
android:layout_height="match_parent"
android:orientation="vertical">
<TextView
android:id="@+id/value2"
android:layout_gravity="center"
android:gravity="center"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/field3" android:id="@+id/field3"
@ -281,21 +305,31 @@
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
android:id="@+id/label3" android:id="@+id/label3"
android:padding="5dp" android:padding="10dp"
android:minHeight="20dp" android:minHeight="20dp"
android:textSize="16sp" android:textSize="16sp"
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center" android:gravity="center"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="1" android:layout_weight="1"
android:paddingTop="5dp"
android:paddingBottom="5dp"
android:layout_height="match_parent" /> android:layout_height="match_parent" />
<TextView <LinearLayout
android:id="@+id/value3"
android:layout_gravity="center"
android:gravity="center"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="2" android:layout_weight="2"
android:layout_height="match_parent" /> android:layout_height="match_parent"
android:id="@+id/value3BG"
android:orientation="vertical">
<TextView
android:id="@+id/value3"
android:layout_gravity="center"
android:gravity="center"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/field4" android:id="@+id/field4"
@ -305,21 +339,32 @@
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
android:id="@+id/label4" android:id="@+id/label4"
android:padding="5dp" android:padding="10dp"
android:minHeight="20dp" android:minHeight="20dp"
android:textSize="16sp" android:textSize="16sp"
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center" android:gravity="center"
android:layout_width="0dp" android:layout_width="0dp"
android:paddingTop="5dp"
android:paddingBottom="5dp"
android:layout_weight="1" android:layout_weight="1"
android:layout_height="match_parent" /> android:layout_height="match_parent" />
<TextView <LinearLayout
android:id="@+id/value4"
android:layout_gravity="center"
android:gravity="center"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="2" android:layout_weight="2"
android:layout_height="match_parent" /> android:layout_height="match_parent"
android:id="@+id/value4BG"
android:orientation="vertical">
<TextView
android:id="@+id/value4"
android:layout_gravity="center"
android:gravity="center"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<!-- End Fields container --> <!-- End Fields container -->

24
app/src/main/res/values-ar/strings.xml
View File

@ -123,7 +123,7 @@
<item>هل تود كتم هذا الحساب ؟</item> <item>هل تود كتم هذا الحساب ؟</item>
<item>هل تود حجب هذا الحساب ؟</item> <item>هل تود حجب هذا الحساب ؟</item>
<item>هل تود الإبلاغ عن هذا التبويق ؟</item> <item>هل تود الإبلاغ عن هذا التبويق ؟</item>
<item>Block this domain?</item> <item>هل تريد حظر هذا النطاق؟</item>
</string-array> </string-array>
<string-array name="more_action_owner_confirm"> <string-array name="more_action_owner_confirm">
<item>هل تود حذف هذا التبويق ؟</item> <item>هل تود حذف هذا التبويق ؟</item>
@ -572,17 +572,17 @@
<string name="select_sound">اختيار نغمة</string> <string name="select_sound">اختيار نغمة</string>
<string name="set_enable_time_slot">تفعيل الفترة الزمنية</string> <string name="set_enable_time_slot">تفعيل الفترة الزمنية</string>
<string name="how_to_videos">الفيديوهات التوضيحية</string> <string name="how_to_videos">الفيديوهات التوضيحية</string>
<string name="retrieve_remote_conversation">Fetching remote thread!</string> <string name="retrieve_remote_conversation">جارٍ جلب المنشور عن بُعد!</string>
<string name="no_blocked_domain">No blocked domains!</string> <string name="no_blocked_domain">ليس هناك أية نطاقات محظورة!</string>
<string name="unblock_domain_confirm">Unblock domain</string> <string name="unblock_domain_confirm">إلغاء حظر النطاق</string>
<string name="unblock_domain_confirm_message">Are you sure to unblock %s?</string> <string name="unblock_domain_confirm_message">أمتأكد أنك تريد إلغاء الحظر عن %s؟</string>
<string name="block_domain_confirm_message">Are you sure to block %s?</string> <string name="block_domain_confirm_message">أمتأكد أنك تريد حظر %s؟</string>
<string name="blocked_domains">Blocked domains</string> <string name="blocked_domains">النطاقات المحظورة</string>
<string name="block_domain">Block domain</string> <string name="block_domain">حظر النطاق</string>
<string name="toast_block_domain">The domain is blocked</string> <string name="toast_block_domain">تم حظر النطاق</string>
<string name="toast_unblock_domain">The domain is no longer blocked!</string> <string name="toast_unblock_domain">لقد تم إلغاء حظر هذا النطاق!</string>
<string name="retrieve_remote_status">Fetching remote status</string> <string name="retrieve_remote_status">جلب المنشور عن بُعد</string>
<string name="comment">Comment</string> <string name="comment">تعليق</string>
<string-array name="filter_expire"> <string-array name="filter_expire">
<item>أبدًا</item> <item>أبدًا</item>
<item>30 دقيقة</item> <item>30 دقيقة</item>

36
app/src/main/res/values-fr/strings.xml
View File

@ -123,7 +123,7 @@
<item>Masquer ce compte ?</item> <item>Masquer ce compte ?</item>
<item>Bloquer ce compte ?</item> <item>Bloquer ce compte ?</item>
<item>Signaler ce pouet ?</item> <item>Signaler ce pouet ?</item>
<item>Block this domain?</item> <item>Désirez-vous bloquer ce domaine ?</item>
</string-array> </string-array>
<string-array name="more_action_owner_confirm"> <string-array name="more_action_owner_confirm">
<item>Supprimer ce pouet ?</item> <item>Supprimer ce pouet ?</item>
@ -533,7 +533,7 @@
<string name="action_filter_delete">Supprimer le filtre ?</string> <string name="action_filter_delete">Supprimer le filtre ?</string>
<string name="action_update_filter">Mettre à jour le filtre</string> <string name="action_update_filter">Mettre à jour le filtre</string>
<string name="action_filter_create">Créer un filtre</string> <string name="action_filter_create">Créer un filtre</string>
<string name="how_to_follow">Whom to follow</string> <string name="how_to_follow">Suggestion de comptes</string>
<string name="action_who_to_follow_empty_content">Actuellement, cette liste ne contient aucun compte !</string> <string name="action_who_to_follow_empty_content">Actuellement, cette liste ne contient aucun compte !</string>
<string name="follow_account">Suivre</string> <string name="follow_account">Suivre</string>
<string name="select_all">Tout sélectionner</string> <string name="select_all">Tout sélectionner</string>
@ -545,12 +545,12 @@
<string name="adding_account_list_trunk">Ajout des comptes dans la liste</string> <string name="adding_account_list_trunk">Ajout des comptes dans la liste</string>
<string name="action_list_add">Vous n\'avez pas encore créé de liste. Cliquez sur le bouton \"+\" pour en ajouter une.</string> <string name="action_list_add">Vous n\'avez pas encore créé de liste. Cliquez sur le bouton \"+\" pour en ajouter une.</string>
<string name="action_remote_instance_add">Vous ne suivez aucune instance. Cliquez sur le bouton \"+\" pour en ajouter une.</string> <string name="action_remote_instance_add">Vous ne suivez aucune instance. Cliquez sur le bouton \"+\" pour en ajouter une.</string>
<string name="about_trunk">Who to follow</string> <string name="about_trunk">Comptes suggérés</string>
<string name="about_trunk_action">API Trunk</string> <string name="about_trunk_action">API Trunk</string>
<string name="toast_impossible_to_follow">Abonnement impossible au(x) compte(s)</string> <string name="toast_impossible_to_follow">Abonnement impossible au(x) compte(s)</string>
<string name="retrieve_remote_account">Recherche du compte distant</string> <string name="retrieve_remote_account">Recherche du compte distant</string>
<string name="expand_image">Automatically expand hidden media</string> <string name="expand_image">Étendre automatiquement les médias cachés</string>
<string name="set_display_follow_instance">Display follow instances button</string> <string name="set_display_follow_instance">Afficher le bouton de suivi d’instances</string>
<string name="channel_notif_follow">Nouvel abonnement</string> <string name="channel_notif_follow">Nouvel abonnement</string>
<string name="channel_notif_boost">Nouveau Repouet</string> <string name="channel_notif_boost">Nouveau Repouet</string>
<string name="channel_notif_fav">Nouveau Favori</string> <string name="channel_notif_fav">Nouveau Favori</string>
@ -560,19 +560,19 @@
<string name="channel_notif_media">Téléchargement des Médias</string> <string name="channel_notif_media">Téléchargement des Médias</string>
<string name="set_notif_sound">Changer le son des notifications</string> <string name="set_notif_sound">Changer le son des notifications</string>
<string name="select_sound">Choisir une sonnerie</string> <string name="select_sound">Choisir une sonnerie</string>
<string name="set_enable_time_slot">Enable time slot</string> <string name="set_enable_time_slot">Activer le créneau horaire</string>
<string name="how_to_videos">How To Videos</string> <string name="how_to_videos">Tutoriels vidéo</string>
<string name="retrieve_remote_conversation">Fetching remote thread!</string> <string name="retrieve_remote_conversation">Récupération du fil distant !</string>
<string name="no_blocked_domain">No blocked domains!</string> <string name="no_blocked_domain">Aucun domaine bloqué !</string>
<string name="unblock_domain_confirm">Unblock domain</string> <string name="unblock_domain_confirm">Débloquer le domaine</string>
<string name="unblock_domain_confirm_message">Are you sure to unblock %s?</string> <string name="unblock_domain_confirm_message">Confirmez-vous le déblocage de %s ?</string>
<string name="block_domain_confirm_message">Are you sure to block %s?</string> <string name="block_domain_confirm_message">Êtes-vous sûr de vouloir bloquer %s ?</string>
<string name="blocked_domains">Blocked domains</string> <string name="blocked_domains">Les domaines bloqués</string>
<string name="block_domain">Block domain</string> <string name="block_domain">Bloquer le domaine</string>
<string name="toast_block_domain">The domain is blocked</string> <string name="toast_block_domain">Le domaine est bloqué</string>
<string name="toast_unblock_domain">The domain is no longer blocked!</string> <string name="toast_unblock_domain">Le domaine n\'est plus bloqué !</string>
<string name="retrieve_remote_status">Fetching remote status</string> <string name="retrieve_remote_status">Récupération du statut distant</string>
<string name="comment">Comment</string> <string name="comment">Commenter</string>
<string-array name="filter_expire"> <string-array name="filter_expire">
<item>Jamais</item> <item>Jamais</item>
<item>30 minutes</item> <item>30 minutes</item>