Move anchor tags to own not translateable string

3 files changed, 27 insertions, 9 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 d0328359c..628c47419 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
@@ -1,12 +1,14 @@
 package it.niedermann.nextcloud.deck.ui.about;
 
+import android.content.res.Resources;
 import android.os.Bundle;
-import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import androidx.fragment.app.Fragment;
+
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import it.niedermann.nextcloud.deck.R;
@@ -24,10 +26,20 @@ public class AboutFragmentContributingTab extends Fragment {
     @Override
     public View onCreateView(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.setHtml(aboutSource, R.string.about_source, getString(R.string.url_source));
-        LinkUtil.setHtml(aboutIssues, R.string.about_issues, getString(R.string.url_issues));
-        LinkUtil.setHtml(aboutTranslate, R.string.about_translate, getString(R.string.url_translations));
+        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
+                )));
+        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
+                )));
+        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
+                )));
         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 e86dd1a68..f8520fde2 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,12 +1,13 @@
 package it.niedermann.nextcloud.deck.ui.about;
 
 import android.os.Bundle;
-import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import androidx.fragment.app.Fragment;
+
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import it.niedermann.nextcloud.deck.BuildConfig;
@@ -27,8 +28,12 @@ public class AboutFragmentCreditsTab extends Fragment {
         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.setHtml(aboutMaintainer, R.string.about_maintainer);
-        LinkUtil.setHtml(aboutTranslators, R.string.about_translators_transifex, getString(R.string.url_translations));
+        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,
+                v.getResources().getString(R.string.about_translators_transifex, LinkUtil.concatenateResources(v.getResources(),
+                        R.string.anchor_start, R.string.url_translations, R.string.anchor_middle, R.string.about_translators_transifex_label, R.string.anchor_end
+                )));
         return v;
     }
 }
\ 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 444a6a383..4e4f87df8 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
@@ -3,13 +3,14 @@ package it.niedermann.nextcloud.deck.ui.about;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
 
+import androidx.fragment.app.Fragment;
+
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
@@ -32,7 +33,7 @@ public class AboutFragmentLicenseTab extends Fragment {
     public View onCreateView(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));
+        LinkUtil.setHtml(iconsDisclaimer, R.string.about_icons_disclaimer, getString(R.string.about_app_icon_author, getString(R.string.url_about_icon_author)));
         return v;
     }
 }
\ No newline at end of file