Fix #185 Use butterknife resource binding where possible

2 files changed, 26 insertions, 22 deletions

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 88a4f18d8..adacda0e5 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,6 +1,5 @@
 package it.niedermann.nextcloud.deck.ui.about;
 
-import android.content.res.Resources;
 import android.graphics.Typeface;
 import android.os.Bundle;
 import android.text.Spannable;
@@ -18,6 +17,7 @@ import androidx.fragment.app.Fragment;
 
 import java.util.Objects;
 
+import butterknife.BindString;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import it.niedermann.nextcloud.deck.BuildConfig;
@@ -39,24 +39,31 @@ public class AboutFragmentCreditsTab extends Fragment {
     @BindView(R.id.about_translators)
     TextView aboutTranslators;
 
+    @BindString(R.string.you_are_currently_offline)
+    String offlineText;
+    @BindString(R.string.strong_start)
+    String strongStart;
+    @BindString(R.string.strong_end)
+    String strongEnd;
+
     @Override
     public View onCreateView(@NonNull 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, getString(R.string.about_version, getVersionStrongTag(getResources(), BuildConfig.VERSION_NAME)));
+        LinkUtil.setHtml(aboutVersion, getString(R.string.about_version, getVersionStrongTag(BuildConfig.VERSION_NAME)));
         SyncManager syncManager = new SyncManager(Objects.requireNonNull(getActivity()));
         try {
             syncManager.getServerVersion(new IResponseCallback<Capabilities>(null) {
                 @Override
                 public void onResponse(Capabilities response) {
-                    Objects.requireNonNull(getActivity()).runOnUiThread(() -> LinkUtil.setHtml(aboutServerAppVersion, getVersionStrongTag(getResources(), response.getDeckVersion().toString())));
+                    Objects.requireNonNull(getActivity()).runOnUiThread(() -> LinkUtil.setHtml(aboutServerAppVersion, getVersionStrongTag(response.getDeckVersion().toString())));
                 }
             });
         } catch (OfflineException e) {
-            Spannable offlineText = new SpannableString(getString(R.string.you_are_currently_offline));
-            offlineText.setSpan(new StyleSpan(Typeface.ITALIC), 0, offlineText.length(), 0);
-            offlineText.setSpan(new ForegroundColorSpan(ContextCompat.getColor(Objects.requireNonNull(getContext()), R.color.fg_secondary)), 0, offlineText.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-            aboutServerAppVersion.setText(offlineText);
+            Spannable offlineTextSpannable = new SpannableString(offlineText);
+            offlineTextSpannable.setSpan(new StyleSpan(Typeface.ITALIC), 0, offlineTextSpannable.length(), 0);
+            offlineTextSpannable.setSpan(new ForegroundColorSpan(ContextCompat.getColor(Objects.requireNonNull(getContext()), R.color.fg_secondary)), 0, offlineTextSpannable.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+            aboutServerAppVersion.setText(offlineTextSpannable);
         }
         LinkUtil.setHtml(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));
@@ -67,10 +74,7 @@ public class AboutFragmentCreditsTab extends Fragment {
         return v;
     }
 
-    private static String getVersionStrongTag(Resources resources, String version) {
-        return resources.getString(R.string.strong_start) +
-                "v" +
-                version +
-                resources.getString(R.string.strong_end);
+    private String getVersionStrongTag(String version) {
+        return strongStart + "v" + version + strongEnd;
     }
 }
\ 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 d06da58fb..3ab1ea2b1 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
@@ -13,6 +13,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 
+import butterknife.BindString;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
@@ -26,6 +27,11 @@ public class AboutFragmentLicenseTab extends Fragment {
     @BindView(R.id.about_app_license_button)
     Button appLicenseButton;
 
+    @BindString(R.string.paragraph_start)
+    String paragraphStart;
+    @BindString(R.string.paragraph_end)
+    String paragraphEnd;
+
     @OnClick(R.id.about_app_license_button)
     void openLicense() {
         startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.url_license))));
@@ -36,21 +42,15 @@ public class AboutFragmentLicenseTab extends Fragment {
         View v = inflater.inflate(R.layout.fragment_about_license_tab, container, false);
         ButterKnife.bind(this, v);
         Resources resources = getResources();
-        LinkUtil.setHtml(iconsDisclaimer,
-                resources.getString(R.string.paragraph_start),
-                resources.getString(R.string.about_icons_disclaimer, getAppIconHint(resources), getMdiLink(resources)),
-                resources.getString(R.string.paragraph_end)
-        );
+        LinkUtil.setHtml(iconsDisclaimer, paragraphStart, resources.getString(R.string.about_icons_disclaimer, getAppIconHint(resources), getMdiLink(resources)), paragraphEnd);
         return v;
     }
 
-    private static 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 getAppIconHint(Resources resources) {
+        return LinkUtil.makeLink(resources, R.string.url_about_icon_author, R.string.about_app_icon_author_link_label) + paragraphEnd + paragraphStart;
     }
 
-    private static String getMdiLink(Resources resources) {
+    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