From c7f8a09caf2cd7c31ac457ca7db045b7449a6597 Mon Sep 17 00:00:00 2001 From: Lucas Bergeron Date: Wed, 20 Sep 2023 19:20:17 +0200 Subject: [PATCH] Fix #2 - Rename About to Feedback --- .../java/com/example/ideator/MainActivity.java | 2 +- .../FeedbackFragment.java} | 18 +++++++++--------- .../FeedbackViewModel.java} | 6 +++--- ...ragment_about.xml => fragment_feedback.xml} | 4 ++-- app/src/main/res/menu/activity_main_drawer.xml | 4 ++-- .../main/res/navigation/mobile_navigation.xml | 8 ++++---- app/src/main/res/values/strings.xml | 2 +- 7 files changed, 22 insertions(+), 22 deletions(-) rename app/src/main/java/com/example/ideator/ui/{about/AboutFragment.java => feedback/FeedbackFragment.java} (52%) rename app/src/main/java/com/example/ideator/ui/{about/AboutViewModel.java => feedback/FeedbackViewModel.java} (73%) rename app/src/main/res/layout/{fragment_about.xml => fragment_feedback.xml} (90%) diff --git a/app/src/main/java/com/example/ideator/MainActivity.java b/app/src/main/java/com/example/ideator/MainActivity.java index 9c3c662..284f688 100644 --- a/app/src/main/java/com/example/ideator/MainActivity.java +++ b/app/src/main/java/com/example/ideator/MainActivity.java @@ -35,7 +35,7 @@ protected void onCreate(Bundle savedInstanceState) { // Passing each menu ID as a set of Ids because each // menu should be considered as top level destinations. mAppBarConfiguration = new AppBarConfiguration.Builder( - R.id.nav_ideas, R.id.nav_profile, R.id.nav_about) + R.id.nav_ideas, R.id.nav_profile, R.id.nav_feedback) .setOpenableLayout(drawer) .build(); NavController navController = Navigation.findNavController(this, R.id.nav_host_fragment_content_main); diff --git a/app/src/main/java/com/example/ideator/ui/about/AboutFragment.java b/app/src/main/java/com/example/ideator/ui/feedback/FeedbackFragment.java similarity index 52% rename from app/src/main/java/com/example/ideator/ui/about/AboutFragment.java rename to app/src/main/java/com/example/ideator/ui/feedback/FeedbackFragment.java index b476a18..db11ee3 100644 --- a/app/src/main/java/com/example/ideator/ui/about/AboutFragment.java +++ b/app/src/main/java/com/example/ideator/ui/feedback/FeedbackFragment.java @@ -1,4 +1,4 @@ -package com.example.ideator.ui.about; +package com.example.ideator.ui.feedback; import android.os.Bundle; import android.view.LayoutInflater; @@ -10,22 +10,22 @@ import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModelProvider; -import com.example.ideator.databinding.FragmentAboutBinding; +import com.example.ideator.databinding.FragmentFeedbackBinding; -public class AboutFragment extends Fragment { +public class FeedbackFragment extends Fragment { - private FragmentAboutBinding binding; + private FragmentFeedbackBinding binding; public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - AboutViewModel aboutViewModel = - new ViewModelProvider(this).get(AboutViewModel.class); + FeedbackViewModel feedbackViewModel = + new ViewModelProvider(this).get(FeedbackViewModel.class); - binding = FragmentAboutBinding.inflate(inflater, container, false); + binding = FragmentFeedbackBinding.inflate(inflater, container, false); View root = binding.getRoot(); - final TextView textView = binding.textAbout; - aboutViewModel.getText().observe(getViewLifecycleOwner(), textView::setText); + final TextView textView = binding.textFeedback; + feedbackViewModel.getText().observe(getViewLifecycleOwner(), textView::setText); return root; } diff --git a/app/src/main/java/com/example/ideator/ui/about/AboutViewModel.java b/app/src/main/java/com/example/ideator/ui/feedback/FeedbackViewModel.java similarity index 73% rename from app/src/main/java/com/example/ideator/ui/about/AboutViewModel.java rename to app/src/main/java/com/example/ideator/ui/feedback/FeedbackViewModel.java index b493ecd..87c78d4 100644 --- a/app/src/main/java/com/example/ideator/ui/about/AboutViewModel.java +++ b/app/src/main/java/com/example/ideator/ui/feedback/FeedbackViewModel.java @@ -1,14 +1,14 @@ -package com.example.ideator.ui.about; +package com.example.ideator.ui.feedback; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModel; -public class AboutViewModel extends ViewModel { +public class FeedbackViewModel extends ViewModel { private final MutableLiveData mText; - public AboutViewModel() { + public FeedbackViewModel() { mText = new MutableLiveData<>(); mText.setValue("More information about us soon"); } diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_feedback.xml similarity index 90% rename from app/src/main/res/layout/fragment_about.xml rename to app/src/main/res/layout/fragment_feedback.xml index 51e8099..db9d687 100644 --- a/app/src/main/res/layout/fragment_about.xml +++ b/app/src/main/res/layout/fragment_feedback.xml @@ -4,10 +4,10 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".ui.about.AboutFragment"> + tools:context=".ui.feedback.FeedbackFragment"> + android:title="@string/menu_feedback" /> \ No newline at end of file diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml index cb4e140..2e38aa1 100644 --- a/app/src/main/res/navigation/mobile_navigation.xml +++ b/app/src/main/res/navigation/mobile_navigation.xml @@ -18,8 +18,8 @@ tools:layout="@layout/fragment_profile" /> + android:id="@+id/nav_feedback" + android:name="com.example.ideator.ui.feedback.FeedbackFragment" + android:label="@string/menu_feedback" + tools:layout="@layout/fragment_feedback" /> \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 953d641..503c08f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -9,7 +9,7 @@ Ideas Profile - About + Feedback You do not have ideas yet. Click the "+" button to create your first idea.