diff --git a/app/src/main/java/com/player/musicoo/adapter/RealHumanVoiceAdapter.kt b/app/src/main/java/com/player/musicoo/adapter/RealHumanVoiceAdapter.kt index c4be2d5..808ebe4 100644 --- a/app/src/main/java/com/player/musicoo/adapter/RealHumanVoiceAdapter.kt +++ b/app/src/main/java/com/player/musicoo/adapter/RealHumanVoiceAdapter.kt @@ -52,11 +52,9 @@ class RealHumanVoiceAdapter( if (App.currentPlayingAudio != null) { if (App.currentPlayingAudio?.file == audio.file) { - stateImg.setImageResource(R.drawable.playing_white_icon) name.setTextColor(context.getColor(R.color.green)) desc.setTextColor(context.getColor(R.color.green)) } else { - stateImg.setImageResource(R.drawable.play_white_icon) name.setTextColor(context.getColor(R.color.white)) desc.setTextColor(context.getColor(R.color.white)) } diff --git a/app/src/main/java/com/player/musicoo/fragment/HomeFragment.kt b/app/src/main/java/com/player/musicoo/fragment/HomeFragment.kt index 938caaa..6baef2e 100644 --- a/app/src/main/java/com/player/musicoo/fragment/HomeFragment.kt +++ b/app/src/main/java/com/player/musicoo/fragment/HomeFragment.kt @@ -52,24 +52,23 @@ class HomeFragment : Fragment() { if (App.realHumanVoiceList.isNotEmpty()) { realHumanVoiceAdapter = RealHumanVoiceAdapter(requireActivity(), App.realHumanVoiceList) binding.realRv.layoutManager = - LinearLayoutManager(requireActivity(), LinearLayoutManager.HORIZONTAL, false) - binding.realRv.addItemDecoration(HorizontalSpaceItemDecoration(requireActivity())) + GridLayoutManager(requireActivity(), 2, GridLayoutManager.VERTICAL, false) + binding.realRv.addItemDecoration(GridSpacingItemDecoration(requireActivity(), 20, 2)) binding.realRv.adapter = realHumanVoiceAdapter } if (App.soundsOfAppliancesList.isNotEmpty()) { soundsOfAppliancesAdapter = SoundsOfAppliancesAdapter(requireActivity(), App.soundsOfAppliancesList) binding.soundsRv.layoutManager = - LinearLayoutManager(requireActivity(), LinearLayoutManager.HORIZONTAL, false) - binding.soundsRv.addItemDecoration(HorizontalSpaceItemDecoration(requireActivity())) + GridLayoutManager(requireActivity(), 2, GridLayoutManager.VERTICAL, false) + binding.soundsRv.addItemDecoration(GridSpacingItemDecoration(requireActivity(), 20, 2)) binding.soundsRv.adapter = soundsOfAppliancesAdapter } if (App.soundsOfNatureList.isNotEmpty()) { soundsOfNatureAdapter = SoundsOfNatureAdapter(requireActivity(), App.soundsOfNatureList) binding.natureRv.layoutManager = - GridLayoutManager(requireActivity(), 3, GridLayoutManager.HORIZONTAL, false) - binding.natureRv.addItemDecoration(GridSpacingItemDecoration(requireActivity(), 10, 3)) + LinearLayoutManager(requireActivity(), LinearLayoutManager.VERTICAL, false) binding.natureRv.adapter = soundsOfNatureAdapter } } @@ -108,13 +107,13 @@ class HomeFragment : Fragment() { override fun onHiddenChanged(hidden: Boolean) { super.onHiddenChanged(hidden) - if(!hidden){ + if (!hidden) { initImmersionBar() } } @SuppressLint("NotifyDataSetChanged") - private fun notifyDataSetChanged(){ + private fun notifyDataSetChanged() { soundsOfAppliancesAdapter?.notifyDataSetChanged() realHumanVoiceAdapter?.notifyDataSetChanged() soundsOfNatureAdapter?.notifyDataSetChanged() diff --git a/app/src/main/res/drawable/drw_main_bottom_bg.xml b/app/src/main/res/drawable/drw_main_bottom_bg.xml index 96f161e..538cdd6 100644 --- a/app/src/main/res/drawable/drw_main_bottom_bg.xml +++ b/app/src/main/res/drawable/drw_main_bottom_bg.xml @@ -2,10 +2,7 @@ - \ No newline at end of file diff --git a/app/src/main/res/drawable/drw_primary_bottom_bg.xml b/app/src/main/res/drawable/drw_primary_bottom_bg.xml new file mode 100644 index 0000000..96f161e --- /dev/null +++ b/app/src/main/res/drawable/drw_primary_bottom_bg.xml @@ -0,0 +1,11 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/settings_icon.xml b/app/src/main/res/drawable/settings_icon.xml new file mode 100644 index 0000000..739f29d --- /dev/null +++ b/app/src/main/res/drawable/settings_icon.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/activity_launch.xml b/app/src/main/res/layout/activity_launch.xml index f1e728c..3a58741 100644 --- a/app/src/main/res/layout/activity_launch.xml +++ b/app/src/main/res/layout/activity_launch.xml @@ -22,17 +22,11 @@ android:layout_height="match_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent" + android:scaleType="centerCrop" + android:src="@mipmap/splash_bg_img"/> - + app:hl_shadowOffsetY="4dp" + app:hl_strokeWith="1dp"> + android:textColor="@color/white" + android:textSize="14dp" /> @@ -121,6 +121,11 @@ + + + android:layout_height="match_parent"> - + android:layout_height="match_parent" + android:layout_above="@+id/bottom_play_info_layout" + android:layout_centerInParent="true" + android:layout_gravity="center" + android:layout_margin="20dp" + android:background="#00000000" + android:elevation="0dp" + app:cardBackgroundColor="#000000" + app:cardCornerRadius="16dp" + app:cardElevation="0dp"> - - - + - + - + - - - - - - - - - - + android:fontFamily="@font/medium_font" + android:gravity="center" + android:text="@string/app_name" + android:textColor="@color/white" + android:textSize="20dp" /> + - + android:layout_marginEnd="16dp" + android:layout_weight="1" + android:orientation="vertical"> - + - + + + + + + + + + + + + + - - - - - + diff --git a/app/src/main/res/layout/activity_primary.xml b/app/src/main/res/layout/activity_primary.xml index 283d80b..34a62f1 100644 --- a/app/src/main/res/layout/activity_primary.xml +++ b/app/src/main/res/layout/activity_primary.xml @@ -52,7 +52,7 @@ + android:textSize="32dp" /> + android:layout_width="24dp" + android:layout_height="24dp" + android:src="@drawable/settings_icon" /> @@ -97,12 +97,12 @@ diff --git a/app/src/main/res/layout/real_human_voice_layout.xml b/app/src/main/res/layout/real_human_voice_layout.xml index 4a3798c..6e1089a 100644 --- a/app/src/main/res/layout/real_human_voice_layout.xml +++ b/app/src/main/res/layout/real_human_voice_layout.xml @@ -1,17 +1,17 @@ @@ -62,11 +64,6 @@ - diff --git a/app/src/main/res/layout/sounds_of_appliances_layout.xml b/app/src/main/res/layout/sounds_of_appliances_layout.xml index f661ae8..33c6020 100644 --- a/app/src/main/res/layout/sounds_of_appliances_layout.xml +++ b/app/src/main/res/layout/sounds_of_appliances_layout.xml @@ -1,27 +1,27 @@ + android:layout_width="match_parent" + android:layout_height="140dp"> diff --git a/app/src/main/res/layout/sounds_of_nature_layout.xml b/app/src/main/res/layout/sounds_of_nature_layout.xml index 04acaa6..590bbda 100644 --- a/app/src/main/res/layout/sounds_of_nature_layout.xml +++ b/app/src/main/res/layout/sounds_of_nature_layout.xml @@ -61,6 +61,8 @@ android:layout_height="wrap_content" android:fontFamily="@font/medium_font" android:text="@string/app_name" + android:maxLines="1" + android:ellipsize="end" android:textColor="@color/white" android:textSize="16dp" /> diff --git a/app/src/main/res/mipmap-xxhdpi/musicoo_logo_img.png b/app/src/main/res/mipmap-xxhdpi/musicoo_logo_img.png index e4ac0e9..f4e2bc1 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/musicoo_logo_img.png and b/app/src/main/res/mipmap-xxhdpi/musicoo_logo_img.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/splash_bg_img.png b/app/src/main/res/mipmap-xxhdpi/splash_bg_img.png index 43429c3..2454d54 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/splash_bg_img.png and b/app/src/main/res/mipmap-xxhdpi/splash_bg_img.png differ diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 863b9f3..52dcb7e 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -13,4 +13,6 @@ #99FC746F #1A1A1A #00000000 + #3A3D3B + #993A3D3B \ 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 5aa4c13..009b420 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,7 +1,7 @@ Musiclax - Ready to sleep - We\'ve carefully prepared sounds for you + Sleep Soundly Tonight + Experience the tranquility of our specially designed sleep sounds. Data Error Parents voice Permission Request