Moved hardcoded URLs to a constant file Fixed commons-app#2850 (commons-app#2851)

* Moved hardcoded URLs to build.grade Fixed commons-app#2850

* Moved Urls to a constant file

* Fixed Typo

Author: madhurgupta10

app/src/main/java/fr/free/nrw/commons/AboutActivity.java

@@ -32,6 +32,7 @@ public class AboutActivity extends NavigationBaseActivity {
     @BindView(R.id.about_version) TextView versionText;
     @BindView(R.id.about_license) HtmlTextView aboutLicenseText;
     @BindView(R.id.about_faq) TextView faqText;
+    @BindView(R.id.about_improve) HtmlTextView improve;
 
     /**
      * This method helps in the creation About screen
@@ -45,18 +46,25 @@ public void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_about);
 
         ButterKnife.bind(this);
+
         String aboutText = getString(R.string.about_license);
         aboutLicenseText.setHtmlText(aboutText);
+
+        @SuppressLint("StringFormatMatches")
+        String improveText = String.format(getString(R.string.about_improve), Urls.NEW_ISSUE_URL);
+        improve.setHtmlText(improveText);
+
         SpannableString content = new SpannableString(getString(R.string.about_faq));
         content.setSpan(new UnderlineSpan(), 0, content.length(), 0);
         faqText.setText(content);
+
         versionText.setText(ConfigUtils.getVersionNameWithSha(getApplicationContext()));
+
         TextView rate_us = findViewById(R.id.about_rate_us);
         TextView privacy_policy = findViewById(R.id.about_privacy_policy);
         TextView translate = findViewById(R.id.about_translate);
         TextView credits = findViewById(R.id.about_credits);
         TextView faq = findViewById(R.id.about_faq);
-
         rate_us.setText(StringUtil.fromHtml(getString(R.string.about_rate_us)));
         privacy_policy.setText(StringUtil.fromHtml(getString(R.string.about_privacy_policy)));
         translate.setText(StringUtil.fromHtml(getString(R.string.about_translate)));
@@ -70,22 +78,22 @@ public void onCreate(Bundle savedInstanceState) {
     public void launchFacebook(View view) {
         Intent intent;
         try {
-            intent = new Intent(Intent.ACTION_VIEW, Uri.parse("fb://page/" + "1921335171459985"));
-            intent.setPackage("com.facebook.katana");
+            intent = new Intent(Intent.ACTION_VIEW, Uri.parse(Urls.FACEBOOK_APP_URL));
+            intent.setPackage(Urls.FACEBOOK_PACKAGE_NAME);
             startActivity(intent);
         } catch (Exception e) {
-            Utils.handleWebUrl(this,Uri.parse("https://www.facebook.com/" + "1921335171459985"));
+            Utils.handleWebUrl(this, Uri.parse(Urls.FACEBOOK_WEB_URL));
         }
     }
 
     @OnClick(R.id.github_launch_icon)
     public void launchGithub(View view) {
-        Utils.handleWebUrl(this,Uri.parse("https://github.com/commons-app/apps-android-commons\\"));
+        Utils.handleWebUrl(this, Uri.parse(Urls.GITHUB_REPO_URL));
     }
 
     @OnClick(R.id.website_launch_icon)
     public void launchWebsite(View view) {
-        Utils.handleWebUrl(this,Uri.parse("https://commons-app.github.io/\\"));
+        Utils.handleWebUrl(this, Uri.parse(Urls.WEBSITE_URL));
     }
 
     @OnClick(R.id.about_rate_us)
@@ -95,18 +103,18 @@ public void launchRatings(View view){
 
     @OnClick(R.id.about_credits)
     public void launchCredits(View view) {
-        Utils.handleWebUrl(this,Uri.parse("https://github.com/commons-app/apps-android-commons/blob/master/CREDITS/\\"));
+        Utils.handleWebUrl(this, Uri.parse(Urls.CREDITS_URL));
     }
 
     @OnClick(R.id.about_privacy_policy)
     public void launchPrivacyPolicy(View view) {
-        Utils.handleWebUrl(this,Uri.parse("https://github.com/commons-app/apps-android-commons/wiki/Privacy-policy\\"));
+        Utils.handleWebUrl(this, Uri.parse(BuildConfig.PRIVACY_POLICY_URL));
     }
 
 
     @OnClick(R.id.about_faq)
     public void launchFrequentlyAskedQuesions(View view) {
-        Utils.handleWebUrl(this,Uri.parse("https://github.com/commons-app/apps-android-commons/wiki/Frequently-Asked-Questions\\"));
+        Utils.handleWebUrl(this, Uri.parse(Urls.FAQ_URL));
     }
 
     @Override
@@ -120,12 +128,12 @@ public boolean onCreateOptionsMenu(Menu menu) {
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.share_app_icon:
-                String shareText = "Upload photos to Wikimedia Commons on your phone\nDownload the Commons app: http://play.google.com/store/apps/details?id=fr.free.nrw.commons";
+                String shareText = String.format(getString(R.string.share_text), Urls.PLAY_STORE_URL);
                 Intent sendIntent = new Intent();
                 sendIntent.setAction(Intent.ACTION_SEND);
                 sendIntent.putExtra(Intent.EXTRA_TEXT, shareText);
                 sendIntent.setType("text/plain");
-                startActivity(Intent.createChooser(sendIntent, "Share app via..."));
+                startActivity(Intent.createChooser(sendIntent, getString(R.string.share_via)));
                 return true;
             default:
                 return super.onOptionsItemSelected(item);
@@ -148,8 +156,7 @@ public void launchTranslate(View view) {
                 .setMessage(R.string.about_translate_message)
                 .setPositiveButton(R.string.about_translate_proceed, (dialog, which) -> {
                     String langCode = CommonsApplication.getInstance().getLanguageLookUpTable().getCodes().get(spinner.getSelectedItemPosition());
-                    Utils.handleWebUrl(AboutActivity.this,Uri.parse("https://translatewiki.net/w/i.php?title=Special:Translate&language="
-                            + langCode + "&group=commons-android-strings&filter=%21translated&action=translate ?"));
+                    Utils.handleWebUrl(AboutActivity.this, Uri.parse(Urls.TRANSLATE_WIKI_URL + langCode));
                 });
         builder.setNegativeButton(R.string.about_translate_cancel, (dialog, which) -> finish());
         builder.create().show();

app/src/main/java/fr/free/nrw/commons/Urls.java

@@ -0,0 +1,14 @@
+package fr.free.nrw.commons;
+
+class Urls {
+    static final String NEW_ISSUE_URL = "https://github.com/commons-app/apps-android-commons/issues";
+    static final String GITHUB_REPO_URL = "https://github.com/commons-app/apps-android-commons";
+    static final String WEBSITE_URL = "https://commons-app.github.io";
+    static final String CREDITS_URL = "https://github.com/commons-app/apps-android-commons/blob/master/CREDITS";
+    static final String FAQ_URL = "https://github.com/commons-app/apps-android-commons/wiki/Frequently-Asked-Questions";
+    static final String PLAY_STORE_URL = "https://play.google.com/store/apps/details?id=fr.free.nrw.commons";
+    static final String TRANSLATE_WIKI_URL = "https://translatewiki.net/w/i.php?title=Special:Translate&group=commons-android-strings&filter=%21translated&action=translate&language=";
+    static final String FACEBOOK_WEB_URL = "https://www.facebook.com/1921335171459985";
+    static final String FACEBOOK_APP_URL = "fb://page/1921335171459985";
+    static final String FACEBOOK_PACKAGE_NAME = "com.facebook.katana";
+}

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

@@ -69,8 +69,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/small_gap"
-                        android:gravity="center"
-                        android:text="@string/about_improve" />
+                        android:gravity="center" />
 
 
                     <LinearLayout

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

@@ -91,7 +91,7 @@
   <string name="menu_about">About</string>
   <string name="about_license">The Wikimedia Commons app is an open-source app created and maintained by grantees and volunteers of the Wikimedia community. The Wikimedia Foundation is not involved in the creation, development, or maintenance of the app. </string>
   <string name="trademarked_name" translatable="false">Wikimedia Commons</string>
-  <string name="about_improve">Create a new &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;GitHub issue&lt;/a&gt; for bug reports and suggestions.</string>
+  <string name="about_improve">Create a new &lt;a href=\"%1$s\"&gt;GitHub issue&lt;/a&gt; for bug reports and suggestions.</string>
   <string name="about_privacy_policy"><![CDATA[<u>Privacy policy</u>]]></string>
   <string name="about_credits"><![CDATA[<u>Credits</u>]]></string>
   <string name="title_activity_about">About</string>
@@ -537,5 +537,7 @@ Upload your first media by tapping on the add button.</string>
   <string name="welcome_dont_upload_content_description">Examples of images not to upload</string>
   <string name="skip_image">SKIP THIS IMAGE</string>
   <string name="download_failed_we_cannot_download_the_file_without_storage_permission">Download Failed!!. We cannot download the file without external storage permission.</string>
+  <string name="share_text">Upload photos to Wikimedia Commons on your phone Download the Commons app: %1$s</string>
+  <string name="share_via">Share app via...</string>
   <string name="image_info">Image Info</string>
 </resources>