diff --git a/build.gradle.kts b/build.gradle.kts index 6d280a8..598b4c3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -36,9 +36,7 @@ dependencies { implementation("androidx.appcompat:appcompat:1.6.1") implementation("com.google.android.material:material:1.9.0") implementation("androidx.constraintlayout:constraintlayout:2.1.4") - implementation("androidx.cardview:cardview:1.0.0") - implementation("androidx.navigation:navigation-fragment:2.6.0") - implementation("androidx.navigation:navigation-ui:2.6.0") + testImplementation("junit:junit:4.13.2") androidTestImplementation("androidx.test.ext:junit:1.1.5") androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") diff --git a/src/main/java/com/hnucm/c202201020427/FirstFragment.java b/src/main/java/com/hnucm/c202201020427/FirstFragment.java deleted file mode 100644 index 7a100a9..0000000 --- a/src/main/java/com/hnucm/c202201020427/FirstFragment.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.hnucm.c202201020427; - -import android.os.Bundle; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.NonNull; -import androidx.fragment.app.Fragment; -import androidx.navigation.fragment.NavHostFragment; - -import com.hnucm.c202201020427.databinding.FragmentFirstBinding; - -public class FirstFragment extends Fragment { - - private FragmentFirstBinding binding; - - @Override - public View onCreateView( - LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState - ) { - - binding = FragmentFirstBinding.inflate(inflater, container, false); - return binding.getRoot(); - - } - - public void onViewCreated(@NonNull View view, Bundle savedInstanceState) { - super.onViewCreated(view, savedInstanceState); - - binding.buttonFirst.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - NavHostFragment.findNavController(FirstFragment.this) - .navigate(R.id.action_FirstFragment_to_SecondFragment); - } - }); - } - - @Override - public void onDestroyView() { - super.onDestroyView(); - binding = null; - } - -} \ No newline at end of file diff --git a/src/main/java/com/hnucm/c202201020427/SecondFragment.java b/src/main/java/com/hnucm/c202201020427/SecondFragment.java deleted file mode 100644 index abf2d06..0000000 --- a/src/main/java/com/hnucm/c202201020427/SecondFragment.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.hnucm.c202201020427; - -import android.os.Bundle; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.NonNull; -import androidx.fragment.app.Fragment; -import androidx.navigation.fragment.NavHostFragment; - -import com.hnucm.c202201020427.databinding.FragmentSecondBinding; - -public class SecondFragment extends Fragment { - - private FragmentSecondBinding binding; - - @Override - public View onCreateView( - LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState - ) { - - binding = FragmentSecondBinding.inflate(inflater, container, false); - return binding.getRoot(); - - } - - public void onViewCreated(@NonNull View view, Bundle savedInstanceState) { - super.onViewCreated(view, savedInstanceState); - - binding.buttonSecond.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - NavHostFragment.findNavController(SecondFragment.this) - .navigate(R.id.action_SecondFragment_to_FirstFragment); - } - }); - } - - @Override - public void onDestroyView() { - super.onDestroyView(); - binding = null; - } - -} \ No newline at end of file diff --git a/src/main/res/drawable/img_53.png b/src/main/res/drawable/img_53.png new file mode 100644 index 0000000..9b9dafe Binary files /dev/null and b/src/main/res/drawable/img_53.png differ diff --git a/src/main/res/drawable/img_54.png b/src/main/res/drawable/img_54.png new file mode 100644 index 0000000..8c6f1b4 Binary files /dev/null and b/src/main/res/drawable/img_54.png differ diff --git a/src/main/res/layout/activity_fankui.xml b/src/main/res/layout/activity_fankui.xml index 3e22032..807a915 100644 --- a/src/main/res/layout/activity_fankui.xml +++ b/src/main/res/layout/activity_fankui.xml @@ -97,4 +97,15 @@ app:layout_constraintBottom_toBottomOf="@+id/imageView43" app:layout_constraintEnd_toEndOf="@+id/imageView43" app:layout_constraintStart_toStartOf="@+id/imageView43" /> + + + + \ No newline at end of file diff --git a/src/main/res/layout/activity_zhanghaokefu.xml b/src/main/res/layout/activity_zhanghaokefu.xml index caf2a10..ac4a7e5 100644 --- a/src/main/res/layout/activity_zhanghaokefu.xml +++ b/src/main/res/layout/activity_zhanghaokefu.xml @@ -4,42 +4,48 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="#EEEEEE" tools:context=".zhanghaokefu"> + app:srcCompat="@drawable/img_53" /> + + + app:layout_constraintStart_toStartOf="@+id/imageView64" + app:layout_constraintTop_toTopOf="@+id/imageView64" /> + app:layout_constraintTop_toTopOf="parent"> + \ No newline at end of file diff --git a/src/main/res/layout/content_shebeiguanli.xml b/src/main/res/layout/content_shebeiguanli.xml deleted file mode 100644 index 455f39f..0000000 --- a/src/main/res/layout/content_shebeiguanli.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/main/res/layout/fragment_first.xml b/src/main/res/layout/fragment_first.xml deleted file mode 100644 index 44baecd..0000000 --- a/src/main/res/layout/fragment_first.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - -