From 8d6b09c8008d35e9212dacd225106d7599c0e52a Mon Sep 17 00:00:00 2001 From: Gregor Santner Date: Sun, 19 Mar 2017 23:32:18 +0100 Subject: [PATCH] v0.2.4 Release - Custom default icon and color for secondlion ; fixes #155 --- .atomignore | 17 ++++++++ .travis.yml | 2 +- CHANGELOG.md | 9 +++++ CONTRIBUTORS.txt | 1 + app/build.gradle | 38 +++++++++++++----- app/src/main/AndroidManifest.xml | 32 ++++++++------- app/src/main/ic_launcher_test.png | Bin 0 -> 17574 bytes .../activity/MainActivity.java | 4 ++ .../diaspora_android/util/AppSettings.java | 20 ++++++--- .../res/drawable-hdpi/ic_launcher_test.png | Bin 0 -> 2947 bytes .../res/drawable-ldpi/ic_launcher_test.png | Bin 0 -> 1539 bytes .../res/drawable-mdpi/ic_launcher_test.png | Bin 0 -> 2014 bytes .../res/drawable-xhdpi/ic_launcher_test.png | Bin 0 -> 3983 bytes .../res/drawable-xxhdpi/ic_launcher_test.png | Bin 0 -> 6168 bytes .../res/drawable-xxxhdpi/ic_launcher_test.png | Bin 0 -> 8359 bytes .../res/values-cs/strings-preferences.xml | 6 ++- .../res/values-es/strings-preferences.xml | 6 ++- .../res/values-fr/strings-preferences.xml | 6 ++- .../res/values-hu/strings-preferences.xml | 5 ++- app/src/main/res/values-it/strings-about.xml | 4 +- .../res/values-it/strings-preferences.xml | 12 ++++-- app/src/main/res/values-it/strings.xml | 14 +++---- .../res/values-ja/strings-preferences.xml | 6 ++- .../res/values-ml/strings-preferences.xml | 1 - .../res/values-nl/strings-preferences.xml | 7 +++- .../res/values-pl/strings-preferences.xml | 6 ++- .../res/values-pt-rBR/strings-preferences.xml | 1 - .../res/values-ru/strings-preferences.xml | 6 ++- .../res/values-sv/strings-preferences.xml | 1 - app/src/main/res/values/strings-about.xml | 4 +- app/src/main/res/values/strings.xml | 1 - circle.yml | 38 ++++++++++++++++++ 32 files changed, 189 insertions(+), 58 deletions(-) create mode 100644 .atomignore create mode 100755 app/src/main/ic_launcher_test.png create mode 100644 app/src/main/res/drawable-hdpi/ic_launcher_test.png create mode 100644 app/src/main/res/drawable-ldpi/ic_launcher_test.png create mode 100644 app/src/main/res/drawable-mdpi/ic_launcher_test.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_launcher_test.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_launcher_test.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_launcher_test.png create mode 100644 circle.yml diff --git a/.atomignore b/.atomignore new file mode 100644 index 00000000..e915f848 --- /dev/null +++ b/.atomignore @@ -0,0 +1,17 @@ +.git +.github +.gradle +.idea +build +gradle +.gitlab-ci.yml +*.iml +local.properties +settings.gradle +gradlew +gradlew.bat +LICENSE.md +app/build +app/.gitignore +app/pom.xml +app/proguard-rules.pro diff --git a/.travis.yml b/.travis.yml index a2e9adaa..c4683a96 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ cache: - $HOME/.gradle/wrapper/ script: "./gradlew $TASK" env: - - TASK="lintFlavorDandelionDebug" + - TASK="lintFlavorDefaultDebug" - TASK="build check --stacktrace" branches: diff --git a/CHANGELOG.md b/CHANGELOG.md index a1a6209c..78d10d9a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +# v0.2.4 +- Different icon and color for secondlion +- Language switcher +- Handle dia.so links +- Improve security at internal browser decision +- More icons for notification dropdown +- Update gradle build scripts +- Added CircleCI + # v0.2.3 - Add Czech translation (thanks @bezcitu) - Add option to copy image urls to clipboard diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 9b5f3306..77d8f7d3 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -18,3 +18,4 @@ pskosinski (email AT pskosinski DOT pl): Polish translation SansPseudoFix (https://github.com/SansPseudoFix): French translation secitem (secitem AT tuta DOT io): Czech translation Zsolt Szakács (maxigaz AT diaspora DOT zone): Hungarian translation +Danilo Raffaelli (https://crowdin.com/profile/Daraf): Italian translation diff --git a/app/build.gradle b/app/build.gradle index 0f6af394..2e5f0cc3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,10 +5,19 @@ android { compileSdkVersion 24 buildToolsVersion "24.0.3" + def VERSION_CODE = 14 + def VERSION_NAME = "0.2.4" + def APP_NAME = "dandelion*" + def APP_PACKAGE = "com.github.dfa.diaspora_android" + def APP_ICON = "@drawable/ic_launcher" + defaultConfig { minSdkVersion 17 targetSdkVersion 24 + buildConfigField "boolean", "IS_TEST_BUILD", "false" + buildConfigField "boolean", "IS_GPLAY_BUILD", "false" + vectorDrawables.useSupportLibrary = true } buildTypes { @@ -19,21 +28,31 @@ android { } productFlavors { - flavorDandelion { - applicationId "com.github.dfa.diaspora_android" - manifestPlaceholders = [appName: "dandelion*"] - versionCode 13 - versionName "0.2.3" + flavorDefault { + applicationId APP_PACKAGE + resValue 'string', 'app_name', APP_NAME + manifestPlaceholders = [appIcon: APP_ICON] + versionCode VERSION_CODE; versionName VERSION_NAME } - flavorSecondlion { - applicationId "com.github.dfa.secondlion" - manifestPlaceholders = [appName: "secondlion*"] + flavorTest { + applicationId APP_PACKAGE.replace("diaspora_android", "secondlion") + resValue 'string', 'app_name', "secondlion*" + manifestPlaceholders = [appIcon: APP_ICON + "_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' } @@ -96,5 +115,4 @@ task copyRepoFiles(type: Copy) { } } } - tasks.copyRepoFiles.execute() diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9f7ad6bf..150e8241 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -9,16 +9,16 @@ + android:allowBackup="false" + android:icon="${appIcon}" + android:label="@string/app_name" + android:theme="@style/DiasporaLight"> + android:exported="false" /> + android:label="@string/settings" + android:launchMode="singleInstance" + android:theme="@style/DiasporaLight.NoActionBar" /> + android:label="@string/about_activity__title_about_app" + android:theme="@style/DiasporaLight.NoActionBar" /> + android:windowSoftInputMode="adjustResize"> @@ -67,12 +68,15 @@ + - + diff --git a/app/src/main/ic_launcher_test.png b/app/src/main/ic_launcher_test.png new file mode 100755 index 0000000000000000000000000000000000000000..18e3ea1d07dbcf2003c48081e26ea2275ad10007 GIT binary patch literal 17574 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 VpZL#|hhjQXl2b=iJhOcL{{X(Ib*TUV literal 0 HcmV?d00001 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 e1b98532..757037ce 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 @@ -59,6 +59,7 @@ import android.widget.TextView; import android.widget.Toast; import com.github.dfa.diaspora_android.App; +import com.github.dfa.diaspora_android.BuildConfig; import com.github.dfa.diaspora_android.R; import com.github.dfa.diaspora_android.data.DiasporaPodList; import com.github.dfa.diaspora_android.data.DiasporaUserProfile; @@ -392,6 +393,9 @@ public class MainActivity extends ThemedActivity } } } + else if (BuildConfig.IS_TEST_BUILD){ + navheaderImage.setImageResource(R.drawable.ic_launcher_test); + } updateNavigationViewEntryVisibilities(); } 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 db494ca6..9b2cd01b 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 @@ -17,7 +17,10 @@ package com.github.dfa.diaspora_android.util; import android.annotation.SuppressLint; import android.content.Context; import android.content.SharedPreferences; +import android.support.annotation.ColorRes; +import android.support.v4.content.ContextCompat; +import com.github.dfa.diaspora_android.BuildConfig; import com.github.dfa.diaspora_android.R; import com.github.dfa.diaspora_android.data.DiasporaAspect; import com.github.dfa.diaspora_android.data.DiasporaPodList.DiasporaPod; @@ -136,6 +139,10 @@ public class AppSettings { return pref.getInt(key, defaultColor); } + public int getColorRes(@ColorRes int resColorId){ + return ContextCompat.getColor(context, resColorId); + } + public void registerPrefAppPreferenceChangedListener(SharedPreferences.OnSharedPreferenceChangeListener listener) { prefApp.registerOnSharedPreferenceChangeListener(listener); } @@ -445,13 +452,14 @@ public class AppSettings { public int[] getPrimaryColorSettings() { return new int[]{ - getInt(prefApp, R.string.pref_key__primary_color_base, context.getResources().getColor(R.color.md_blue_500)), - getInt(prefApp, R.string.pref_key__primary_color_shade, context.getResources().getColor(R.color.primary)) + getInt(prefApp, R.string.pref_key__primary_color_base, getColorRes(R.color.md_blue_500)), + getInt(prefApp, R.string.pref_key__primary_color_shade, getColorRes(R.color.primary)) }; } public int getPrimaryColor() { - return getInt(prefApp, R.string.pref_key__primary_color_shade, context.getResources().getColor(R.color.primary)); + return getInt(prefApp, R.string.pref_key__primary_color_shade, getColorRes( + BuildConfig.IS_TEST_BUILD ? R.color.md_brown_800 : R.color.primary)); } public void setAccentColorSettings(int base, int shade) { @@ -461,13 +469,13 @@ public class AppSettings { public int[] getAccentColorSettings() { return new int[]{ - getInt(prefApp, R.string.pref_key__accent_color_base, context.getResources().getColor(R.color.md_deep_orange_500)), - getInt(prefApp, R.string.pref_key__accent_color_shade, context.getResources().getColor(R.color.accent)) + getInt(prefApp, R.string.pref_key__accent_color_base, getColorRes(R.color.md_deep_orange_500)), + getInt(prefApp, R.string.pref_key__accent_color_shade, getColorRes(R.color.accent)) }; } public int getAccentColor() { - return getInt(prefApp, R.string.pref_key__accent_color_shade, context.getResources().getColor(R.color.accent)); + return getInt(prefApp, R.string.pref_key__accent_color_shade, getColorRes(R.color.accent)); } public boolean isExtendedNotificationsActivated() { diff --git a/app/src/main/res/drawable-hdpi/ic_launcher_test.png b/app/src/main/res/drawable-hdpi/ic_launcher_test.png new file mode 100644 index 0000000000000000000000000000000000000000..2e1ab3f50c9880b38d64fa0266807273f46429aa GIT binary patch literal 2947 zcmV-}3w-p6P)004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00006 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-ldpi/ic_launcher_test.png b/app/src/main/res/drawable-ldpi/ic_launcher_test.png new file mode 100644 index 0000000000000000000000000000000000000000..a4c4ac0b2b60df1da2821fb406ad3ee5023940f2 GIT binary patch literal 1539 zcmV+e2K@PnP)004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00006 zVoOIv00000008+zyMF)x010qNS#tma#Hj!R#Hj)8Ya7r2000McNliru;R6#C10)#1 zT$lg=1oBBlK~z}7wU}*8Q&$+rf9IAKifC7nIf4#1-n3Ihh7$%cMrDf*LtM;UGEMe@ zn7C}y5BsphZE?x6WyuoVG$YHlWG`xh#=S%xGs_@R*b4$vGzJBAzQvh=2rUCzde1&^ z+FWRFxyAA%P1@UY&+|Xe>;E}|Dag8fYwPMS$G^8o00<4RsqaBRe-LnD3P7Ad9#9N; zfGl8^`p*m80xkmWKo>9+4=@o2kl8>Luo+km%!%>71bTp0pbj_=^jZNXEP$~oAa4L= z2KQK%An-fzkpdQs1gD{lGTB z!GntfCNs3en@-N0TIFNv1Wp4)*wQ!bre02P*^Rnu6#;YG6Z3jz4&=2cD}{fg0m-zumkpc=Rr z%DSW|)+w``KAK?V`WIx$s%inyeZGapV}}U%{RnG4piJrf#+Z`E3cNX1osn{ad4+~% zbA+D?&4y-+t4!IHPG=a9!CiSkiD^j}0%vOKSfvZaix3D+3m+=U?m)AR8C_SgWx-O* zm2TGMk9S$IY6np*<8r6->hArrzpsb3Q$LGK=Uegh-y3H(P17X0E|Tm?WM${dWo2u` z?1wXD-De+)L7&$Q+#IF5V`3fhn6(mJhnz))@~PF;!tO}nnN2m^xp9TgznYml@3HW@ z87{Y|dg&FJ>nWz7s0?>TCPTh{(frHzbe?TP*i74(XJTR0fO+P@3&j=BVt1q{*CaDP z$HV*_&-m_}k;#@F?~OZ@GtI@)6{}?D*|u2D%TgG0%@ABOO(V~yarf3Waphv092pvn zi#!bU{fonq%p|csE0jz^1+^XcE?S{7%1oD=T+cF!D=KBl%JpRDFA)(Sq-5ZJ58W5e z(0Zy~p8KPb+t<5=e`F-q*2jV8fk2XhB6ufDhk^Tjv^F)+-rOL9fq)DZ#Bp3>G{B*K z@9@*%FBusQ2qDH?KH1hGS`u2SE2bBl%_(~Wnlr%@P=Z z+ac;}Tz*k8Jz^Echtg-utvlYuosk)Sexaq2J2$$*zl+K%MfKL#tX6BObVpR`c11gh z72F$N-brEU+OVqYmpjZSxR3h7UkD*U4@&;NbWSWPDka64%7IVb=GehcMZoWm zHQNM%_klJT<3w@O4=KmG{NoFk$h)_%3vYjaI97BW3YILxIU|jZmeWW%X)lYQA0i54 ztOgDMX|Z?m8v~$Tzu;8BmQf z@z*hNTv!PM^PK(*t7x*mAaW#1)Ro@uoVCR002ovPDHLkV1nMhqLu&v literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_launcher_test.png b/app/src/main/res/drawable-mdpi/ic_launcher_test.png new file mode 100644 index 0000000000000000000000000000000000000000..7f0dec563a533d9e0f902afaf9114f5871df46d9 GIT binary patch literal 2014 zcmV<42O;>0P)004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00006 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_launcher_test.png b/app/src/main/res/drawable-xxhdpi/ic_launcher_test.png new file mode 100644 index 0000000000000000000000000000000000000000..cb8629349fb596e6ea5bd3bb7776a7235ff9736a GIT binary patch literal 6168 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�bkp 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 od!H!C{~v Rozšířené oznámení Rozšiř oznámení zvonku pomocí výběrového menu, které zobrazuje kategorie oznámení + Změnit jazyk aplikace. Restartujte aplikaci, aby mohly být provedeny změny + Jazyk + Jazyk systému + Konfigurovat velikost textu WebViewu Velikost písma Normální @@ -73,7 +77,7 @@ Automaticky schovat horní a dolní nástrojovou lištu během scrollování Inteligentně schovat nástrojovou lištu Přidej „sdíleno pomocí“-poznámku - Připoj referenci na tuto aplikaci („sdíleno pomocí…“) ke sdílenému textu + Přidat referenci této aplikace ke sdílenému textu: [via #dandelion] Různé Celkový reset diff --git a/app/src/main/res/values-es/strings-preferences.xml b/app/src/main/res/values-es/strings-preferences.xml index a0d42fde..e5510951 100644 --- a/app/src/main/res/values-es/strings-preferences.xml +++ b/app/src/main/res/values-es/strings-preferences.xml @@ -31,7 +31,11 @@ Notificaciones extendidas Extender la campana de notificaciones con un menú desplegable que muestra categorías de notificación + Cambiar el idioma de esta aplicación. Reinicie la aplicación para que los cambios surtan efecto + Idioma + Idioma del sistema + Control del tamaño del texto de la vista Web Tamaño de letra Tamaño normal @@ -73,7 +77,7 @@ Ocultar barras de herramientas superior e inferior automáticamente mientras se desplaza Barras de herramientas Intellihide Añadir compartido por aviso - Agregar una referencia a esta aplicación (\"compartida por…\") a los textos compartidos + Agregar una referencia a esta aplicación en los textos compartidos: [vía #dandelion] Diverso Reinicio completo diff --git a/app/src/main/res/values-fr/strings-preferences.xml b/app/src/main/res/values-fr/strings-preferences.xml index ab5d3aa4..d79fdbab 100644 --- a/app/src/main/res/values-fr/strings-preferences.xml +++ b/app/src/main/res/values-fr/strings-preferences.xml @@ -31,7 +31,11 @@ Notifications étendues Étendre la cloche de notifications avec un menu déroulant qui affiche les catégories de notification + Change la langue de l\'application. Redémarrez l\'application pour que les changements prennent effet + Langue + Langue du système + Contrôle de la taille du texte pour l\'affichage web Taille de la police Normal @@ -73,7 +77,7 @@ Masquer les barres d’outils en haut et en bas automatiquement lors du défilement Masquage intelligent des barres d\'outils Ajoutez \"partagé via …\" aux partages - Ajoutez une référence à l\'application (« partagée via …\") aux textes partagés + Ajouter une référence à cette application aux partages: [via #dandelion] Divers Réinitialisation complète diff --git a/app/src/main/res/values-hu/strings-preferences.xml b/app/src/main/res/values-hu/strings-preferences.xml index 4ad0e966..c8dad184 100644 --- a/app/src/main/res/values-hu/strings-preferences.xml +++ b/app/src/main/res/values-hu/strings-preferences.xml @@ -31,7 +31,10 @@ Kiterjesztett értesítések Az értesítések gombra kattintva megjelenik egy gyorsmenü, amely értesítéskategóriákat mutat + Nyelv + Rendszernyelv + A webnézet szövegméretének módosítása Betűméret Normál @@ -73,7 +76,7 @@ A felső és alsó eszköztárak automatikus elrejtése görgetés közben Intelligensen eltűnő eszköztárak Használt program megemlítése megosztáskor - Ennek az alkalmazásnak megemlítése megosztott szövegeknél (\"megosztva … által\") + Hivatkozás erre az alkalmazásra a megosztásokban: [megosztva ezzel: #dandelion] Egyéb Teljes visszaállítás eredeti értékekre diff --git a/app/src/main/res/values-it/strings-about.xml b/app/src/main/res/values-it/strings-about.xml index 14ad7c08..b4a5eeaf 100644 --- a/app/src/main/res/values-it/strings-about.xml +++ b/app/src/main/res/values-it/strings-about.xml @@ -18,13 +18,13 @@ Log di debug copiato negli appunti dandelion* è la tua app per l\'esplorazione del social network diaspora*. Aggiunge funzionalità, quali un\'utile barra degli strumenti e il supporto per i server proxy come la rete Tor, alla vostra esperienza social. Contribuisci al codice! - dandelion* è sviluppato liberamente e segue le idee del progetto diaspora*. Se volete contribuire sei il benvenuto! Attualmente siamo un team molto piccolo, quindi apprezziamo qualsiasi tipo di aiuto! + dandelion* è sviluppato liberamente e segue le idee del progetto diaspora*. Se vuoi contribuire sei il benvenuto! Attualmente siamo un team molto piccolo, quindi apprezziamo qualsiasi tipo di aiuto! Ottieni il codice sorgente Traduci l\'app! L\'app non è disponibile nella tua lingua? Si può cambiare! Perché non ci aiuti a tradurlo? Utilizziamo la piattaforma Crowdin per permettere a chiunque di tradurre l\'app. Fammi tradurre Lascia un feedback! - dandelion* è ancora in sviluppo, quindi se avete suggerimenti o qualsiasi tipo di feedback, utilizzate lo strumento di segnalazione dei bug per dirci la tua! + dandelion* è ancora in sviluppo, quindi se avete suggerimenti o qualsiasi tipo di feedback, utilizza lo strumento di segnalazione dei bug per dirci la tua! Segnala un bug Passaparola! Dì ai tuoi amici e familiari di diaspora* e di #dandelion! Perché non scrivi un post sulla tua esperienza? Ci piacerebbe sentire cosa ne pensate! diff --git a/app/src/main/res/values-it/strings-preferences.xml b/app/src/main/res/values-it/strings-preferences.xml index 384f2a8a..8afe2c90 100644 --- a/app/src/main/res/values-it/strings-preferences.xml +++ b/app/src/main/res/values-it/strings-preferences.xml @@ -31,12 +31,16 @@ Notifiche estese Estendi il bottone delle notifiche con un menù che mostra le categorie di notifiche + Cambia la lingua di questa app. Riavvia l\'app per rendere effettive le modifiche + Lingua + Lingua di sistema + Controllo dimensione testo del WebView Dimensione font Normale - Grosso - Immenso + Grande + Molto grande Carica immagini Disabilita il caricamento delle immagini per risparmiare la rete dati @@ -55,7 +59,7 @@ Usa il proxy con i dati di dandelion* per eludere i firewall.\nPotrebbe essere necessario il riavvio Host Porta - App è necessario riavviare per disattivare l\'utilizzo del proxy + E\' necessario riavviare l\'app per disattivare l\'utilizzo del proxy Orbot proxy preset caricato Apri collegamenti esterni con le schede personalizzate di Chrome. Chromium o Google Chrome devono essere installati per questa funzione. \nNOTA IMPORTANTE: le schede personalizzate di Chrome non usano i server proxy configurabili! @@ -73,7 +77,7 @@ Nascondi barre superiori e inferiori automaticamente quando scrolli Barre che si nascondono intelligentemente Aggiungi avviso dell\'app - Aggiunge un riferimento a quest\'app (\"Condiviso da…\") nei testi condivisi + Aggiungere un riferimento a questa applicazione ai testi condivisi: [via #dandelion] Vario Reset completo diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 7a94d176..7ef28d15 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -37,9 +37,9 @@ Tag seguiti Attività pubbliche Segnalazioni - Condividi link - Condividi screensot - Fai uno screenshot + Condividi link come testo + Condividi screenshot della pagina Web + Fai uno screenshot della pagina web Salvataggio dell\'immagine in Salvataggio dello screenshot come: Indirizzo copiato… @@ -65,12 +65,12 @@ 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 - dandelion*. Nella sezione dei permessi puoi garantire il permesso per la scrittura sul dispositivo. - Devi garantire il permesso di accesso alla memoria per poter salvare e caricare le immagini. Dopodiché devi + Devi concedere 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 - - dandelion*. Nella sezione dei permessi puoi garantire il permesso per la scrittura sul dispositivo. + salvare le immagini più avanti, puoi concedere il permesso successivamente. Vai su: Impostazioni - App - + dandelion*. Nella sezione dei permessi puoi concedere il permesso per la scrittura sul dispositivo. Permesso negato. - Permesso garantito. Si prega di riprovare. + Permesso concesso. Si prega di riprovare. Pod personalizzato Nome del pod Protocollo diff --git a/app/src/main/res/values-ja/strings-preferences.xml b/app/src/main/res/values-ja/strings-preferences.xml index cea7cb07..ac32453b 100644 --- a/app/src/main/res/values-ja/strings-preferences.xml +++ b/app/src/main/res/values-ja/strings-preferences.xml @@ -31,7 +31,11 @@ 拡張通知 通知のカテゴリーを示すドロップダウン・メニューで通知ベルを拡張します + このアプリの言語を変更します。アプリを再起動すると変更を反映します + 言語 + システム言語 + WebView のテキストサイズを調整 フォントサイズ 標準 @@ -73,7 +77,7 @@ スクロールの間、自動的に上部と下部のツールバーを非表示にします Intellihide ツールバー シェア方法の通知を追加 - シェアしたテキストに、このアプリへの参照 (\"…でシェア\") を追加します + 共有テキストにこのアプリへの参照を追加します: [via #dandelion] その他 完全なリセット diff --git a/app/src/main/res/values-ml/strings-preferences.xml b/app/src/main/res/values-ml/strings-preferences.xml index b5d03914..cbb48b95 100644 --- a/app/src/main/res/values-ml/strings-preferences.xml +++ b/app/src/main/res/values-ml/strings-preferences.xml @@ -37,7 +37,6 @@ മുകളിലെയും ചുവട്ടിലെയും ടൂൾബാറുകൾ സ്ക്രോൾ ചെയ്യുമ്പോൾ താനേ അപ്രത്യക്ഷമാക്കുക ടൂൾബാറുകൾ ഇന്റലിഹൈഡ് ചെയ്യുക അറിയിപ്പാൽ പങ്കുവച്ചത് എന്ന് കൂട്ടിച്ചേർക്കുക - പങ്കുവയ്ക്കുന്ന വാചകങ്ങളിൽ ഈ പ്രയോഗത്തിന്റെ അവലംബം(\"…പങ്കുവച്ചത്\") എന്ന് കൂട്ടിച്ചേർക്കുക diff --git a/app/src/main/res/values-nl/strings-preferences.xml b/app/src/main/res/values-nl/strings-preferences.xml index f8ba0e91..43615641 100644 --- a/app/src/main/res/values-nl/strings-preferences.xml +++ b/app/src/main/res/values-nl/strings-preferences.xml @@ -31,7 +31,11 @@ Uitgebreide meldingen Uitbreiden van de meldingsbel met een dropdown menu dat meldingen van Categorieën toont + Taal wijzigen van deze app. Opnieuw opstarten om wijzigingen te bevestigen + Taal + Systeemtaal gebruiken + Lettergrootte van WebView instellen Lettergrootte Normaal @@ -64,6 +68,7 @@ Open uw accountinstellingen van diaspora* Uw lijst met contactpersonen beheren Beheren van Hashtags + Gevolgde hashtags ontvolgen Account wijzigen Lokale sessiegegevens wissen en schakel over naar een andere diaspora* pod/account Dit zal alle cookies en sessiegegevens wissen. Wilt u echt uw account wijzigen? @@ -72,7 +77,7 @@ Boven- en onderkant werkbalken automatisch verbergen tijdens het scrollen Werkbalken slim wegwerken Gedeeld-via-aankondiging toevoegen - Een verwijzing naar deze app (\"gedeeld door…\") toevoegen aan gedeelde teksten + Verwijzing naar deze app toevoegen aan gedeelde berichten: [via #dandelion] Overig Volledige reset diff --git a/app/src/main/res/values-pl/strings-preferences.xml b/app/src/main/res/values-pl/strings-preferences.xml index 3f6b0e8b..ac63385c 100644 --- a/app/src/main/res/values-pl/strings-preferences.xml +++ b/app/src/main/res/values-pl/strings-preferences.xml @@ -31,7 +31,11 @@ Rozszerzone powiadomienia Dodaj do ikony powiadomień menu wyboru kategorii powiadomień + Zmień język aplikacji. Uruchom ponownie aplikację by zobaczyć zmianę + Język + Język systemowy + Wybierz rozmiar tekstu WebView Rozmiar czcionki Normalny @@ -73,7 +77,7 @@ Automatycznie ukryj paski narzędzi na górze i na dole podczas przewijania Autoukrywanie pasków narzędzi Informacja o użytej aplikacji - Dodawaj do wpisów informację o użytej aplikacji (\"udostępniono za pomocą…\") + Umieszczaj odnośnik do tej aplikacji na dole udostępnianych wiadomości: [via #dandelion] Różne Całkowity restart diff --git a/app/src/main/res/values-pt-rBR/strings-preferences.xml b/app/src/main/res/values-pt-rBR/strings-preferences.xml index d036cf5e..7607f980 100644 --- a/app/src/main/res/values-pt-rBR/strings-preferences.xml +++ b/app/src/main/res/values-pt-rBR/strings-preferences.xml @@ -39,7 +39,6 @@ Ocultar as barras de ferramentas superior e inferior automaticamente durante a rolagem Barras de ferramentas auto ocultante Acrescentar compartilhado-por-aviso - Acrescentar uma referência (\"compartilhado por…\") a este app para textos compartilhados diff --git a/app/src/main/res/values-ru/strings-preferences.xml b/app/src/main/res/values-ru/strings-preferences.xml index 048d1db8..f4d8f324 100644 --- a/app/src/main/res/values-ru/strings-preferences.xml +++ b/app/src/main/res/values-ru/strings-preferences.xml @@ -31,7 +31,11 @@ Расширенные уведомления Показывать выпадающее меню с категориями уведомлений при нажатии на иконку уведомлений + Изменить язык этого приложения. Перезапустите приложение, чтобы изменения вступили в силу + Язык + Язык системы + Управление размером текста WebView Размер шрифта Нормальный @@ -73,7 +77,7 @@ Скрывать верхнюю и нижнюю панели инструментов автоматически во время прокрутки Интеллектуальное скрытие панелей инструментов Присоединять \"Опубликовано из\" к сообщению - Присоединять ссылку на приложение (\"Опубликовано из…\") к размещенным записям + Добавлять к сообщениям ссылку на это приложение: [via #dandelion] Прочее Полный сброс diff --git a/app/src/main/res/values-sv/strings-preferences.xml b/app/src/main/res/values-sv/strings-preferences.xml index 9bfd6a97..6151a71c 100644 --- a/app/src/main/res/values-sv/strings-preferences.xml +++ b/app/src/main/res/values-sv/strings-preferences.xml @@ -72,7 +72,6 @@ Dölj automatiskt de övre och undre verktygsfälten när du skrollar Intellihide-verktygsfält Lägg till delade-av-meddelande - Lägg till en hänvisning till denna app (\"delas av...\") till delade texter Diverse Total återställning diff --git a/app/src/main/res/values/strings-about.xml b/app/src/main/res/values/strings-about.xml index ed04a288..d83c92a8 100644 --- a/app/src/main/res/values/strings-about.xml +++ b/app/src/main/res/values/strings-about.xml @@ -16,7 +16,7 @@ Pod Domain: %1$s Debug log copied to clipboard - @string/dandelion + @string/app_name dandelion* is your companion app for browsing the social network diaspora*. It adds features like useful toolbars and support for proxy servers like the Tor Network to your social experience. Contribute Code! @@ -48,7 +48,7 @@ %1$s<br><br>Thank you! @string/about_activity__title_about_license - Copyright © 2015-2016 + Copyright © 2015-2017 \nThis program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. \n \nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d6fe7730..e3b9b855 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -3,7 +3,6 @@ dandelion* diaspora* Diaspora for Android - @string/dandelion #dandelion The community-run distributed social network *[via #dandelion]* diff --git a/circle.yml b/circle.yml new file mode 100644 index 00000000..8ee4b16e --- /dev/null +++ b/circle.yml @@ -0,0 +1,38 @@ +################### +general: + artifacts: + - /home/ubuntu/dandelion/app/build/outputs/apk/ + branches: + ignore: + - gh-pages + - l10n_master + - crowdin + +################### +machine: + java: + version: oraclejdk8 + environment: + ANDROID_HOME: /usr/local/android-sdk-linux + +################### +dependencies: + pre: + # Android SDK Platform + - if [ ! -d "/usr/local/android-sdk-linux/platforms/android-24" ]; then echo y | android update sdk --no-ui --all --filter "android-24"; fi + # Android SDK Build-tools + - if [ ! -d "/usr/local/android-sdk-linux/build-tools/24.0.3" ]; then echo y | android update sdk --no-ui --all --filter "build-tools-24.0.3"; fi + # Android Support Repository + - if [ ! -d "/usr/local/android-sdk-linux/extras/android/m2repository/com/android/support/design/24.2.0" ]; then echo y | android update sdk --no-ui --all --filter "extra-android-m2repository"; fi + + + cache_directories: + - /usr/local/android-sdk-linux/platforms/android-24 + - /usr/local/android-sdk-linux/build-tools/24.0.3 + - /usr/local/android-sdk-linux/extras/android/m2repository + +################### +test: + override: + - (./gradlew assembleFlavorDefault): + timeout: 360