Cleanup and release v0.1.3

gsantner · Jul 4, 2016 · 2024f5d · 2024f5d
1 parent 91ac7aa
commit 2024f5d
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 44 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,14 @@
+# v0.1.3 (2016-07-04)
+- Added titles on top toolbar (by @scoute-dich)
+- Made bottom toolbar automatically disappear
+- Added option to share images to external app
+- Added option to enable proxy (by @vanitasvitae)
+- Added french translation (thanks to SansPseudoFix)
+- Added new settings section (by @vanitasvitae)
+- Fixed buggy snackbars
+- Removed swipe-to-refresh functionality in some places
+- Big thanks and good luck to @scoute-dich and @martinchodev for accompanying this project :)
+
 # v0.1.2 (2016-06-05)
 - Extract and show aspects (by @gsantner)
 - Cache last podlist

diff --git a/app/build.gradle b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "com.github.dfa.diaspora_android"
         minSdkVersion 15
         targetSdkVersion 23
-        versionCode 3
-        versionName "0.1.2"
+        versionCode 4
+        versionName "0.1.3"
     }
     buildTypes {
         release {

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
@@ -171,7 +171,6 @@ public class MainActivity extends AppCompatActivity
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        Intent startIntent = getIntent();
         // Bind UI
         setContentView(R.layout.main__activity);
         ButterKnife.bind(this);
@@ -710,7 +709,7 @@ public void onClick(DialogInterface dialog, int which) {
             Snackbar.make(swipeRefreshLayout, getString(R.string.toast_screenshot) + " " + fileSaveName, Snackbar.LENGTH_LONG).show();
         }
 
-        Bitmap bitmap = null;
+        Bitmap bitmap;
         webView.setDrawingCacheEnabled(true);
         bitmap = Bitmap.createBitmap(webView.getDrawingCache());
         webView.setDrawingCacheEnabled(false);
@@ -727,8 +726,7 @@ public void onClick(DialogInterface dialog, int which) {
             if (bitmapWriter != null) {
                 try {
                     bitmapWriter.close();
-                } catch (IOException _ignored) {
-                }
+                } catch (IOException _ignored) {/* Nothing */}
             }
         }
 

diff --git a/app/src/main/java/com/github/dfa/diaspora_android/data/AppSettings.java b/app/src/main/java/com/github/dfa/diaspora_android/data/AppSettings.java
@@ -3,9 +3,6 @@
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.util.Log;
-
-import com.github.dfa.diaspora_android.App;
 
 /**
  * Created by gsantner on 20.03.16. Part of Diaspora for Android.

diff --git a/app/src/main/java/com/github/dfa/diaspora_android/data/PodAspect.java b/app/src/main/java/com/github/dfa/diaspora_android/data/PodAspect.java
@@ -48,8 +48,7 @@ public String toJsonString() {
             j.put("id", id);
             j.put("name", name);
             j.put("selected", selected);
-        } catch (JSONException e) {
-        }
+        } catch (JSONException e) {/*Nothing*/}
         return j.toString();
     }
 
