diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 47f805a..720011e 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -18,7 +18,7 @@ android { defaultConfig { //com.hi.music.player - applicationId = "com.hi.music.player.test" + applicationId = "com.hi.music.player" minSdk = 23 targetSdk = 34 versionCode = 1 diff --git a/app/google-services.json b/app/google-services.json index 63b1faa..64dd984 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.test" + "package_name": "com.hi.music.player" } }, "oauth_client": [], diff --git a/app/keystore.properties b/app/keystore.properties index e447842..93e516c 100644 --- a/app/keystore.properties +++ b/app/keystore.properties @@ -1,5 +1,5 @@ app_name=Music Player -package_name=com.hi.music.player.test +package_name=com.hi.music.player keystoreFile=app/MusicPlayer.jks key_alias=MusicPlayerkey0 key_store_password=MusicPlayer diff --git a/app/src/main/java/com/hi/music/player/adapter/A_ImportFragmentAdapter.java b/app/src/main/java/com/hi/music/player/adapter/A_ImportFragmentAdapter.java index 2739c32..6da1df4 100644 --- a/app/src/main/java/com/hi/music/player/adapter/A_ImportFragmentAdapter.java +++ b/app/src/main/java/com/hi/music/player/adapter/A_ImportFragmentAdapter.java @@ -26,9 +26,11 @@ public class A_ImportFragmentAdapter extends RecyclerView.Adapter audioFiles = new ArrayList<>(); private AudioItem audioItem; private OnOptionClickListener onOptionClickListener;; + private String newName; - public A_ImportFragmentAdapter(Context context) { + public A_ImportFragmentAdapter(Context context,String newName) { this.context = context; + this.newName = newName; } @NonNull @@ -50,6 +52,7 @@ public class A_ImportFragmentAdapter extends RecyclerView.Adapter= 0 && position < audioFiles.size()) { audioFiles.get(position).setName(newTitle); // 假设 AudioItem 有一个 setName 方法 diff --git a/app/src/main/java/com/hi/music/player/ui/activity/A_PlayActivity.java b/app/src/main/java/com/hi/music/player/ui/activity/A_PlayActivity.java index 9849409..0a7b6fb 100644 --- a/app/src/main/java/com/hi/music/player/ui/activity/A_PlayActivity.java +++ b/app/src/main/java/com/hi/music/player/ui/activity/A_PlayActivity.java @@ -59,6 +59,7 @@ public class A_PlayActivity extends BaseActivity { // 设置观察者 musicService.getIsPlaying().observe(A_PlayActivity.this, this::updatePlayButton); + musicService.getFileName().observe(A_PlayActivity.this, vb.songTitle::setText); // 更新进度条和时间 @@ -121,7 +122,7 @@ public class A_PlayActivity extends BaseActivity { @Override public void onResourceReady(@NonNull Bitmap resource, @Nullable Transition transition) { // 对图片进行高斯模糊处理 - Bitmap blurredBitmap = blurBitmap(A_PlayActivity.this, resource,5); + Bitmap blurredBitmap = blurBitmap(A_PlayActivity.this, resource, 5); // 将模糊后的图片作为背景设置到 vb.topContainer Drawable blurredDrawable = new BitmapDrawable(getResources(), blurredBitmap); @@ -135,7 +136,6 @@ public class A_PlayActivity extends BaseActivity { }); - startMusicService(audioItem); // 启动音乐服务 setupPlayButtonClickListener(); // 设置播放按钮的点击事件 @@ -280,7 +280,6 @@ public class A_PlayActivity extends BaseActivity { } - // 保存背景状态到SharedPreferences private void saveBackgroundPreference() { SharedPreferences sharedPreferences = getSharedPreferences("AppPreferences", MODE_PRIVATE); diff --git a/app/src/main/java/com/hi/music/player/ui/fragmnt/A_ImportFragment.java b/app/src/main/java/com/hi/music/player/ui/fragmnt/A_ImportFragment.java index d62c66a..1364297 100644 --- a/app/src/main/java/com/hi/music/player/ui/fragmnt/A_ImportFragment.java +++ b/app/src/main/java/com/hi/music/player/ui/fragmnt/A_ImportFragment.java @@ -47,6 +47,8 @@ public class A_ImportFragment extends BaseFragment { private A_ImportFragmentAdapter adapter; private A_VMImport viewModel; + private String newName = ""; + @Override protected FragmentAImportBinding getFragmentVb() { return FragmentAImportBinding.inflate(getLayoutInflater()); @@ -55,7 +57,7 @@ public class A_ImportFragment extends BaseFragment { @Override protected void initView() { viewModel = new ViewModelProvider(this).get(A_VMImport.class); - adapter = new A_ImportFragmentAdapter(requireContext()); + adapter = new A_ImportFragmentAdapter(requireContext(),newName); setupRecyclerView(); // observeAudioFiles(); @@ -137,8 +139,12 @@ public class A_ImportFragment extends BaseFragment { confirm.setOnClickListener(view -> { String newName = inputField.getText().toString(); - adapter.updateTitle(position, newName); -// Toast.makeText(requireContext(), "新名称: " + newName + ", 项目: " + position, Toast.LENGTH_SHORT).show(); + adapter.updateTitle(position, newName); // 更新 UI + + // 获取音频文件路径并更新名称 + String filePath = adapter.getAudioFile(position).getFile(); // 获取音频文件路径 + viewModel.updateAudioFileName(filePath, newName); // 更新 ViewModel 中的名称 + subDialog.dismiss(); }); diff --git a/app/src/main/java/com/hi/music/player/ui/fragmnt/viewmodel/A_VMImport.java b/app/src/main/java/com/hi/music/player/ui/fragmnt/viewmodel/A_VMImport.java index 969c998..16c0f12 100644 --- a/app/src/main/java/com/hi/music/player/ui/fragmnt/viewmodel/A_VMImport.java +++ b/app/src/main/java/com/hi/music/player/ui/fragmnt/viewmodel/A_VMImport.java @@ -110,6 +110,20 @@ public class A_VMImport extends AndroidViewModel { saveAudioFiles(); // 更新 SharedPreferences } + // 更新音频文件名称并持久化保存 + public void updateAudioFileName(String oldFilePath, String newName) { + for (AudioItem item : audioFiles) { + if (item.getFile().equals(oldFilePath)) { + item.setName(newName); // 更新音频名称 + break; + } + } + + // 更新音频文件列表并保存 + saveAudioFiles(); // 保存更新后的音频文件列表 + audioFilesLiveData.setValue(new ArrayList<>(audioFiles)); // 更新 LiveData + } + // 获取音频文件列表 public MutableLiveData> getAudioFiles() { return audioFilesLiveData; diff --git a/app/src/main/res/anim/slide_down.xml b/app/src/main/res/anim/slide_down.xml deleted file mode 100644 index 947e71c..0000000 --- a/app/src/main/res/anim/slide_down.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/anim/slide_up.xml b/app/src/main/res/anim/slide_up.xml deleted file mode 100644 index c2f373e..0000000 --- a/app/src/main/res/anim/slide_up.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/arrow_bottom.xml b/app/src/main/res/drawable/arrow_bottom.xml deleted file mode 100644 index 352178a..0000000 --- a/app/src/main/res/drawable/arrow_bottom.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/bg_best_bg.xml b/app/src/main/res/drawable/bg_best_bg.xml deleted file mode 100644 index 7ecac2d..0000000 --- a/app/src/main/res/drawable/bg_best_bg.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_black_13.xml b/app/src/main/res/drawable/bg_black_13.xml deleted file mode 100644 index 2d83a27..0000000 --- a/app/src/main/res/drawable/bg_black_13.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_library.xml b/app/src/main/res/drawable/bg_library.xml deleted file mode 100644 index 7938f56..0000000 --- a/app/src/main/res/drawable/bg_library.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_like_layout.xml b/app/src/main/res/drawable/bg_like_layout.xml deleted file mode 100644 index 052ada0..0000000 --- a/app/src/main/res/drawable/bg_like_layout.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_profile.xml b/app/src/main/res/drawable/bg_profile.xml deleted file mode 100644 index 872beec..0000000 --- a/app/src/main/res/drawable/bg_profile.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/bg_retry.xml b/app/src/main/res/drawable/bg_retry.xml deleted file mode 100644 index 33177ab..0000000 --- a/app/src/main/res/drawable/bg_retry.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_retry_btn.xml b/app/src/main/res/drawable/bg_retry_btn.xml deleted file mode 100644 index 9f03c5a..0000000 --- a/app/src/main/res/drawable/bg_retry_btn.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_search.xml b/app/src/main/res/drawable/bg_search.xml deleted file mode 100644 index ecda9f0..0000000 --- a/app/src/main/res/drawable/bg_search.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_search_result_play.xml b/app/src/main/res/drawable/bg_search_result_play.xml deleted file mode 100644 index 1ad57c2..0000000 --- a/app/src/main/res/drawable/bg_search_result_play.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/black_gradient.xml b/app/src/main/res/drawable/black_gradient.xml deleted file mode 100644 index 4f7d3df..0000000 --- a/app/src/main/res/drawable/black_gradient.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/clock.xml b/app/src/main/res/drawable/clock.xml deleted file mode 100644 index 324cc10..0000000 --- a/app/src/main/res/drawable/clock.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/home_background.xml b/app/src/main/res/drawable/home_background.xml deleted file mode 100644 index a4b40ce..0000000 --- a/app/src/main/res/drawable/home_background.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/horizontal_progressbar.xml b/app/src/main/res/drawable/horizontal_progressbar.xml deleted file mode 100644 index 043d608..0000000 --- a/app/src/main/res/drawable/horizontal_progressbar.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_download.xml b/app/src/main/res/drawable/ic_download.xml deleted file mode 100644 index e9918f7..0000000 --- a/app/src/main/res/drawable/ic_download.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_download_done.xml b/app/src/main/res/drawable/ic_download_done.xml deleted file mode 100644 index ca73dba..0000000 --- a/app/src/main/res/drawable/ic_download_done.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_menu_hamburger.xml b/app/src/main/res/drawable/ic_menu_hamburger.xml deleted file mode 100644 index 05148ad..0000000 --- a/app/src/main/res/drawable/ic_menu_hamburger.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/icon_cancel.xml b/app/src/main/res/drawable/icon_cancel.xml deleted file mode 100644 index 3a839bc..0000000 --- a/app/src/main/res/drawable/icon_cancel.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/icon_download.xml b/app/src/main/res/drawable/icon_download.xml deleted file mode 100644 index a5161c8..0000000 --- a/app/src/main/res/drawable/icon_download.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/icon_fill_in.xml b/app/src/main/res/drawable/icon_fill_in.xml deleted file mode 100644 index 154ee4f..0000000 --- a/app/src/main/res/drawable/icon_fill_in.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/icon_liked.xml b/app/src/main/res/drawable/icon_liked.xml deleted file mode 100644 index 2445315..0000000 --- a/app/src/main/res/drawable/icon_liked.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/icon_liked_white.xml b/app/src/main/res/drawable/icon_liked_white.xml deleted file mode 100644 index e7666ac..0000000 --- a/app/src/main/res/drawable/icon_liked_white.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/icon_looper.xml b/app/src/main/res/drawable/icon_looper.xml deleted file mode 100644 index 327283d..0000000 --- a/app/src/main/res/drawable/icon_looper.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/icon_looper_1.xml b/app/src/main/res/drawable/icon_looper_1.xml deleted file mode 100644 index 0563c0a..0000000 --- a/app/src/main/res/drawable/icon_looper_1.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/icon_looper_no.xml b/app/src/main/res/drawable/icon_looper_no.xml deleted file mode 100644 index 7a7585b..0000000 --- a/app/src/main/res/drawable/icon_looper_no.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/icon_next_black.xml b/app/src/main/res/drawable/icon_next_black.xml deleted file mode 100644 index a266e90..0000000 --- a/app/src/main/res/drawable/icon_next_black.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/icon_not_like.xml b/app/src/main/res/drawable/icon_not_like.xml deleted file mode 100644 index 6b5fe93..0000000 --- a/app/src/main/res/drawable/icon_not_like.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/icon_random.xml b/app/src/main/res/drawable/icon_random.xml deleted file mode 100644 index c376105..0000000 --- a/app/src/main/res/drawable/icon_random.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/icon_search.xml b/app/src/main/res/drawable/icon_search.xml deleted file mode 100644 index cde8483..0000000 --- a/app/src/main/res/drawable/icon_search.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/im_place.xml b/app/src/main/res/drawable/im_place.xml deleted file mode 100644 index c6fdfa1..0000000 --- a/app/src/main/res/drawable/im_place.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/more.xml b/app/src/main/res/drawable/more.xml deleted file mode 100644 index 80184ea..0000000 --- a/app/src/main/res/drawable/more.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/panel_bg.xml b/app/src/main/res/drawable/panel_bg.xml deleted file mode 100644 index 2f67c0d..0000000 --- a/app/src/main/res/drawable/panel_bg.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/panel_icon_list.xml b/app/src/main/res/drawable/panel_icon_list.xml deleted file mode 100644 index cbded56..0000000 --- a/app/src/main/res/drawable/panel_icon_list.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/panel_icon_pause.xml b/app/src/main/res/drawable/panel_icon_pause.xml deleted file mode 100644 index c94bc45..0000000 --- a/app/src/main/res/drawable/panel_icon_pause.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/panel_icon_play.xml b/app/src/main/res/drawable/panel_icon_play.xml deleted file mode 100644 index 6de0f12..0000000 --- a/app/src/main/res/drawable/panel_icon_play.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/pause_flat.xml b/app/src/main/res/drawable/pause_flat.xml deleted file mode 100644 index 98f79ff..0000000 --- a/app/src/main/res/drawable/pause_flat.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/pause_shadow.xml b/app/src/main/res/drawable/pause_shadow.xml deleted file mode 100644 index 4ab0bd7..0000000 --- a/app/src/main/res/drawable/pause_shadow.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/placeholder.xml b/app/src/main/res/drawable/placeholder.xml deleted file mode 100644 index 670dfcf..0000000 --- a/app/src/main/res/drawable/placeholder.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/play_big.xml b/app/src/main/res/drawable/play_big.xml deleted file mode 100644 index fabc4bd..0000000 --- a/app/src/main/res/drawable/play_big.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/play_black_gradient.xml b/app/src/main/res/drawable/play_black_gradient.xml deleted file mode 100644 index dd3a561..0000000 --- a/app/src/main/res/drawable/play_black_gradient.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/play_flat.xml b/app/src/main/res/drawable/play_flat.xml deleted file mode 100644 index 043dfa9..0000000 --- a/app/src/main/res/drawable/play_flat.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/play_shadow.xml b/app/src/main/res/drawable/play_shadow.xml deleted file mode 100644 index 2c16085..0000000 --- a/app/src/main/res/drawable/play_shadow.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/profile_select.xml b/app/src/main/res/drawable/profile_select.xml deleted file mode 100644 index 957684f..0000000 --- a/app/src/main/res/drawable/profile_select.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/profile_unselect.xml b/app/src/main/res/drawable/profile_unselect.xml deleted file mode 100644 index 3c33911..0000000 --- a/app/src/main/res/drawable/profile_unselect.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/rec_bg_18.xml b/app/src/main/res/drawable/rec_bg_18.xml deleted file mode 100644 index d44f5db..0000000 --- a/app/src/main/res/drawable/rec_bg_18.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/round_rectangle_top.xml b/app/src/main/res/drawable/round_rectangle_top.xml deleted file mode 100644 index f90f3a2..0000000 --- a/app/src/main/res/drawable/round_rectangle_top.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/rounded_light.xml b/app/src/main/res/drawable/rounded_light.xml deleted file mode 100644 index ca6a66d..0000000 --- a/app/src/main/res/drawable/rounded_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/rounded_rectangle_tab_layout.xml b/app/src/main/res/drawable/rounded_rectangle_tab_layout.xml deleted file mode 100644 index 489a08f..0000000 --- a/app/src/main/res/drawable/rounded_rectangle_tab_layout.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/search_select.xml b/app/src/main/res/drawable/search_select.xml deleted file mode 100644 index 74567d9..0000000 --- a/app/src/main/res/drawable/search_select.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/search_unselect.xml b/app/src/main/res/drawable/search_unselect.xml deleted file mode 100644 index 45e09f5..0000000 --- a/app/src/main/res/drawable/search_unselect.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/seekbar_progress_drawable.xml b/app/src/main/res/drawable/seekbar_progress_drawable.xml deleted file mode 100644 index 287af61..0000000 --- a/app/src/main/res/drawable/seekbar_progress_drawable.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/seekbar_thumb.xml b/app/src/main/res/drawable/seekbar_thumb.xml deleted file mode 100644 index 35adf6e..0000000 --- a/app/src/main/res/drawable/seekbar_thumb.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_download.xml b/app/src/main/res/drawable/selector_download.xml deleted file mode 100644 index a50226c..0000000 --- a/app/src/main/res/drawable/selector_download.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_icon_play.xml b/app/src/main/res/drawable/selector_icon_play.xml deleted file mode 100644 index 41801ce..0000000 --- a/app/src/main/res/drawable/selector_icon_play.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_like.xml b/app/src/main/res/drawable/selector_like.xml deleted file mode 100644 index e5c716a..0000000 --- a/app/src/main/res/drawable/selector_like.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_panel_icon_play.xml b/app/src/main/res/drawable/selector_panel_icon_play.xml deleted file mode 100644 index 5806676..0000000 --- a/app/src/main/res/drawable/selector_panel_icon_play.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_small_play.xml b/app/src/main/res/drawable/selector_small_play.xml deleted file mode 100644 index 6f8ea7d..0000000 --- a/app/src/main/res/drawable/selector_small_play.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/small_pause.xml b/app/src/main/res/drawable/small_pause.xml deleted file mode 100644 index c4673e8..0000000 --- a/app/src/main/res/drawable/small_pause.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/small_play.xml b/app/src/main/res/drawable/small_play.xml deleted file mode 100644 index 8cfeec4..0000000 --- a/app/src/main/res/drawable/small_play.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/layout/activity_aplay.xml b/app/src/main/res/layout/activity_aplay.xml index ac50c29..0e77ce3 100644 --- a/app/src/main/res/layout/activity_aplay.xml +++ b/app/src/main/res/layout/activity_aplay.xml @@ -22,7 +22,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="16dp" - android:layout_marginTop="32dp" + android:layout_marginTop="50dp" android:src="@drawable/arrow_left" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -31,7 +31,7 @@ android:id="@+id/now_playing_text" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="32dp" + android:layout_marginTop="50dp" android:text="Now Playing" android:textColor="@android:color/white" android:textSize="16sp" @@ -67,7 +67,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="7dp" - android:text="Wonder Where We Land" + android:text="A journey to rest, guided by gentle sounds" android:textColor="@android:color/white" android:textSize="14sp" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/activity_asetting.xml b/app/src/main/res/layout/activity_asetting.xml index 7553090..581ac40 100644 --- a/app/src/main/res/layout/activity_asetting.xml +++ b/app/src/main/res/layout/activity_asetting.xml @@ -27,7 +27,6 @@ android:gravity="center"> diff --git a/app/src/main/res/layout/activity_category_list.xml b/app/src/main/res/layout/activity_category_list.xml deleted file mode 100644 index 7bdbaa3..0000000 --- a/app/src/main/res/layout/activity_category_list.xml +++ /dev/null @@ -1,139 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml deleted file mode 100644 index 568335f..0000000 --- a/app/src/main/res/layout/activity_home.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_like_song.xml b/app/src/main/res/layout/activity_like_song.xml deleted file mode 100644 index 15ff86b..0000000 --- a/app/src/main/res/layout/activity_like_song.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml deleted file mode 100644 index 38cf85a..0000000 --- a/app/src/main/res/layout/activity_main.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_result_list.xml b/app/src/main/res/layout/activity_result_list.xml deleted file mode 100644 index 6c41e37..0000000 --- a/app/src/main/res/layout/activity_result_list.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_play_list.xml b/app/src/main/res/layout/dialog_play_list.xml deleted file mode 100644 index 3b8f8fb..0000000 --- a/app/src/main/res/layout/dialog_play_list.xml +++ /dev/null @@ -1,116 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml deleted file mode 100644 index b5658bc..0000000 --- a/app/src/main/res/layout/fragment_home.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml deleted file mode 100644 index ca87d63..0000000 --- a/app/src/main/res/layout/fragment_profile.xml +++ /dev/null @@ -1,183 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml deleted file mode 100644 index b7dffcf..0000000 --- a/app/src/main/res/layout/fragment_search.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_a_home_1.xml b/app/src/main/res/layout/item_a_home_1.xml index 663aee0..dc59684 100644 --- a/app/src/main/res/layout/item_a_home_1.xml +++ b/app/src/main/res/layout/item_a_home_1.xml @@ -1,7 +1,8 @@ - - - - - - - - - - - diff --git a/app/src/main/res/layout/item_category.xml b/app/src/main/res/layout/item_category.xml deleted file mode 100644 index ae2a203..0000000 --- a/app/src/main/res/layout/item_category.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_category_list.xml b/app/src/main/res/layout/item_category_list.xml deleted file mode 100644 index 7d59012..0000000 --- a/app/src/main/res/layout/item_category_list.xml +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_footer_loading.xml b/app/src/main/res/layout/item_footer_loading.xml deleted file mode 100644 index 6922e1b..0000000 --- a/app/src/main/res/layout/item_footer_loading.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_home.xml b/app/src/main/res/layout/item_home.xml deleted file mode 100644 index cd340b9..0000000 --- a/app/src/main/res/layout/item_home.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_like_song.xml b/app/src/main/res/layout/item_like_song.xml deleted file mode 100644 index 9a79e03..0000000 --- a/app/src/main/res/layout/item_like_song.xml +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_result.xml b/app/src/main/res/layout/item_result.xml deleted file mode 100644 index 6a59692..0000000 --- a/app/src/main/res/layout/item_result.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_result_list_album.xml b/app/src/main/res/layout/item_result_list_album.xml deleted file mode 100644 index fd651f9..0000000 --- a/app/src/main/res/layout/item_result_list_album.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_result_list_song.xml b/app/src/main/res/layout/item_result_list_song.xml deleted file mode 100644 index d230fb3..0000000 --- a/app/src/main/res/layout/item_result_list_song.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_search.xml b/app/src/main/res/layout/item_search.xml deleted file mode 100644 index 52c56f3..0000000 --- a/app/src/main/res/layout/item_search.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_search_child.xml b/app/src/main/res/layout/item_search_child.xml deleted file mode 100644 index 843fcd9..0000000 --- a/app/src/main/res/layout/item_search_child.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_singer.xml b/app/src/main/res/layout/item_singer.xml deleted file mode 100644 index 5ce9c7e..0000000 --- a/app/src/main/res/layout/item_singer.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_suggestion.xml b/app/src/main/res/layout/item_suggestion.xml deleted file mode 100644 index 6e4ae7f..0000000 --- a/app/src/main/res/layout/item_suggestion.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/layout_error.xml b/app/src/main/res/layout/layout_error.xml deleted file mode 100644 index d46ff90..0000000 --- a/app/src/main/res/layout/layout_error.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/layout_panel.xml b/app/src/main/res/layout/layout_panel.xml deleted file mode 100644 index 1850f7e..0000000 --- a/app/src/main/res/layout/layout_panel.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/placeholder_view_panel.xml b/app/src/main/res/layout/placeholder_view_panel.xml deleted file mode 100644 index 4da5969..0000000 --- a/app/src/main/res/layout/placeholder_view_panel.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/rename_dialog.xml b/app/src/main/res/layout/rename_dialog.xml index 72bf8a2..81a3389 100644 --- a/app/src/main/res/layout/rename_dialog.xml +++ b/app/src/main/res/layout/rename_dialog.xml @@ -10,7 +10,6 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp deleted file mode 100644 index b2dfe3d..0000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp deleted file mode 100644 index 62b611d..0000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp deleted file mode 100644 index 1b9a695..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp deleted file mode 100644 index 9287f50..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/bg_home.png b/app/src/main/res/mipmap-xxxhdpi/bg_home.png deleted file mode 100644 index 7ee12e1..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/bg_home.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/bg_library.png b/app/src/main/res/mipmap-xxxhdpi/bg_library.png deleted file mode 100644 index d2ab49f..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/bg_library.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/bg_like.png b/app/src/main/res/mipmap-xxxhdpi/bg_like.png deleted file mode 100644 index f3d5357..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/bg_like.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/cover.png b/app/src/main/res/mipmap-xxxhdpi/cover.png deleted file mode 100644 index a8fb290..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/cover.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp deleted file mode 100644 index 9126ae3..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/icon_list.png b/app/src/main/res/mipmap-xxxhdpi/icon_list.png deleted file mode 100644 index a20815f..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/icon_list.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/icon_next_true.png b/app/src/main/res/mipmap-xxxhdpi/icon_next_true.png deleted file mode 100644 index a80f392..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/icon_next_true.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/icon_pause.png b/app/src/main/res/mipmap-xxxhdpi/icon_pause.png deleted file mode 100644 index 2f201b4..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/icon_pause.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/icon_play.png b/app/src/main/res/mipmap-xxxhdpi/icon_play.png deleted file mode 100644 index 28f7350..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/icon_play.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/icon_previous_true.png b/app/src/main/res/mipmap-xxxhdpi/icon_previous_true.png deleted file mode 100644 index dd03f15..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/icon_previous_true.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/light.png b/app/src/main/res/mipmap-xxxhdpi/light.png deleted file mode 100644 index f2f7bd6..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/light.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/playing_background_light.png b/app/src/main/res/mipmap-xxxhdpi/playing_background_light.png deleted file mode 100644 index 2471fec..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/playing_background_light.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/tab_bg.png b/app/src/main/res/mipmap-xxxhdpi/tab_bg.png deleted file mode 100644 index 4098ffa..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/tab_bg.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/thumb.png b/app/src/main/res/mipmap-xxxhdpi/thumb.png deleted file mode 100644 index 4b212f5..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/thumb.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/timing.png b/app/src/main/res/mipmap-xxxhdpi/timing.png deleted file mode 100644 index 8723ec7..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/timing.png and /dev/null differ diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index fe26dae..43580e4 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -3,30 +3,6 @@ #FF000000 #FFFFFFFF #00000000 - #FFFFFF - #DFD0D0 - #26000000 - #99000000 - #33FFFFFF - #4DFFFFFF - #99FFFFFF - #59FFFFFF - #1A1A1A - #4DFFFFFF #FF424242 - #55B15B - #E03D3D3F - #242529 - #99000000 - #000000 - #2D9C31 - #282A2C - - #2EB06F - #B9D1A6 - #26FFFFFF - #339ED3A2 - - #B3000000 \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5d90b20..fc50d49 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,14 +1,6 @@ MusicApp - Hello blank fragment - Song Of The Day - Recently Played - Top Artists - Trending in Shorts - New Releases - Musicoo - Library Listen Music Anytime Resource Loading... Sounds of Serenity @@ -21,22 +13,4 @@ Share Privacy Policy Terms of Service - Play next - Try again - An error occurred - Search songs, artists… - Play - There is no next song yet - Image loading failed - Song loading failed - Playlist loading failed - %d:%02d:%02d - %d:%02d - Like - Download - Songs %d - Offline %d - Favorite Songs - Offline Songs - It\'s already downloaded \ No newline at end of file