diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9a244d2..61f725f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -16,6 +16,12 @@ 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_HomeActivity.java b/app/src/main/java/com/hi/music/player/ui/activity/A_HomeActivity.java index d05cd00..9022435 100644 --- a/app/src/main/java/com/hi/music/player/ui/activity/A_HomeActivity.java +++ b/app/src/main/java/com/hi/music/player/ui/activity/A_HomeActivity.java @@ -7,10 +7,10 @@ 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.ActivityAhomeBinding; import com.hi.music.player.databinding.HomeTabCustomBinding; -public class A_HomeActivity extends BaseActivity { +public class A_HomeActivity extends BaseActivity { // 图标数组定义为类成员，避免重复 private final int[] defaultIcons = { @@ -30,8 +30,8 @@ public class A_HomeActivity extends BaseActivity { } @Override - protected ActivityAHomeBinding getViewBinding() { - return ActivityAHomeBinding.inflate(getLayoutInflater()); + protected ActivityAhomeBinding getViewBinding() { + return ActivityAhomeBinding.inflate(getLayoutInflater()); } @Override 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 new file mode 100644 index 0000000..960451b --- /dev/null +++ b/app/src/main/java/com/hi/music/player/ui/activity/A_PlayActivity.java @@ -0,0 +1,27 @@ +package com.hi.music.player.ui.activity; + +import com.hi.music.player.databinding.ActivityAplayBinding; + +public class A_PlayActivity extends BaseActivity { + + + @Override + protected ActivityAplayBinding getViewBinding() { + return ActivityAplayBinding.inflate(getLayoutInflater()); + } + + @Override + protected void onCreateInit() { + + } + + @Override + public boolean isFullScreen() { + return true; + } + + @Override + public boolean statusBarLight() { + return false; + } +} \ No newline at end of file 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 new file mode 100644 index 0000000..d6e7662 --- /dev/null +++ b/app/src/main/java/com/hi/music/player/ui/activity/A_SettingActivity.java @@ -0,0 +1,27 @@ +package com.hi.music.player.ui.activity; + +import com.hi.music.player.databinding.ActivityAsettingBinding; + +public class A_SettingActivity extends BaseActivity { + + + @Override + protected ActivityAsettingBinding getViewBinding() { + return ActivityAsettingBinding.inflate(getLayoutInflater()); + } + + @Override + protected void onCreateInit() { + + } + + @Override + public boolean isFullScreen() { + return true; + } + + @Override + public boolean statusBarLight() { + return false; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/hi/music/player/ui/activity/A_SplashActivity.java b/app/src/main/java/com/hi/music/player/ui/activity/A_SplashActivity.java index 307bfa6..3a5d1a3 100644 --- a/app/src/main/java/com/hi/music/player/ui/activity/A_SplashActivity.java +++ b/app/src/main/java/com/hi/music/player/ui/activity/A_SplashActivity.java @@ -3,17 +3,17 @@ package com.hi.music.player.ui.activity; import android.content.Intent; import android.os.CountDownTimer; -import com.hi.music.player.databinding.ActivityASplashBinding; +import com.hi.music.player.databinding.ActivityAsplashBinding; -public class A_SplashActivity extends BaseActivity { +public class A_SplashActivity extends BaseActivity { private static final int SPLASH_TIME_OUT = 1500; private CountDownTimer countDownTimer; @Override - protected ActivityASplashBinding getViewBinding() { - return ActivityASplashBinding.inflate(getLayoutInflater()); + protected ActivityAsplashBinding getViewBinding() { + return ActivityAsplashBinding.inflate(getLayoutInflater()); } @Override 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 952cf9b..5824c66 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 @@ -1,66 +1,18 @@ package com.hi.music.player.ui.fragmnt; -import android.os.Bundle; +import com.hi.music.player.databinding.FragmentAImportBinding; -import androidx.fragment.app.Fragment; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; +public class A_ImportFragment extends BaseFragment { -import com.hi.music.player.R; -/** - * A simple {@link Fragment} subclass. - * Use the {@link A_ImportFragment#newInstance} factory method to - * create an instance of this fragment. - */ -public class A_ImportFragment extends Fragment { - - // TODO: Rename parameter arguments, choose names that match - // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER - private static final String ARG_PARAM1 = "param1"; - private static final String ARG_PARAM2 = "param2"; - - // TODO: Rename and change types of parameters - private String mParam1; - private String mParam2; - - public A_ImportFragment() { - // Required empty public constructor - } - - /** - * Use this factory method to create a new instance of - * this fragment using the provided parameters. - * - * @param param1 Parameter 1. - * @param param2 Parameter 2. - * @return A new instance of fragment AImportFragment. - */ - // TODO: Rename and change types and number of parameters - public static A_ImportFragment newInstance(String param1, String param2) { - A_ImportFragment fragment = new A_ImportFragment(); - Bundle args = new Bundle(); - args.putString(ARG_PARAM1, param1); - args.putString(ARG_PARAM2, param2); - fragment.setArguments(args); - return fragment; + @Override + protected FragmentAImportBinding getFragmentVb() { + return FragmentAImportBinding.inflate(getLayoutInflater()); } @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - if (getArguments() != null) { - mParam1 = getArguments().getString(ARG_PARAM1); - mParam2 = getArguments().getString(ARG_PARAM2); - } - } + protected void initView() { - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - // Inflate the layout for this fragment - return inflater.inflate(R.layout.fragment_a_import, container, false); } } \ No newline at end of file diff --git a/app/src/main/res/drawable/a_rounded_rectangle_tab_layout.xml b/app/src/main/res/drawable/a_rounded_rectangle_tab_layout.xml index dcc6e4f..c09c26b 100644 --- a/app/src/main/res/drawable/a_rounded_rectangle_tab_layout.xml +++ b/app/src/main/res/drawable/a_rounded_rectangle_tab_layout.xml @@ -1,22 +1,17 @@ - - - - - - + + + - - - - - - \ No newline at end of file + + + diff --git a/app/src/main/res/drawable/about.xml b/app/src/main/res/drawable/about.xml new file mode 100644 index 0000000..acb5eec --- /dev/null +++ b/app/src/main/res/drawable/about.xml @@ -0,0 +1,16 @@ + + + + + + + diff --git a/app/src/main/res/drawable/add.xml b/app/src/main/res/drawable/add.xml new file mode 100644 index 0000000..786cba9 --- /dev/null +++ b/app/src/main/res/drawable/add.xml @@ -0,0 +1,16 @@ + + + + + + + diff --git a/app/src/main/res/drawable/arrow_left.xml b/app/src/main/res/drawable/arrow_left.xml new file mode 100644 index 0000000..a70cbf0 --- /dev/null +++ b/app/src/main/res/drawable/arrow_left.xml @@ -0,0 +1,13 @@ + + + diff --git a/app/src/main/res/drawable/arrow_right.xml b/app/src/main/res/drawable/arrow_right.xml new file mode 100644 index 0000000..f21845d --- /dev/null +++ b/app/src/main/res/drawable/arrow_right.xml @@ -0,0 +1,13 @@ + + + diff --git a/app/src/main/res/drawable/category.xml b/app/src/main/res/drawable/category.xml new file mode 100644 index 0000000..fcf2d61 --- /dev/null +++ b/app/src/main/res/drawable/category.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/feedback.xml b/app/src/main/res/drawable/feedback.xml new file mode 100644 index 0000000..7e89b47 --- /dev/null +++ b/app/src/main/res/drawable/feedback.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/more.xml b/app/src/main/res/drawable/more.xml new file mode 100644 index 0000000..80184ea --- /dev/null +++ b/app/src/main/res/drawable/more.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/pause_big.xml b/app/src/main/res/drawable/pause_big.xml new file mode 100644 index 0000000..fabc4bd --- /dev/null +++ b/app/src/main/res/drawable/pause_big.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/pause_flat.xml b/app/src/main/res/drawable/pause_flat.xml new file mode 100644 index 0000000..043dfa9 --- /dev/null +++ b/app/src/main/res/drawable/pause_flat.xml @@ -0,0 +1,16 @@ + + + + + + + diff --git a/app/src/main/res/drawable/pause_shadow.xml b/app/src/main/res/drawable/pause_shadow.xml new file mode 100644 index 0000000..2c16085 --- /dev/null +++ b/app/src/main/res/drawable/pause_shadow.xml @@ -0,0 +1,22 @@ + + + + + + + diff --git a/app/src/main/res/drawable/play.xml b/app/src/main/res/drawable/play.xml new file mode 100644 index 0000000..3382d72 --- /dev/null +++ b/app/src/main/res/drawable/play.xml @@ -0,0 +1,26 @@ + + + + + diff --git a/app/src/main/res/drawable/play_flat.xml b/app/src/main/res/drawable/play_flat.xml new file mode 100644 index 0000000..98f79ff --- /dev/null +++ b/app/src/main/res/drawable/play_flat.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/play_shadow.xml b/app/src/main/res/drawable/play_shadow.xml new file mode 100644 index 0000000..4ab0bd7 --- /dev/null +++ b/app/src/main/res/drawable/play_shadow.xml @@ -0,0 +1,30 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/privacy.xml b/app/src/main/res/drawable/privacy.xml new file mode 100644 index 0000000..3576649 --- /dev/null +++ b/app/src/main/res/drawable/privacy.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/right_arrow.xml b/app/src/main/res/drawable/right_arrow.xml deleted file mode 100644 index 046579e..0000000 --- a/app/src/main/res/drawable/right_arrow.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/round_rectangle.xml b/app/src/main/res/drawable/round_rectangle.xml index 1c13032..29c732b 100644 --- a/app/src/main/res/drawable/round_rectangle.xml +++ b/app/src/main/res/drawable/round_rectangle.xml @@ -1,11 +1,8 @@ - + - - - - - - + + - + diff --git a/app/src/main/res/drawable/round_rectangle_top.xml b/app/src/main/res/drawable/round_rectangle_top.xml new file mode 100644 index 0000000..f90f3a2 --- /dev/null +++ b/app/src/main/res/drawable/round_rectangle_top.xml @@ -0,0 +1,14 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/rounded.xml b/app/src/main/res/drawable/rounded.xml new file mode 100644 index 0000000..617caac --- /dev/null +++ b/app/src/main/res/drawable/rounded.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/share.xml b/app/src/main/res/drawable/share.xml new file mode 100644 index 0000000..d2b3693 --- /dev/null +++ b/app/src/main/res/drawable/share.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/sleep.xml b/app/src/main/res/drawable/sleep.xml new file mode 100644 index 0000000..3693014 --- /dev/null +++ b/app/src/main/res/drawable/sleep.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/terms.xml b/app/src/main/res/drawable/terms.xml new file mode 100644 index 0000000..a07922c --- /dev/null +++ b/app/src/main/res/drawable/terms.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/layout/activity_a_home.xml b/app/src/main/res/layout/activity_ahome.xml similarity index 100% rename from app/src/main/res/layout/activity_a_home.xml rename to app/src/main/res/layout/activity_ahome.xml diff --git a/app/src/main/res/layout/activity_aplay.xml b/app/src/main/res/layout/activity_aplay.xml new file mode 100644 index 0000000..c153508 --- /dev/null +++ b/app/src/main/res/layout/activity_aplay.xml @@ -0,0 +1,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_asetting.xml b/app/src/main/res/layout/activity_asetting.xml new file mode 100644 index 0000000..b12294f --- /dev/null +++ b/app/src/main/res/layout/activity_asetting.xml @@ -0,0 +1,194 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_a_splash.xml b/app/src/main/res/layout/activity_asplash.xml similarity index 100% rename from app/src/main/res/layout/activity_a_splash.xml rename to app/src/main/res/layout/activity_asplash.xml diff --git a/app/src/main/res/layout/fragment_a_home.xml b/app/src/main/res/layout/fragment_a_home.xml index a381573..7ff2a11 100644 --- a/app/src/main/res/layout/fragment_a_home.xml +++ b/app/src/main/res/layout/fragment_a_home.xml @@ -20,15 +20,16 @@ android:id="@+id/first_line_text" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="First Line" - android:textSize="16sp" /> + android:text="@string/ready_to_sleep" + android:textSize="44sp" + android:textStyle="italic|bold" /> + android:text="@string/we_ve_carefully_prepared_sounds_for_you" + android:textSize="14sp" /> + android:text="@string/white_noise" + android:textSize="20sp" /> + android:text="@string/voice_of_nature" + android:textSize="20sp" /> - - + android:id="@+id/title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:layout_marginTop="32sp" + android:text="Parents voice" + android:textSize="32sp" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - \ No newline at end of file + + + + + + + + \ 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 new file mode 100644 index 0000000..3093763 --- /dev/null +++ b/app/src/main/res/layout/item_a_home_1.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/item_a_home_2.xml b/app/src/main/res/layout/item_a_home_2.xml new file mode 100644 index 0000000..ccdea02 --- /dev/null +++ b/app/src/main/res/layout/item_a_home_2.xml @@ -0,0 +1,39 @@ + + + + + + + + + + diff --git a/app/src/main/res/layout/item_a_home_3.xml b/app/src/main/res/layout/item_a_home_3.xml new file mode 100644 index 0000000..c74a477 --- /dev/null +++ b/app/src/main/res/layout/item_a_home_3.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + diff --git a/app/src/main/res/layout/item_a_setting.xml b/app/src/main/res/layout/item_a_setting.xml new file mode 100644 index 0000000..202fec5 --- /dev/null +++ b/app/src/main/res/layout/item_a_setting.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + diff --git a/app/src/main/res/mipmap-xxxhdpi/light.png b/app/src/main/res/mipmap-xxxhdpi/light.png new file mode 100644 index 0000000..f2f7bd6 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/light.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/timing.png b/app/src/main/res/mipmap-xxxhdpi/timing.png new file mode 100644 index 0000000..8723ec7 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/timing.png differ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 453dbaa..24be63e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -11,4 +11,14 @@ Profile Listen Music Anytime Resource Loading... + Ready to sleep + We\'ve carefully prepared sounds for you 🔥 + White noise + Voice of Nature + Setting + About + Feedback + Share + Privacy Policy + Terms of Service \ No newline at end of file