Merged master

.github/ISSUE_TEMPLATE.md

@@ -1,11 +1,12 @@
 #### General information
 
-* **Device:** eg Nexus 5
+
-* **Android Version:** eg Android 6.0.1
+* **Device:**   <!-- eg Nexus 5 -->
-* **Pod:** eg pod.geraspora.de
+* **Android Version:**  <!--eg Android 6.0.1 -->
-* **Diaspora pod version:** eg 0.5.99.0-p9bd2337c  (can be found on the bottom)
+* **App version:**  <!-- See in About -> Debug. eg 0.1.5, or commit -->
-* **App source:** F-Droid, self build (latest HEAD)
+* **App source:**  <!--F-Droid, self build (latest HEAD)  -- Can be left blank if not related -->
-* **App version:** eg 0.1.5, or commit
+* **Pod:** <!--eg pod.geraspora.de -- Can be left blank if not related -->
+* **Diaspora pod version:** <!--eg 0.5.99.0-p9bd2337c  (can be found on the bottom)  -- Can be left blank if not related -->
 
 
 <!--

CHANGELOG.md

@@ -1,9 +1,9 @@
-# v0.1.7 wip
+# v0.2.0
-- Added: Custom Theme Colors!
+- 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!
 

app/src/main/java/com/github/dfa/diaspora_android/activity/AboutActivity.java

@@ -355,7 +355,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)
@@ -397,9 +400,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) {

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

@@ -64,7 +64,12 @@
             android:text="@string/fragment_debug__section_pod" />
 
         <TextView
-            android:id="@+id/fragment_debug__pod_domain"
+            android:id="@+id/fragment_debug__account_profile_name"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <TextView
+            android:id="@+id/fragment_debug__account_profile_domain"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
 

app/src/main/res/values-de/strings-about.xml

@@ -14,7 +14,7 @@
   <string name="fragment_debug__package_name">Paketname: %1$s</string>
   <string name="fragment_debug__android_version">Android Version: %1$s</string>
   <string name="fragment_debug__device_name">Gerätename: %1$s</string>
-  <string name="fragment_debug__pod_domain">Pod-Adresse: %1$s</string>
+  <string name="fragment_debug__pod_profile_url">Pod-Adresse: %1$s</string>
   <string name="fragment_debug__toast_log_copied">Debug-Protokoll in Zwischenablage kopiert</string>
   <string name="fragment_license__3rd_party_libs_title">Verwendete Drittanbieter-Bibliotheken</string>
 </resources>

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

@@ -14,7 +14,7 @@
   <string name="fragment_debug__package_name">Nom du paquet : %1$s</string>
   <string name="fragment_debug__android_version">Version Android : %1$s</string>
   <string name="fragment_debug__device_name">Nom de l\'appareil : %1$s</string>
-  <string name="fragment_debug__pod_domain">Adresse du pod : %1$s</string>
+  <string name="fragment_debug__pod_profile_url">Adresse du pod : %1$s</string>
   <string name="fragment_debug__toast_log_copied">Journal de débogage copié dans le presse-papiers</string>
   <string name="fragment_license__3rd_party_libs_title">Bibliothèques tierces utilisées</string>
 </resources>

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

@@ -14,7 +14,7 @@
   <string name="fragment_debug__package_name">Nome pacchetto: %1$s</string>
   <string name="fragment_debug__android_version">Versione Android: %1$s</string>
   <string name="fragment_debug__device_name">Nome dispositivo: %1$s</string>
-  <string name="fragment_debug__pod_domain">Dominio pod: %1$s</string>
+  <string name="fragment_debug__pod_profile_url">Dominio pod: %1$s</string>
   <string name="fragment_debug__toast_log_copied">Log di debug copiato negli appunti</string>
   <string name="fragment_license__3rd_party_libs_title">Librerie di terze parti usate</string>
 </resources>

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

@@ -14,7 +14,7 @@
   <string name="fragment_debug__package_name">パッケージ名: %1$s</string>
   <string name="fragment_debug__android_version">Android バージョン: %1$s</string>
   <string name="fragment_debug__device_name">デバイス名: %1$s</string>
-  <string name="fragment_debug__pod_domain">ポッドドメイン: %1$s</string>
+  <string name="fragment_debug__pod_profile_url">ポッドドメイン: %1$s</string>
   <string name="fragment_debug__toast_log_copied">デバッグログをクリップボードにコピーしました</string>
   <string name="fragment_license__3rd_party_libs_title">使用したサードパーティ ライブラリー</string>
 </resources>

app/src/main/res/values-ml/strings-about.xml

@@ -9,7 +9,7 @@
   <string name="fragment_debug__section_pod">ഡയസ്പോറ പോഡ്</string>
   <string name="fragment_debug__app_version">പ്രയോഗത്തിന്റെ പതിപ്പ്:%1$s</string>
   <string name="fragment_debug__package_name">പാക്കേജിന്റെ പേര്:%1$s</string>
-  <string name="fragment_debug__pod_domain">പോഡിന്റെ അഡ്രസ്:%1$s</string>
+  <string name="fragment_debug__pod_profile_url">പോഡിന്റെ അഡ്രസ്:%1$s</string>
   <string name="fragment_license__3rd_party_libs_title">മൂന്നാം കക്ഷി ലൈബ്രറികൾ ഉപയോഗിച്ചിട്ടുണ്ട്</string>
   <!-- About (large amount of text) -->
   <!-- Lorem ipsum -->

app/src/main/res/values-pt-rBR/strings-about.xml

@@ -8,7 +8,7 @@
   <string name="fragment_debug__section_app">Aplicação</string>
   <string name="fragment_debug__section_pod">Diaspora Pod</string>
   <string name="fragment_debug__app_version">Versão do App: %1$s</string>
-  <string name="fragment_debug__pod_domain">Vagem de domínio: %1$s</string>
+  <string name="fragment_debug__pod_profile_url">Vagem de domínio: %1$s</string>
   <!-- About (large amount of text) -->
   <!-- Lorem ipsum -->
 </resources>

app/src/main/res/values/strings-about.xml

@@ -20,7 +20,8 @@
     <string name="fragment_debug__android_version">Android Version: %1$s</string>
     <string name="fragment_debug__device_name">Device Name: %1$s</string>
     <string name="fragment_debug__app_codename">Codename: %1$s</string>
-    <string name="fragment_debug__pod_domain">Pod Domain: %1$s</string>
+    <string name="fragment_debug__pod_profile_name">Pod Profile Name: %1$s</string>
+    <string name="fragment_debug__pod_profile_url">Pod Domain: %1$s</string>
     <string name="fragment_debug__toast_log_copied">Debug log copied to clipboard</string>
     <string name="fragment_license__3rd_party_libs_title">Used 3rd Party Libraries</string>