#286 Get rid of HTML formatting in strings.xml

3 files changed, 27 insertions, 63 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 9454ce461..53d7ffa79 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
@@ -10,28 +10,17 @@ import androidx.fragment.app.Fragment;
 
 import it.niedermann.nextcloud.deck.R;
 import it.niedermann.nextcloud.deck.databinding.FragmentAboutContributionTabBinding;
-import it.niedermann.nextcloud.deck.util.LinkUtil;
+
+import static it.niedermann.nextcloud.deck.util.SpannableUtil.url;
 
 public class AboutFragmentContributingTab extends Fragment {
 
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         FragmentAboutContributionTabBinding binding = FragmentAboutContributionTabBinding.inflate(inflater, container, false);
-        LinkUtil.setHtml(binding.aboutSource,
-                getString(
-                        R.string.about_source,
-                        LinkUtil.makeLink(getResources(), R.string.url_source, R.string.url_source)
-                ));
-        LinkUtil.setHtml(binding.aboutIssues,
-                getString(
-                        R.string.about_issues,
-                        LinkUtil.makeLink(getResources(), R.string.url_issues, R.string.url_issues)
-                ));
-        LinkUtil.setHtml(binding.aboutTranslate,
-                getString(
-                        R.string.about_translate,
-                        LinkUtil.makeLink(getResources(), R.string.url_translations, R.string.url_translations)
-                ));
+        binding.aboutSource.setText(getString(R.string.about_source, url(getString(R.string.url_source))));
+        binding.aboutIssues.setText(getString(R.string.about_issues, url(getString(R.string.url_issues))));
+        binding.aboutTranslate.setText(getString(R.string.about_translate, url(getString(R.string.url_translations))));
         return binding.getRoot();
     }
 }
\ 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 5fc55f10e..00b197d53 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,19 +1,13 @@
 package it.niedermann.nextcloud.deck.ui.about;
 
 import android.content.SharedPreferences;
-import android.graphics.Typeface;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.text.Spannable;
-import android.text.SpannableString;
-import android.text.style.ForegroundColorSpan;
-import android.text.style.StyleSpan;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
-import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 
 import it.niedermann.nextcloud.deck.BuildConfig;
@@ -24,7 +18,10 @@ import it.niedermann.nextcloud.deck.exceptions.OfflineException;
 import it.niedermann.nextcloud.deck.model.ocs.Capabilities;
 import it.niedermann.nextcloud.deck.persistence.sync.SyncManager;
 import it.niedermann.nextcloud.deck.util.DateUtil;
