#68 Make strings with hyperlinks better translateable

3 files changed, 43 insertions, 13 deletions

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/about/AboutFragmentContributingTab.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/about/AboutFragmentContributingTab.java
index 628c47419..5928d9bc5 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/about/AboutFragmentContributingTab.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/about/AboutFragmentContributingTab.java
@@ -7,6 +7,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 
 import butterknife.BindView;
@@ -24,22 +25,25 @@ public class AboutFragmentContributingTab extends Fragment {
     TextView aboutTranslate;
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View v = inflater.inflate(R.layout.fragment_about_contribution_tab, container, false);
         Resources resources = v.getResources();
         ButterKnife.bind(this, v);
         LinkUtil.setHtmlFromStringResources(aboutSource,
-                resources.getString(R.string.about_source, LinkUtil.concatenateResources(resources,
-                        R.string.anchor_start, R.string.url_source, R.string.anchor_middle, R.string.url_source, R.string.anchor_end
-                )));
+                resources.getString(
+                        R.string.about_source,
+                        LinkUtil.makeLink(resources, R.string.url_source, R.string.url_source)
+                ));
         LinkUtil.setHtmlFromStringResources(aboutIssues,
-                resources.getString(R.string.about_issues, LinkUtil.concatenateResources(resources,
-                        R.string.anchor_start, R.string.url_issues, R.string.anchor_middle, R.string.url_issues, R.string.anchor_end
-                )));
+                resources.getString(
+                        R.string.about_issues,
+                        LinkUtil.makeLink(resources, R.string.url_issues, R.string.url_issues)
+                ));
         LinkUtil.setHtmlFromStringResources(aboutTranslate,
-                resources.getString(R.string.about_translate, LinkUtil.concatenateResources(resources,
-                        R.string.anchor_start, R.string.url_translations, R.string.anchor_middle, R.string.url_translations, R.string.anchor_end
-                )));
+                resources.getString(
+                        R.string.about_translate,
+                        LinkUtil.makeLink(resources, R.string.url_translations, R.string.url_translations)
+                ));
         return v;
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/about/AboutFragmentCreditsTab.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/about/AboutFragmentCreditsTab.java
index f8520fde2..d61001709 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/about/AboutFragmentCreditsTab.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/about/AboutFragmentCreditsTab.java
@@ -1,5 +1,6 @@
 package it.niedermann.nextcloud.deck.ui.about;
 
+import android.content.res.Resources;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -27,7 +28,7 @@ public class AboutFragmentCreditsTab extends Fragment {
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View v = inflater.inflate(R.layout.fragment_about_credits_tab, container, false);
         ButterKnife.bind(this, v);
-        LinkUtil.setHtml(aboutVersion, R.string.about_version, "v" + BuildConfig.VERSION_NAME);
+        LinkUtil.setHtmlFromStringResources(aboutVersion, getString(R.string.about_version, getVersionStrongTag(getResources())));
         LinkUtil.setHtmlFromStringResources(aboutMaintainer, LinkUtil.concatenateResources(v.getResources(),
                 R.string.anchor_start, R.string.url_maintainer, R.string.anchor_middle, R.string.about_maintainer, R.string.anchor_end));
         LinkUtil.setHtmlFromStringResources(aboutTranslators,
@@ -36,4 +37,12 @@ public class AboutFragmentCreditsTab extends Fragment {
                 )));
         return v;
     }
+
+    private String getVersionStrongTag(Resources resources) {
+        return new StringBuilder()
+                .append(resources.getString(R.string.strong_start))
+                .append("v")
+                .append(BuildConfig.VERSION_NAME)
+                .append(resources.getString(R.string.strong_end)).toString();
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/about/AboutFragmentLicenseTab.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/about/AboutFragmentLicenseTab.java
index 4e4f87df8..6976a6dc2 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/about/AboutFragmentLicenseTab.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/about/AboutFragmentLicenseTab.java
@@ -1,6 +1,7 @@
 package it.niedermann.nextcloud.deck.ui.about;
 
 import android.content.Intent;
+import android.content.res.Resources;
 import android.net.Uri;
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -9,6 +10,7 @@ import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 
 import butterknife.BindView;
@@ -30,10 +32,25 @@ public class AboutFragmentLicenseTab extends Fragment {
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View v = inflater.inflate(R.layout.fragment_about_license_tab, container, false);
         ButterKnife.bind(this, v);
-        LinkUtil.setHtml(iconsDisclaimer, R.string.about_icons_disclaimer, getString(R.string.about_app_icon_author, getString(R.string.url_about_icon_author)));
+        Resources resources = getResources();
+        LinkUtil.setHtmlFromStringResources(iconsDisclaimer,
+                resources.getString(R.string.paragraph_start),
+                resources.getString(R.string.about_icons_disclaimer, getAppIconHint(resources), getMdiLink(resources)),
+                resources.getString(R.string.paragraph_end)
+        );
         return v;
     }
+
+    private String getAppIconHint(Resources resources) {
+        return LinkUtil.makeLink(resources, R.string.url_about_icon_author, R.string.about_app_icon_author_link_label) +
+                resources.getString(R.string.paragraph_end) +
+                resources.getString(R.string.paragraph_start);
+    }
+
+    private String getMdiLink(Resources resources) {
+        return LinkUtil.makeLink(resources, R.string.url_about_icons_disclaimer_mdi, R.string.about_icons_disclaimer_mdi);
+    }
 }
\ No newline at end of file