From b7541019edddd3bb9e55a8d5fef51d3dc7867d6f Mon Sep 17 00:00:00 2001 From: Ashutosh Gangwar Date: Mon, 15 Mar 2021 08:11:56 +0530 Subject: [PATCH] chore(app): fix formatting, cleanup obsolete string resources --- app/build.gradle | 4 ++-- .../ashutoshgngwr/noice/fragment/RandomPresetFragmentTest.kt | 5 ----- .../ashutoshgngwr/noice/fragment/RandomPresetFragment.kt | 2 +- app/src/main/res/layout/random_preset_fragment.xml | 2 +- app/src/main/res/values-de/strings.xml | 1 - app/src/main/res/values-fr-rFR/strings.xml | 1 - app/src/main/res/values-hi/strings.xml | 1 - app/src/main/res/values-it-rIT/strings.xml | 1 - app/src/main/res/values-ru/strings.xml | 1 - app/src/main/res/values-tr/strings.xml | 1 - app/src/main/res/values-zh-rCN/strings.xml | 1 - app/src/main/res/values/strings.xml | 2 +- 12 files changed, 5 insertions(+), 17 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index acbfd4814..1fd9e31a8 100644 --- 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 index 468d9b6d9..53c6b2908 100644 --- 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(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 index f56d59a1f..19a647477 100644 --- 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 index 45bf8f456..ebc8d4541 100644 --- 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" /> Dicht Fokus Intensität - Dichte Voreinstellungen werden versuchen mehr Geräusche auf einmal zu spielen. Hell Stimmung Ok diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml index 317402b26..30aece7f9 100644 --- a/app/src/main/res/values-fr-rFR/strings.xml +++ b/app/src/main/res/values-fr-rFR/strings.xml @@ -157,7 +157,6 @@ D\'accord Ambiance Clair - La présélection « dense » tentera de jouer plus de son simultanément. Intensité Dense Soumettre une évaluation diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 393c4bf72..98e8a8ec4 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -165,7 +165,6 @@ ठीक भाव हलका - घने प्रीसेट एक साथ अधिक ध्वनियों को बजाने का प्रयास करेंगे। सघनता फोकस सघन diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml index fc1ae7f72..d11d416fd 100644 --- a/app/src/main/res/values-it-rIT/strings.xml +++ b/app/src/main/res/values-it-rIT/strings.xml @@ -105,7 +105,6 @@ Rumore grezzo Riunioni pubbliche Relax - Preimpostazioni dense tenteranno di riprodurre più suoni assieme. Timer risveglio Noice si riavvierà allo scadere del tempo. Usa i pulsanti sotto per aggiungere del tempo e avviare il timer. Mostra i preset salvati all\'avvio dell\'app diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index a01284cf1..175ace758 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -169,6 +169,5 @@ Громкость звука устройства Таймер пробуждения отменён! Ваш лаунчер по умолчанию не поддерживает добавление ярлыков. - Компактные предустановки будут пытаться воспроизводить больше звуков одновременно. Фокус \ No newline at end of file diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 33f8719bb..e58c9881a 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -15,7 +15,6 @@ Çeşitli Odaklanmak Çeşitlilik - Çeşitli iken tek seferde daha çok ses kullanır. Sade Amaç Tamam diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 7d0599133..5ad3792d3 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -122,7 +122,6 @@ 好 情绪 轻 - 稠密预设会同时播放更多的声音。 强度 关于 集中 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 71361923e..1accea017 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -16,7 +16,7 @@ Dense Focus Intensity - Generated random presets will contain sounds corresponding to the chosen mood. Moreover, dense presets will attempt to play more sounds simultaneously. + Generated random presets will contain sounds corresponding to the chosen mood. Moreover, dense presets will attempt to play more sounds simultaneously. Light Mood Okay