Merge branch 'master' into rework_fragments

.github/ISSUE_TEMPLATE.md

@@ -24,10 +24,10 @@ I have:
 
 
 #### Expected result
+**What is the expected output?** 
 
-What is the expected output? 
+**What do you see instead?**
 
-What do you see instead?
 
 Upload screenshots via drag&drop if needed and apply resizing:
 `<img width="30%" height="30%" src="https://cloud.githubusercontent.com/assets/67..b55.jpg">`

.travis.yml

@@ -6,7 +6,7 @@ android:
     - tools
     - tools # TODO https://github.com/travis-ci/travis-ci/issues/6193
     - platform-tools
-    - build-tools-24.0.1
+    - build-tools-24.0.2
     - android-24
     - extra-android-m2repository
 before_cache:

README.md

@@ -1,8 +1,9 @@
 [![F-Droid](https://f-droid.org/wiki/images/0/06/F-Droid-button_get-it-on.png)](https://f-droid.org/repository/browse/?fdid=com.github.dfa.diaspora_android)
 
-[![Build Status](https://travis-ci.org/Diaspora-for-Android/diaspora-android.svg?branch=master)](https://travis-ci.org/Diaspora-for-Android/diaspora-android)
+<a name="badgers"></a>[![Build Status](https://travis-ci.org/Diaspora-for-Android/diaspora-android.svg?branch=master)](https://travis-ci.org/Diaspora-for-Android/diaspora-android)
 [![Crowdin](https://d322cqt584bo4o.cloudfront.net/diaspora-for-android/localized.svg)](https://crowdin.com/project/diaspora-for-android)
-[![Join the chat at https://gitter.im/Diaspora-for-Android/diaspora-android](https://badges.gitter.im/Diaspora-for-Android/diaspora-android.svg)](https://gitter.im/Diaspora-for-Android/diaspora-android?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Chat - FreeNode IRC](https://img.shields.io/badge/chat-on%20freenode-blue.svg)](https://kiwiirc.com/client/irc.freenode.net/?nick=user-dfa|?#diaspora-for-android)
+[![Chat - Gitter](https://img.shields.io/badge/chat-on%20gitter-blue.svg)](https://gitter.im/Diaspora-for-Android/diaspora-android)
 
 
 # Diaspora for Android
@@ -15,11 +16,11 @@ This is an unofficial webview based client for the community-run, distributed so
 
 ## Contributions
 We are always open for any kind of contribution. (PR's, bug reports, feature requests, translations, ..)  
-If you got any questions feel free to join our XMPP/Jabber conference at `diaspora-android@conference.jabberhead.tk` or [Gitter](https://gitter.im/Diaspora-for-Android/diaspora-android).  
+If you got any questions feel free to contact us on IRC, XMPP or Gitter. You can start chatting by clicking on the [blue chat badges](#badgers) listed on top.
-Note that the main project members are mostly busy with their job/university/school and may not react or start coding immediately.
 
-We use Crowdin to translate Diaspora for Android. Join our project here:   <https://crowdin.com/project/diaspora-for-android/invite>  
+We use Crowdin to translate Diaspora for Android. Join our project here: <https://crowdin.com/project/diaspora-for-android/invite>. If your desired language is not listed please contact the maintainers/owner.  
-If your desired language is not listed please contact the maintainers/owner.  
+
+Note that the main project members are working on this project for free during leisure time, are mostly busy with their job/university/school, and may not react or start coding immediately.
 
 ### License
 It's released under GNU GENERAL PUBLIC LICENSE (see [LICENCE](https://github.com/Diaspora-for-Android/diaspora-android/blob/master/LICENSE.md)).
@@ -38,5 +39,5 @@ The minimum version supported is Jelly Bean, Android v4.2.0 / API 17
 It requires access to the Internet and to external storage to be able to upload photos when creating a new post and for taking screenshots.
 
 ## Maintainers
-- gsantner ([GitHub](https://github.com/gsantner), [Web](https://gsantner.github.io))  
+- gsantner ([GitHub](https://github.com/gsantner), [Web](https://gsantner.github.io), [diaspora*](https://pod.geraspora.de/people/d1cbdd70095301341e834860008dbc6c))  
 - vanitasvitae ([GitHub](https://github.com/vanitasvitae))

SCREENSHOTS.md

@@ -1,14 +1,24 @@
 <table>
  <tr>
-	<td><img src="https://cloud.githubusercontent.com/assets/7854206/17698079/5025aa3a-63b9-11e6-9c25-dda3020dd36f.png" height="60%" width="60%"></td>
+	<td><img src="https://raw.githubusercontent.com/Diaspora-for-Android/diaspora-android-extras/master/graphics/screens/0.1.6/01.png" height="60%" width="60%"></td>
-	<td><img src="https://cloud.githubusercontent.com/assets/7854206/17698080/503f9904-63b9-11e6-9eb7-9ad1500889af.png" height="60%" width="60%"></td>
+	<td><img src="https://raw.githubusercontent.com/Diaspora-for-Android/diaspora-android-extras/master/graphics/screens/0.1.6/02.png" height="60%" width="60%"></td>
-	<td><img src="https://cloud.githubusercontent.com/assets/7854206/17698082/50443bee-63b9-11e6-9881-d8e871453650.png" height="60%" width="60%"></td>
+	<td><img src="https://raw.githubusercontent.com/Diaspora-for-Android/diaspora-android-extras/master/graphics/screens/0.1.6/03.png" height="60%" width="60%"></td>
-	<td><img src="https://cloud.githubusercontent.com/assets/7854206/17698083/50488514-63b9-11e6-8a44-e7d7e43ae728.png" height="60%" width="60%"></td>
+	<td><img src="https://raw.githubusercontent.com/Diaspora-for-Android/diaspora-android-extras/master/graphics/screens/0.1.6/04.png" height="60%" width="60%"></td>
  </tr>
 <tr>
-	<td><img src="https://cloud.githubusercontent.com/assets/7854206/17698085/504b17ac-63b9-11e6-845f-273f9d0e50ff.png" height="60%" width="60%"></td>
+	<td><img src="https://raw.githubusercontent.com/Diaspora-for-Android/diaspora-android-extras/master/graphics/screens/0.1.6/05.png" height="60%" width="60%"></td>
-	<td><img src="https://cloud.githubusercontent.com/assets/7854206/17698084/504ab4b0-63b9-11e6-96a0-32bc27f4b0ab.png" height="60%" width="60%"></td>
+	<td><img src="https://raw.githubusercontent.com/Diaspora-for-Android/diaspora-android-extras/master/graphics/screens/0.1.6/06.png" height="60%" width="60%"></td>
-	<td><img src="https://cloud.githubusercontent.com/assets/7854206/17698081/503ff9a8-63b9-11e6-8c52-d14fdf973881.png" height="60%" width="60%"></td>
+	<td><img src="https://raw.githubusercontent.com/Diaspora-for-Android/diaspora-android-extras/master/graphics/screens/0.1.6/07.png" height="60%" width="60%"></td>
-	<td><img src="https://cloud.githubusercontent.com/assets/7854206/17698086/505cbd0e-63b9-11e6-8719-9398b81734a1.png" height="60%" width="60%"></td>
+	<td><img src="https://raw.githubusercontent.com/Diaspora-for-Android/diaspora-android-extras/master/graphics/screens/0.1.6/08.png" height="60%" width="60%"></td>
+</tr>
+<tr>
+	<td><img src="https://raw.githubusercontent.com/Diaspora-for-Android/diaspora-android-extras/master/graphics/screens/0.1.6/09.png" height="60%" width="60%"></td>
+	<td><img src="https://raw.githubusercontent.com/Diaspora-for-Android/diaspora-android-extras/master/graphics/screens/0.1.6/10.png" height="60%" width="60%"></td>
+	<td><img src="https://raw.githubusercontent.com/Diaspora-for-Android/diaspora-android-extras/master/graphics/screens/0.1.6/11.png" height="60%" width="60%"></td>
+	<td><img src="https://raw.githubusercontent.com/Diaspora-for-Android/diaspora-android-extras/master/graphics/screens/0.1.6/12.png" height="60%" width="60%"></td>
+</tr>
+<tr>
+	<td><img src="https://raw.githubusercontent.com/Diaspora-for-Android/diaspora-android-extras/master/graphics/screens/0.1.6/13.png" height="60%" width="60%"></td>
+	<td><img src="https://raw.githubusercontent.com/Diaspora-for-Android/diaspora-android-extras/master/graphics/screens/0.1.6/14.png" height="60%" width="60%"></td>
 </tr>
 </table>

app/build.gradle

@@ -3,14 +3,14 @@ apply plugin: 'android-apt'
 
 android {
     compileSdkVersion 24
-    buildToolsVersion "24.0.1"
+    buildToolsVersion "24.0.2"
 
     defaultConfig {
         applicationId "com.github.dfa.diaspora_android"
         minSdkVersion 17
         targetSdkVersion 24
         versionCode 8
-        versionName "0.1.6"
+        versionName "0.1.6-next"
     }
     buildTypes {
         release {

app/src/main/res/drawable/ic_launcher.xml

@@ -1,6 +0,0 @@
-<vector android:height="24dp" android:viewportHeight="20.0"
-    android:viewportWidth="20.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="1" android:fillColor="#207be6"
-        android:pathData="M10,10m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0" android:strokeColor="#00000000"/>
-    <path android:fillColor="#fafafa" android:pathData="M11.337,14.123C11.06,13.736 10.626,13.13 10.374,12.778 10.117,12.418 9.908,12.138 9.897,12.138c-0.011,-0 -0.416,0.544 -0.958,1.287 -0.516,0.708 -0.942,1.288 -0.948,1.288 -0.015,0 -1.86,-1.3 -1.865,-1.313 -0.002,-0.007 0.415,-0.619 0.927,-1.361 0.512,-0.742 0.931,-1.36 0.931,-1.375 0,-0.023 -0.166,-0.081 -1.468,-0.515C5.71,9.879 5.042,9.656 5.032,9.652 5.019,9.647 5.095,9.389 5.359,8.558 5.549,7.959 5.708,7.465 5.713,7.459c0.005,-0.006 0.707,0.219 1.559,0.499 0.852,0.28 1.557,0.51 1.565,0.51 0.009,-0 0.019,-0.013 0.022,-0.029 0.003,-0.016 0.011,-0.742 0.016,-1.613 0.006,-0.871 0.015,-1.591 0.021,-1.6 0.008,-0.013 0.248,-0.016 1.127,-0.016 0.614,0 1.123,0.004 1.13,0.01 0.01,0.007 0.027,0.485 0.055,1.561 0.046,1.766 0.047,1.79 0.075,1.79 0.011,0 0.686,-0.226 1.501,-0.502 0.815,-0.276 1.485,-0.498 1.49,-0.492 0.016,0.019 0.685,2.194 0.676,2.202 -0.004,0.004 -0.684,0.237 -1.511,0.517 -1.137,0.385 -1.504,0.514 -1.507,0.531 -0.002,0.012 0.389,0.596 0.886,1.324 0.489,0.716 0.888,1.308 0.886,1.314 -0.005,0.015 -1.836,1.364 -1.852,1.364 -0.006,0 -0.239,-0.317 -0.516,-0.705z"/>
-</vector>

app/src/main/res/layout/splash__activity.xml

@@ -10,16 +10,17 @@
                 android:paddingTop="@dimen/activity_vertical_margin"
                 tools:context=".activity.SplashActivity">
 
-    <ImageView
+    <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
         android:layout_centerVertical="true"
         android:shadowColor="@color/black"
-        android:minHeight="100dp"
+        android:text="*"
-        android:scaleType="fitXY"
+        android:textAppearance="?android:attr/textAppearanceLarge"
-        android:minWidth="100dp"
+        android:textColor="@color/white"
-        android:src="@drawable/ic_launcher"/>
+        android:textSize="120dp"
+        android:textStyle="bold"/>
 
     <TextView
         android:layout_width="wrap_content"
@@ -30,7 +31,7 @@
         android:text="@string/app_name"
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:textColor="@color/white"
-        android:textSize="32sp"
+        android:textSize="32dp"
         android:textStyle="bold"/>
 
 </RelativeLayout>

app/src/main/res/values-fr/strings-preferences.xml

@@ -21,6 +21,7 @@
   <string name="pref_title__load_images">Charger les images</string>
   <string name="pref_desc__load_images">Désactiver le chargements des images pour préserver la data mobile</string>
   <!-- Proxy -->
+  <string name="pref_title__sub_proxy">Proxy</string>
   <string name="pref_title__proxy_enabled">Activer Proxy</string>
   <string name="pref_desc__proxy_enabled">Serveur Proxy.\n(Nécessite un redémarrage)</string>
   <string name="pref_title__proxy_host">Hôte</string>

app/src/main/res/values-it/strings-preferences.xml

@@ -21,11 +21,15 @@
   <string name="pref_title__load_images">Carica immagini</string>
   <string name="pref_desc__load_images">Disabilita il caricamento delle immagini per risparmiare la rete dati</string>
   <!-- Proxy -->
+  <string name="pref_title__sub_proxy">Proxy</string>
+  <string name="pref_desc__sub_proxy">@string/pref_desc__proxy_enabled</string>
   <string name="pref_title__proxy_enabled">Attiva proxy</string>
   <string name="pref_desc__proxy_enabled">Traffico del proxy di Diaspora per bypassare i firewall.\nPuò essere necessario il riavvio dell\'app</string>
   <string name="pref_title__proxy_host">Host</string>
   <string name="pref_title__proxy_port">Porta</string>
   <!-- Chrome custom tabs -->
+  <string name="pref_title__chrome_custom_tabs_enabled">Schede personalizzate di Chrome</string>
+  <string name="pref_desc__chrome_custom_tabs_enabled">Apri collegamento esterno nelle schede personalizzate di Chrome. Per usare questa funzione Chromium o Google Chrome deve essere installato</string>
   <!-- Diaspora Settings -->
   <string name="pref_title__personal_settings">Impostazioni personali</string>
   <string name="pref_desc__personal_settings">Apri le impostazioni del tuo account Diaspora</string>

app/src/main/res/values-ja/strings-preferences.xml

@@ -21,6 +21,8 @@
   <string name="pref_title__load_images">画像の読み込み</string>
   <string name="pref_desc__load_images">安全なモバイルデータのため、画像の読み込みを無効にします</string>
   <!-- Proxy -->
+  <string name="pref_title__sub_proxy">プロキシ</string>
+  <string name="pref_desc__sub_proxy">@string/pref_desc__proxy_enabled</string>
   <string name="pref_title__proxy_enabled">プロキシを有効にする</string>
   <string name="pref_desc__proxy_enabled">Diaspora の通信をプロキシして、ファイアウォールに回避します。\n再起動が必要になることがあります</string>
   <string name="pref_title__proxy_host">ホスト</string>

tools/localization/.gitignore

@@ -1 +0,0 @@
-crowdin.yaml

tools/localization/downloadLocalizations.sh

@@ -1,40 +0,0 @@
-#!/bin/bash
-#########################################################
-#
-#   Title
-#
-#   Created by Gregor Santer (gsantner), 2016
-#   https://gsantner.github.io/
-#
-#########################################################
-
-
-#Pfade
-SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-SCRIPTFILE=$(readlink -f $0)
-SCRIPTPATH=$(dirname $SCRIPTFILE)
-argc=$#
-
-#########################################################
-cd "$SCRIPTDIR"
-
-if [ ! -f "crowdin.yaml" ] ; then
-	echo "project_identifier: diaspora-for-android" > 'crowdin.yaml'
-	echo "base_path: $(realpath '../../')" >>'crowdin.yaml'
-	echo "api_key: DONT_PUSH_API_KEY" >>'crowdin.yaml'
-	cat "../../crowdin.yaml" >> "crowdin.yaml"
-	echo "# Add all non locality languages here" >> "crowdin.yaml"
-	echo "# (e.g. enUS, enUK, deCH, deAT will automatically go into the right folder)" >> "crowdin.yaml"
-	echo "# Otherwise e.g.  en would get added into the folder enEN (which is wrong)." >> "crowdin.yaml"
-	echo "# https://crowdin.com/page/api/language-codes contains supported language codes" >> "crowdin.yaml"
-	echo "# The first listed ones here are diffently managed by crowdin than on android" >> "crowdin.yaml"
-fi
-
-if grep -q "DONT_PUSH" "crowdin.yaml" ; then
-	echo "Insert API key to crowdin.yaml"
-	echo "and update folder to the root folder of the repository"
-	exit
-fi
-
-# Load latest translations
-crowdin-cli download -b master