diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 8fc720b8..6a7ba75d 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.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:
`
`
diff --git a/.travis.yml b/.travis.yml
index 74b79b85..41f1aaaa 100644
--- a/.travis.yml
+++ b/.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:
diff --git a/README.md b/README.md
index a2696020..201b7cfa 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,9 @@
[](https://f-droid.org/repository/browse/?fdid=com.github.dfa.diaspora_android)
-[](https://travis-ci.org/Diaspora-for-Android/diaspora-android)
+[](https://travis-ci.org/Diaspora-for-Android/diaspora-android)
[](https://crowdin.com/project/diaspora-for-android)
-[](https://gitter.im/Diaspora-for-Android/diaspora-android?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[](https://kiwiirc.com/client/irc.freenode.net/?nick=user-dfa|?#diaspora-for-android)
+[](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).
-Note that the main project members are mostly busy with their job/university/school and may not react or start coding immediately.
+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.
-We use Crowdin to translate Diaspora for Android. Join our project here:
-If your desired language is not listed please contact the maintainers/owner.
+We use Crowdin to translate Diaspora for Android. Join our project here: . 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))
diff --git a/SCREENSHOTS.md b/SCREENSHOTS.md
index 368da74a..8f443531 100644
--- a/SCREENSHOTS.md
+++ b/SCREENSHOTS.md
@@ -1,14 +1,24 @@
-  |
-  |
-  |
-  |
+  |
+  |
+  |
+  |
-  |
-  |
-  |
-  |
+  |
+  |
+  |
+  |
+
+
+  |
+  |
+  |
+  |
+
+
+  |
+  |
diff --git a/app/build.gradle b/app/build.gradle
index 4cb94656..0e7cceec 100644
--- a/app/build.gradle
+++ b/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 {
diff --git a/app/src/main/res/drawable-hdpi/ic_launcher.png b/app/src/main/res/drawable-hdpi/ic_launcher.png
new file mode 100644
index 00000000..11f95124
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_launcher.png differ
diff --git a/app/src/main/res/drawable-ldpi/ic_launcher.png b/app/src/main/res/drawable-ldpi/ic_launcher.png
new file mode 100644
index 00000000..8e89a6a9
Binary files /dev/null and b/app/src/main/res/drawable-ldpi/ic_launcher.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_launcher.png b/app/src/main/res/drawable-mdpi/ic_launcher.png
new file mode 100644
index 00000000..b356e40a
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_launcher.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_launcher.png b/app/src/main/res/drawable-xhdpi/ic_launcher.png
new file mode 100644
index 00000000..5055f6cf
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_launcher.png b/app/src/main/res/drawable-xxhdpi/ic_launcher.png
new file mode 100644
index 00000000..2001d858
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_launcher.png b/app/src/main/res/drawable-xxxhdpi/ic_launcher.png
new file mode 100644
index 00000000..0d77fa66
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/drawable/ic_launcher.xml b/app/src/main/res/drawable/ic_launcher.xml
deleted file mode 100644
index 4d66007f..00000000
--- a/app/src/main/res/drawable/ic_launcher.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
diff --git a/app/src/main/res/layout/splash__activity.xml b/app/src/main/res/layout/splash__activity.xml
index 5f65f563..5b6d5df3 100644
--- a/app/src/main/res/layout/splash__activity.xml
+++ b/app/src/main/res/layout/splash__activity.xml
@@ -10,16 +10,17 @@
android:paddingTop="@dimen/activity_vertical_margin"
tools:context=".activity.SplashActivity">
-
+ android:text="*"
+ android:textAppearance="?android:attr/textAppearanceLarge"
+ android:textColor="@color/white"
+ android:textSize="120dp"
+ android:textStyle="bold"/>
diff --git a/app/src/main/res/values-fr/strings-preferences.xml b/app/src/main/res/values-fr/strings-preferences.xml
index 48b8d71d..0406f8e6 100644
--- a/app/src/main/res/values-fr/strings-preferences.xml
+++ b/app/src/main/res/values-fr/strings-preferences.xml
@@ -21,6 +21,7 @@
Charger les images
Désactiver le chargements des images pour préserver la data mobile
+ Proxy
Activer Proxy
Serveur Proxy.\n(Nécessite un redémarrage)
Hôte
diff --git a/app/src/main/res/values-it/strings-preferences.xml b/app/src/main/res/values-it/strings-preferences.xml
index 01fbf921..71aa9c99 100644
--- a/app/src/main/res/values-it/strings-preferences.xml
+++ b/app/src/main/res/values-it/strings-preferences.xml
@@ -21,11 +21,15 @@
Carica immagini
Disabilita il caricamento delle immagini per risparmiare la rete dati
+ Proxy
+ @string/pref_desc__proxy_enabled
Attiva proxy
Traffico del proxy di Diaspora per bypassare i firewall.\nPuò essere necessario il riavvio dell\'app
Host
Porta
+ Schede personalizzate di Chrome
+ Apri collegamento esterno nelle schede personalizzate di Chrome. Per usare questa funzione Chromium o Google Chrome deve essere installato
Impostazioni personali
Apri le impostazioni del tuo account Diaspora
diff --git a/app/src/main/res/values-ja/strings-preferences.xml b/app/src/main/res/values-ja/strings-preferences.xml
index 909ff218..2d88e3e2 100644
--- a/app/src/main/res/values-ja/strings-preferences.xml
+++ b/app/src/main/res/values-ja/strings-preferences.xml
@@ -21,6 +21,8 @@
画像の読み込み
安全なモバイルデータのため、画像の読み込みを無効にします
+ プロキシ
+ @string/pref_desc__proxy_enabled
プロキシを有効にする
Diaspora の通信をプロキシして、ファイアウォールに回避します。\n再起動が必要になることがあります
ホスト
diff --git a/tools/localization/.gitignore b/tools/localization/.gitignore
deleted file mode 100755
index 98626981..00000000
--- a/tools/localization/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-crowdin.yaml
diff --git a/tools/localization/downloadLocalizations.sh b/tools/localization/downloadLocalizations.sh
deleted file mode 100755
index 86fc3252..00000000
--- a/tools/localization/downloadLocalizations.sh
+++ /dev/null
@@ -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