diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a4b02fa7..a35c1683 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -135,6 +135,7 @@ + @@ -143,6 +144,7 @@ + @@ -186,6 +188,7 @@ + @@ -206,6 +209,7 @@ + @@ -230,6 +234,7 @@ + diff --git a/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java index d9b7999e..bbe82baf 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java @@ -26,6 +26,8 @@ import android.app.AlarmManager; import android.app.AlertDialog; import android.app.PendingIntent; import android.content.BroadcastReceiver; +import android.graphics.drawable.LayerDrawable; +import android.support.v4.view.MenuItemCompat; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; @@ -81,6 +83,7 @@ import com.github.dfa.diaspora_android.data.PodUserProfile; import com.github.dfa.diaspora_android.listener.WebUserProfileChangedListener; import com.github.dfa.diaspora_android.receivers.OpenExternalLinkReceiver; import com.github.dfa.diaspora_android.receivers.UpdateTitleReceiver; +import com.github.dfa.diaspora_android.ui.BadgeDrawable; import com.github.dfa.diaspora_android.ui.ContextMenuWebView; import com.github.dfa.diaspora_android.ui.CustomWebViewClient; import com.github.dfa.diaspora_android.util.CustomTabHelpers.BrowserFallback; @@ -754,21 +757,16 @@ public class MainActivity extends AppCompatActivity @Override public boolean onPrepareOptionsMenu(Menu menu) { - Log.i(App.TAG, "MainActivity.onPrepareOptionsMenu()"); - MenuItem itemNotification = menu.findItem(R.id.action_notifications); - if (itemNotification != null) { - if (podUserProfile.getNotificationCount() > 0) { - itemNotification.setIcon(R.drawable.ic_notifications_colored_48px); - } else { - itemNotification.setIcon(R.drawable.ic_notifications_white_48px); - } + MenuItem item; - MenuItem itemConversation = menu.findItem(R.id.action_conversations); - if (podUserProfile.getUnreadMessagesCount() > 0) { - itemConversation.setIcon(R.drawable.ic_email_colored_48px); - } else { - itemConversation.setIcon(R.drawable.ic_mail_white_48px); - } + if ((item = menu.findItem(R.id.action_notifications)) != null) { + LayerDrawable icon = (LayerDrawable) item.getIcon(); + BadgeDrawable.setBadgeCount(this, icon, podUserProfile.getNotificationCount()); + } + + if ((item = menu.findItem(R.id.action_conversations)) != null) { + LayerDrawable icon = (LayerDrawable) item.getIcon(); + BadgeDrawable.setBadgeCount(this, icon, podUserProfile.getUnreadMessagesCount()); } return super.onPrepareOptionsMenu(menu); } diff --git a/app/src/main/java/com/github/dfa/diaspora_android/ui/BadgeDrawable.java b/app/src/main/java/com/github/dfa/diaspora_android/ui/BadgeDrawable.java new file mode 100644 index 00000000..03460aa9 --- /dev/null +++ b/app/src/main/java/com/github/dfa/diaspora_android/ui/BadgeDrawable.java @@ -0,0 +1,127 @@ +package com.github.dfa.diaspora_android.ui; + +import android.content.Context; +import android.graphics.Canvas; +import android.graphics.Color; +import android.graphics.ColorFilter; +import android.graphics.Paint; +import android.graphics.PixelFormat; +import android.graphics.Rect; +import android.graphics.Typeface; +import android.graphics.drawable.Drawable; +import android.graphics.drawable.LayerDrawable; +import android.support.v4.content.ContextCompat; + +import com.github.dfa.diaspora_android.R; + +public class BadgeDrawable extends Drawable { + // Source: http://mobikul.com/adding-badge-count-on-menu-items-like-cart-notification-etc/ + private static final String BADGE_VALUE_OVERFLOW = "*"; + + private Paint badgeBackground; + private Paint badgeStroke; + private Paint badgeText; + private Rect textRect = new Rect(); + + private String badgeValue = ""; + private boolean shouldDraw; + + public BadgeDrawable(Context context) { + float textSize = context.getResources().getDimension(R.dimen.textsize_badge_count); + + badgeBackground = new Paint(); + badgeBackground.setColor(ContextCompat.getColor(context.getApplicationContext(), R.color.accent)); + badgeBackground.setAntiAlias(true); + badgeBackground.setStyle(Paint.Style.FILL); + badgeStroke = new Paint(); + badgeStroke.setColor(ContextCompat.getColor(context.getApplicationContext(), R.color.colorPrimaryDark)); + badgeStroke.setAntiAlias(true); + badgeStroke.setStyle(Paint.Style.FILL); + + badgeText = new Paint(); + badgeText.setColor(Color.WHITE); + badgeText.setTypeface(Typeface.DEFAULT); + badgeText.setTextSize(textSize); + badgeText.setAntiAlias(true); + badgeText.setTextAlign(Paint.Align.CENTER); + } + + @Override + public void draw(Canvas canvas) { + if (!shouldDraw) { + return; + } + Rect bounds = getBounds(); + float width = bounds.right - bounds.left; + float height = bounds.bottom - bounds.top; + + // Position the badge in the top-right quadrant of the icon. + float radius = ((Math.max(width, height) / 2)) / 2; + float centerX = (width - radius - 1) + 5; + float centerY = radius - 5; + if (badgeValue.length() <= 2) { + // Draw badge circle. + canvas.drawCircle(centerX, centerY, (int) (radius + 7.5), badgeStroke); + canvas.drawCircle(centerX, centerY, (int) (radius + 5.5), badgeBackground); + } else { + canvas.drawCircle(centerX, centerY, (int) (radius + 8.5), badgeStroke); + canvas.drawCircle(centerX, centerY, (int) (radius + 6.5), badgeBackground); + //canvas.drawRoundRect(radius, radius, radius, radius, 10, 10, badgeBackground); + } + // Draw badge count text inside the circle. + badgeText.getTextBounds(badgeValue, 0, badgeValue.length(), textRect); + float textHeight = textRect.bottom - textRect.top; + float textY = centerY + (textHeight / 2f); + if (badgeValue.length() > 2) + canvas.drawText(BADGE_VALUE_OVERFLOW, centerX, textY, badgeText); + else + canvas.drawText(badgeValue, centerX, textY, badgeText); + } + + /* + Sets the count (i.e notifications) to display. + */ + public void setCount(String count) { + badgeValue = count; + + // Only draw a badge if there are notifications. + shouldDraw = !count.equalsIgnoreCase("0"); + invalidateSelf(); + } + + @Override + public void setAlpha(int alpha) { + // do nothing + } + + @Override + public void setColorFilter(ColorFilter cf) { + // do nothing + } + + @Override + public int getOpacity() { + return PixelFormat.UNKNOWN; + } + + public static void setBadgeCount(Context context, LayerDrawable icon, Integer count) { + setBadgeCount(context, icon, count.toString()); + } + + public static void setBadgeCount(Context context, LayerDrawable icon, String count) { + + BadgeDrawable badge; + + // Reuse drawable if possible + Drawable reuse = icon.findDrawableByLayerId(R.id.ic_badge); + if (reuse != null && reuse instanceof BadgeDrawable) { + badge = (BadgeDrawable) reuse; + } else { + badge = new BadgeDrawable(context); + } + + badge.setCount(count); + icon.mutate(); + icon.setDrawableByLayerId(R.id.ic_badge, badge); + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable-hdpi/ic_launcher.png b/app/src/main/res/drawable-hdpi/ic_launcher.png deleted file mode 100644 index 2bcd75a5..00000000 Binary files a/app/src/main/res/drawable-hdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_launcher.png b/app/src/main/res/drawable-mdpi/ic_launcher.png deleted file mode 100644 index 2bcd75a5..00000000 Binary files a/app/src/main/res/drawable-mdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_launcher.png b/app/src/main/res/drawable-xhdpi/ic_launcher.png deleted file mode 100644 index 2bcd75a5..00000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_launcher.png b/app/src/main/res/drawable-xxhdpi/ic_launcher.png deleted file mode 100644 index 2bcd75a5..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_launcher.png b/app/src/main/res/drawable-xxxhdpi/ic_launcher.png deleted file mode 100644 index 2bcd75a5..00000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/drawable/fab_compose.png b/app/src/main/res/drawable/fab_compose.png deleted file mode 100644 index 0d6f4cf5..00000000 Binary files a/app/src/main/res/drawable/fab_compose.png and /dev/null differ diff --git a/app/src/main/res/drawable/fab_search.png b/app/src/main/res/drawable/fab_search.png deleted file mode 100644 index a2e21291..00000000 Binary files a/app/src/main/res/drawable/fab_search.png and /dev/null differ diff --git a/app/src/main/res/drawable/fab_top.png b/app/src/main/res/drawable/fab_top.png deleted file mode 100644 index 98a7415d..00000000 Binary files a/app/src/main/res/drawable/fab_top.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_arrow_upward_white_48px.xml b/app/src/main/res/drawable/ic_arrow_upward_white_48px.xml new file mode 100644 index 00000000..92bfb15d --- /dev/null +++ b/app/src/main/res/drawable/ic_arrow_upward_white_48px.xml @@ -0,0 +1,4 @@ + + + diff --git a/app/src/main/res/drawable/ic_atsign.xml b/app/src/main/res/drawable/ic_atsign.xml new file mode 100644 index 00000000..d6830618 --- /dev/null +++ b/app/src/main/res/drawable/ic_atsign.xml @@ -0,0 +1,7 @@ + + + diff --git a/app/src/main/res/drawable/ic_email_colored_48px.xml b/app/src/main/res/drawable/ic_email_colored_48px.xml index ab034128..c79ed6bc 100644 --- a/app/src/main/res/drawable/ic_email_colored_48px.xml +++ b/app/src/main/res/drawable/ic_email_colored_48px.xml @@ -1,4 +1,4 @@ - + diff --git a/app/src/main/res/drawable/ic_launcher.xml b/app/src/main/res/drawable/ic_launcher.xml new file mode 100644 index 00000000..4d66007f --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + diff --git a/app/src/main/res/drawable/ic_mail_white_48px__layer.xml b/app/src/main/res/drawable/ic_mail_white_48px__layer.xml new file mode 100644 index 00000000..983a98bf --- /dev/null +++ b/app/src/main/res/drawable/ic_mail_white_48px__layer.xml @@ -0,0 +1,11 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_mode_edit_white_48px.xml b/app/src/main/res/drawable/ic_mode_edit_white_48px.xml new file mode 100644 index 00000000..a7b5fa79 --- /dev/null +++ b/app/src/main/res/drawable/ic_mode_edit_white_48px.xml @@ -0,0 +1,4 @@ + + + diff --git a/app/src/main/res/drawable/ic_notifications_colored_48px.xml b/app/src/main/res/drawable/ic_notifications_colored_48px.xml deleted file mode 100644 index c1a647cc..00000000 --- a/app/src/main/res/drawable/ic_notifications_colored_48px.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_notifications_white_48px__layer.xml b/app/src/main/res/drawable/ic_notifications_white_48px__layer.xml new file mode 100644 index 00000000..971baea6 --- /dev/null +++ b/app/src/main/res/drawable/ic_notifications_white_48px__layer.xml @@ -0,0 +1,11 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search_white_48px.xml b/app/src/main/res/drawable/ic_search_white_48px.xml new file mode 100644 index 00000000..13b7e484 --- /dev/null +++ b/app/src/main/res/drawable/ic_search_white_48px.xml @@ -0,0 +1,4 @@ + + + diff --git a/app/src/main/res/drawable/ic_stream.xml b/app/src/main/res/drawable/ic_stream.xml new file mode 100644 index 00000000..0050d519 --- /dev/null +++ b/app/src/main/res/drawable/ic_stream.xml @@ -0,0 +1,4 @@ + + + diff --git a/app/src/main/res/drawable/jb_mentions.png b/app/src/main/res/drawable/jb_mentions.png deleted file mode 100644 index d1a2f181..00000000 Binary files a/app/src/main/res/drawable/jb_mentions.png and /dev/null differ diff --git a/app/src/main/res/drawable/jb_stream.png b/app/src/main/res/drawable/jb_stream.png deleted file mode 100644 index 78cbc780..00000000 Binary files a/app/src/main/res/drawable/jb_stream.png and /dev/null differ diff --git a/app/src/main/res/drawable/progressbar.xml b/app/src/main/res/drawable/progressbar.xml new file mode 100644 index 00000000..44815b57 --- /dev/null +++ b/app/src/main/res/drawable/progressbar.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/main__app_bar.xml b/app/src/main/res/layout/main__app_bar.xml index e4ef0e24..b5be6807 100644 --- a/app/src/main/res/layout/main__app_bar.xml +++ b/app/src/main/res/layout/main__app_bar.xml @@ -1,10 +1,10 @@ + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + tools:context=".activity.MainActivity"> - + - + + app:popupTheme="@style/Theme.AppCompat.NoActionBar"/> diff --git a/app/src/main/res/layout/main__content.xml b/app/src/main/res/layout/main__content.xml index a50f9875..6794e928 100644 --- a/app/src/main/res/layout/main__content.xml +++ b/app/src/main/res/layout/main__content.xml @@ -1,13 +1,13 @@ + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/content_layout" + android:layout_width="match_parent" + android:layout_height="match_parent" + app:layout_behavior="@string/appbar_scrolling_view_behavior" + tools:context=".activity.MainActivity" + tools:showIn="@layout/main__app_bar"> + android:progressDrawable="@drawable/progressbar" + app:layout_behavior="@string/appbar_scrolling_view_behavior"/> \ No newline at end of file diff --git a/app/src/main/res/layout/splash__activity.xml b/app/src/main/res/layout/splash__activity.xml index 5adde8d1..5f65f563 100644 --- a/app/src/main/res/layout/splash__activity.xml +++ b/app/src/main/res/layout/splash__activity.xml @@ -26,11 +26,7 @@ android:layout_height="wrap_content" android:layout_alignParentBottom="true" android:layout_centerHorizontal="true" - android:layout_marginBottom="15dp" - android:shadowColor="@color/black" - android:shadowDx="-4" - android:shadowDy="4" - android:shadowRadius="6" + android:layout_marginBottom="30dp" android:text="@string/app_name" android:textAppearance="?android:attr/textAppearanceLarge" android:textColor="@color/white" diff --git a/app/src/main/res/menu/main__menu_bottom.xml b/app/src/main/res/menu/main__menu_bottom.xml index 9ed22043..002a2a29 100644 --- a/app/src/main/res/menu/main__menu_bottom.xml +++ b/app/src/main/res/menu/main__menu_bottom.xml @@ -6,14 +6,14 @@ @@ -31,7 +31,7 @@ diff --git a/app/src/main/res/menu/main__menu_top.xml b/app/src/main/res/menu/main__menu_top.xml index 06e8f3ec..d6c873b7 100644 --- a/app/src/main/res/menu/main__menu_top.xml +++ b/app/src/main/res/menu/main__menu_top.xml @@ -5,13 +5,13 @@ diff --git a/app/src/main/res/menu/main__navdrawer.xml b/app/src/main/res/menu/main__navdrawer.xml index 6ae0d7a3..25a2f7a9 100644 --- a/app/src/main/res/menu/main__navdrawer.xml +++ b/app/src/main/res/menu/main__navdrawer.xml @@ -4,7 +4,7 @@ Anwendung Gerät Diaspora Pod + Debug-Protokoll App Version: %1$s Paketname: %1$s Android Version: %1$s Gerätename: %1$s Pod-Adresse: %1$s + Debug-Protokoll in Zwischenablage kopiert Verwendete Drittanbieter-Bibliotheken - DiasporaForAndroid ist dein Begleiter auf deinen Streifzügen durch das soziale Netzwerk Diaspora. Es bietet dir zusätzliche Features wie nützliche Toolbars und Unterstützung für Proxyserver wie etwa das Tornetzwerk. <br><br> + DiasporaForAndroid ist dein Begleiter auf deinen Streifzügen durch das soziale Netzwerk Diaspora. Er bietet dir zusätzliche Features wie nützliche Toolbars und Unterstützung für Proxyserver wie etwa das Tornetzwerk. <br><br> Diaspora benutzt Markdown-Formatierung für deine Beiträge. Weitere Informationen dazu findest du auf<br> https://wiki.diasporafoundation.org/Markdown_reference_guide <br> <br> diff --git a/app/src/main/res/values-de/strings-preferences.xml b/app/src/main/res/values-de/strings-preferences.xml index 34e68524..6990eb51 100644 --- a/app/src/main/res/values-de/strings-preferences.xml +++ b/app/src/main/res/values-de/strings-preferences.xml @@ -26,6 +26,7 @@ Port Persönliche Einstellungen + Öffne die Einstellungen deines Diaspora Accounts Kontakte Bearbeite deine Kontaktliste Tags verwalten diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 73c70527..07789f80 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -65,11 +65,8 @@ Wenn du den Zugriff verweigerst und die Funktion später doch nutzen willst, kannst du die Berechtigung nachträglich erteilen. Öffne dafür: Systemeinstellungen - Apps - Diaspora. Im Bereich Berechtigungen kannst dann die entsprechende Einstellung vornehmen. - Du musst der App Zugriff auf den Gerätespeicher gewähren, damit das Bild - gespeichert werden kann. Danach solltest du die Anwendung komplett schließen oder das Gerät neu starten. - Wenn du den Zugriff verweigerst und die Funktion später doch nutzen willst, kannst du die Berechtigung - nachträglich erteilen. Öffne dafür: Systemeinstellungen - Apps - Diaspora. Im Bereich Berechtigungen kannst - dann die entsprechende Einstellung vornehmen. + Du musst der App Zugriff auf den Gerätespeicher gewähren, damit Bilder gespeichert oder hochgeladen werden können. Danach solltest du die Anwendung komplett schließen oder das Telefon neu starten. Wenn du den Zugriff verweigerst und die Funktion später doch nutzen willst, kannst du die Berechtigung +nachträglich erteilen. Öffne dafür: Systemeinstellungen - Apps - Diaspora. Im Bereich Berechtigungen kannst dann die entsprechende Einstellung vornehmen. Berechtigung verweigert. Berechtigung erteilt. Bitte versuche es erneut. diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 099c0526..9e7fe3fb 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -59,7 +59,6 @@ Todas las etiquetas Debe conceder \"Permiso de Almacenamiento de Información\" para guardar capturas de pantalla. Después debe cerrar completamente la aplicación o reiniciar el teléfono. Si usted no permite el acceso al almacenamiento pero desea utilizar la función de captura de pantalla en un momento posterior, puede conceder el permiso más adelante. Por favor vaya a: ajustes del sistema - aplicaciones - Diaspora. En la sección de permisos puede conceder el \"permiso de almacenamiento de escritura\". - Debe conceder \"Permiso de Almacenamiento de Información\" para guardar imagenes. Después, debe cerrar completamete la aplicación o reiniciar el teléfono. Si usted no permite el acceso de almacenamiento pero quiere guardar imagenes en otro momento, puede conceder el permiso más adelante. Por favor abrir: ajustes del sistema - aplicaciones - Diaspora. En la sección de permisos puede conceder el \"permiso de almacenamiento de escritura\". Permiso denegado. Permiso concedido. Por favor, inténtelo de nuevo. diff --git a/app/src/main/res/values-fr/strings-about.xml b/app/src/main/res/values-fr/strings-about.xml index de400cf2..2c9f51c0 100644 --- a/app/src/main/res/values-fr/strings-about.xml +++ b/app/src/main/res/values-fr/strings-about.xml @@ -6,10 +6,15 @@ Licence Déboguer Application + Appareil Pod diaspora + Journal de débogage Version app : %1$s Nom du paquet : %1$s + Version Android : %1$s + Nom de l\'appareil : %1$s Adresse du pod : %1$s + Journal de débogage copié dans le presse-papiers Bibliothèques tierces utilisées diff --git a/app/src/main/res/values-fr/strings-preferences.xml b/app/src/main/res/values-fr/strings-preferences.xml index 1db8a9d5..6807c3e2 100644 --- a/app/src/main/res/values-fr/strings-preferences.xml +++ b/app/src/main/res/values-fr/strings-preferences.xml @@ -26,6 +26,7 @@ Port Paramètres personnels + Ouvrir vos paramètres de compte diaspora Contacts Gérer votre liste de contacts Gérer les Hashtags diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 9f489534..63422ca4 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -61,7 +61,7 @@ Tout Tags Vous devez autoriser \"Modifier ou supprimer le contenu de la carte Sd \" pour sauvegarder les captures d\'écrans. Ensuite, vous devriez fermer l\'application ou redémarrer votre téléphone. Si vous n\'avez pas autorisé l\'accès à l\'espace de stockage mais que vous souhaitez utiliser la fonctionnalité de prise de capture d\'écran plus tard, vous pouvez donner la permission plus tard. Veuillez ouvrir : Paramètres - applications - Diaspora. Dans la section Autorisations, vous pouvez autoriser \"Modifier ou supprimer le contenu de la carte Sd \". - Vous devez autoriser \"Modifier ou supprimer le contenu de la carte Sd \" pour sauvegarder les images. Ensuite, vous devriez fermer l\'application ou redémarrer votre téléphone. Si vous n\'avez pas autorisé l\'accès à l\'espace de stockage mais que vous souhaitez sauvegarder des images ultérieurement, vous pouvez donner la permission plus tard. Veuillez ouvrir : Paramètres - applications - Diaspora. Dans la section Autorisations, vous pouvez autoriser \"Modifier ou supprimer le contenu de la carte Sd \". + Vous devez autoriser \"Modifier ou supprimer le contenu de la carte Sd \" pour sauvegarder/téléverser les images. Ensuite, vous devriez fermer l\'application ou redémarrer votre téléphone. Si vous n\'avez pas autorisé l\'accès à l\'espace de stockage mais que vous souhaitez sauvegarder des images ultérieurement, vous pouvez donner la permission plus tard. Veuillez ouvrir : Paramètres - applications - Diaspora. Dans la section Autorisations, vous pouvez autoriser \"Modifier ou supprimer le contenu de la carte Sd \". Permission refusée. Permission accordée. Veuillez réessayer. diff --git a/app/src/main/res/values-it/strings-about.xml b/app/src/main/res/values-it/strings-about.xml index 833edea5..34a663aa 100644 --- a/app/src/main/res/values-it/strings-about.xml +++ b/app/src/main/res/values-it/strings-about.xml @@ -8,11 +8,13 @@ Applicazione Dispositivo Pod Diaspora + Log di debug Versione app: %1$s Nome pacchetto: %1$s Versione Android: %1$s Nome dispositivo: %1$s Dominio pod: %1$s + Log di debug copiato negli appunti Librerie di terze parti usate diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index d084d2a9..0d3b5547 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -64,8 +64,9 @@ chiudere completamente l\'app o riavviare il dispositivo. Se non permetti l\'accesso alla memoria ma vuoi usare la funzione degli screenshot più avanti, puoi garantire il permesso successivamente. Vai su: Impostazioni - App - Diaspora. Nella sezione dei permessi puoi garantire il permesso per la scrittura sul dispositivo. - Devi garantire il permesso di accesso alla memoria per poter salvare le immagini. Dopodiché devi - chiudere completamente l\'app o riavviare il dispositivo. Se non permetti l\'accesso alla memoria ma vuoi salvare le immagini più avanti, puoi garantire il permesso successivamente. Vai su: Impostazioni - App - + Devi garantire il permesso di accesso alla memoria per poter salvare e caricare le immagini. Dopodiché devi + chiudere completamente l\'app o riavviare il dispositivo. Se non permetti l\'accesso alla memoria ma vuoi + salvare le immagini più avanti, puoi garantire il permesso successivamente. Vai su: Impostazioni - App - Diaspora. Nella sezione dei permessi puoi garantire il permesso per la scrittura sul dispositivo. Permesso negato. Permesso garantito. Si prega di riprovare. diff --git a/app/src/main/res/values-ja/strings-about.xml b/app/src/main/res/values-ja/strings-about.xml index 8654f9a7..305579ec 100644 --- a/app/src/main/res/values-ja/strings-about.xml +++ b/app/src/main/res/values-ja/strings-about.xml @@ -6,10 +6,15 @@ ライセンス デバッグ アプリケーション + デバイス ダイアスポラ ポッド + デバッグログ アプリバージョン: %1$s パッケージ名: %1$s + Android バージョン: %1$s + デバイス名: %1$s ポッドドメイン: %1$s + デバッグログをクリップボードにコピーしました 使用したサードパーティ ライブラリー diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 1caab130..f987ef11 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -61,7 +61,7 @@ すべてのタグ スクリーン ショットを保存するために、\"ストレージのアクセス許可\" を付与する必要があります。その後、完全にアプリを閉じるか、携帯電話を再起動する必要があります。ストレージへのアクセスを許可しないで、後でスクリーン ショット機能を使用する場合は、後でアクセス許可を付与することができます。その場合: システム設定 - アプリ - Diaspora を開いて、アクセス許可のセクションで、\"ストレージの書き込みアクセス許可\" を付与することができます。 - 画像を保存するために、\"ストレージのアクセス許可\" を付与する必要があります。その後、完全にアプリを閉じるか、携帯電話を再起動する必要があります。ストレージへのアクセスを許可しないで、後で画像を保存したい場合は、後でアクセス許可を付与することができます。その場合: システム設定 - アプリ - Diaspora を開いて、アクセス許可のセクションで、\"ストレージの書き込みアクセス許可\" を付与することができます。 + 画像を保存/アップロードするために、\"ストレージのアクセス許可\" を付与する必要があります。その後、完全にアプリを閉じるか、携帯電話を再起動する必要があります。ストレージへのアクセスを許可しないで、後で画像を保存したい場合は、後でアクセス許可を付与することができます。その場合: システム設定 - アプリ - Diaspora を開いて、アクセス許可のセクションで、\"ストレージの書き込みアクセス許可\" を付与することができます。 アクセスが拒否されました。 アクセスを許可しました。もう一度やり直してください。 diff --git a/app/src/main/res/values/color.xml b/app/src/main/res/values/color.xml index 7595c3fc..28f1e010 100644 --- a/app/src/main/res/values/color.xml +++ b/app/src/main/res/values/color.xml @@ -5,14 +5,14 @@ @color/accent - #3F51B5 - #303F9F - #C5CAE9 - #4CAF50 + #207be6 + #195ed2 + #BBDEFB + #FF5300 #212121 - #757575 + #727272 #FFFFFF - #BDBDBD + #B6B6B6 #ffffff diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index e65ac3f4..1009fc6a 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -11,4 +11,7 @@ 250dp + + + 11sp diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 545b9c6d..a95b417b 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -6,6 +6,7 @@ @color/colorPrimary @color/colorPrimaryDark @color/colorAccent + @color/colorAccent +