chore(app): fix formatting, cleanup obsolete string resources

trynoice · Mar 15, 2021 · b754101 · b754101
1 parent b73944c
commit b754101
Show file tree

Hide file tree

Showing 12 changed files with 5 additions and 17 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -83,14 +83,14 @@ dependencies {
   implementation 'com.github.medyo:android-about-page:1.2.5'
   implementation 'com.google.android.exoplayer:exoplayer-core:2.11.8'
   implementation 'com.google.android:flexbox:2.0.1'
-  implementation 'com.hopenlib.library:flextools:1.0.1'
   implementation 'com.google.android.material:material:1.3.0'
   implementation 'com.google.code.gson:gson:2.8.6'
+  implementation 'com.hopenlib.library:flextools:1.0.1'
   implementation 'io.noties.markwon:core:4.6.2'
   implementation 'org.greenrobot:eventbus:3.1.1'
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
-    playstoreImplementation 'com.anjlab.android.iab.v3:library:1.1.0'
+  playstoreImplementation 'com.anjlab.android.iab.v3:library:1.1.0'
   playstoreImplementation 'com.google.android.gms:play-services-cast-framework:19.0.0'
   playstoreImplementation 'com.google.android.play:core:1.10.0'
 

diff --git a/app/src/androidTest/java/com/github/ashutoshgngwr/noice/fragment/RandomPresetFragmentTest.kt b/app/src/androidTest/java/com/github/ashutoshgngwr/noice/fragment/RandomPresetFragmentTest.kt
@@ -46,8 +46,6 @@ class RandomPresetFragmentTest {
 
   @Test
   fun testRandomPresetButton_onClick() {
-    mockkObject(Preset.Companion)
-
     val intensityExpectations = mapOf(
       R.id.preset_intensity__any to SoundLibraryFragment.RANGE_INTENSITY_ANY,
       R.id.preset_intensity__dense to SoundLibraryFragment.RANGE_INTENSITY_DENSE,
@@ -62,9 +60,6 @@ class RandomPresetFragmentTest {
 
     for ((typeID, tag) in typeExpectations) {
       for ((intensityID, intensityRange) in intensityExpectations) {
-        val mockPreset = mockk<Preset>(relaxed = true)
-        every { Preset.generateRandom(tag, intensityRange) } returns mockPreset
-
         Espresso.onView(withId(typeID)).perform(ViewActions.click())
         Espresso.onView(withId(intensityID)).perform(ViewActions.click())
 

diff --git a/app/src/main/java/com/github/ashutoshgngwr/noice/fragment/RandomPresetFragment.kt b/app/src/main/java/com/github/ashutoshgngwr/noice/fragment/RandomPresetFragment.kt
@@ -41,8 +41,8 @@ class RandomPresetFragment : Fragment() {
         R.id.preset_intensity__dense -> SoundLibraryFragment.RANGE_INTENSITY_DENSE
         else -> SoundLibraryFragment.RANGE_INTENSITY_ANY
       }
+
       MediaPlayerService.playRandomPreset(requireContext(), tag, intensity)
-      //We'll add later a if player is playing then show else there was an error
 
       // maybe show in-app review dialog to the user
       InAppReviewFlowManager.maybeAskForReview(requireActivity())

diff --git a/app/src/main/res/layout/random_preset_fragment.xml b/app/src/main/res/layout/random_preset_fragment.xml
@@ -24,7 +24,7 @@
         android:layout_height="wrap_content"
         android:layout_marginVertical="7dp"
         android:paddingBottom="15dp"
-        android:text="@string/intensity_description"
+        android:text="@string/random_preset_description"
         android:textAlignment="center" />
 
       <TextView

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -16,7 +16,6 @@
     <string name="dense">Dicht</string>
     <string name="focus">Fokus</string>
     <string name="intensity">Intensität</string>
-    <string name="intensity_description">Dichte Voreinstellungen werden versuchen mehr Geräusche auf einmal zu spielen.</string>
     <string name="light">Hell</string>
     <string name="mood">Stimmung</string>
     <string name="okay">Ok</string>

diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
@@ -157,7 +157,6 @@
     <string name="okay">D\'accord</string>
     <string name="mood">Ambiance</string>
     <string name="light">Clair</string>
-    <string name="intensity_description">La présélection « dense » tentera de jouer plus de son simultanément.</string>
     <string name="intensity">Intensité</string>
     <string name="dense">Dense</string>
     <string name="submit_feedback">Soumettre une évaluation</string>

diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
@@ -165,7 +165,6 @@
     <string name="okay">ठीक</string>
     <string name="mood">भाव</string>
     <string name="light">हलका</string>
-    <string name="intensity_description">घने प्रीसेट एक साथ अधिक ध्वनियों को बजाने का प्रयास करेंगे।</string>
     <string name="intensity">सघनता</string>
     <string name="focus">फोकस</string>
     <string name="dense">सघन</string>

diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
@@ -105,7 +105,6 @@
     <string name="sound_group__raw_noise">Rumore grezzo</string>
     <string name="sound_group__public_gatherings">Riunioni pubbliche</string>
     <string name="relax">Relax</string>
-    <string name="intensity_description">Preimpostazioni dense tenteranno di riprodurre più suoni assieme.</string>
     <string name="wake_up_timer">Timer risveglio</string>
     <string name="sleep_timer_description">Noice si riavvierà allo scadere del tempo. Usa i pulsanti sotto per aggiungere del tempo e avviare il timer.</string>
     <string name="show_saved_preset_on_startup">Mostra i preset salvati all\'avvio dell\'app</string>

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
@@ -169,6 +169,5 @@
     <string name="device_media_volume">Громкость звука устройства</string>
     <string name="wake_up_timer_cancelled">Таймер пробуждения отменён!</string>
     <string name="shortcuts_not_supported">Ваш лаунчер по умолчанию не поддерживает добавление ярлыков.</string>
-    <string name="intensity_description">Компактные предустановки будут пытаться воспроизводить больше звуков одновременно.</string>
     <string name="focus">Фокус</string>
 </resources>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
@@ -15,7 +15,6 @@
     <string name="dense">Çeşitli</string>
     <string name="focus">Odaklanmak</string>
     <string name="intensity">Çeşitlilik</string>
-    <string name="intensity_description">Çeşitli iken tek seferde daha çok ses kullanır.</string>
     <string name="light">Sade</string>
     <string name="mood">Amaç</string>
     <string name="okay">Tamam</string>

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
@@ -122,7 +122,6 @@
     <string name="okay">好</string>
     <string name="mood">情绪</string>
     <string name="light">轻</string>
-    <string name="intensity_description">稠密预设会同时播放更多的声音。</string>
     <string name="intensity">强度</string>
     <string name="about">关于</string>
     <string name="focus">集中</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -16,7 +16,7 @@
     <string name="dense">Dense</string>
     <string name="focus">Focus</string>
     <string name="intensity">Intensity</string>
-    <string name="intensity_description">Generated random presets will contain sounds corresponding to the chosen mood. Moreover, dense presets will attempt to play more sounds simultaneously.</string>
+    <string name="random_preset_description">Generated random presets will contain sounds corresponding to the chosen mood. Moreover, dense presets will attempt to play more sounds simultaneously.</string>
     <string name="light">Light</string>
     <string name="mood">Mood</string>
     <string name="okay">Okay</string>