diff --git a/app/MusicPlayer.jks b/app/MusicPlayer.jks index 792f9cd..8b685e5 100644 Binary files a/app/MusicPlayer.jks and b/app/MusicPlayer.jks differ diff --git a/app/OfflineMusicPlayer.jks b/app/OfflineMusicPlayer.jks new file mode 100644 index 0000000..dc46e9f Binary files /dev/null and b/app/OfflineMusicPlayer.jks differ diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 720011e..98ffe9d 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -13,18 +13,18 @@ plugins { val timestamp = SimpleDateFormat("MM_dd_HH_mm").format(Date()) android { - namespace = "com.hi.music.player" + namespace = "com.offline.music.player" compileSdk = 34 defaultConfig { //com.hi.music.player - applicationId = "com.hi.music.player" + applicationId = "com.offline.music.player" minSdk = 23 targetSdk = 34 versionCode = 1 versionName = "1.0.0" - setProperty("archivesBaseName", "MusicApp_V" + versionName + "(${versionCode})_$timestamp") + setProperty("archivesBaseName", "Offline Music Player" + versionName + "(${versionCode})_$timestamp") testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/google-services.json b/app/google-services.json index 64dd984..214f730 100644 --- a/app/google-services.json +++ b/app/google-services.json @@ -9,7 +9,7 @@ "client_info": { "mobilesdk_app_id": "1:550960818622:android:96fd4141e43410fb24f1ef", "android_client_info": { - "package_name": "com.hi.music.player" + "package_name": "com.offline.music.player" } }, "oauth_client": [], diff --git a/app/keystore.properties b/app/keystore.properties index 93e516c..6acd881 100644 --- a/app/keystore.properties +++ b/app/keystore.properties @@ -1,6 +1,6 @@ -app_name=Music Player -package_name=com.hi.music.player -keystoreFile=app/MusicPlayer.jks -key_alias=MusicPlayerkey0 -key_store_password=MusicPlayer -key_password=MusicPlayer \ No newline at end of file +app_name=Offline Music Player +package_name=com.offline.music.player +keystoreFile=app/OfflineMusicPlayer.jks +key_alias=OfflineMusicPlayerkey0 +key_store_password=OfflineMusicPlayer +key_password=OfflineMusicPlayer \ No newline at end of file diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 8993d1b..0f5210c 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -29,7 +29,7 @@ -dontwarn retrofit2.** -dontwarn javax.annotation.Nullable --keep class com.hi.music.player.javabean.A_data.AudioItem { *; } +-keep class com.offline.music.player.javabean.A_data.AudioItem { *; } # 保持 Context、Intent 和权限相关的公共方法 -keep class android.content.Context { *; } diff --git a/app/src/androidTest/java/com/hi/music/player/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/offline/music/player/ExampleInstrumentedTest.java similarity index 95% rename from app/src/androidTest/java/com/hi/music/player/ExampleInstrumentedTest.java rename to app/src/androidTest/java/com/offline/music/player/ExampleInstrumentedTest.java index 506e548..e27f1b6 100644 --- a/app/src/androidTest/java/com/hi/music/player/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/com/offline/music/player/ExampleInstrumentedTest.java @@ -1,4 +1,4 @@ -package com.hi.music.player; +package com.offline.music.player; import android.content.Context; diff --git a/app/src/main/java/com/hi/music/player/MusicApplication.java b/app/src/main/java/com/offline/music/player/MusicApplication.java similarity index 96% rename from app/src/main/java/com/hi/music/player/MusicApplication.java rename to app/src/main/java/com/offline/music/player/MusicApplication.java index 68e8777..13d7c65 100644 --- a/app/src/main/java/com/hi/music/player/MusicApplication.java +++ b/app/src/main/java/com/offline/music/player/MusicApplication.java @@ -1,4 +1,4 @@ -package com.hi.music.player; +package com.offline.music.player; import android.app.Application; import android.content.Context; diff --git a/app/src/main/java/com/hi/music/player/adapter/A_HomeViewPagerAdapter.java b/app/src/main/java/com/offline/music/player/adapter/A_HomeViewPagerAdapter.java similarity index 82% rename from app/src/main/java/com/hi/music/player/adapter/A_HomeViewPagerAdapter.java rename to app/src/main/java/com/offline/music/player/adapter/A_HomeViewPagerAdapter.java index ed7371b..3d4497a 100644 --- a/app/src/main/java/com/hi/music/player/adapter/A_HomeViewPagerAdapter.java +++ b/app/src/main/java/com/offline/music/player/adapter/A_HomeViewPagerAdapter.java @@ -1,12 +1,12 @@ -package com.hi.music.player.adapter; +package com.offline.music.player.adapter; import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentActivity; import androidx.viewpager2.adapter.FragmentStateAdapter; -import com.hi.music.player.ui.fragmnt.A_HomeFragment; -import com.hi.music.player.ui.fragmnt.A_ImportFragment; +import com.offline.music.player.ui.fragmnt.A_HomeFragment; +import com.offline.music.player.ui.fragmnt.A_ImportFragment; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/hi/music/player/adapter/A_ImportFragmentAdapter.java b/app/src/main/java/com/offline/music/player/adapter/A_ImportFragmentAdapter.java similarity index 94% rename from app/src/main/java/com/hi/music/player/adapter/A_ImportFragmentAdapter.java rename to app/src/main/java/com/offline/music/player/adapter/A_ImportFragmentAdapter.java index 6da1df4..0cce4d2 100644 --- a/app/src/main/java/com/hi/music/player/adapter/A_ImportFragmentAdapter.java +++ b/app/src/main/java/com/offline/music/player/adapter/A_ImportFragmentAdapter.java @@ -1,4 +1,4 @@ -package com.hi.music.player.adapter; +package com.offline.music.player.adapter; import android.content.Context; import android.content.Intent; @@ -12,9 +12,9 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; -import com.hi.music.player.R; -import com.hi.music.player.javabean.A_data.AudioItem; -import com.hi.music.player.ui.activity.A_PlayActivity; +import com.offline.music.player.R; +import com.offline.music.player.javabean.A_data.AudioItem; +import com.offline.music.player.ui.activity.A_PlayActivity; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/hi/music/player/adapter/A_InstrumentAdapter.java b/app/src/main/java/com/offline/music/player/adapter/A_InstrumentAdapter.java similarity index 91% rename from app/src/main/java/com/hi/music/player/adapter/A_InstrumentAdapter.java rename to app/src/main/java/com/offline/music/player/adapter/A_InstrumentAdapter.java index 0e043fd..8a637a0 100644 --- a/app/src/main/java/com/hi/music/player/adapter/A_InstrumentAdapter.java +++ b/app/src/main/java/com/offline/music/player/adapter/A_InstrumentAdapter.java @@ -1,4 +1,4 @@ -package com.hi.music.player.adapter; +package com.offline.music.player.adapter; import android.content.Context; import android.content.Intent; @@ -14,10 +14,10 @@ import androidx.recyclerview.widget.DiffUtil; import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; -import com.hi.music.player.R; -import com.hi.music.player.helper.AudioItemDiffCallback; -import com.hi.music.player.javabean.A_data.AudioItem; -import com.hi.music.player.ui.activity.A_PlayActivity; +import com.offline.music.player.R; +import com.offline.music.player.helper.AudioItemDiffCallback; +import com.offline.music.player.javabean.A_data.AudioItem; +import com.offline.music.player.ui.activity.A_PlayActivity; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/hi/music/player/adapter/A_NatureAdapter.java b/app/src/main/java/com/offline/music/player/adapter/A_NatureAdapter.java similarity index 90% rename from app/src/main/java/com/hi/music/player/adapter/A_NatureAdapter.java rename to app/src/main/java/com/offline/music/player/adapter/A_NatureAdapter.java index 8e67b8d..5d7d9f5 100644 --- a/app/src/main/java/com/hi/music/player/adapter/A_NatureAdapter.java +++ b/app/src/main/java/com/offline/music/player/adapter/A_NatureAdapter.java @@ -1,4 +1,4 @@ -package com.hi.music.player.adapter; +package com.offline.music.player.adapter; import android.content.Context; import android.content.Intent; @@ -13,10 +13,10 @@ import androidx.recyclerview.widget.DiffUtil; import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; -import com.hi.music.player.R; -import com.hi.music.player.helper.AudioItemDiffCallback; -import com.hi.music.player.javabean.A_data.AudioItem; -import com.hi.music.player.ui.activity.A_PlayActivity; +import com.offline.music.player.R; +import com.offline.music.player.helper.AudioItemDiffCallback; +import com.offline.music.player.javabean.A_data.AudioItem; +import com.offline.music.player.ui.activity.A_PlayActivity; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/hi/music/player/adapter/A_WhiteAdapter.java b/app/src/main/java/com/offline/music/player/adapter/A_WhiteAdapter.java similarity index 91% rename from app/src/main/java/com/hi/music/player/adapter/A_WhiteAdapter.java rename to app/src/main/java/com/offline/music/player/adapter/A_WhiteAdapter.java index 3067dae..7f038c5 100644 --- a/app/src/main/java/com/hi/music/player/adapter/A_WhiteAdapter.java +++ b/app/src/main/java/com/offline/music/player/adapter/A_WhiteAdapter.java @@ -1,4 +1,4 @@ -package com.hi.music.player.adapter; +package com.offline.music.player.adapter; import android.content.Context; import android.content.Intent; @@ -14,10 +14,10 @@ import androidx.recyclerview.widget.DiffUtil; import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; -import com.hi.music.player.R; -import com.hi.music.player.helper.AudioItemDiffCallback; -import com.hi.music.player.javabean.A_data.AudioItem; -import com.hi.music.player.ui.activity.A_PlayActivity; +import com.offline.music.player.R; +import com.offline.music.player.helper.AudioItemDiffCallback; +import com.offline.music.player.javabean.A_data.AudioItem; +import com.offline.music.player.ui.activity.A_PlayActivity; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/hi/music/player/helper/AudioItemDiffCallback.java b/app/src/main/java/com/offline/music/player/helper/AudioItemDiffCallback.java similarity index 90% rename from app/src/main/java/com/hi/music/player/helper/AudioItemDiffCallback.java rename to app/src/main/java/com/offline/music/player/helper/AudioItemDiffCallback.java index cc38d3c..40b930a 100644 --- a/app/src/main/java/com/hi/music/player/helper/AudioItemDiffCallback.java +++ b/app/src/main/java/com/offline/music/player/helper/AudioItemDiffCallback.java @@ -1,8 +1,8 @@ -package com.hi.music.player.helper; +package com.offline.music.player.helper; import androidx.recyclerview.widget.DiffUtil; -import com.hi.music.player.javabean.A_data.AudioItem; +import com.offline.music.player.javabean.A_data.AudioItem; import java.util.List; import java.util.Objects; diff --git a/app/src/main/java/com/hi/music/player/helper/CircularProgressBar.java b/app/src/main/java/com/offline/music/player/helper/CircularProgressBar.java similarity index 99% rename from app/src/main/java/com/hi/music/player/helper/CircularProgressBar.java rename to app/src/main/java/com/offline/music/player/helper/CircularProgressBar.java index 152f042..e55c2a9 100644 --- a/app/src/main/java/com/hi/music/player/helper/CircularProgressBar.java +++ b/app/src/main/java/com/offline/music/player/helper/CircularProgressBar.java @@ -1,4 +1,4 @@ -package com.hi.music.player.helper; +package com.offline.music.player.helper; import android.content.Context; import android.graphics.Canvas; diff --git a/app/src/main/java/com/hi/music/player/helper/ItemDecoration.java b/app/src/main/java/com/offline/music/player/helper/ItemDecoration.java similarity index 96% rename from app/src/main/java/com/hi/music/player/helper/ItemDecoration.java rename to app/src/main/java/com/offline/music/player/helper/ItemDecoration.java index 735d63a..bfe3ce5 100644 --- a/app/src/main/java/com/hi/music/player/helper/ItemDecoration.java +++ b/app/src/main/java/com/offline/music/player/helper/ItemDecoration.java @@ -1,4 +1,4 @@ -package com.hi.music.player.helper; +package com.offline.music.player.helper; import android.graphics.Rect; import android.view.View; @@ -9,7 +9,7 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.StaggeredGridLayoutManager; -import com.hi.music.player.MusicApplication; +import com.offline.music.player.MusicApplication; public class ItemDecoration extends RecyclerView.ItemDecoration { diff --git a/app/src/main/java/com/hi/music/player/helper/JsonUtils.java b/app/src/main/java/com/offline/music/player/helper/JsonUtils.java similarity index 93% rename from app/src/main/java/com/hi/music/player/helper/JsonUtils.java rename to app/src/main/java/com/offline/music/player/helper/JsonUtils.java index 54e9094..67b55cc 100644 --- a/app/src/main/java/com/hi/music/player/helper/JsonUtils.java +++ b/app/src/main/java/com/offline/music/player/helper/JsonUtils.java @@ -1,9 +1,9 @@ -package com.hi.music.player.helper; +package com.offline.music.player.helper; import android.content.Context; -import com.hi.music.player.javabean.A_data.AudioItem; -import com.hi.music.player.javabean.A_data.Category; +import com.offline.music.player.javabean.A_data.AudioItem; +import com.offline.music.player.javabean.A_data.Category; import org.json.JSONArray; import org.json.JSONObject; diff --git a/app/src/main/java/com/hi/music/player/helper/SettingUtil.java b/app/src/main/java/com/offline/music/player/helper/SettingUtil.java similarity index 98% rename from app/src/main/java/com/hi/music/player/helper/SettingUtil.java rename to app/src/main/java/com/offline/music/player/helper/SettingUtil.java index dee09e7..03e4e86 100644 --- a/app/src/main/java/com/hi/music/player/helper/SettingUtil.java +++ b/app/src/main/java/com/offline/music/player/helper/SettingUtil.java @@ -1,4 +1,4 @@ -package com.hi.music.player.helper; +package com.offline.music.player.helper; import android.content.ActivityNotFoundException; import android.content.Context; diff --git a/app/src/main/java/com/hi/music/player/javabean/A_data/AudioItem.java b/app/src/main/java/com/offline/music/player/javabean/A_data/AudioItem.java similarity index 94% rename from app/src/main/java/com/hi/music/player/javabean/A_data/AudioItem.java rename to app/src/main/java/com/offline/music/player/javabean/A_data/AudioItem.java index 52068db..edaefdd 100644 --- a/app/src/main/java/com/hi/music/player/javabean/A_data/AudioItem.java +++ b/app/src/main/java/com/offline/music/player/javabean/A_data/AudioItem.java @@ -1,4 +1,4 @@ -package com.hi.music.player.javabean.A_data; +package com.offline.music.player.javabean.A_data; import java.io.Serializable; diff --git a/app/src/main/java/com/hi/music/player/javabean/A_data/Category.java b/app/src/main/java/com/offline/music/player/javabean/A_data/Category.java similarity index 91% rename from app/src/main/java/com/hi/music/player/javabean/A_data/Category.java rename to app/src/main/java/com/offline/music/player/javabean/A_data/Category.java index 4fd9d64..3800c72 100644 --- a/app/src/main/java/com/hi/music/player/javabean/A_data/Category.java +++ b/app/src/main/java/com/offline/music/player/javabean/A_data/Category.java @@ -1,4 +1,4 @@ -package com.hi.music.player.javabean.A_data; +package com.offline.music.player.javabean.A_data; import java.util.List; diff --git a/app/src/main/java/com/hi/music/player/service/MusicPlayerForegroundService.java b/app/src/main/java/com/offline/music/player/service/MusicPlayerForegroundService.java similarity index 98% rename from app/src/main/java/com/hi/music/player/service/MusicPlayerForegroundService.java rename to app/src/main/java/com/offline/music/player/service/MusicPlayerForegroundService.java index bc956c0..1756887 100644 --- a/app/src/main/java/com/hi/music/player/service/MusicPlayerForegroundService.java +++ b/app/src/main/java/com/offline/music/player/service/MusicPlayerForegroundService.java @@ -1,4 +1,4 @@ -package com.hi.music.player.service; +package com.offline.music.player.service; import android.app.Notification; import android.app.NotificationChannel; @@ -24,9 +24,9 @@ import androidx.core.app.NotificationCompat; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; -import com.hi.music.player.R; -import com.hi.music.player.javabean.A_data.AudioItem; -import com.hi.music.player.ui.activity.A_PlayActivity; +import com.offline.music.player.R; +import com.offline.music.player.javabean.A_data.AudioItem; +import com.offline.music.player.ui.activity.A_PlayActivity; import java.io.File; import java.io.IOException; diff --git a/app/src/main/java/com/hi/music/player/ui/activity/A_HomeActivity.java b/app/src/main/java/com/offline/music/player/ui/activity/A_HomeActivity.java similarity index 95% rename from app/src/main/java/com/hi/music/player/ui/activity/A_HomeActivity.java rename to app/src/main/java/com/offline/music/player/ui/activity/A_HomeActivity.java index dba4520..37e4b43 100644 --- a/app/src/main/java/com/hi/music/player/ui/activity/A_HomeActivity.java +++ b/app/src/main/java/com/offline/music/player/ui/activity/A_HomeActivity.java @@ -1,24 +1,22 @@ -package com.hi.music.player.ui.activity; +package com.offline.music.player.ui.activity; import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.content.ServiceConnection; -import android.os.Handler; import android.os.IBinder; -import android.os.Looper; import android.util.Log; import android.view.LayoutInflater; import android.view.View; import com.google.android.material.tabs.TabLayout; import com.google.android.material.tabs.TabLayoutMediator; -import com.hi.music.player.R; -import com.hi.music.player.adapter.A_HomeViewPagerAdapter; -import com.hi.music.player.databinding.ActivityAhomeBinding; -import com.hi.music.player.databinding.HomeTabCustomBinding; -import com.hi.music.player.javabean.A_data.AudioItem; -import com.hi.music.player.service.MusicPlayerForegroundService; +import com.offline.music.player.R; +import com.offline.music.player.adapter.A_HomeViewPagerAdapter; +import com.offline.music.player.databinding.ActivityAhomeBinding; +import com.offline.music.player.databinding.HomeTabCustomBinding; +import com.offline.music.player.javabean.A_data.AudioItem; +import com.offline.music.player.service.MusicPlayerForegroundService; import java.util.Locale; diff --git a/app/src/main/java/com/hi/music/player/ui/activity/A_PlayActivity.java b/app/src/main/java/com/offline/music/player/ui/activity/A_PlayActivity.java similarity index 97% rename from app/src/main/java/com/hi/music/player/ui/activity/A_PlayActivity.java rename to app/src/main/java/com/offline/music/player/ui/activity/A_PlayActivity.java index 0a7b6fb..caf3ddc 100644 --- a/app/src/main/java/com/hi/music/player/ui/activity/A_PlayActivity.java +++ b/app/src/main/java/com/offline/music/player/ui/activity/A_PlayActivity.java @@ -1,4 +1,4 @@ -package com.hi.music.player.ui.activity; +package com.offline.music.player.ui.activity; import android.content.ComponentName; import android.content.Context; @@ -11,7 +11,6 @@ import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.os.Handler; import android.os.IBinder; -import android.os.Looper; import android.renderscript.Allocation; import android.renderscript.Element; import android.renderscript.RenderScript; @@ -22,7 +21,6 @@ import android.view.View; import android.widget.RadioGroup; import android.widget.SeekBar; import android.widget.TextView; -import android.widget.Toast; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -32,10 +30,10 @@ import com.bumptech.glide.Glide; import com.bumptech.glide.request.target.CustomTarget; import com.bumptech.glide.request.transition.Transition; import com.google.android.material.bottomsheet.BottomSheetDialog; -import com.hi.music.player.R; -import com.hi.music.player.databinding.ActivityAplayBinding; -import com.hi.music.player.javabean.A_data.AudioItem; -import com.hi.music.player.service.MusicPlayerForegroundService; +import com.offline.music.player.R; +import com.offline.music.player.databinding.ActivityAplayBinding; +import com.offline.music.player.javabean.A_data.AudioItem; +import com.offline.music.player.service.MusicPlayerForegroundService; import java.util.ArrayList; import java.util.List; @@ -102,6 +100,9 @@ public class A_PlayActivity extends BaseActivity { loadBackgroundPreference(); // 加载之前保存的背景状态 updateSeekBarAndTime(); + if (musicService != null) { + musicService.startUpdatingProgress(); + } // 从Intent获取音频项 AudioItem audioItem = (AudioItem) getIntent().getSerializableExtra("Path"); diff --git a/app/src/main/java/com/hi/music/player/ui/activity/A_SettingActivity.java b/app/src/main/java/com/offline/music/player/ui/activity/A_SettingActivity.java similarity index 88% rename from app/src/main/java/com/hi/music/player/ui/activity/A_SettingActivity.java rename to app/src/main/java/com/offline/music/player/ui/activity/A_SettingActivity.java index 0de4d00..00d3fd0 100644 --- a/app/src/main/java/com/hi/music/player/ui/activity/A_SettingActivity.java +++ b/app/src/main/java/com/offline/music/player/ui/activity/A_SettingActivity.java @@ -1,9 +1,9 @@ -package com.hi.music.player.ui.activity; +package com.offline.music.player.ui.activity; import android.view.View; -import com.hi.music.player.databinding.ActivityAsettingBinding; -import com.hi.music.player.helper.SettingUtil; +import com.offline.music.player.databinding.ActivityAsettingBinding; +import com.offline.music.player.helper.SettingUtil; public class A_SettingActivity extends BaseActivity { diff --git a/app/src/main/java/com/hi/music/player/ui/activity/A_SplashActivity.java b/app/src/main/java/com/offline/music/player/ui/activity/A_SplashActivity.java similarity index 93% rename from app/src/main/java/com/hi/music/player/ui/activity/A_SplashActivity.java rename to app/src/main/java/com/offline/music/player/ui/activity/A_SplashActivity.java index 2261a13..a09644b 100644 --- a/app/src/main/java/com/hi/music/player/ui/activity/A_SplashActivity.java +++ b/app/src/main/java/com/offline/music/player/ui/activity/A_SplashActivity.java @@ -1,10 +1,10 @@ -package com.hi.music.player.ui.activity; +package com.offline.music.player.ui.activity; import android.content.Intent; import android.os.CountDownTimer; import android.view.View; -import com.hi.music.player.databinding.ActivityAsplashBinding; +import com.offline.music.player.databinding.ActivityAsplashBinding; public class A_SplashActivity extends BaseActivity { diff --git a/app/src/main/java/com/hi/music/player/ui/activity/BaseActivity.java b/app/src/main/java/com/offline/music/player/ui/activity/BaseActivity.java similarity index 94% rename from app/src/main/java/com/hi/music/player/ui/activity/BaseActivity.java rename to app/src/main/java/com/offline/music/player/ui/activity/BaseActivity.java index 4d54b4f..b7f61f4 100644 --- a/app/src/main/java/com/hi/music/player/ui/activity/BaseActivity.java +++ b/app/src/main/java/com/offline/music/player/ui/activity/BaseActivity.java @@ -1,4 +1,4 @@ -package com.hi.music.player.ui.activity; +package com.offline.music.player.ui.activity; import android.os.Bundle; import android.os.Handler; @@ -6,14 +6,12 @@ import android.view.View; import android.view.Window; import android.view.WindowManager; -import androidx.annotation.NonNull; import androidx.appcompat.app.AppCompatActivity; import androidx.core.view.WindowCompat; import androidx.core.view.WindowInsetsControllerCompat; -import androidx.lifecycle.ViewModel; import androidx.viewbinding.ViewBinding; -import com.hi.music.player.databinding.ActivityBaseBinding; +import com.offline.music.player.databinding.ActivityBaseBinding; public abstract class BaseActivity extends AppCompatActivity implements View.OnClickListener { diff --git a/app/src/main/java/com/hi/music/player/ui/activity/viewmodel/A_VMHome.java b/app/src/main/java/com/offline/music/player/ui/activity/viewmodel/A_VMHome.java similarity index 82% rename from app/src/main/java/com/hi/music/player/ui/activity/viewmodel/A_VMHome.java rename to app/src/main/java/com/offline/music/player/ui/activity/viewmodel/A_VMHome.java index 2b53f0e..16ee189 100644 --- a/app/src/main/java/com/hi/music/player/ui/activity/viewmodel/A_VMHome.java +++ b/app/src/main/java/com/offline/music/player/ui/activity/viewmodel/A_VMHome.java @@ -1,4 +1,4 @@ -package com.hi.music.player.ui.activity.viewmodel; +package com.offline.music.player.ui.activity.viewmodel; import android.app.Application; diff --git a/app/src/main/java/com/hi/music/player/ui/activity/viewmodel/A_VMPlay.java b/app/src/main/java/com/offline/music/player/ui/activity/viewmodel/A_VMPlay.java similarity index 82% rename from app/src/main/java/com/hi/music/player/ui/activity/viewmodel/A_VMPlay.java rename to app/src/main/java/com/offline/music/player/ui/activity/viewmodel/A_VMPlay.java index 7eaa3f3..493dfd9 100644 --- a/app/src/main/java/com/hi/music/player/ui/activity/viewmodel/A_VMPlay.java +++ b/app/src/main/java/com/offline/music/player/ui/activity/viewmodel/A_VMPlay.java @@ -1,4 +1,4 @@ -package com.hi.music.player.ui.activity.viewmodel; +package com.offline.music.player.ui.activity.viewmodel; import android.app.Application; diff --git a/app/src/main/java/com/hi/music/player/ui/fragmnt/A_HomeFragment.java b/app/src/main/java/com/offline/music/player/ui/fragmnt/A_HomeFragment.java similarity index 84% rename from app/src/main/java/com/hi/music/player/ui/fragmnt/A_HomeFragment.java rename to app/src/main/java/com/offline/music/player/ui/fragmnt/A_HomeFragment.java index 9df55f2..3e278a3 100644 --- a/app/src/main/java/com/hi/music/player/ui/fragmnt/A_HomeFragment.java +++ b/app/src/main/java/com/offline/music/player/ui/fragmnt/A_HomeFragment.java @@ -1,14 +1,14 @@ -package com.hi.music.player.ui.fragmnt; +package com.offline.music.player.ui.fragmnt; import androidx.lifecycle.ViewModelProvider; import androidx.recyclerview.widget.LinearLayoutManager; -import com.hi.music.player.adapter.A_InstrumentAdapter; -import com.hi.music.player.adapter.A_NatureAdapter; -import com.hi.music.player.adapter.A_WhiteAdapter; -import com.hi.music.player.databinding.FragmentAHomeBinding; -import com.hi.music.player.helper.ItemDecoration; -import com.hi.music.player.ui.fragmnt.viewmodel.A_VMHome; +import com.offline.music.player.adapter.A_InstrumentAdapter; +import com.offline.music.player.adapter.A_NatureAdapter; +import com.offline.music.player.adapter.A_WhiteAdapter; +import com.offline.music.player.databinding.FragmentAHomeBinding; +import com.offline.music.player.helper.ItemDecoration; +import com.offline.music.player.ui.fragmnt.viewmodel.A_VMHome; public class A_HomeFragment extends BaseFragment { diff --git a/app/src/main/java/com/hi/music/player/ui/fragmnt/A_ImportFragment.java b/app/src/main/java/com/offline/music/player/ui/fragmnt/A_ImportFragment.java similarity index 96% rename from app/src/main/java/com/hi/music/player/ui/fragmnt/A_ImportFragment.java rename to app/src/main/java/com/offline/music/player/ui/fragmnt/A_ImportFragment.java index 1364297..ce52ac8 100644 --- a/app/src/main/java/com/hi/music/player/ui/fragmnt/A_ImportFragment.java +++ b/app/src/main/java/com/offline/music/player/ui/fragmnt/A_ImportFragment.java @@ -1,4 +1,4 @@ -package com.hi.music.player.ui.fragmnt; +package com.offline.music.player.ui.fragmnt; import static android.app.Activity.RESULT_OK; @@ -28,12 +28,12 @@ import androidx.core.content.ContextCompat; import androidx.lifecycle.ViewModelProvider; import androidx.recyclerview.widget.LinearLayoutManager; -import com.hi.music.player.R; -import com.hi.music.player.adapter.A_ImportFragmentAdapter; -import com.hi.music.player.databinding.FragmentAImportBinding; -import com.hi.music.player.javabean.A_data.AudioItem; -import com.hi.music.player.ui.activity.A_SettingActivity; -import com.hi.music.player.ui.fragmnt.viewmodel.A_VMImport; +import com.offline.music.player.R; +import com.offline.music.player.adapter.A_ImportFragmentAdapter; +import com.offline.music.player.databinding.FragmentAImportBinding; +import com.offline.music.player.javabean.A_data.AudioItem; +import com.offline.music.player.ui.activity.A_SettingActivity; +import com.offline.music.player.ui.fragmnt.viewmodel.A_VMImport; import java.io.IOException; import java.util.List; diff --git a/app/src/main/java/com/hi/music/player/ui/fragmnt/BaseFragment.java b/app/src/main/java/com/offline/music/player/ui/fragmnt/BaseFragment.java similarity index 95% rename from app/src/main/java/com/hi/music/player/ui/fragmnt/BaseFragment.java rename to app/src/main/java/com/offline/music/player/ui/fragmnt/BaseFragment.java index 2dc2b44..db381ca 100644 --- a/app/src/main/java/com/hi/music/player/ui/fragmnt/BaseFragment.java +++ b/app/src/main/java/com/offline/music/player/ui/fragmnt/BaseFragment.java @@ -1,4 +1,4 @@ -package com.hi.music.player.ui.fragmnt; +package com.offline.music.player.ui.fragmnt; import android.content.Context; import android.os.Bundle; @@ -9,7 +9,6 @@ import android.view.ViewGroup; import androidx.annotation.NonNull; import androidx.appcompat.app.AppCompatActivity; import androidx.fragment.app.Fragment; -import androidx.lifecycle.ViewModel; import androidx.viewbinding.ViewBinding; diff --git a/app/src/main/java/com/hi/music/player/ui/fragmnt/viewmodel/A_VMHome.java b/app/src/main/java/com/offline/music/player/ui/fragmnt/viewmodel/A_VMHome.java similarity index 92% rename from app/src/main/java/com/hi/music/player/ui/fragmnt/viewmodel/A_VMHome.java rename to app/src/main/java/com/offline/music/player/ui/fragmnt/viewmodel/A_VMHome.java index 839a7ce..327066c 100644 --- a/app/src/main/java/com/hi/music/player/ui/fragmnt/viewmodel/A_VMHome.java +++ b/app/src/main/java/com/offline/music/player/ui/fragmnt/viewmodel/A_VMHome.java @@ -1,13 +1,13 @@ -package com.hi.music.player.ui.fragmnt.viewmodel; +package com.offline.music.player.ui.fragmnt.viewmodel; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModel; -import com.hi.music.player.MusicApplication; -import com.hi.music.player.helper.JsonUtils; -import com.hi.music.player.javabean.A_data.AudioItem; -import com.hi.music.player.javabean.A_data.Category; +import com.offline.music.player.MusicApplication; +import com.offline.music.player.helper.JsonUtils; +import com.offline.music.player.javabean.A_data.AudioItem; +import com.offline.music.player.javabean.A_data.Category; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/hi/music/player/ui/fragmnt/viewmodel/A_VMImport.java b/app/src/main/java/com/offline/music/player/ui/fragmnt/viewmodel/A_VMImport.java similarity index 97% rename from app/src/main/java/com/hi/music/player/ui/fragmnt/viewmodel/A_VMImport.java rename to app/src/main/java/com/offline/music/player/ui/fragmnt/viewmodel/A_VMImport.java index 16c0f12..b3c369d 100644 --- a/app/src/main/java/com/hi/music/player/ui/fragmnt/viewmodel/A_VMImport.java +++ b/app/src/main/java/com/offline/music/player/ui/fragmnt/viewmodel/A_VMImport.java @@ -1,4 +1,4 @@ -package com.hi.music.player.ui.fragmnt.viewmodel; +package com.offline.music.player.ui.fragmnt.viewmodel; import android.app.Application; import android.content.Context; @@ -13,7 +13,7 @@ import androidx.lifecycle.MutableLiveData; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.hi.music.player.javabean.A_data.AudioItem; +import com.offline.music.player.javabean.A_data.AudioItem; import java.io.IOException; import java.lang.reflect.Type; diff --git a/app/src/main/res/layout/activity_ahome.xml b/app/src/main/res/layout/activity_ahome.xml index 4bfc5db..5622b0a 100644 --- a/app/src/main/res/layout/activity_ahome.xml +++ b/app/src/main/res/layout/activity_ahome.xml @@ -49,7 +49,7 @@ app:layout_constraintTop_toTopOf="parent"> - - MusicApp + Offline Music Player Listen Music Anytime Resource Loading... diff --git a/app/src/test/java/com/hi/music/player/ExampleUnitTest.java b/app/src/test/java/com/offline/music/player/ExampleUnitTest.java similarity index 91% rename from app/src/test/java/com/hi/music/player/ExampleUnitTest.java rename to app/src/test/java/com/offline/music/player/ExampleUnitTest.java index 9682bb7..7b7959f 100644 --- a/app/src/test/java/com/hi/music/player/ExampleUnitTest.java +++ b/app/src/test/java/com/offline/music/player/ExampleUnitTest.java @@ -1,4 +1,4 @@ -package com.hi.music.player; +package com.offline.music.player; import org.junit.Test;