From fd053702804eeceb374d84eaed30ff661c78d879 Mon Sep 17 00:00:00 2001 From: vanitasvitae Date: Sun, 30 Oct 2016 21:04:08 +0100 Subject: [PATCH] Fixed pod displaying pod domain/name in debug fragment and fixed diaspora markdown link --- CHANGELOG.md | 6 +++--- .../dfa/diaspora_android/activity/AboutActivity.java | 9 ++++++--- app/src/main/res/layout/about__fragment_debug.xml | 7 ++++++- app/src/main/res/values-de/strings-about.xml | 2 +- app/src/main/res/values-fr/strings-about.xml | 2 +- app/src/main/res/values-it/strings-about.xml | 2 +- app/src/main/res/values-ja/strings-about.xml | 2 +- app/src/main/res/values-ml/strings-about.xml | 2 +- app/src/main/res/values-pt-rBR/strings-about.xml | 2 +- app/src/main/res/values/strings-about.xml | 6 ++++-- 10 files changed, 25 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b0bba9e..34751a5a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,9 @@ -# v0.1.7 wip -- Added: Custom Theme Colors! +# v0.2.0 +- Added: Customizable Theme Colors! +- Improved account setup with easy tor hidden service configuration - Eye candy for the settings activity - Added: "Contacts" shortcut in the navigation slider - Increased the overall performance by using Fragments -- Improved account setup with easy tor hidden service configuration - Lots of bugfixes - Fixes for the bugfixes! diff --git a/app/src/main/java/com/github/dfa/diaspora_android/activity/AboutActivity.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/AboutActivity.java index 83d8a64f..2caa1c72 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/activity/AboutActivity.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/AboutActivity.java @@ -296,7 +296,10 @@ public class AboutActivity extends ThemedActivity @BindView(R.id.fragment_debug__device_name) TextView deviceName; - @BindView(R.id.fragment_debug__pod_domain) + @BindView(R.id.fragment_debug__account_profile_name) + TextView podName; + + @BindView(R.id.fragment_debug__account_profile_domain) TextView podDomain; @BindView(R.id.fragment_debug__log_box) @@ -338,9 +341,9 @@ public class AboutActivity extends ThemedActivity osVersion.setText(getString(R.string.fragment_debug__android_version, Build.VERSION.RELEASE)); deviceName.setText(getString(R.string.fragment_debug__device_name, Build.MANUFACTURER + " " + Build.MODEL)); - podDomain.setText(getString(R.string.fragment_debug__pod_domain, urls.getPodUrl())); if (app.getSettings().getPod() != null) { - podDomain.setText(getString(R.string.fragment_debug__pod_domain, app.getSettings().getPod().getName())); + podDomain.setText(getString(R.string.fragment_debug__pod_profile_url, app.getSettings().getPod().getPodUrl())); + podName.setText(getString(R.string.fragment_debug__pod_profile_name, app.getSettings().getPod().getName())); } } catch (PackageManager.NameNotFoundException e) { diff --git a/app/src/main/res/layout/about__fragment_debug.xml b/app/src/main/res/layout/about__fragment_debug.xml index bde176a9..b65a3489 100644 --- a/app/src/main/res/layout/about__fragment_debug.xml +++ b/app/src/main/res/layout/about__fragment_debug.xml @@ -64,7 +64,12 @@ android:text="@string/fragment_debug__section_pod" /> + + diff --git a/app/src/main/res/values-de/strings-about.xml b/app/src/main/res/values-de/strings-about.xml index c2ffbd61..2bffa194 100644 --- a/app/src/main/res/values-de/strings-about.xml +++ b/app/src/main/res/values-de/strings-about.xml @@ -14,7 +14,7 @@ Paketname: %1$s Android Version: %1$s Gerätename: %1$s - Pod-Adresse: %1$s + Pod-Adresse: %1$s Debug-Protokoll in Zwischenablage kopiert Verwendete Drittanbieter-Bibliotheken diff --git a/app/src/main/res/values-fr/strings-about.xml b/app/src/main/res/values-fr/strings-about.xml index e1d28166..d189896a 100644 --- a/app/src/main/res/values-fr/strings-about.xml +++ b/app/src/main/res/values-fr/strings-about.xml @@ -14,7 +14,7 @@ Nom du paquet : %1$s Version Android : %1$s Nom de l\'appareil : %1$s - Adresse du pod : %1$s + Adresse du pod : %1$s Journal de débogage copié dans le presse-papiers Bibliothèques tierces utilisées diff --git a/app/src/main/res/values-it/strings-about.xml b/app/src/main/res/values-it/strings-about.xml index 957fa634..10c8ed17 100644 --- a/app/src/main/res/values-it/strings-about.xml +++ b/app/src/main/res/values-it/strings-about.xml @@ -14,7 +14,7 @@ Nome pacchetto: %1$s Versione Android: %1$s Nome dispositivo: %1$s - Dominio pod: %1$s + Dominio pod: %1$s Log di debug copiato negli appunti Librerie di terze parti usate diff --git a/app/src/main/res/values-ja/strings-about.xml b/app/src/main/res/values-ja/strings-about.xml index 21d010b0..7be8a91c 100644 --- a/app/src/main/res/values-ja/strings-about.xml +++ b/app/src/main/res/values-ja/strings-about.xml @@ -14,7 +14,7 @@ パッケージ名: %1$s Android バージョン: %1$s デバイス名: %1$s - ポッドドメイン: %1$s + ポッドドメイン: %1$s デバッグログをクリップボードにコピーしました 使用したサードパーティ ライブラリー diff --git a/app/src/main/res/values-ml/strings-about.xml b/app/src/main/res/values-ml/strings-about.xml index a5fbe45e..cf24187d 100644 --- a/app/src/main/res/values-ml/strings-about.xml +++ b/app/src/main/res/values-ml/strings-about.xml @@ -9,7 +9,7 @@ ഡയസ്പോറ പോഡ് പ്രയോഗത്തിന്റെ പതിപ്പ്:%1$s പാക്കേജിന്റെ പേര്:%1$s - പോഡിന്റെ അഡ്രസ്:%1$s + പോഡിന്റെ അഡ്രസ്:%1$s മൂന്നാം കക്ഷി ലൈബ്രറികൾ ഉപയോഗിച്ചിട്ടുണ്ട് 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 94341faf..8c7b5520 100644 --- a/app/src/main/res/values-pt-rBR/strings-about.xml +++ b/app/src/main/res/values-pt-rBR/strings-about.xml @@ -8,7 +8,7 @@ Aplicação Diaspora Pod Versão do App: %1$s - Vagem de domínio: %1$s + Vagem de domínio: %1$s diff --git a/app/src/main/res/values/strings-about.xml b/app/src/main/res/values/strings-about.xml index 38b43ed5..ff5df216 100644 --- a/app/src/main/res/values/strings-about.xml +++ b/app/src/main/res/values/strings-about.xml @@ -19,7 +19,9 @@ Package Name: %1$s Android Version: %1$s Device Name: %1$s - Pod Domain: %1$s + Codename: %1$s + Pod Profile Name: %1$s + Pod Domain: %1$s Debug log copied to clipboard Used 3rd Party Libraries @@ -29,7 +31,7 @@ DiasporaForAndroid is your companion app for browsing the Diaspora social network. It adds features like useful toolbars and support for proxy servers like the Tor Network to your social experience. <br><br> Diaspora uses Markdown to format posts. You can find more information at<br> - https://wiki.diasporafoundation.org/Markdown_reference_guide <br> <br> + https://diasporafoundation.org/formatting <br> <br> DiasporaForAndroid is developed free as in freedom and follows the ideas of the Diaspora project. <br> You can find the source code on Github: <br>