diff --git a/CHANGELOG.md b/CHANGELOG.md
index f549dc55..2026c00a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+### v0.2.6 (2017-05-03)
+- Fixed #156 #158 #159
+- Added chinese traditional language
+- Added NavSlider option: Statistics
+- Changed shared-by-notice text
+- Fix bottom bar hint text background color (Fix #157)
+- Color improvements
+
### v0.2.5 (2017-04-10)
- Introduce minimalistic Markdown Parser
- Show LICENSE at first start
diff --git a/app/build.gradle b/app/build.gradle
index 5449e9fc..4614d522 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,16 +5,17 @@ android {
compileSdkVersion 24
buildToolsVersion "24.0.3"
- def VERSION_CODE = 15
- def VERSION_NAME = "0.2.5"
- def APP_NAME = "dandelion*"
- def APP_PACKAGE = "com.github.dfa.diaspora_android"
- def APP_ICON = "@drawable/ic_launcher"
-
defaultConfig {
minSdkVersion 17
targetSdkVersion 24
+ versionCode 16
+ versionName "0.2.6"
+
+ applicationId "com.github.dfa.diaspora_android"
+ resValue 'string', 'app_name', "dandelion*"
+ manifestPlaceholders = [appIcon: "@drawable/ic_launcher"]
+
buildConfigField "boolean", "IS_TEST_BUILD", "false"
buildConfigField "boolean", "IS_GPLAY_BUILD", "false"
@@ -29,29 +30,22 @@ android {
productFlavors {
flavorDefault {
- applicationId APP_PACKAGE
- resValue 'string', 'app_name', APP_NAME
- manifestPlaceholders = [appIcon: APP_ICON]
- versionCode VERSION_CODE; versionName VERSION_NAME
}
+ /*
+ flavorGplay {
+ buildConfigField "boolean", "IS_GPLAY_BUILD", "true"
+ }
+ */
+
flavorTest {
- applicationId APP_PACKAGE.replace("diaspora_android", "secondlion")
+ applicationId "com.github.dfa.secondlion"
resValue 'string', 'app_name', "secondlion*"
- manifestPlaceholders = [appIcon: APP_ICON + "_test"]
+ manifestPlaceholders = [appIcon: "@drawable/ic_launcher_test"]
versionCode = Integer.parseInt(new Date().format('yyMMdd'))
versionName = new Date().format('yyMMdd')
buildConfigField "boolean", "IS_TEST_BUILD", "true"
}
-
- /* flavorGplay {
- applicationId APP_PACKAGE
- resValue 'string', 'app_name', APP_NAME
- manifestPlaceholders = [appIcon: APP_ICON]
- versionCode VERSION_CODE; versionName VERSION_NAME
- buildConfigField "boolean", "IS_GPLAY_BUILD", "true"
- }
-*/
}
lintOptions {
disable 'MissingTranslation'
diff --git a/app/src/main/java/com/github/dfa/diaspora_android/util/AppSettings.java b/app/src/main/java/com/github/dfa/diaspora_android/util/AppSettings.java
index 11be71f1..b0a17e6c 100644
--- a/app/src/main/java/com/github/dfa/diaspora_android/util/AppSettings.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/util/AppSettings.java
@@ -467,11 +467,12 @@ public class AppSettings {
public int[] getPrimaryColorSettings() {
return new int[]{
- getInt(prefApp, R.string.pref_key__primary_color_base, getColorRes(R.color.md_blue_500)),
+ getInt(prefApp, R.string.pref_key__primary_color_base, getColorRes(R.color.md_blue_650)),
getInt(prefApp, R.string.pref_key__primary_color_shade, getColorRes(R.color.primary))
};
}
+ @SuppressWarnings("ConstantConditions")
public int getPrimaryColor() {
return getInt(prefApp, R.string.pref_key__primary_color_shade, getColorRes(
BuildConfig.IS_TEST_BUILD ? R.color.md_brown_800 : R.color.primary));
@@ -484,7 +485,7 @@ public class AppSettings {
public int[] getAccentColorSettings() {
return new int[]{
- getInt(prefApp, R.string.pref_key__accent_color_base, getColorRes(R.color.md_deep_orange_500)),
+ getInt(prefApp, R.string.pref_key__accent_color_base, getColorRes(R.color.md_green_400)),
getInt(prefApp, R.string.pref_key__accent_color_shade, getColorRes(R.color.accent))
};
}
diff --git a/app/src/main/res/values-da/strings-about.xml b/app/src/main/res/values-da/strings-about.xml
index 1cc85051..218f5aad 100644
--- a/app/src/main/res/values-da/strings-about.xml
+++ b/app/src/main/res/values-da/strings-about.xml
@@ -1,5 +1,31 @@
+ Om
+ Licens
+ Fejlsøgning
+ Applikation
+ Enhed
+ diaspora* Pod
+ Fejlsøgningslog
+ Fejlsøgningslog (udvidet)
+ App version: %1$s
+ Android version: %1$s
+ Enhedsnavn: %1$s
+ Kodenavn: %1$s
+ Pod-profilnavn: %1$s
+ Pod-domæne: %1$s
+ Fejlsøgningslog kopieret til udklipsbord
+ dandelion* er dine hjælpe-applikationer til at finde rundt på det sociale netværk diaspora*. Den tilføjer funktionaliteter som værktøjslinker og understøttelse for proxy-servere som Tor til din sociale oplevelse.
+ Bidrag med kode!
+ dandelion* udvikles som fri software og følger ideerne bag diaspora*-projektet. Hvis du har lyst til at bidrage, så sæt i gang! For nuværende er vi et meget lille hold der står bag, og vi sætter stor pris på enhver form for hjælp!
+ Hent kildekoden
+ Oversæt applikationen!
+ Findes applikationen ikke på dit sprog? Det kan du ændre! Hvorfor ikke hjælpe os med at oversætte den? Vi burer crowdin-platformen som gør dig i stand til at oversætte.
+ Lad mig oversætte
+ Meld tilbage!
+ dandelion* udvikles stadig, så hvis du har forslag eller anden form for tilbagemelding, så lad os det venligst vide via vores problem-tracker!
+ Rapporter fejl
+ Spred ordet!
diff --git a/app/src/main/res/values-da/strings-preferences.xml b/app/src/main/res/values-da/strings-preferences.xml
index fd7f2a36..ff2e1553 100644
--- a/app/src/main/res/values-da/strings-preferences.xml
+++ b/app/src/main/res/values-da/strings-preferences.xml
@@ -4,6 +4,8 @@
+ Øverste værktøjslinje indlæser strøm
+ Klik på tom plads i den øverste værktøjslinje for at åbne strømme
@@ -11,6 +13,9 @@
+ Primær farve
+ Værktøjslinjers farver
+ Markeringsfarve
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 69332975..04896a27 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -3,10 +3,35 @@
+ Genindlæs
+ Indstillinger
+ Notifikationer
+ Samtaler
+ Strøm
+ Profil
+ Aspekter
+ Aktiviteter
+ Synes om
+ Kommenteret
+ Omtalelser
+ Offentlig
+ Søg
+ Kontakter
+ Ændringslog
+ Statistik
+ Alle notifikationer
+ Kommenterede også
+ Kommenter på opslag
+ Syntes om
+ Nævnte
+ Gendelte
+ Del billede
+ Åben i ekstern browser…
+ Kopier link-adresse til udklipsholder
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index dc154dd5..37e94906 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -19,6 +19,7 @@
Suchen
Kontakte
Änderungen
+ Statistik
Alle Benachrichtigungen
Auch kommentiert
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 36d22053..a842d219 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -19,6 +19,7 @@
Búsqueda
Contactos
Registro de cambios
+ Estadísticas
Todas las notificaciones
También Comentado
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index d338f16e..96b8feda 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -19,6 +19,7 @@
Rechercher
Contacts
Nouveautés
+ Statistiques
Toutes les notifications
Aussi commenté
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index d86e7229..82bdad3d 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -19,6 +19,7 @@
Buscar
Contactos
Cambios
+ Estatísticas
Todas as notificacións
Tamén comentadas
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 3c5894ff..662bdf07 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -19,6 +19,7 @@
Keresés
Partnerek
Újdonságok
+ Statisztika
Összes értesítés
Más hozzászólások
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index aad3af37..e6b8fd79 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -19,6 +19,7 @@
Cerca
Contatti
Log delle modifiche
+ Statistiche
Tutte le notifiche
Inoltre ha commentato
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 1a23f95b..7d0e6345 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -19,6 +19,7 @@
検索
連絡先
変更履歴
+ 統計情報
すべての通知
コメントもしました
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 8471b7ce..505deb17 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -19,8 +19,11 @@
검색
연락처
변경사항
+ 상태
모든 알림
+ 다른 코멘트
+ 게시물에 댓글 달기
좋아하는
멘션한
재공유
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 7e516935..efa0aba2 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -19,6 +19,7 @@
Zoeken
Contacten
Aanpassingen
+ Statistieken
Alle meldingen
Heeft ook gereageerd
diff --git a/app/src/main/res/values-pl/strings-preferences.xml b/app/src/main/res/values-pl/strings-preferences.xml
index ac63385c..9a965401 100644
--- a/app/src/main/res/values-pl/strings-preferences.xml
+++ b/app/src/main/res/values-pl/strings-preferences.xml
@@ -17,7 +17,7 @@
Pasek nawigacji
- Wybierz elementy widoczne w pasku nawigacji
+ Wybierz elementy widoczne w panelu nawigacyjnym
Użytkownik
Ogólne
Administracja
@@ -70,8 +70,8 @@
Zarządzanie tagami
Przestań śledzić wybrane tagi
Zmień konto
- Skasuj dane sesji lokalnej i przełącz się do innego poda diaspora*/konta
- Operacja spowoduje usunięcie wszystkich ciasteczek i danych sesji. Jesteś pewny, że chcesz zmienić konto?
+ Skasuj dane lokalnej sesji i przełącz się na inne konto diaspory*
+ Operacja spowoduje usunięcie wszystkich ciasteczek i danych sesji. Jesteś pewny, że chcesz przełączyć na inne konto?
Wyczyść pamięć podręczną
Wyczyść pamięć podręczną WebView
Automatycznie ukryj paski narzędzi na górze i na dole podczas przewijania
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 0b111b82..a9842542 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -19,6 +19,7 @@
Szukaj
Kontakty
Lista zmian
+ Statystyki
Wszystkie powiadomienia
Także skomentował/a
diff --git a/app/src/main/res/values-pt-rBR/strings-about.xml b/app/src/main/res/values-pt-rBR/strings-about.xml
index dc2626bd..306e9e77 100644
--- a/app/src/main/res/values-pt-rBR/strings-about.xml
+++ b/app/src/main/res/values-pt-rBR/strings-about.xml
@@ -5,8 +5,13 @@
Licença
Depurando
Aplicação
+ Dispositivo
diaspora* Pod
+ Histórico de Depuração
+ Histórico de depuração (detalhado)
Versão do App: %1$s
Versão do Android: %1$s
+ Nome do dispositivo: %1$s
+ Domínio do Pod: %1$s
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index e0e296f6..771dbdeb 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -18,6 +18,8 @@
Público
Buscar
Contatos
+ Histórico de mudanças
+ Estatísticas
Todas as notificações
Também comentado
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 276352d1..0847290f 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -19,6 +19,7 @@
Поиск
Контакты
История изменений
+ Статистика
Все уведомления
Также прокомментировали
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index e04c48e8..84b63d8c 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -18,6 +18,8 @@
Offentlig
Söc
Kontakter
+ Ändringar
+ Statistik
Alla Notiser
Kommenterade Även
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 37dba6fe..ef43d0f0 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -19,6 +19,7 @@
搜尋
聯絡人
更新紀錄
+ 統計資料
全部的通知
其他留言
diff --git a/app/src/main/res/values/color.xml b/app/src/main/res/values/color.xml
index c08cf7b3..03dbddbf 100644
--- a/app/src/main/res/values/color.xml
+++ b/app/src/main/res/values/color.xml
@@ -2,14 +2,14 @@
- @color/md_blue_650
- @color/md_blue_750
- @color/md_deep_orange_650
+ @color/primary
+ @color/primary_dark
+ @color/accent
- @color/md_blue_650
- @color/md_blue_750
- @color/md_deep_orange_650
+ @color/md_blue_750
+ @color/md_blue_900
+ @color/accent_green
#BBDEFB
#212121
#727272
@@ -29,7 +29,7 @@
#e91e63
#9c27b0
#673ab7
- #3f51b5
+ #3f51b5
#2196f3
#00bcd4
#009688