From 27158158fda02ee5e93496a3eceb059addd0d3f0 Mon Sep 17 00:00:00 2001 From: lihongwei Date: Fri, 20 Sep 2024 10:46:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9A=E9=9D=A2=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 4 +- ...apter.java => A_HomeViewPagerAdapter.java} | 12 +-- ...AHomeActivity.java => A_HomeActivity.java} | 12 +-- ...ashActivity.java => A_SplashActivity.java} | 11 +-- .../player/ui/fragmnt/AHomeFragment.java | 24 ------ .../player/ui/fragmnt/A_HomeFragment.java | 18 +++++ ...ortFragment.java => A_ImportFragment.java} | 10 +-- .../drawable/circular_progress_drawable.xml | 18 ----- ...activity_ahome.xml => activity_a_home.xml} | 5 +- ...vity_asplash.xml => activity_a_splash.xml} | 2 +- app/src/main/res/layout/fragment_a_home.xml | 75 +++++++++++++++++-- app/src/main/res/layout/fragment_a_import.xml | 2 +- 12 files changed, 117 insertions(+), 76 deletions(-) rename app/src/main/java/com/hi/music/player/adapter/{AHomeViewPagerAdapter.java => A_HomeViewPagerAdapter.java} (62%) rename app/src/main/java/com/hi/music/player/ui/activity/{AHomeActivity.java => A_HomeActivity.java} (87%) rename app/src/main/java/com/hi/music/player/ui/activity/{AsplashActivity.java => A_SplashActivity.java} (75%) delete mode 100644 app/src/main/java/com/hi/music/player/ui/fragmnt/AHomeFragment.java create mode 100644 app/src/main/java/com/hi/music/player/ui/fragmnt/A_HomeFragment.java rename app/src/main/java/com/hi/music/player/ui/fragmnt/{AImportFragment.java => A_ImportFragment.java} (86%) delete mode 100644 app/src/main/res/drawable/circular_progress_drawable.xml rename app/src/main/res/layout/{activity_ahome.xml => activity_a_home.xml} (97%) rename app/src/main/res/layout/{activity_asplash.xml => activity_a_splash.xml} (98%) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f8fe189..14816a1 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -19,7 +19,7 @@ android:name=".ui.activity.PlayActivity" android:exported="false" /> diff --git a/app/src/main/java/com/hi/music/player/adapter/AHomeViewPagerAdapter.java b/app/src/main/java/com/hi/music/player/adapter/A_HomeViewPagerAdapter.java similarity index 62% rename from app/src/main/java/com/hi/music/player/adapter/AHomeViewPagerAdapter.java rename to app/src/main/java/com/hi/music/player/adapter/A_HomeViewPagerAdapter.java index 545473c..ed7371b 100644 --- a/app/src/main/java/com/hi/music/player/adapter/AHomeViewPagerAdapter.java +++ b/app/src/main/java/com/hi/music/player/adapter/A_HomeViewPagerAdapter.java @@ -5,19 +5,19 @@ import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentActivity; import androidx.viewpager2.adapter.FragmentStateAdapter; -import com.hi.music.player.ui.fragmnt.AHomeFragment; -import com.hi.music.player.ui.fragmnt.AImportFragment; +import com.hi.music.player.ui.fragmnt.A_HomeFragment; +import com.hi.music.player.ui.fragmnt.A_ImportFragment; import java.util.ArrayList; import java.util.List; -public class AHomeViewPagerAdapter extends FragmentStateAdapter { +public class A_HomeViewPagerAdapter extends FragmentStateAdapter { private final List fragments = new ArrayList<>(); - public AHomeViewPagerAdapter(@NonNull FragmentActivity fragmentActivity) { + public A_HomeViewPagerAdapter(@NonNull FragmentActivity fragmentActivity) { super(fragmentActivity); - fragments.add(new AHomeFragment()); - fragments.add(new AImportFragment()); + fragments.add(new A_HomeFragment()); + fragments.add(new A_ImportFragment()); } @NonNull diff --git a/app/src/main/java/com/hi/music/player/ui/activity/AHomeActivity.java b/app/src/main/java/com/hi/music/player/ui/activity/A_HomeActivity.java similarity index 87% rename from app/src/main/java/com/hi/music/player/ui/activity/AHomeActivity.java rename to app/src/main/java/com/hi/music/player/ui/activity/A_HomeActivity.java index 375bedc..d05cd00 100644 --- a/app/src/main/java/com/hi/music/player/ui/activity/AHomeActivity.java +++ b/app/src/main/java/com/hi/music/player/ui/activity/A_HomeActivity.java @@ -6,11 +6,11 @@ import android.view.LayoutInflater; 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.AHomeViewPagerAdapter; -import com.hi.music.player.databinding.ActivityAhomeBinding; +import com.hi.music.player.adapter.A_HomeViewPagerAdapter; +import com.hi.music.player.databinding.ActivityAHomeBinding; import com.hi.music.player.databinding.HomeTabCustomBinding; -public class AHomeActivity extends BaseActivity { +public class A_HomeActivity extends BaseActivity { // 图标数组定义为类成员，避免重复 private final int[] defaultIcons = { @@ -30,8 +30,8 @@ public class AHomeActivity extends BaseActivity { } @Override - protected ActivityAhomeBinding getViewBinding() { - return ActivityAhomeBinding.inflate(getLayoutInflater()); + protected ActivityAHomeBinding getViewBinding() { + return ActivityAHomeBinding.inflate(getLayoutInflater()); } @Override @@ -53,7 +53,7 @@ public class AHomeActivity extends BaseActivity { public void initData(){ - AHomeViewPagerAdapter adapter = new AHomeViewPagerAdapter(this); + A_HomeViewPagerAdapter adapter = new A_HomeViewPagerAdapter(this); vb.homeViewpager.setAdapter(adapter); // 设置TabLayout的图标 diff --git a/app/src/main/java/com/hi/music/player/ui/activity/AsplashActivity.java b/app/src/main/java/com/hi/music/player/ui/activity/A_SplashActivity.java similarity index 75% rename from app/src/main/java/com/hi/music/player/ui/activity/AsplashActivity.java rename to app/src/main/java/com/hi/music/player/ui/activity/A_SplashActivity.java index 0b975e5..307bfa6 100644 --- a/app/src/main/java/com/hi/music/player/ui/activity/AsplashActivity.java +++ b/app/src/main/java/com/hi/music/player/ui/activity/A_SplashActivity.java @@ -3,16 +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 ASplashActivity 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 @@ -48,7 +49,7 @@ public class ASplashActivity extends BaseActivity { @Override public void onFinish() { vb.progressBar.setProgress(100); - Intent intent = new Intent(ASplashActivity.this, AHomeActivity.class); + Intent intent = new Intent(A_SplashActivity.this, A_HomeActivity.class); startActivity(intent); finish(); } diff --git a/app/src/main/java/com/hi/music/player/ui/fragmnt/AHomeFragment.java b/app/src/main/java/com/hi/music/player/ui/fragmnt/AHomeFragment.java deleted file mode 100644 index e0e502a..0000000 --- a/app/src/main/java/com/hi/music/player/ui/fragmnt/AHomeFragment.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.hi.music.player.ui.fragmnt; - -import android.os.Bundle; - -import androidx.fragment.app.Fragment; - -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - -import com.hi.music.player.R; - - -public class AHomeFragment extends Fragment { - - - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - // Inflate the layout for this fragment - return inflater.inflate(R.layout.fragment_a_home, container, false); - } -} \ No newline at end of file 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 new file mode 100644 index 0000000..b460d4b --- /dev/null +++ b/app/src/main/java/com/hi/music/player/ui/fragmnt/A_HomeFragment.java @@ -0,0 +1,18 @@ +package com.hi.music.player.ui.fragmnt; + +import com.hi.music.player.databinding.FragmentAHomeBinding; + + +public class A_HomeFragment extends BaseFragment { + + + @Override + protected FragmentAHomeBinding getFragmentVb() { + return FragmentAHomeBinding.inflate(getLayoutInflater()); + } + + @Override + protected void initView() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/hi/music/player/ui/fragmnt/AImportFragment.java b/app/src/main/java/com/hi/music/player/ui/fragmnt/A_ImportFragment.java similarity index 86% rename from app/src/main/java/com/hi/music/player/ui/fragmnt/AImportFragment.java rename to app/src/main/java/com/hi/music/player/ui/fragmnt/A_ImportFragment.java index a89cb02..952cf9b 100644 --- a/app/src/main/java/com/hi/music/player/ui/fragmnt/AImportFragment.java +++ b/app/src/main/java/com/hi/music/player/ui/fragmnt/A_ImportFragment.java @@ -12,10 +12,10 @@ import com.hi.music.player.R; /** * A simple {@link Fragment} subclass. - * Use the {@link AImportFragment#newInstance} factory method to + * Use the {@link A_ImportFragment#newInstance} factory method to * create an instance of this fragment. */ -public class AImportFragment extends Fragment { +public class A_ImportFragment extends Fragment { // TODO: Rename parameter arguments, choose names that match // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER @@ -26,7 +26,7 @@ public class AImportFragment extends Fragment { private String mParam1; private String mParam2; - public AImportFragment() { + public A_ImportFragment() { // Required empty public constructor } @@ -39,8 +39,8 @@ public class AImportFragment extends Fragment { * @return A new instance of fragment AImportFragment. */ // TODO: Rename and change types and number of parameters - public static AImportFragment newInstance(String param1, String param2) { - AImportFragment fragment = new AImportFragment(); + 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); diff --git a/app/src/main/res/drawable/circular_progress_drawable.xml b/app/src/main/res/drawable/circular_progress_drawable.xml deleted file mode 100644 index 7ae0e50..0000000 --- a/app/src/main/res/drawable/circular_progress_drawable.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_ahome.xml b/app/src/main/res/layout/activity_a_home.xml similarity index 97% rename from app/src/main/res/layout/activity_ahome.xml rename to app/src/main/res/layout/activity_a_home.xml index 4f9ca99..96b46e5 100644 --- a/app/src/main/res/layout/activity_ahome.xml +++ b/app/src/main/res/layout/activity_a_home.xml @@ -5,7 +5,7 @@ android:id="@+id/main" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".ui.activity.AHomeActivity"> + tools:context=".ui.activity.A_HomeActivity"> @@ -50,7 +51,7 @@ android:id="@+id/circular_progress_bar" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center"/> + android:layout_gravity="center" /> + tools:context=".ui.activity.A_SplashActivity"> + tools:context=".ui.fragmnt.A_HomeFragment"> - - + + android:layout_height="match_parent"> - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_a_import.xml b/app/src/main/res/layout/fragment_a_import.xml index c6ef680..2d44233 100644 --- a/app/src/main/res/layout/fragment_a_import.xml +++ b/app/src/main/res/layout/fragment_a_import.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".ui.fragmnt.AImportFragment"> + tools:context=".ui.fragmnt.A_ImportFragment">