diff --git a/app/src/main/java/com/example/CQUPT/MainActivity.java b/app/src/main/java/com/example/CQUPT/MainActivity.java index fac6d5a..752691b 100644 --- a/app/src/main/java/com/example/CQUPT/MainActivity.java +++ b/app/src/main/java/com/example/CQUPT/MainActivity.java @@ -57,7 +57,7 @@ protected void onCreate(Bundle savedInstanceState) { // 配置导航 mAppBarConfiguration = new AppBarConfiguration.Builder( - R.id.nav_home, R.id.nav_gallery, R.id.nav_slideshow, + R.id.nav_home, R.id.nav_slideshow, R.id.nav_network, R.id.nav_news, R.id.nav_course_selection, R.id.settingsFragment, R.id.aboutFragment) .setOpenableLayout(drawer) .build(); diff --git a/app/src/main/java/com/example/CQUPT/ui/gallery/GalleryFragment.java b/app/src/main/java/com/example/CQUPT/ui/gallery/GalleryFragment.java deleted file mode 100644 index 1b4d91c..0000000 --- a/app/src/main/java/com/example/CQUPT/ui/gallery/GalleryFragment.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.example.CQUPT.ui.gallery; - -import android.os.Bundle; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; -import androidx.annotation.NonNull; -import androidx.fragment.app.Fragment; -import androidx.lifecycle.ViewModelProvider; -import com.example.CQUPT.databinding.FragmentGalleryBinding; - -public class GalleryFragment extends Fragment { - -private FragmentGalleryBinding binding; - - public View onCreateView(@NonNull LayoutInflater inflater, - ViewGroup container, Bundle savedInstanceState) { - GalleryViewModel galleryViewModel = - new ViewModelProvider(this).get(GalleryViewModel.class); - - binding = FragmentGalleryBinding.inflate(inflater, container, false); - View root = binding.getRoot(); - - final TextView textView = binding.textGallery; - galleryViewModel.getText().observe(getViewLifecycleOwner(), textView::setText); - return root; - } - -@Override - public void onDestroyView() { - super.onDestroyView(); - binding = null; - } -} \ No newline at end of file diff --git a/app/src/main/java/com/example/CQUPT/ui/gallery/GalleryViewModel.java b/app/src/main/java/com/example/CQUPT/ui/gallery/GalleryViewModel.java deleted file mode 100644 index 57d85f0..0000000 --- a/app/src/main/java/com/example/CQUPT/ui/gallery/GalleryViewModel.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.example.CQUPT.ui.gallery; - -import androidx.lifecycle.LiveData; -import androidx.lifecycle.MutableLiveData; -import androidx.lifecycle.ViewModel; - -public class GalleryViewModel extends ViewModel { - - private final MutableLiveData mText; - - public GalleryViewModel() { - mText = new MutableLiveData<>(); -// mText.setValue("why This is gallery fragment"); - } - - public LiveData getText() { - return mText; - } -} \ No newline at end of file diff --git a/app/src/main/res/menu/activity_main_drawer.xml b/app/src/main/res/menu/activity_main_drawer.xml index 18dc55c..5a77cdb 100644 --- a/app/src/main/res/menu/activity_main_drawer.xml +++ b/app/src/main/res/menu/activity_main_drawer.xml @@ -8,10 +8,6 @@ android:id="@+id/nav_home" android:icon="@drawable/ic_menu_schedule" android:title="课表" /> - - -