diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 52652fa..a2f7226 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -17,9 +17,9 @@ android:allowBackup="true" android:dataExtractionRules="@xml/data_extraction_rules" android:fullBackupContent="@xml/backup_rules" - android:icon="@mipmap/ic_launcher" + android:icon="@mipmap/logo" android:label="@string/app_name" - android:roundIcon="@mipmap/ic_launcher" + android:roundIcon="@mipmap/logo" android:supportsRtl="true" android:theme="@style/Theme.MusicApp" tools:targetApi="31"> 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 0fca300..9849409 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 @@ -100,6 +100,7 @@ public class A_PlayActivity extends BaseActivity { loadBackgroundPreference(); // 加载之前保存的背景状态 + updateSeekBarAndTime(); // 从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/hi/music/player/ui/activity/A_SettingActivity.java index 3d38618..0de4d00 100644 --- a/app/src/main/java/com/hi/music/player/ui/activity/A_SettingActivity.java +++ b/app/src/main/java/com/hi/music/player/ui/activity/A_SettingActivity.java @@ -40,6 +40,10 @@ public class A_SettingActivity extends BaseActivity { SettingUtil.openTermsOfService(this); }); + vb.back.setOnClickListener(v -> { + finish(); + }); + } diff --git a/app/src/main/java/com/hi/music/player/ui/fragmnt/A_HomeFragment.java b/app/src/main/java/com/hi/music/player/ui/fragmnt/A_HomeFragment.java index b92e1ed..9df55f2 100644 --- a/app/src/main/java/com/hi/music/player/ui/fragmnt/A_HomeFragment.java +++ b/app/src/main/java/com/hi/music/player/ui/fragmnt/A_HomeFragment.java @@ -7,6 +7,7 @@ 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; @@ -45,6 +46,9 @@ public class A_HomeFragment extends BaseFragment { Vb.recyclerViewFirst.setAdapter(instrumentAdapter); Vb.recyclerViewSecond.setAdapter(whiteAdapter); Vb.recyclerViewThird.setAdapter(natureAdapter); + + ItemDecoration itemDecoration = new ItemDecoration(12, 10, 9); + Vb.recyclerViewSecond.addItemDecoration(itemDecoration); } public void initEvent() { 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 67b8d08..d62c66a 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 @@ -158,18 +158,36 @@ public class A_ImportFragment extends BaseFragment { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { if (ContextCompat.checkSelfPermission(requireContext(), Manifest.permission.READ_MEDIA_AUDIO) != PackageManager.PERMISSION_GRANTED) { requestPermissions(Manifest.permission.READ_MEDIA_AUDIO); + Log.d("A_ImportFragment", "123Build.VERSION_CODES.TIRAMISU"); // 添加调试日志 } else { openAudioPicker(); + Log.d("A_ImportFragment", "Build.VERSION_CODES.TIRAMISU"); // 添加调试日志 } } else { if (ContextCompat.checkSelfPermission(requireContext(), Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) { requestPermissions(Manifest.permission.READ_EXTERNAL_STORAGE); + Log.d("A_ImportFragment", "156Build.VERSION_CODES.TIRAMISU"); // 添加调试日志 + showPermissionDeniedDialog(); } else { openAudioPicker(); + Log.d("A_ImportFragment", "Not Build.VERSION_CODES.TIRAMISU"); // 添加调试日志 } } } + private void showPermissionDeniedDialog() { + AlertDialog.Builder builder = new AlertDialog.Builder(requireContext()); + builder.setTitle("Permission denied"); + builder.setMessage("You have denied permission to read the audio file, and some functions will not work properly. Please go to Application Settings to grant permissions."); + builder.setPositiveButton("Go to Settings", (dialog, which) -> { + Intent intent = new Intent(android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS); + Uri uri = Uri.fromParts("package", requireContext().getPackageName(), null); + intent.setData(uri); + startActivity(intent); + }); + builder.setNegativeButton("Cancel", (dialog, which) -> dialog.dismiss()); + builder.show(); + } private void requestPermissions(String permission) { ActivityCompat.requestPermissions(requireActivity(), new String[]{permission}, REQUEST_CODE_READ_MEDIA_AUDIO); @@ -191,7 +209,7 @@ public class A_ImportFragment extends BaseFragment { private void openAudioPicker() { if (!Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState())) { - Toast.makeText(getContext(), "外部存储不可用", Toast.LENGTH_LONG).show(); + Toast.makeText(getContext(), "The external storage is unavailable", Toast.LENGTH_LONG).show(); return; } diff --git a/app/src/main/res/layout/activity_aplay.xml b/app/src/main/res/layout/activity_aplay.xml index 1efaf39..ac50c29 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="28dp" + android:layout_marginTop="32dp" 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="28dp" + android:layout_marginTop="32dp" android:text="Now Playing" android:textColor="@android:color/white" android:textSize="16sp" diff --git a/app/src/main/res/layout/activity_asetting.xml b/app/src/main/res/layout/activity_asetting.xml index 88a19a2..7553090 100644 --- a/app/src/main/res/layout/activity_asetting.xml +++ b/app/src/main/res/layout/activity_asetting.xml @@ -11,10 +11,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center_vertical" - android:layout_marginTop="4dp" + android:layout_marginTop="10dp" android:orientation="horizontal"> diff --git a/app/src/main/res/layout/activity_asplash.xml b/app/src/main/res/layout/activity_asplash.xml index ba70108..8599aa8 100644 --- a/app/src/main/res/layout/activity_asplash.xml +++ b/app/src/main/res/layout/activity_asplash.xml @@ -10,12 +10,12 @@ + app:layout_constraintStart_toStartOf="parent" /> + app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/fragment_a_home.xml b/app/src/main/res/layout/fragment_a_home.xml index 4efcd76..b0d51b5 100644 --- a/app/src/main/res/layout/fragment_a_home.xml +++ b/app/src/main/res/layout/fragment_a_home.xml @@ -25,12 +25,14 @@ android:text="@string/ready_to_sleep" android:textColor="@color/white" android:textSize="44sp" + android:layout_gravity="center" android:textStyle="italic|bold" /> diff --git a/app/src/main/res/layout/fragment_a_import.xml b/app/src/main/res/layout/fragment_a_import.xml index a64575e..56ddc6e 100644 --- a/app/src/main/res/layout/fragment_a_import.xml +++ b/app/src/main/res/layout/fragment_a_import.xml @@ -12,7 +12,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="16dp" - android:layout_marginTop="32sp" + android:layout_marginTop="32dp" android:text="Parents voice" android:textColor="@color/white" android:textSize="28sp" @@ -36,6 +36,7 @@ android:layout_width="match_parent" android:layout_height="0dp" android:layout_marginBottom="16dp" + android:layout_marginTop="16dp" app:layout_constraintTop_toBottomOf="@+id/title" app:layout_constraintBottom_toBottomOf="parent"/> 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 242d129..663aee0 100644 --- a/app/src/main/res/layout/item_a_home_1.xml +++ b/app/src/main/res/layout/item_a_home_1.xml @@ -1,6 +1,7 @@ Library Listen Music Anytime Resource Loading... - Ready to sleep - We\'ve carefully prepared sounds for you 🔥 + Sounds of Serenity + Soothing tunes crafted for deep relaxation and sleep 🌙 White noise Voice of Nature Setting