-import it.niedermann.nextcloud.deck.util.LinkUtil;
+
+import static it.niedermann.nextcloud.deck.util.SpannableUtil.disabled;
+import static it.niedermann.nextcloud.deck.util.SpannableUtil.strong;
+import static it.niedermann.nextcloud.deck.util.SpannableUtil.url;
 
 public class AboutFragmentCreditsTab extends Fragment {
 
@@ -38,17 +35,17 @@ public class AboutFragmentCreditsTab extends Fragment {
 
         // VERSIONS
 
-        LinkUtil.setHtml(binding.aboutVersion, getString(R.string.about_version, strong("v" + BuildConfig.VERSION_NAME)));
+        binding.aboutVersion.setText(getString(R.string.about_version, strong("v" + BuildConfig.VERSION_NAME)));
         SyncManager syncManager = new SyncManager(requireActivity());
         try {
             syncManager.getServerVersion(new IResponseCallback<Capabilities>(null) {
                 @Override
                 public void onResponse(Capabilities response) {
-                    requireActivity().runOnUiThread(() -> LinkUtil.setHtml(binding.aboutServerAppVersion, strong("v" + response.getDeckVersion().toString())));
+                    requireActivity().runOnUiThread(() -> binding.aboutServerAppVersion.setText(strong("v" + response.getDeckVersion().toString())));
                 }
             });
         } catch (OfflineException e) {
-            binding.aboutServerAppVersion.setText(disabled(getString(R.string.you_are_currently_offline)));
+            binding.aboutServerAppVersion.setText(disabled(getString(R.string.you_are_currently_offline), requireContext()));
         }
 
         String backgroundSyncOffValue = getString(R.string.pref_value_background_sync_off);
@@ -60,28 +57,15 @@ public class AboutFragmentCreditsTab extends Fragment {
 
         binding.lastBackgroundSync.setText(
                 lastBackgroundSync == BACKGROUND_SYNC_NEVER_EXECUTED || settingsBackgroundSync.equals(backgroundSyncOffValue)
-                        ? disabled(getString(R.string.simple_disabled))
+                        ? disabled(getString(R.string.simple_disabled), requireContext())
                         : strong(DateUtil.getRelativeDateTimeString(getContext(), lastBackgroundSync))
         );
-        LinkUtil.setHtml(binding.aboutMaintainer, LinkUtil.concatenateResources(getResources(),
-                R.string.anchor_start, R.string.url_maintainer, R.string.anchor_middle, R.string.about_maintainer, R.string.anchor_end));
-        LinkUtil.setHtml(binding.aboutTranslators,
-                getString(R.string.about_translators_transifex, LinkUtil.concatenateResources(getResources(),
-                        R.string.anchor_start, R.string.url_translations, R.string.anchor_middle, R.string.about_translators_transifex_label, R.string.anchor_end
-                )));
+        binding.aboutMaintainer.setText(url(getString(R.string.about_maintainer), getString(R.string.url_maintainer)));
+        binding.aboutTranslators.setText(getString(
+                R.string.about_translators_transifex,
+                url(getString(R.string.about_translators_transifex_label), getString(R.string.url_translations))
+                )
+        );
         return binding.getRoot();
     }
-
-    private SpannableString strong(CharSequence text) {
-        SpannableString span = new SpannableString(text);
-        span.setSpan(new StyleSpan(Typeface.BOLD), 0, span.length(), 0);
-        return span;
-    }
-
-    private SpannableString disabled(CharSequence text) {
-        SpannableString span = new SpannableString(text);
-        span.setSpan(new StyleSpan(Typeface.ITALIC), 0, span.length(), 0);
-        span.setSpan(new ForegroundColorSpan(ContextCompat.getColor(requireContext(), R.color.fg_secondary)), 0, span.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-        return span;
-    }
 }
\ 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 d4a23ea1c..e0b13da03 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,7 +1,6 @@
 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;
@@ -13,29 +12,21 @@ import androidx.fragment.app.Fragment;
 
 import it.niedermann.nextcloud.deck.R;
 import it.niedermann.nextcloud.deck.databinding.FragmentAboutLicenseTabBinding;
-import it.niedermann.nextcloud.deck.util.LinkUtil;
 
-public class AboutFragmentLicenseTab extends Fragment {
+import static it.niedermann.nextcloud.deck.util.SpannableUtil.url;
 
-    private String paragraphStart;
-    private String paragraphEnd;
+public class AboutFragmentLicenseTab extends Fragment {
 
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         FragmentAboutLicenseTabBinding binding = FragmentAboutLicenseTabBinding.inflate(inflater, container, false);
-        Resources resources = getResources();
-        paragraphStart = getString(R.string.paragraph_start);
-        paragraphEnd = getString(R.string.paragraph_end);
+        binding.aboutIconsDisclaimer.setText(
+                getString(R.string.about_icons_disclaimer,
+                        url(getString(R.string.about_app_icon_author_link_label), getString(R.string.url_about_icon_author)),
+                        url(getString(R.string.about_icons_disclaimer_mdi), getString(R.string.url_about_icons_disclaimer_mdi))
+                )
+        );
         binding.aboutAppLicenseButton.setOnClickListener((v) -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.url_license)))));
-        LinkUtil.setHtml(binding.aboutIconsDisclaimer, paragraphStart, getString(R.string.about_icons_disclaimer, getAppIconHint(resources), getMdiLink(resources)), paragraphEnd);
         return binding.getRoot();
     }
-
-    private String getAppIconHint(Resources resources) {
-        return LinkUtil.makeLink(resources, R.string.url_about_icon_author, R.string.about_app_icon_author_link_label) + paragraphEnd + paragraphStart;
-    }
-
-    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