From 3f389e24e9fc8fdf0c3bd576be40763e041cb0be Mon Sep 17 00:00:00 2001 From: ocean <503259349@qq.com> Date: Wed, 5 Jun 2024 10:30:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=8D=A2namespace?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle.kts | 2 +- .../task/player}/ExampleInstrumentedTest.kt | 2 +- .../music/task/player}/ProApp.kt | 16 +++++++------- .../music/task/player}/db/bean/Audio.kt | 2 +- .../music/task/player}/db/bean/Category.kt | 2 +- .../player}/db/bean/CurrentPlayingAudio.kt | 2 +- .../player}/db/bean/CurrentPlayingAudioDao.kt | 2 +- .../task/player}/db/bean/LocalAudioDao.kt | 2 +- .../task/player}/db/bean/ResourcesList.kt | 2 +- .../task/player}/db/tools/AppDatabase.kt | 6 ++--- .../task/player}/db/tools/CollectViewModel.kt | 6 ++--- .../player}/db/tools/CurrentAudioDatabase.kt | 6 ++--- .../player}/db/tools/CurrentAudioManager.kt | 6 ++--- .../task/player}/db/tools/DatabaseManager.kt | 4 ++-- .../player}/service/LocalPlaybackService.kt | 2 +- .../music/task/player}/tools/ConvertUtil.kt | 2 +- .../tools/GridSpacingItemDecoration.kt | 2 +- .../tools/HorizontalSpaceItemDecoration.kt | 2 +- .../music/task/player}/tools/OpenUrlUtil.kt | 2 +- .../task/player}/tools/ResourcesMusicUtil.kt | 13 ++++------- .../tools/media/MediaControllerManager.kt | 14 ++++++------ .../tools/sp/SharedPreferencesHelper.kt | 2 +- .../task/player}/ui/activity/AboutActivity.kt | 6 ++--- .../task/player}/ui/activity/BaseActivity.kt | 2 +- .../player}/ui/activity/LaunchActivity.kt | 4 ++-- .../task/player}/ui/activity/MainActivity.kt | 20 ++++++++--------- .../ui/activity/PlayDetailsActivity.kt | 16 +++++++------- .../player}/ui/adapter/ParentsVoiceAdapter.kt | 18 +++++++-------- .../ui/adapter/RealHumanVoiceAdapter.kt | 16 +++++++------- .../ui/adapter/SoundsOfAppliancesAdapter.kt | 16 +++++++------- .../ui/adapter/SoundsOfNatureAdapter.kt | 16 +++++++------- .../task/player}/ui/fragment/HomeFragment.kt | 16 +++++++------- .../task/player}/ui/fragment/MeFragment.kt | 12 +++++----- .../player}/ui/fragment/SettingsFragment.kt | 22 +++++++++---------- .../music/task/player}/ui/view/BlurLayout.kt | 2 +- .../player}/ui/view/CircularProgressBar.kt | 2 +- .../task/player}/ui/view/CustomProgressBar.kt | 2 +- .../task/player}/ui/view/MarqueeTextView.java | 2 +- .../task/player}/ui/view/RadiusLayout.kt | 2 +- app/src/main/res/layout/activity_main.xml | 6 ++--- .../main/res/layout/parents_voice_layout.xml | 2 +- .../res/layout/real_human_voice_layout.xml | 4 ++-- .../music/task/player}/ExampleUnitTest.kt | 2 +- 43 files changed, 141 insertions(+), 146 deletions(-) rename app/src/androidTest/java/com/{kitobochi/softapp/task/noisetimber => offline/music/task/player}/ExampleInstrumentedTest.kt (93%) rename app/src/main/java/com/{kitobochi/softapp/task/noisetimber => offline/music/task/player}/ProApp.kt (83%) rename app/src/main/java/com/{kitobochi/softapp/task/noisetimber => offline/music/task/player}/db/bean/Audio.kt (88%) rename app/src/main/java/com/{kitobochi/softapp/task/noisetimber => offline/music/task/player}/db/bean/Category.kt (65%) rename app/src/main/java/com/{kitobochi/softapp/task/noisetimber => offline/music/task/player}/db/bean/CurrentPlayingAudio.kt (87%) rename app/src/main/java/com/{kitobochi/softapp/task/noisetimber => offline/music/task/player}/db/bean/CurrentPlayingAudioDao.kt (88%) rename app/src/main/java/com/{kitobochi/softapp/task/noisetimber => offline/music/task/player}/db/bean/LocalAudioDao.kt (92%) rename app/src/main/java/com/{kitobochi/softapp/task/noisetimber => offline/music/task/player}/db/bean/ResourcesList.kt (63%) rename app/src/main/java/com/{kitobochi/softapp/task/noisetimber => offline/music/task/player}/db/tools/AppDatabase.kt (54%) rename app/src/main/java/com/{kitobochi/softapp/task/noisetimber => offline/music/task/player}/db/tools/CollectViewModel.kt (80%) rename app/src/main/java/com/{kitobochi/softapp/task/noisetimber => offline/music/task/player}/db/tools/CurrentAudioDatabase.kt (55%) rename app/src/main/java/com/{kitobochi/softapp/task/noisetimber => offline/music/task/player}/db/tools/CurrentAudioManager.kt (84%) rename app/src/main/java/com/{kitobochi/softapp/task/noisetimber => offline/music/task/player}/db/tools/DatabaseManager.kt (92%) rename app/src/main/java/com/{kitobochi/softapp/task/noisetimber => offline/music/task/player}/service/LocalPlaybackService.kt (93%) rename app/src/main/java/com/{kitobochi/softapp/task/noisetimber => offline/music/task/player}/tools/ConvertUtil.kt (89%) rename app/src/main/java/com/{kitobochi/softapp/task/noisetimber => offline/music/task/player}/tools/GridSpacingItemDecoration.kt (90%) rename app/src/main/java/com/{kitobochi/softapp/task/noisetimber => offline/music/task/player}/tools/HorizontalSpaceItemDecoration.kt (92%) rename app/src/main/java/com/{kitobochi/softapp/task/noisetimber => offline/music/task/player}/tools/OpenUrlUtil.kt (94%) rename app/src/main/java/com/{kitobochi/softapp/task/noisetimber => offline/music/task/player}/tools/ResourcesMusicUtil.kt (81%) rename app/src/main/java/com/{kitobochi/softapp/task/noisetimber => offline/music/task/player}/tools/media/MediaControllerManager.kt (90%) rename app/src/main/java/com/{kitobochi/softapp/task/noisetimber => offline/music/task/player}/tools/sp/SharedPreferencesHelper.kt (95%) rename app/src/main/java/com/{kitobochi/softapp/task/noisetimber => offline/music/task/player}/ui/activity/AboutActivity.kt (73%) rename app/src/main/java/com/{kitobochi/softapp/task/noisetimber => offline/music/task/player}/ui/activity/BaseActivity.kt (79%) rename app/src/main/java/com/{kitobochi/softapp/task/noisetimber => offline/music/task/player}/ui/activity/LaunchActivity.kt (86%) rename app/src/main/java/com/{kitobochi/softapp/task/noisetimber => offline/music/task/player}/ui/activity/MainActivity.kt (89%) rename app/src/main/java/com/{kitobochi/softapp/task/noisetimber => offline/music/task/player}/ui/activity/PlayDetailsActivity.kt (89%) rename app/src/main/java/com/{kitobochi/softapp/task/noisetimber => offline/music/task/player}/ui/adapter/ParentsVoiceAdapter.kt (77%) rename app/src/main/java/com/{kitobochi/softapp/task/noisetimber => offline/music/task/player}/ui/adapter/RealHumanVoiceAdapter.kt (78%) rename app/src/main/java/com/{kitobochi/softapp/task/noisetimber => offline/music/task/player}/ui/adapter/SoundsOfAppliancesAdapter.kt (80%) rename app/src/main/java/com/{kitobochi/softapp/task/noisetimber => offline/music/task/player}/ui/adapter/SoundsOfNatureAdapter.kt (80%) rename app/src/main/java/com/{kitobochi/softapp/task/noisetimber => offline/music/task/player}/ui/fragment/HomeFragment.kt (86%) rename app/src/main/java/com/{kitobochi/softapp/task/noisetimber => offline/music/task/player}/ui/fragment/MeFragment.kt (93%) rename app/src/main/java/com/{kitobochi/softapp/task/noisetimber => offline/music/task/player}/ui/fragment/SettingsFragment.kt (69%) rename app/src/main/java/com/{kitobochi/softapp/task/noisetimber => offline/music/task/player}/ui/view/BlurLayout.kt (95%) rename app/src/main/java/com/{kitobochi/softapp/task/noisetimber => offline/music/task/player}/ui/view/CircularProgressBar.kt (94%) rename app/src/main/java/com/{kitobochi/softapp/task/noisetimber => offline/music/task/player}/ui/view/CustomProgressBar.kt (95%) rename app/src/main/java/com/{kitobochi/softapp/task/noisetimber => offline/music/task/player}/ui/view/MarqueeTextView.java (90%) rename app/src/main/java/com/{kitobochi/softapp/task/noisetimber => offline/music/task/player}/ui/view/RadiusLayout.kt (94%) rename app/src/test/java/com/{kitobochi/softapp/task/noisetimber => offline/music/task/player}/ExampleUnitTest.kt (87%) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index dc8e03d..932d85e 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -5,7 +5,7 @@ plugins { } android { - namespace = "com.kitobochi.softapp.task.noisetimber" + namespace = "com.offline.music.task.player" compileSdk = 34 defaultConfig { diff --git a/app/src/androidTest/java/com/kitobochi/softapp/task/noisetimber/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/offline/music/task/player/ExampleInstrumentedTest.kt similarity index 93% rename from app/src/androidTest/java/com/kitobochi/softapp/task/noisetimber/ExampleInstrumentedTest.kt rename to app/src/androidTest/java/com/offline/music/task/player/ExampleInstrumentedTest.kt index 773c5bf..c6b0937 100644 --- a/app/src/androidTest/java/com/kitobochi/softapp/task/noisetimber/ExampleInstrumentedTest.kt +++ b/app/src/androidTest/java/com/offline/music/task/player/ExampleInstrumentedTest.kt @@ -1,4 +1,4 @@ -package com.kitobochi.softapp.task.noisetimber +package com.offline.music.task.player import androidx.test.platform.app.InstrumentationRegistry import androidx.test.ext.junit.runners.AndroidJUnit4 diff --git a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/ProApp.kt b/app/src/main/java/com/offline/music/task/player/ProApp.kt similarity index 83% rename from app/src/main/java/com/kitobochi/softapp/task/noisetimber/ProApp.kt rename to app/src/main/java/com/offline/music/task/player/ProApp.kt index 7cc42d2..9dc8ab1 100644 --- a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/ProApp.kt +++ b/app/src/main/java/com/offline/music/task/player/ProApp.kt @@ -1,14 +1,14 @@ -package com.kitobochi.softapp.task.noisetimber +package com.offline.music.task.player import android.app.Application import android.content.Context -import com.kitobochi.softapp.task.noisetimber.db.bean.Audio -import com.kitobochi.softapp.task.noisetimber.db.bean.CurrentPlayingAudio -import com.kitobochi.softapp.task.noisetimber.db.bean.ResourcesList -import com.kitobochi.softapp.task.noisetimber.db.tools.CurrentAudioManager -import com.kitobochi.softapp.task.noisetimber.db.tools.DatabaseManager -import com.kitobochi.softapp.task.noisetimber.tools.media.MediaControllerManager -import com.kitobochi.softapp.task.noisetimber.tools.parseResources +import com.offline.music.task.player.db.bean.Audio +import com.offline.music.task.player.db.bean.CurrentPlayingAudio +import com.offline.music.task.player.db.bean.ResourcesList +import com.offline.music.task.player.db.tools.CurrentAudioManager +import com.offline.music.task.player.db.tools.DatabaseManager +import com.offline.music.task.player.tools.media.MediaControllerManager +import com.offline.music.task.player.tools.parseResources import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/db/bean/Audio.kt b/app/src/main/java/com/offline/music/task/player/db/bean/Audio.kt similarity index 88% rename from app/src/main/java/com/kitobochi/softapp/task/noisetimber/db/bean/Audio.kt rename to app/src/main/java/com/offline/music/task/player/db/bean/Audio.kt index 602ae37..f2bc036 100644 --- a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/db/bean/Audio.kt +++ b/app/src/main/java/com/offline/music/task/player/db/bean/Audio.kt @@ -1,4 +1,4 @@ -package com.kitobochi.softapp.task.noisetimber.db.bean +package com.offline.music.task.player.db.bean import androidx.annotation.Keep import androidx.room.ColumnInfo diff --git a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/db/bean/Category.kt b/app/src/main/java/com/offline/music/task/player/db/bean/Category.kt similarity index 65% rename from app/src/main/java/com/kitobochi/softapp/task/noisetimber/db/bean/Category.kt rename to app/src/main/java/com/offline/music/task/player/db/bean/Category.kt index 1cd22da..a1aac7b 100644 --- a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/db/bean/Category.kt +++ b/app/src/main/java/com/offline/music/task/player/db/bean/Category.kt @@ -1,4 +1,4 @@ -package com.kitobochi.softapp.task.noisetimber.db.bean +package com.offline.music.task.player.db.bean import java.io.Serializable diff --git a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/db/bean/CurrentPlayingAudio.kt b/app/src/main/java/com/offline/music/task/player/db/bean/CurrentPlayingAudio.kt similarity index 87% rename from app/src/main/java/com/kitobochi/softapp/task/noisetimber/db/bean/CurrentPlayingAudio.kt rename to app/src/main/java/com/offline/music/task/player/db/bean/CurrentPlayingAudio.kt index f9851a9..12bd6b4 100644 --- a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/db/bean/CurrentPlayingAudio.kt +++ b/app/src/main/java/com/offline/music/task/player/db/bean/CurrentPlayingAudio.kt @@ -1,4 +1,4 @@ -package com.kitobochi.softapp.task.noisetimber.db.bean +package com.offline.music.task.player.db.bean import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/db/bean/CurrentPlayingAudioDao.kt b/app/src/main/java/com/offline/music/task/player/db/bean/CurrentPlayingAudioDao.kt similarity index 88% rename from app/src/main/java/com/kitobochi/softapp/task/noisetimber/db/bean/CurrentPlayingAudioDao.kt rename to app/src/main/java/com/offline/music/task/player/db/bean/CurrentPlayingAudioDao.kt index 0f36241..74765b9 100644 --- a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/db/bean/CurrentPlayingAudioDao.kt +++ b/app/src/main/java/com/offline/music/task/player/db/bean/CurrentPlayingAudioDao.kt @@ -1,4 +1,4 @@ -package com.kitobochi.softapp.task.noisetimber.db.bean +package com.offline.music.task.player.db.bean import androidx.room.Dao import androidx.room.Delete diff --git a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/db/bean/LocalAudioDao.kt b/app/src/main/java/com/offline/music/task/player/db/bean/LocalAudioDao.kt similarity index 92% rename from app/src/main/java/com/kitobochi/softapp/task/noisetimber/db/bean/LocalAudioDao.kt rename to app/src/main/java/com/offline/music/task/player/db/bean/LocalAudioDao.kt index 005628a..e21f364 100644 --- a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/db/bean/LocalAudioDao.kt +++ b/app/src/main/java/com/offline/music/task/player/db/bean/LocalAudioDao.kt @@ -1,4 +1,4 @@ -package com.kitobochi.softapp.task.noisetimber.db.bean +package com.offline.music.task.player.db.bean import androidx.room.Dao import androidx.room.Delete diff --git a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/db/bean/ResourcesList.kt b/app/src/main/java/com/offline/music/task/player/db/bean/ResourcesList.kt similarity index 63% rename from app/src/main/java/com/kitobochi/softapp/task/noisetimber/db/bean/ResourcesList.kt rename to app/src/main/java/com/offline/music/task/player/db/bean/ResourcesList.kt index e2e62c9..6f941d2 100644 --- a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/db/bean/ResourcesList.kt +++ b/app/src/main/java/com/offline/music/task/player/db/bean/ResourcesList.kt @@ -1,4 +1,4 @@ -package com.kitobochi.softapp.task.noisetimber.db.bean +package com.offline.music.task.player.db.bean import java.io.Serializable diff --git a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/db/tools/AppDatabase.kt b/app/src/main/java/com/offline/music/task/player/db/tools/AppDatabase.kt similarity index 54% rename from app/src/main/java/com/kitobochi/softapp/task/noisetimber/db/tools/AppDatabase.kt rename to app/src/main/java/com/offline/music/task/player/db/tools/AppDatabase.kt index b199ba2..29c5643 100644 --- a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/db/tools/AppDatabase.kt +++ b/app/src/main/java/com/offline/music/task/player/db/tools/AppDatabase.kt @@ -1,10 +1,10 @@ -package com.kitobochi.softapp.task.noisetimber.db.tools +package com.offline.music.task.player.db.tools import androidx.room.Database import androidx.room.RoomDatabase -import com.kitobochi.softapp.task.noisetimber.db.bean.Audio -import com.kitobochi.softapp.task.noisetimber.db.bean.LocalAudioDao +import com.offline.music.task.player.db.bean.Audio +import com.offline.music.task.player.db.bean.LocalAudioDao @Database(entities = [Audio::class], version = 1, exportSchema = false) abstract class AppDatabase : RoomDatabase() { diff --git a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/db/tools/CollectViewModel.kt b/app/src/main/java/com/offline/music/task/player/db/tools/CollectViewModel.kt similarity index 80% rename from app/src/main/java/com/kitobochi/softapp/task/noisetimber/db/tools/CollectViewModel.kt rename to app/src/main/java/com/offline/music/task/player/db/tools/CollectViewModel.kt index 13c7907..6970442 100644 --- a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/db/tools/CollectViewModel.kt +++ b/app/src/main/java/com/offline/music/task/player/db/tools/CollectViewModel.kt @@ -1,11 +1,11 @@ -package com.kitobochi.softapp.task.noisetimber.db.tools +package com.offline.music.task.player.db.tools import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import androidx.room.Room -import com.kitobochi.softapp.task.noisetimber.ProApp -import com.kitobochi.softapp.task.noisetimber.db.bean.Audio +import com.offline.music.task.player.ProApp +import com.offline.music.task.player.db.bean.Audio import kotlinx.coroutines.launch class CollectViewModel : ViewModel() { diff --git a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/db/tools/CurrentAudioDatabase.kt b/app/src/main/java/com/offline/music/task/player/db/tools/CurrentAudioDatabase.kt similarity index 55% rename from app/src/main/java/com/kitobochi/softapp/task/noisetimber/db/tools/CurrentAudioDatabase.kt rename to app/src/main/java/com/offline/music/task/player/db/tools/CurrentAudioDatabase.kt index dc05213..32b0363 100644 --- a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/db/tools/CurrentAudioDatabase.kt +++ b/app/src/main/java/com/offline/music/task/player/db/tools/CurrentAudioDatabase.kt @@ -1,10 +1,10 @@ -package com.kitobochi.softapp.task.noisetimber.db.tools +package com.offline.music.task.player.db.tools import androidx.room.Database import androidx.room.RoomDatabase -import com.kitobochi.softapp.task.noisetimber.db.bean.CurrentPlayingAudio -import com.kitobochi.softapp.task.noisetimber.db.bean.CurrentPlayingAudioDao +import com.offline.music.task.player.db.bean.CurrentPlayingAudio +import com.offline.music.task.player.db.bean.CurrentPlayingAudioDao @Database(entities = [CurrentPlayingAudio::class], version = 1, exportSchema = false) abstract class CurrentAudioDatabase : RoomDatabase() { diff --git a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/db/tools/CurrentAudioManager.kt b/app/src/main/java/com/offline/music/task/player/db/tools/CurrentAudioManager.kt similarity index 84% rename from app/src/main/java/com/kitobochi/softapp/task/noisetimber/db/tools/CurrentAudioManager.kt rename to app/src/main/java/com/offline/music/task/player/db/tools/CurrentAudioManager.kt index dc58e7f..254fa0f 100644 --- a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/db/tools/CurrentAudioManager.kt +++ b/app/src/main/java/com/offline/music/task/player/db/tools/CurrentAudioManager.kt @@ -1,9 +1,9 @@ -package com.kitobochi.softapp.task.noisetimber.db.tools +package com.offline.music.task.player.db.tools import android.content.Context import androidx.room.Room -import com.kitobochi.softapp.task.noisetimber.db.bean.CurrentPlayingAudio -import com.kitobochi.softapp.task.noisetimber.db.bean.CurrentPlayingAudioDao +import com.offline.music.task.player.db.bean.CurrentPlayingAudio +import com.offline.music.task.player.db.bean.CurrentPlayingAudioDao class CurrentAudioManager private constructor(context: Context) { private val database: CurrentAudioDatabase = Room.databaseBuilder( diff --git a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/db/tools/DatabaseManager.kt b/app/src/main/java/com/offline/music/task/player/db/tools/DatabaseManager.kt similarity index 92% rename from app/src/main/java/com/kitobochi/softapp/task/noisetimber/db/tools/DatabaseManager.kt rename to app/src/main/java/com/offline/music/task/player/db/tools/DatabaseManager.kt index 5326cc8..abf00b9 100644 --- a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/db/tools/DatabaseManager.kt +++ b/app/src/main/java/com/offline/music/task/player/db/tools/DatabaseManager.kt @@ -1,8 +1,8 @@ -package com.kitobochi.softapp.task.noisetimber.db.tools +package com.offline.music.task.player.db.tools import android.content.Context import androidx.room.Room -import com.kitobochi.softapp.task.noisetimber.db.bean.Audio +import com.offline.music.task.player.db.bean.Audio import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/service/LocalPlaybackService.kt b/app/src/main/java/com/offline/music/task/player/service/LocalPlaybackService.kt similarity index 93% rename from app/src/main/java/com/kitobochi/softapp/task/noisetimber/service/LocalPlaybackService.kt rename to app/src/main/java/com/offline/music/task/player/service/LocalPlaybackService.kt index e346d5d..deac5db 100644 --- a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/service/LocalPlaybackService.kt +++ b/app/src/main/java/com/offline/music/task/player/service/LocalPlaybackService.kt @@ -1,4 +1,4 @@ -package com.kitobochi.softapp.task.noisetimber.service +package com.offline.music.task.player.service import android.content.Intent import androidx.media3.common.Player diff --git a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/tools/ConvertUtil.kt b/app/src/main/java/com/offline/music/task/player/tools/ConvertUtil.kt similarity index 89% rename from app/src/main/java/com/kitobochi/softapp/task/noisetimber/tools/ConvertUtil.kt rename to app/src/main/java/com/offline/music/task/player/tools/ConvertUtil.kt index 131a1fe..0af8753 100644 --- a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/tools/ConvertUtil.kt +++ b/app/src/main/java/com/offline/music/task/player/tools/ConvertUtil.kt @@ -1,4 +1,4 @@ -package com.kitobochi.softapp.task.noisetimber.tools +package com.offline.music.task.player.tools import android.content.Context import android.content.pm.PackageManager diff --git a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/tools/GridSpacingItemDecoration.kt b/app/src/main/java/com/offline/music/task/player/tools/GridSpacingItemDecoration.kt similarity index 90% rename from app/src/main/java/com/kitobochi/softapp/task/noisetimber/tools/GridSpacingItemDecoration.kt rename to app/src/main/java/com/offline/music/task/player/tools/GridSpacingItemDecoration.kt index 52fe7a2..2c78e91 100644 --- a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/tools/GridSpacingItemDecoration.kt +++ b/app/src/main/java/com/offline/music/task/player/tools/GridSpacingItemDecoration.kt @@ -1,4 +1,4 @@ -package com.kitobochi.softapp.task.noisetimber.tools +package com.offline.music.task.player.tools import android.content.Context import android.graphics.Rect diff --git a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/tools/HorizontalSpaceItemDecoration.kt b/app/src/main/java/com/offline/music/task/player/tools/HorizontalSpaceItemDecoration.kt similarity index 92% rename from app/src/main/java/com/kitobochi/softapp/task/noisetimber/tools/HorizontalSpaceItemDecoration.kt rename to app/src/main/java/com/offline/music/task/player/tools/HorizontalSpaceItemDecoration.kt index fa3d700..eb32f7b 100644 --- a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/tools/HorizontalSpaceItemDecoration.kt +++ b/app/src/main/java/com/offline/music/task/player/tools/HorizontalSpaceItemDecoration.kt @@ -1,4 +1,4 @@ -package com.kitobochi.softapp.task.noisetimber.tools +package com.offline.music.task.player.tools import android.content.Context import android.graphics.Rect diff --git a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/tools/OpenUrlUtil.kt b/app/src/main/java/com/offline/music/task/player/tools/OpenUrlUtil.kt similarity index 94% rename from app/src/main/java/com/kitobochi/softapp/task/noisetimber/tools/OpenUrlUtil.kt rename to app/src/main/java/com/offline/music/task/player/tools/OpenUrlUtil.kt index e3622fc..e8d50bc 100644 --- a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/tools/OpenUrlUtil.kt +++ b/app/src/main/java/com/offline/music/task/player/tools/OpenUrlUtil.kt @@ -1,4 +1,4 @@ -package com.kitobochi.softapp.task.noisetimber.tools +package com.offline.music.task.player.tools import android.content.ActivityNotFoundException import android.content.Context diff --git a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/tools/ResourcesMusicUtil.kt b/app/src/main/java/com/offline/music/task/player/tools/ResourcesMusicUtil.kt similarity index 81% rename from app/src/main/java/com/kitobochi/softapp/task/noisetimber/tools/ResourcesMusicUtil.kt rename to app/src/main/java/com/offline/music/task/player/tools/ResourcesMusicUtil.kt index b3fd7cd..8e13c8d 100644 --- a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/tools/ResourcesMusicUtil.kt +++ b/app/src/main/java/com/offline/music/task/player/tools/ResourcesMusicUtil.kt @@ -1,16 +1,11 @@ -package com.kitobochi.softapp.task.noisetimber.tools +package com.offline.music.task.player.tools import android.content.Context -import android.database.Cursor import android.media.MediaMetadataRetriever -import android.net.Uri -import android.provider.MediaStore -import com.kitobochi.softapp.task.noisetimber.db.bean.Audio -import com.kitobochi.softapp.task.noisetimber.db.bean.Category -import com.kitobochi.softapp.task.noisetimber.db.bean.ResourcesList +import com.offline.music.task.player.db.bean.Audio +import com.offline.music.task.player.db.bean.Category +import com.offline.music.task.player.db.bean.ResourcesList import org.json.JSONObject -import java.io.File -import java.io.InputStream fun parseResources(context: Context, jsonString: String): ResourcesList { val jsonObject = JSONObject(jsonString) diff --git a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/tools/media/MediaControllerManager.kt b/app/src/main/java/com/offline/music/task/player/tools/media/MediaControllerManager.kt similarity index 90% rename from app/src/main/java/com/kitobochi/softapp/task/noisetimber/tools/media/MediaControllerManager.kt rename to app/src/main/java/com/offline/music/task/player/tools/media/MediaControllerManager.kt index 58aa116..ecc78fe 100644 --- a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/tools/media/MediaControllerManager.kt +++ b/app/src/main/java/com/offline/music/task/player/tools/media/MediaControllerManager.kt @@ -1,4 +1,4 @@ -package com.kitobochi.softapp.task.noisetimber.tools.media +package com.offline.music.task.player.tools.media import android.content.ComponentName import android.content.Context @@ -10,13 +10,13 @@ import androidx.media3.session.MediaController import androidx.media3.session.SessionToken import com.google.common.util.concurrent.ListenableFuture import com.google.common.util.concurrent.MoreExecutors -import com.kitobochi.softapp.task.noisetimber.ProApp -import com.kitobochi.softapp.task.noisetimber.R +import com.offline.music.task.player.ProApp +import com.offline.music.task.player.R -import com.kitobochi.softapp.task.noisetimber.db.bean.Audio -import com.kitobochi.softapp.task.noisetimber.db.bean.CurrentPlayingAudio -import com.kitobochi.softapp.task.noisetimber.service.LocalPlaybackService -import com.kitobochi.softapp.task.noisetimber.tools.containsContent +import com.offline.music.task.player.db.bean.Audio +import com.offline.music.task.player.db.bean.CurrentPlayingAudio +import com.offline.music.task.player.service.LocalPlaybackService +import com.offline.music.task.player.tools.containsContent import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/tools/sp/SharedPreferencesHelper.kt b/app/src/main/java/com/offline/music/task/player/tools/sp/SharedPreferencesHelper.kt similarity index 95% rename from app/src/main/java/com/kitobochi/softapp/task/noisetimber/tools/sp/SharedPreferencesHelper.kt rename to app/src/main/java/com/offline/music/task/player/tools/sp/SharedPreferencesHelper.kt index 8c369c9..7352839 100644 --- a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/tools/sp/SharedPreferencesHelper.kt +++ b/app/src/main/java/com/offline/music/task/player/tools/sp/SharedPreferencesHelper.kt @@ -1,4 +1,4 @@ -package com.kitobochi.softapp.task.noisetimber.tools.sp +package com.offline.music.task.player.tools.sp import android.content.Context import android.content.SharedPreferences diff --git a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/ui/activity/AboutActivity.kt b/app/src/main/java/com/offline/music/task/player/ui/activity/AboutActivity.kt similarity index 73% rename from app/src/main/java/com/kitobochi/softapp/task/noisetimber/ui/activity/AboutActivity.kt rename to app/src/main/java/com/offline/music/task/player/ui/activity/AboutActivity.kt index 6fa3ea6..d686e70 100644 --- a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/ui/activity/AboutActivity.kt +++ b/app/src/main/java/com/offline/music/task/player/ui/activity/AboutActivity.kt @@ -1,10 +1,10 @@ -package com.kitobochi.softapp.task.noisetimber.ui.activity +package com.offline.music.task.player.ui.activity import android.os.Bundle import com.gyf.immersionbar.ktx.immersionBar -import com.kitobochi.softapp.task.noisetimber.databinding.ActivityAboutBinding +import com.offline.music.task.player.databinding.ActivityAboutBinding -import com.kitobochi.softapp.task.noisetimber.tools.getAppVersion +import com.offline.music.task.player.tools.getAppVersion class AboutActivity : BaseActivity() { diff --git a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/ui/activity/BaseActivity.kt b/app/src/main/java/com/offline/music/task/player/ui/activity/BaseActivity.kt similarity index 79% rename from app/src/main/java/com/kitobochi/softapp/task/noisetimber/ui/activity/BaseActivity.kt rename to app/src/main/java/com/offline/music/task/player/ui/activity/BaseActivity.kt index f10c2ec..5084022 100644 --- a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/ui/activity/BaseActivity.kt +++ b/app/src/main/java/com/offline/music/task/player/ui/activity/BaseActivity.kt @@ -1,4 +1,4 @@ -package com.kitobochi.softapp.task.noisetimber.ui.activity +package com.offline.music.task.player.ui.activity import android.os.Bundle import androidx.appcompat.app.AppCompatActivity diff --git a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/ui/activity/LaunchActivity.kt b/app/src/main/java/com/offline/music/task/player/ui/activity/LaunchActivity.kt similarity index 86% rename from app/src/main/java/com/kitobochi/softapp/task/noisetimber/ui/activity/LaunchActivity.kt rename to app/src/main/java/com/offline/music/task/player/ui/activity/LaunchActivity.kt index 094c2c9..ec55dd2 100644 --- a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/ui/activity/LaunchActivity.kt +++ b/app/src/main/java/com/offline/music/task/player/ui/activity/LaunchActivity.kt @@ -1,9 +1,9 @@ -package com.kitobochi.softapp.task.noisetimber.ui.activity +package com.offline.music.task.player.ui.activity import android.content.Intent import android.os.Bundle import com.gyf.immersionbar.ktx.immersionBar -import com.kitobochi.softapp.task.noisetimber.databinding.ActivityLaunchBinding +import com.offline.music.task.player.databinding.ActivityLaunchBinding import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay diff --git a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/ui/activity/MainActivity.kt b/app/src/main/java/com/offline/music/task/player/ui/activity/MainActivity.kt similarity index 89% rename from app/src/main/java/com/kitobochi/softapp/task/noisetimber/ui/activity/MainActivity.kt rename to app/src/main/java/com/offline/music/task/player/ui/activity/MainActivity.kt index 386006c..f7f2da9 100644 --- a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/ui/activity/MainActivity.kt +++ b/app/src/main/java/com/offline/music/task/player/ui/activity/MainActivity.kt @@ -1,4 +1,4 @@ -package com.kitobochi.softapp.task.noisetimber.ui.activity +package com.offline.music.task.player.ui.activity import android.content.Intent import android.os.Bundle @@ -11,15 +11,15 @@ import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentTransaction import androidx.media3.common.Player import com.bumptech.glide.Glide -import com.kitobochi.softapp.task.noisetimber.ProApp -import com.kitobochi.softapp.task.noisetimber.R -import com.kitobochi.softapp.task.noisetimber.databinding.ActivityMainBinding -import com.kitobochi.softapp.task.noisetimber.db.bean.Audio -import com.kitobochi.softapp.task.noisetimber.tools.getAudioDurationFromAssets -import com.kitobochi.softapp.task.noisetimber.tools.media.MediaControllerManager -import com.kitobochi.softapp.task.noisetimber.ui.fragment.HomeFragment -import com.kitobochi.softapp.task.noisetimber.ui.fragment.MeFragment -import com.kitobochi.softapp.task.noisetimber.ui.fragment.SettingsFragment +import com.offline.music.task.player.ProApp +import com.offline.music.task.player.R +import com.offline.music.task.player.databinding.ActivityMainBinding +import com.offline.music.task.player.db.bean.Audio +import com.offline.music.task.player.tools.getAudioDurationFromAssets +import com.offline.music.task.player.tools.media.MediaControllerManager +import com.offline.music.task.player.ui.fragment.HomeFragment +import com.offline.music.task.player.ui.fragment.MeFragment +import com.offline.music.task.player.ui.fragment.SettingsFragment class MainActivity : BaseActivity() { private lateinit var binding: ActivityMainBinding diff --git a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/ui/activity/PlayDetailsActivity.kt b/app/src/main/java/com/offline/music/task/player/ui/activity/PlayDetailsActivity.kt similarity index 89% rename from app/src/main/java/com/kitobochi/softapp/task/noisetimber/ui/activity/PlayDetailsActivity.kt rename to app/src/main/java/com/offline/music/task/player/ui/activity/PlayDetailsActivity.kt index f72c185..59e09ac 100644 --- a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/ui/activity/PlayDetailsActivity.kt +++ b/app/src/main/java/com/offline/music/task/player/ui/activity/PlayDetailsActivity.kt @@ -1,4 +1,4 @@ -package com.kitobochi.softapp.task.noisetimber.ui.activity +package com.offline.music.task.player.ui.activity import android.animation.ValueAnimator import android.annotation.SuppressLint @@ -13,13 +13,13 @@ import androidx.media3.common.util.UnstableApi import com.bumptech.glide.Glide import com.google.android.material.slider.Slider.OnChangeListener import com.gyf.immersionbar.ktx.immersionBar -import com.kitobochi.softapp.task.noisetimber.R -import com.kitobochi.softapp.task.noisetimber.databinding.ActivityPlayDetailsBinding -import com.kitobochi.softapp.task.noisetimber.db.bean.Audio -import com.kitobochi.softapp.task.noisetimber.tools.containsContent -import com.kitobochi.softapp.task.noisetimber.tools.convertMillisToMinutesAndSecondsString -import com.kitobochi.softapp.task.noisetimber.tools.getAudioDurationFromAssets -import com.kitobochi.softapp.task.noisetimber.tools.media.MediaControllerManager +import com.offline.music.task.player.R +import com.offline.music.task.player.databinding.ActivityPlayDetailsBinding +import com.offline.music.task.player.db.bean.Audio +import com.offline.music.task.player.tools.containsContent +import com.offline.music.task.player.tools.convertMillisToMinutesAndSecondsString +import com.offline.music.task.player.tools.getAudioDurationFromAssets +import com.offline.music.task.player.tools.media.MediaControllerManager class PlayDetailsActivity : BaseActivity() { diff --git a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/ui/adapter/ParentsVoiceAdapter.kt b/app/src/main/java/com/offline/music/task/player/ui/adapter/ParentsVoiceAdapter.kt similarity index 77% rename from app/src/main/java/com/kitobochi/softapp/task/noisetimber/ui/adapter/ParentsVoiceAdapter.kt rename to app/src/main/java/com/offline/music/task/player/ui/adapter/ParentsVoiceAdapter.kt index 886c76f..f7afddd 100644 --- a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/ui/adapter/ParentsVoiceAdapter.kt +++ b/app/src/main/java/com/offline/music/task/player/ui/adapter/ParentsVoiceAdapter.kt @@ -1,4 +1,4 @@ -package com.kitobochi.softapp.task.noisetimber.ui.adapter +package com.offline.music.task.player.ui.adapter import android.content.Context import android.content.Intent @@ -6,14 +6,14 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.kitobochi.softapp.task.noisetimber.ProApp -import com.kitobochi.softapp.task.noisetimber.R -import com.kitobochi.softapp.task.noisetimber.databinding.ParentsVoiceLayoutBinding -import com.kitobochi.softapp.task.noisetimber.db.bean.Audio -import com.kitobochi.softapp.task.noisetimber.tools.containsContent -import com.kitobochi.softapp.task.noisetimber.tools.convertMillisToMinutesAndSecondsString -import com.kitobochi.softapp.task.noisetimber.tools.getAudioDurationFromAssets -import com.kitobochi.softapp.task.noisetimber.ui.activity.PlayDetailsActivity +import com.offline.music.task.player.ProApp +import com.offline.music.task.player.R +import com.offline.music.task.player.databinding.ParentsVoiceLayoutBinding +import com.offline.music.task.player.db.bean.Audio +import com.offline.music.task.player.tools.containsContent +import com.offline.music.task.player.tools.convertMillisToMinutesAndSecondsString +import com.offline.music.task.player.tools.getAudioDurationFromAssets +import com.offline.music.task.player.ui.activity.PlayDetailsActivity //LOGO class ParentsVoiceAdapter( diff --git a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/ui/adapter/RealHumanVoiceAdapter.kt b/app/src/main/java/com/offline/music/task/player/ui/adapter/RealHumanVoiceAdapter.kt similarity index 78% rename from app/src/main/java/com/kitobochi/softapp/task/noisetimber/ui/adapter/RealHumanVoiceAdapter.kt rename to app/src/main/java/com/offline/music/task/player/ui/adapter/RealHumanVoiceAdapter.kt index b8ea777..77c499d 100644 --- a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/ui/adapter/RealHumanVoiceAdapter.kt +++ b/app/src/main/java/com/offline/music/task/player/ui/adapter/RealHumanVoiceAdapter.kt @@ -1,4 +1,4 @@ -package com.kitobochi.softapp.task.noisetimber.ui.adapter +package com.offline.music.task.player.ui.adapter import android.content.Context import android.content.Intent @@ -6,13 +6,13 @@ import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -import com.kitobochi.softapp.task.noisetimber.ProApp -import com.kitobochi.softapp.task.noisetimber.R -import com.kitobochi.softapp.task.noisetimber.databinding.RealHumanVoiceLayoutBinding -import com.kitobochi.softapp.task.noisetimber.db.bean.Audio -import com.kitobochi.softapp.task.noisetimber.tools.convertMillisToMinutesAndSecondsString -import com.kitobochi.softapp.task.noisetimber.tools.getAudioDurationFromAssets -import com.kitobochi.softapp.task.noisetimber.ui.activity.PlayDetailsActivity +import com.offline.music.task.player.ProApp +import com.offline.music.task.player.R +import com.offline.music.task.player.databinding.RealHumanVoiceLayoutBinding +import com.offline.music.task.player.db.bean.Audio +import com.offline.music.task.player.tools.convertMillisToMinutesAndSecondsString +import com.offline.music.task.player.tools.getAudioDurationFromAssets +import com.offline.music.task.player.ui.activity.PlayDetailsActivity class RealHumanVoiceAdapter( private val context: Context, diff --git a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/ui/adapter/SoundsOfAppliancesAdapter.kt b/app/src/main/java/com/offline/music/task/player/ui/adapter/SoundsOfAppliancesAdapter.kt similarity index 80% rename from app/src/main/java/com/kitobochi/softapp/task/noisetimber/ui/adapter/SoundsOfAppliancesAdapter.kt rename to app/src/main/java/com/offline/music/task/player/ui/adapter/SoundsOfAppliancesAdapter.kt index 26bb606..c71680d 100644 --- a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/ui/adapter/SoundsOfAppliancesAdapter.kt +++ b/app/src/main/java/com/offline/music/task/player/ui/adapter/SoundsOfAppliancesAdapter.kt @@ -1,4 +1,4 @@ -package com.kitobochi.softapp.task.noisetimber.ui.adapter +package com.offline.music.task.player.ui.adapter import android.content.Context import android.content.Intent @@ -7,13 +7,13 @@ import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -import com.kitobochi.softapp.task.noisetimber.ProApp -import com.kitobochi.softapp.task.noisetimber.R -import com.kitobochi.softapp.task.noisetimber.databinding.SoundsOfAppliancesLayoutBinding -import com.kitobochi.softapp.task.noisetimber.db.bean.Audio -import com.kitobochi.softapp.task.noisetimber.tools.convertMillisToMinutesAndSecondsString -import com.kitobochi.softapp.task.noisetimber.tools.getAudioDurationFromAssets -import com.kitobochi.softapp.task.noisetimber.ui.activity.PlayDetailsActivity +import com.offline.music.task.player.ProApp +import com.offline.music.task.player.R +import com.offline.music.task.player.databinding.SoundsOfAppliancesLayoutBinding +import com.offline.music.task.player.db.bean.Audio +import com.offline.music.task.player.tools.convertMillisToMinutesAndSecondsString +import com.offline.music.task.player.tools.getAudioDurationFromAssets +import com.offline.music.task.player.ui.activity.PlayDetailsActivity class SoundsOfAppliancesAdapter( private val context: Context, diff --git a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/ui/adapter/SoundsOfNatureAdapter.kt b/app/src/main/java/com/offline/music/task/player/ui/adapter/SoundsOfNatureAdapter.kt similarity index 80% rename from app/src/main/java/com/kitobochi/softapp/task/noisetimber/ui/adapter/SoundsOfNatureAdapter.kt rename to app/src/main/java/com/offline/music/task/player/ui/adapter/SoundsOfNatureAdapter.kt index 71e7dff..fb0e91a 100644 --- a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/ui/adapter/SoundsOfNatureAdapter.kt +++ b/app/src/main/java/com/offline/music/task/player/ui/adapter/SoundsOfNatureAdapter.kt @@ -1,4 +1,4 @@ -package com.kitobochi.softapp.task.noisetimber.ui.adapter +package com.offline.music.task.player.ui.adapter import android.content.Context import android.content.Intent @@ -7,13 +7,13 @@ import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -import com.kitobochi.softapp.task.noisetimber.ProApp -import com.kitobochi.softapp.task.noisetimber.R -import com.kitobochi.softapp.task.noisetimber.databinding.SoundsOfNatureLayoutBinding -import com.kitobochi.softapp.task.noisetimber.db.bean.Audio -import com.kitobochi.softapp.task.noisetimber.tools.convertMillisToMinutesAndSecondsString -import com.kitobochi.softapp.task.noisetimber.tools.getAudioDurationFromAssets -import com.kitobochi.softapp.task.noisetimber.ui.activity.PlayDetailsActivity +import com.offline.music.task.player.ProApp +import com.offline.music.task.player.R +import com.offline.music.task.player.databinding.SoundsOfNatureLayoutBinding +import com.offline.music.task.player.db.bean.Audio +import com.offline.music.task.player.tools.convertMillisToMinutesAndSecondsString +import com.offline.music.task.player.tools.getAudioDurationFromAssets +import com.offline.music.task.player.ui.activity.PlayDetailsActivity class SoundsOfNatureAdapter( diff --git a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/ui/fragment/HomeFragment.kt b/app/src/main/java/com/offline/music/task/player/ui/fragment/HomeFragment.kt similarity index 86% rename from app/src/main/java/com/kitobochi/softapp/task/noisetimber/ui/fragment/HomeFragment.kt rename to app/src/main/java/com/offline/music/task/player/ui/fragment/HomeFragment.kt index e7f031b..f6cf414 100644 --- a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/ui/fragment/HomeFragment.kt +++ b/app/src/main/java/com/offline/music/task/player/ui/fragment/HomeFragment.kt @@ -1,4 +1,4 @@ -package com.kitobochi.softapp.task.noisetimber.ui.fragment +package com.offline.music.task.player.ui.fragment import android.annotation.SuppressLint import android.os.Bundle @@ -9,13 +9,13 @@ import androidx.fragment.app.Fragment import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import com.gyf.immersionbar.ktx.immersionBar -import com.kitobochi.softapp.task.noisetimber.ProApp -import com.kitobochi.softapp.task.noisetimber.databinding.FragmentHome2Binding -import com.kitobochi.softapp.task.noisetimber.tools.GridSpacingItemDecoration -import com.kitobochi.softapp.task.noisetimber.tools.HorizontalSpaceItemDecoration -import com.kitobochi.softapp.task.noisetimber.ui.adapter.RealHumanVoiceAdapter -import com.kitobochi.softapp.task.noisetimber.ui.adapter.SoundsOfAppliancesAdapter -import com.kitobochi.softapp.task.noisetimber.ui.adapter.SoundsOfNatureAdapter +import com.offline.music.task.player.ProApp +import com.offline.music.task.player.databinding.FragmentHome2Binding +import com.offline.music.task.player.tools.GridSpacingItemDecoration +import com.offline.music.task.player.tools.HorizontalSpaceItemDecoration +import com.offline.music.task.player.ui.adapter.RealHumanVoiceAdapter +import com.offline.music.task.player.ui.adapter.SoundsOfAppliancesAdapter +import com.offline.music.task.player.ui.adapter.SoundsOfNatureAdapter class HomeFragment : Fragment() { private lateinit var binding: FragmentHome2Binding diff --git a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/ui/fragment/MeFragment.kt b/app/src/main/java/com/offline/music/task/player/ui/fragment/MeFragment.kt similarity index 93% rename from app/src/main/java/com/kitobochi/softapp/task/noisetimber/ui/fragment/MeFragment.kt rename to app/src/main/java/com/offline/music/task/player/ui/fragment/MeFragment.kt index 4971bc3..7d3b248 100644 --- a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/ui/fragment/MeFragment.kt +++ b/app/src/main/java/com/offline/music/task/player/ui/fragment/MeFragment.kt @@ -1,4 +1,4 @@ -package com.kitobochi.softapp.task.noisetimber.ui.fragment +package com.offline.music.task.player.ui.fragment import android.Manifest import android.annotation.SuppressLint @@ -20,11 +20,11 @@ import androidx.core.content.ContextCompat import androidx.fragment.app.Fragment import androidx.recyclerview.widget.LinearLayoutManager import com.gyf.immersionbar.ktx.immersionBar -import com.kitobochi.softapp.task.noisetimber.ProApp -import com.kitobochi.softapp.task.noisetimber.R -import com.kitobochi.softapp.task.noisetimber.databinding.FragmentMeBinding -import com.kitobochi.softapp.task.noisetimber.db.bean.Audio -import com.kitobochi.softapp.task.noisetimber.ui.adapter.ParentsVoiceAdapter +import com.offline.music.task.player.ProApp +import com.offline.music.task.player.R +import com.offline.music.task.player.databinding.FragmentMeBinding +import com.offline.music.task.player.db.bean.Audio +import com.offline.music.task.player.ui.adapter.ParentsVoiceAdapter import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/ui/fragment/SettingsFragment.kt b/app/src/main/java/com/offline/music/task/player/ui/fragment/SettingsFragment.kt similarity index 69% rename from app/src/main/java/com/kitobochi/softapp/task/noisetimber/ui/fragment/SettingsFragment.kt rename to app/src/main/java/com/offline/music/task/player/ui/fragment/SettingsFragment.kt index 0b45606..a43ff3f 100644 --- a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/ui/fragment/SettingsFragment.kt +++ b/app/src/main/java/com/offline/music/task/player/ui/fragment/SettingsFragment.kt @@ -1,4 +1,4 @@ -package com.kitobochi.softapp.task.noisetimber.ui.fragment +package com.offline.music.task.player.ui.fragment import android.content.Intent import android.os.Bundle @@ -7,16 +7,16 @@ import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment import com.gyf.immersionbar.ktx.immersionBar -import com.kitobochi.softapp.task.noisetimber.R -import com.kitobochi.softapp.task.noisetimber.databinding.FragmentSettingBinding -import com.kitobochi.softapp.task.noisetimber.tools.EMAIL -import com.kitobochi.softapp.task.noisetimber.tools.PRIVACY_POLICY_URL -import com.kitobochi.softapp.task.noisetimber.tools.TERMS_OF_SERVICE_URL -import com.kitobochi.softapp.task.noisetimber.tools.openPrivacyPolicy -import com.kitobochi.softapp.task.noisetimber.tools.openTermsOfService -import com.kitobochi.softapp.task.noisetimber.tools.sendFeedback -import com.kitobochi.softapp.task.noisetimber.tools.shareApp -import com.kitobochi.softapp.task.noisetimber.ui.activity.AboutActivity +import com.offline.music.task.player.R +import com.offline.music.task.player.databinding.FragmentSettingBinding +import com.offline.music.task.player.tools.EMAIL +import com.offline.music.task.player.tools.PRIVACY_POLICY_URL +import com.offline.music.task.player.tools.TERMS_OF_SERVICE_URL +import com.offline.music.task.player.tools.openPrivacyPolicy +import com.offline.music.task.player.tools.openTermsOfService +import com.offline.music.task.player.tools.sendFeedback +import com.offline.music.task.player.tools.shareApp +import com.offline.music.task.player.ui.activity.AboutActivity class SettingsFragment : Fragment() { private lateinit var binding: FragmentSettingBinding diff --git a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/ui/view/BlurLayout.kt b/app/src/main/java/com/offline/music/task/player/ui/view/BlurLayout.kt similarity index 95% rename from app/src/main/java/com/kitobochi/softapp/task/noisetimber/ui/view/BlurLayout.kt rename to app/src/main/java/com/offline/music/task/player/ui/view/BlurLayout.kt index 7845193..67eecdf 100644 --- a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/ui/view/BlurLayout.kt +++ b/app/src/main/java/com/offline/music/task/player/ui/view/BlurLayout.kt @@ -1,4 +1,4 @@ -package com.kitobochi.softapp.task.noisetimber.ui.view +package com.offline.music.task.player.ui.view import android.content.Context import android.graphics.* diff --git a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/ui/view/CircularProgressBar.kt b/app/src/main/java/com/offline/music/task/player/ui/view/CircularProgressBar.kt similarity index 94% rename from app/src/main/java/com/kitobochi/softapp/task/noisetimber/ui/view/CircularProgressBar.kt rename to app/src/main/java/com/offline/music/task/player/ui/view/CircularProgressBar.kt index d67b352..ac06c13 100644 --- a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/ui/view/CircularProgressBar.kt +++ b/app/src/main/java/com/offline/music/task/player/ui/view/CircularProgressBar.kt @@ -1,4 +1,4 @@ -package com.kitobochi.softapp.task.noisetimber.ui.view +package com.offline.music.task.player.ui.view import android.content.Context import android.graphics.Canvas diff --git a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/ui/view/CustomProgressBar.kt b/app/src/main/java/com/offline/music/task/player/ui/view/CustomProgressBar.kt similarity index 95% rename from app/src/main/java/com/kitobochi/softapp/task/noisetimber/ui/view/CustomProgressBar.kt rename to app/src/main/java/com/offline/music/task/player/ui/view/CustomProgressBar.kt index aee2d10..6e24ac3 100644 --- a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/ui/view/CustomProgressBar.kt +++ b/app/src/main/java/com/offline/music/task/player/ui/view/CustomProgressBar.kt @@ -1,4 +1,4 @@ -package com.kitobochi.softapp.task.noisetimber.ui.view +package com.offline.music.task.player.ui.view import android.content.Context import android.graphics.Canvas diff --git a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/ui/view/MarqueeTextView.java b/app/src/main/java/com/offline/music/task/player/ui/view/MarqueeTextView.java similarity index 90% rename from app/src/main/java/com/kitobochi/softapp/task/noisetimber/ui/view/MarqueeTextView.java rename to app/src/main/java/com/offline/music/task/player/ui/view/MarqueeTextView.java index 359c5cd..0ee0682 100644 --- a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/ui/view/MarqueeTextView.java +++ b/app/src/main/java/com/offline/music/task/player/ui/view/MarqueeTextView.java @@ -1,4 +1,4 @@ -package com.kitobochi.softapp.task.noisetimber.ui.view; +package com.offline.music.task.player.ui.view; import android.content.Context; import android.text.TextUtils; diff --git a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/ui/view/RadiusLayout.kt b/app/src/main/java/com/offline/music/task/player/ui/view/RadiusLayout.kt similarity index 94% rename from app/src/main/java/com/kitobochi/softapp/task/noisetimber/ui/view/RadiusLayout.kt rename to app/src/main/java/com/offline/music/task/player/ui/view/RadiusLayout.kt index 96cd622..c143589 100644 --- a/app/src/main/java/com/kitobochi/softapp/task/noisetimber/ui/view/RadiusLayout.kt +++ b/app/src/main/java/com/offline/music/task/player/ui/view/RadiusLayout.kt @@ -1,4 +1,4 @@ -package com.kitobochi.softapp.task.noisetimber.ui.view +package com.offline.music.task.player.ui.view import android.content.Context import android.graphics.Bitmap diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 6e75b7d..51fb5a4 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -52,7 +52,7 @@ - - - - - @@ -18,7 +18,7 @@ android:layout_height="match_parent" android:scaleType="centerCrop" /> - +