refactor(app): update navigation menu

links to #602
trynoice · Apr 25, 2021 · 40e3266 · 40e3266
1 parent fc4b933
commit 40e3266
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 66 deletions.
diff --git a/app/src/androidTest/java/com/github/ashutoshgngwr/noice/MainActivityTest.kt b/app/src/androidTest/java/com/github/ashutoshgngwr/noice/MainActivityTest.kt
@@ -26,7 +26,6 @@ import androidx.test.espresso.intent.matcher.IntentMatchers.*
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.platform.app.InstrumentationRegistry
 import com.github.ashutoshgngwr.noice.fragment.AboutFragment
 import com.github.ashutoshgngwr.noice.fragment.PresetFragment
 import com.github.ashutoshgngwr.noice.fragment.SoundLibraryFragment
@@ -169,17 +168,13 @@ class MainActivityTest {
       onView(withId(R.id.navigation_drawer))
         .perform(NavigationViewActions.navigateTo(R.id.report_issue))
 
-      intended(
-        filterEquals(
-          Intent(
-            Intent.ACTION_VIEW, Uri.parse(
-              InstrumentationRegistry.getInstrumentation()
-                .targetContext
-                .getString(R.string.app_issues_url)
-            )
-          )
-        )
-      )
+      val context = ApplicationProvider.getApplicationContext<Context>()
+      var url = context.getString(R.string.app_issues_github_url)
+      if (BuildConfig.IS_PLAY_STORE_BUILD) {
+        url = context.getString(R.string.app_issues_form_url)
+      }
+
+      intended(filterEquals(Intent(Intent.ACTION_VIEW, Uri.parse(url))))
     } finally {
       Intents.release()
     }
@@ -203,39 +198,8 @@ class MainActivityTest {
         filterEquals(
           Intent(
             Intent.ACTION_VIEW, Uri.parse(
-              InstrumentationRegistry.getInstrumentation()
-                .targetContext
-                .getString(R.string.feedback_form_url)
-            )
-          )
-        )
-      )
-    } finally {
-      Intents.release()
-    }
-  }
-
-  @Test
-  fun testRateOnPlayStoreMenuItem() {
-    Intents.init()
-    try {
-      Intents.intending(hasAction(Intent.ACTION_VIEW))
-        .respondWith(Instrumentation.ActivityResult(Activity.RESULT_OK, Intent()))
-
-      onView(withId(R.id.layout_main))
-        .check(matches(isClosed(Gravity.START)))
-        .perform(DrawerActions.open(Gravity.START))
-
-      onView(withId(R.id.navigation_drawer))
-        .perform(NavigationViewActions.navigateTo(R.id.rate_on_play_store))
-
-      intended(
-        filterEquals(
-          Intent(
-            Intent.ACTION_VIEW,
-            Uri.parse(
               ApplicationProvider.getApplicationContext<Context>()
-                .getString(R.string.rate_us_on_play_store_url)
+                .getString(R.string.feedback_form_url)
             )
           )
         )

diff --git a/app/src/main/java/com/github/ashutoshgngwr/noice/MainActivity.kt b/app/src/main/java/com/github/ashutoshgngwr/noice/MainActivity.kt
@@ -91,8 +91,6 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
 
     // setup listener for navigation item clicks
     binding.navigationDrawer.setNavigationItemSelectedListener(this)
-    binding.navigationDrawer.menu.findItem(R.id.rate_on_play_store).isVisible =
-      BuildConfig.IS_PLAY_STORE_BUILD
 
     // bind navigation drawer menu items checked state with fragment back stack
     supportFragmentManager.addOnBackStackChangedListener {
@@ -201,17 +199,16 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
         startActivity(Intent(this, AppIntroActivity::class.java))
       }
       R.id.report_issue -> {
-        customTabsIntent.launchUrl(this, Uri.parse(getString(R.string.app_issues_url)))
+        var url = getString(R.string.app_issues_github_url)
+        if (BuildConfig.IS_PLAY_STORE_BUILD) {
+          url = getString(R.string.app_issues_form_url)
+        }
+
+        customTabsIntent.launchUrl(this, Uri.parse(url))
       }
       R.id.submit_feedback -> {
         customTabsIntent.launchUrl(this, Uri.parse(getString(R.string.feedback_form_url)))
       }
-      R.id.rate_on_play_store -> {
-        startActivity(
-          Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.rate_us_on_play_store_url)))
-            .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-        )
-      }
     }
 
     // hack to avoid stuttering in animations

diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml
@@ -37,6 +37,12 @@
     android:icon="@drawable/ic_nav_settings"
     android:title="@string/settings" />
 
+  <item
+    android:id="@+id/support_development"
+    android:icon="@drawable/ic_nav_support_development"
+    android:title="@string/support_development"
+    android:checkable="true" />
+
   <item
     android:id="@+id/about"
     android:icon="@drawable/ic_nav_info"
@@ -49,12 +55,6 @@
     android:title="@string/help"
     android:checkable="false" />
 
-  <item
-    android:id="@+id/support_development"
-    android:icon="@drawable/ic_nav_support_development"
-    android:title="@string/support_development"
-    android:checkable="true" />
-
   <item
     android:id="@+id/report_issue"
     android:icon="@drawable/ic_nav_report"
@@ -67,10 +67,4 @@
     android:icon="@drawable/ic_nav_feedback"
     android:title="@string/submit_feedback" />
 
-  <item
-    android:id="@+id/rate_on_play_store"
-    android:icon="@drawable/ic_nav_rate"
-    android:title="@string/about_play_store"
-    android:checkable="false" />
-
 </menu>
diff --git a/app/src/main/res/values/dont_translate.xml b/app/src/main/res/values/dont_translate.xml
@@ -99,7 +99,10 @@
   </string>
   <string name="credits__sound_wind_in_palm_trees" translatable="false">Palm Trees from BBC Sound Effects</string>
   <string name="credits__sound_wind_in_palm_trees_url" translatable="false">https://sound-effects.bbcrewind.co.uk/search?q=NHU05078140</string>
-  <string name="app_issues_url" translatable="false">https://github.com/ashutoshgngwr/noice/issues</string>
+  <string name="app_issues_github_url" translatable="false">https://github.com/ashutoshgngwr/noice/issues</string>
+  <string name="app_issues_form_url" translatable="false">
+    https://docs.google.com/forms/d/e/1FAIpQLSdYhyYjxhJ7IKyiqdc3AE3uINSoRWBw8ROB003gkZ47KeSjWw/viewform?usp=sf_link
+  </string>
   <string name="feedback_form_url" translatable="false">
     https://docs.google.com/forms/d/e/1FAIpQLSdEfOCyWfQ4QFMnLqlLj3BF27VKS1C-CQIokbmkXFchf6QZ6g/viewform?usp=sf_link
   </string>