@@ -67,10 +66,7 @@ public String toString() {
 
     @Override
     public boolean equals(Object o) {
-        if (o instanceof PodAspect) {
-            return ((PodAspect) o).id == id;
-        }
-        return false;
+        return o instanceof PodAspect && ((PodAspect) o).id == id;
     }
 
     public String toShareAbleText() {

diff --git a/app/src/main/java/com/github/dfa/diaspora_android/ui/CustomWebViewClient.java b/app/src/main/java/com/github/dfa/diaspora_android/ui/CustomWebViewClient.java
@@ -54,9 +54,9 @@ public void onPageFinished(WebView view, String url) {
         if (cookies != null) {
             cookieManager.setCookie(url, cookies);
             cookieManager.setCookie("https://" + app.getSettings().getPodDomain(), cookies);
-            for (String c : cookies.split(";")) {
-                //Log.d(App.TAG, "Cookie: " + c.split("=")[0] + " Value:" + c.split("=")[1]);
-            }
+            //for (String c : cookies.split(";")) {
+            // Log.d(App.TAG, "Cookie: " + c.split("=")[0] + " Value:" + c.split("=")[1]);
+            //}
             //new ProfileFetchTask(app).execute();
         }
     }

diff --git a/app/src/main/java/com/github/dfa/diaspora_android/util/AvatarImageLoader.java b/app/src/main/java/com/github/dfa/diaspora_android/util/AvatarImageLoader.java
@@ -20,10 +20,7 @@ public AvatarImageLoader(Context context) {
     }
 
     public boolean clearAvatarImage() {
-        if (isAvatarDownloaded()) {
-            return avatarFile.delete();
-        }
-        return true;
+        return (!isAvatarDownloaded() || avatarFile.delete());
     }
 
     public boolean loadToImageView(ImageView imageView) {

diff --git a/app/src/main/res/layout/podselection__activity.xml b/app/src/main/res/layout/podselection__activity.xml
@@ -46,6 +46,7 @@
             android:layout_alignParentTop="true"
             android:layout_toEndOf="@+id/textView"
             android:layout_toLeftOf="@+id/podselection__button_select_pod"
+            android:layout_toStartOf="@+id/podselection__button_select_pod"
             android:layout_toRightOf="@+id/textView"
             android:hint="@string/filter_hint"
             android:inputType="textUri|textWebEditText" />

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -67,11 +67,6 @@
     <string name="messages">Unterhaltungen</string>
     <string name="new_post">D* Neuer Beitrag</string>
     <string name="notifications">Benachrichtigungen</string>
-    <string name="settings_font">Schriftgröße ändern</string>
-    <string name="settings_view">Ansicht wechseln</string>
-    <string name="normal">normal</string>
-    <string name="large">groß</string>
-    <string name="huge">riesig</string>
     <string name="image">Konnte Bild nicht laden …</string>
     <string name="jb_share">Inhalt Teilen</string>
     <string name="share_link">Link als Text teilen</string>
@@ -149,7 +144,6 @@ along with this program.  If not, see http://www.gnu.org/licenses.&lt;br> &lt;br
         https://www.flickr.com/photos/129581906@N06/sets/72157651933980136/with/16594947123.
         Sie wurden von \"Lydia\" veröffentlicht und stehen unter der cc by-nc-sa Lizenz.&lt;/i></string>
     <string name="splash_screen_description">Startbildschirm</string>
-    <string name="new_conversations">Ungelesene Unterhaltung. Öffnen?</string>
     <string name="new_notifications">Ungelesene Benachrichtigung. Lesen?</string>
     <string name="help_about">Changelog</string>
     <string name="jb_profile">Profil</string>

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
@@ -5,7 +5,6 @@
 
     <string name="reload">Rafraîchir</string>
     <string name="new_notifications">Notifications non lues. Lire ?</string>
-    <string name="new_conversations">Conversations non lues. Lire ?</string>
     <string name="permissions_screenshot">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 \".</string>
     <string name="permissions_image">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 \".</string>
     <string name="permission_denied">Permission refusée.</string>
@@ -59,8 +58,6 @@
     <string name="jb_settings_view">Paramètres de l\'application</string>
     <string name="jb_share">Partager du contenu</string>
 
-    <string name="settings_font">Changer la taille de la police</string>
-    <string name="settings_view">Changer de vue</string>
     <string name="share_link">Partager le lien comme texte</string>
     <string name="share_screenshot">Partager la capture d\'écran d\'un site web</string>
     <string name="take_screenshot">Prendre une capture d\'écran d\'un site web</string>
@@ -144,22 +141,20 @@
         They were published by \"Lydia\" and are licensed under cc by-nc-sa.&lt;/i></string>
 
     <string name="splash_screen_description">Splash screen</string>
-    <string name="normal">Normal</string>
-    <string name="large">Large</string>
-    <string name="huge">Énorme</string>
     <string name="image">Impossible de récupérer l\'image</string>
     <string name="jb_profile">Profile</string>
 
     <string name="exit_app">Quitter l\'application</string>
+    <string name="toggle_desktop_page">Toggle mobile/desktop view</string>
     <string name="shared_by_diaspora_android">*[partagé via #DiasporaForAndroid]*</string>
-    <string name="toast_link_address_copied">Lien copié...</string>
+    <string name="toast_link_address_copied">Lien copié…</string>
     <string name="context_menu_share_link">Partager un lien</string>
     <string name="context_menu_save_image">Enregistrer l\'image</string>
     <string name="context_menu_share_image">Partager l\'image</string>
-    <string name="context_menu_open_external_browser">Ouvrir dans un navigateur externe...</string>
+    <string name="context_menu_open_external_browser">Ouvrir dans un navigateur externe…</string>
     <string name="context_menu_copy_link">Copier le lien dans le presse-papier</string>
     <string name="toast_saved_image_to_location">Enregistrer l\'image sous</string>
 
-    <string name="toast_set_proxy_failed">Attention : connexion au proxy impossible...</string>
-    <string name="share_dotdotdot">Partager...</string>
+    <string name="toast_set_proxy_failed">Attention: connexion au proxy impossible…</string>
+    <string name="share_dotdotdot">Partager…</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -7,7 +7,6 @@
     <string name="app_name" translatable="false">Diaspora</string>
     <string name="reload">Reload</string>
     <string name="new_notifications">Unread notification. Want to read it?</string>
-    <string name="new_conversations">Unread conversation. Open it?</string>
     <string name="permissions_screenshot">You must grant \"Access Storage Permission\" to save screenshots. After that you should
         completely close the app or restart the phone. If you don\'t permit the storage access but want to use the
         screenshot function at a later time, you can grant the permission later. Please open then: systemsettings - apps -
@@ -68,8 +67,6 @@
     <string name="jb_settings_view">App settings</string>
     <string name="jb_share">Share content</string>
 
-    <string name="settings_font">Change font size</string>
-    <string name="settings_view">Change view</string>
     <string name="share_link">Share link as text</string>
     <string name="share_screenshot">Share screenshot of webpage</string>
     <string name="take_screenshot">Take screenshot of webpage</string>
@@ -192,9 +189,6 @@
         They were published by \"Lydia\" and are licensed under cc by-nc-sa.&lt;/i></string>
 
     <string name="splash_screen_description">Splash screen</string>
-    <string name="normal">Normal</string>
-    <string name="large">Large</string>
-    <string name="huge">Huge</string>
     <string name="image">Unable to get image</string>
     <string name="jb_profile">Profile</string>