From c1131115f3f97e487fa1445cc98094776b869ddf Mon Sep 17 00:00:00 2001 From: litingting Date: Wed, 18 Sep 2024 15:13:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=AE=E5=BD=95=E7=BB=93?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 4 ++-- .../hi/music/player/adapter/HomeViewPagerAdapter.java | 6 +++--- .../music/player/ui/{ => activity}/BaseActivity.java | 2 +- .../music/player/ui/{ => activity}/HomeActivity.java | 5 +---- .../music/player/ui/{ => activity}/MainActivity.java | 3 +-- .../music/player/ui/{ => fragmnt}/BaseFragment.java | 2 +- .../music/player/ui/{ => fragmnt}/HomeFragment.java | 2 +- .../player/ui/{ => fragmnt}/ProfileFragment.java | 11 +---------- .../music/player/ui/{ => fragmnt}/SearchFragment.java | 11 +---------- app/src/main/res/layout/activity_base.xml | 2 +- app/src/main/res/layout/activity_home.xml | 2 +- app/src/main/res/layout/activity_main.xml | 2 +- app/src/main/res/layout/fragment_home.xml | 2 +- app/src/main/res/layout/fragment_profile.xml | 2 +- app/src/main/res/layout/fragment_search.xml | 2 +- 15 files changed, 18 insertions(+), 40 deletions(-) rename app/src/main/java/com/hi/music/player/ui/{ => activity}/BaseActivity.java (98%) rename app/src/main/java/com/hi/music/player/ui/{ => activity}/HomeActivity.java (96%) rename app/src/main/java/com/hi/music/player/ui/{ => activity}/MainActivity.java (95%) rename app/src/main/java/com/hi/music/player/ui/{ => fragmnt}/BaseFragment.java (97%) rename app/src/main/java/com/hi/music/player/ui/{ => fragmnt}/HomeFragment.java (93%) rename app/src/main/java/com/hi/music/player/ui/{ => fragmnt}/ProfileFragment.java (60%) rename app/src/main/java/com/hi/music/player/ui/{ => fragmnt}/SearchFragment.java (60%) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6240991..43b9ffd 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -15,10 +15,10 @@ android:theme="@style/Theme.MusicApp" tools:targetApi="31"> diff --git a/app/src/main/java/com/hi/music/player/adapter/HomeViewPagerAdapter.java b/app/src/main/java/com/hi/music/player/adapter/HomeViewPagerAdapter.java index 4690ef1..acab625 100644 --- a/app/src/main/java/com/hi/music/player/adapter/HomeViewPagerAdapter.java +++ b/app/src/main/java/com/hi/music/player/adapter/HomeViewPagerAdapter.java @@ -5,9 +5,9 @@ import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentActivity; import androidx.viewpager2.adapter.FragmentStateAdapter; -import com.hi.music.player.ui.HomeFragment; -import com.hi.music.player.ui.ProfileFragment; -import com.hi.music.player.ui.SearchFragment; +import com.hi.music.player.ui.fragmnt.HomeFragment; +import com.hi.music.player.ui.fragmnt.ProfileFragment; +import com.hi.music.player.ui.fragmnt.SearchFragment; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/hi/music/player/ui/BaseActivity.java b/app/src/main/java/com/hi/music/player/ui/activity/BaseActivity.java similarity index 98% rename from app/src/main/java/com/hi/music/player/ui/BaseActivity.java rename to app/src/main/java/com/hi/music/player/ui/activity/BaseActivity.java index 6787586..13cbf67 100644 --- a/app/src/main/java/com/hi/music/player/ui/BaseActivity.java +++ b/app/src/main/java/com/hi/music/player/ui/activity/BaseActivity.java @@ -1,4 +1,4 @@ -package com.hi.music.player.ui; +package com.hi.music.player.ui.activity; import android.os.Bundle; import android.view.View; diff --git a/app/src/main/java/com/hi/music/player/ui/HomeActivity.java b/app/src/main/java/com/hi/music/player/ui/activity/HomeActivity.java similarity index 96% rename from app/src/main/java/com/hi/music/player/ui/HomeActivity.java rename to app/src/main/java/com/hi/music/player/ui/activity/HomeActivity.java index 48b76b3..2767be6 100644 --- a/app/src/main/java/com/hi/music/player/ui/HomeActivity.java +++ b/app/src/main/java/com/hi/music/player/ui/activity/HomeActivity.java @@ -1,10 +1,7 @@ -package com.hi.music.player.ui; +package com.hi.music.player.ui.activity; -import android.os.Bundle; import android.view.LayoutInflater; -import androidx.appcompat.app.AppCompatActivity; - import com.google.android.material.tabs.TabLayout; import com.google.android.material.tabs.TabLayoutMediator; import com.hi.music.player.R; diff --git a/app/src/main/java/com/hi/music/player/ui/MainActivity.java b/app/src/main/java/com/hi/music/player/ui/activity/MainActivity.java similarity index 95% rename from app/src/main/java/com/hi/music/player/ui/MainActivity.java rename to app/src/main/java/com/hi/music/player/ui/activity/MainActivity.java index 891cc47..a367ef7 100644 --- a/app/src/main/java/com/hi/music/player/ui/MainActivity.java +++ b/app/src/main/java/com/hi/music/player/ui/activity/MainActivity.java @@ -1,10 +1,9 @@ -package com.hi.music.player.ui; +package com.hi.music.player.ui.activity; import android.view.View; import com.hi.music.player.databinding.ActivityMainBinding; import com.hi.music.player.network.RetrofitManager; -import com.hi.music.player.ui.BaseActivity; public class MainActivity extends BaseActivity { diff --git a/app/src/main/java/com/hi/music/player/ui/BaseFragment.java b/app/src/main/java/com/hi/music/player/ui/fragmnt/BaseFragment.java similarity index 97% rename from app/src/main/java/com/hi/music/player/ui/BaseFragment.java rename to app/src/main/java/com/hi/music/player/ui/fragmnt/BaseFragment.java index fc1bba7..5f2874f 100644 --- a/app/src/main/java/com/hi/music/player/ui/BaseFragment.java +++ b/app/src/main/java/com/hi/music/player/ui/fragmnt/BaseFragment.java @@ -1,4 +1,4 @@ -package com.hi.music.player.ui; +package com.hi.music.player.ui.fragmnt; import android.content.Context; import android.os.Bundle; diff --git a/app/src/main/java/com/hi/music/player/ui/HomeFragment.java b/app/src/main/java/com/hi/music/player/ui/fragmnt/HomeFragment.java similarity index 93% rename from app/src/main/java/com/hi/music/player/ui/HomeFragment.java rename to app/src/main/java/com/hi/music/player/ui/fragmnt/HomeFragment.java index 440efd7..37c4b4b 100644 --- a/app/src/main/java/com/hi/music/player/ui/HomeFragment.java +++ b/app/src/main/java/com/hi/music/player/ui/fragmnt/HomeFragment.java @@ -1,4 +1,4 @@ -package com.hi.music.player.ui; +package com.hi.music.player.ui.fragmnt; import com.hi.music.player.R; import com.hi.music.player.databinding.FragmentHomeBinding; diff --git a/app/src/main/java/com/hi/music/player/ui/ProfileFragment.java b/app/src/main/java/com/hi/music/player/ui/fragmnt/ProfileFragment.java similarity index 60% rename from app/src/main/java/com/hi/music/player/ui/ProfileFragment.java rename to app/src/main/java/com/hi/music/player/ui/fragmnt/ProfileFragment.java index c04551e..b99b884 100644 --- a/app/src/main/java/com/hi/music/player/ui/ProfileFragment.java +++ b/app/src/main/java/com/hi/music/player/ui/fragmnt/ProfileFragment.java @@ -1,14 +1,5 @@ -package com.hi.music.player.ui; +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; import com.hi.music.player.databinding.FragmentProfileBinding; diff --git a/app/src/main/java/com/hi/music/player/ui/SearchFragment.java b/app/src/main/java/com/hi/music/player/ui/fragmnt/SearchFragment.java similarity index 60% rename from app/src/main/java/com/hi/music/player/ui/SearchFragment.java rename to app/src/main/java/com/hi/music/player/ui/fragmnt/SearchFragment.java index 98876e1..eabcf1f 100644 --- a/app/src/main/java/com/hi/music/player/ui/SearchFragment.java +++ b/app/src/main/java/com/hi/music/player/ui/fragmnt/SearchFragment.java @@ -1,14 +1,5 @@ -package com.hi.music.player.ui; +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; import com.hi.music.player.databinding.FragmentSearchBinding; diff --git a/app/src/main/res/layout/activity_base.xml b/app/src/main/res/layout/activity_base.xml index d9642c5..2492721 100644 --- a/app/src/main/res/layout/activity_base.xml +++ b/app/src/main/res/layout/activity_base.xml @@ -4,6 +4,6 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".ui.BaseActivity"> + tools:context=".ui.activity.BaseActivity"> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml index ba5cfbe..909108e 100644 --- a/app/src/main/res/layout/activity_home.xml +++ b/app/src/main/res/layout/activity_home.xml @@ -4,7 +4,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@drawable/home_background" - tools:context=".ui.HomeActivity"> + tools:context=".ui.activity.HomeActivity"> + tools:context=".ui.activity.MainActivity"> + tools:context=".ui.fragmnt.HomeFragment"> + tools:context=".ui.fragmnt.ProfileFragment"> + tools:context=".ui.fragmnt.SearchFragment">