diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/MainActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/MainActivity.java index c5cbeb8..da35e65 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/MainActivity.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/MainActivity.java @@ -5,7 +5,7 @@ import com.google.android.material.bottomnavigation.BottomNavigationView; import org.ntlab.acanthus_client.R; -import org.ntlab.acanthus_client.databinding.ActivityMain3Binding; +import org.ntlab.acanthus_client.databinding.ActivityMainBinding; import androidx.appcompat.app.AppCompatActivity; import androidx.navigation.NavController; @@ -16,22 +16,22 @@ public class MainActivity extends AppCompatActivity { - private ActivityMain3Binding binding; + private ActivityMainBinding binding; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - binding = ActivityMain3Binding.inflate(getLayoutInflater()); + binding = ActivityMainBinding.inflate(getLayoutInflater()); setContentView(binding.getRoot()); BottomNavigationView navView = findViewById(R.id.nav_view); // Passing each menu ID as a set of Ids because each // menu should be considered as top level destinations. AppBarConfiguration appBarConfiguration = new AppBarConfiguration.Builder( - R.id.navigation_home, R.id.navigation_dashboard, R.id.navigation_notifications) + R.id.navigation_home, R.id.navigation_search, R.id.navigation_make, R.id.navigation_mypage) .build(); - NavController navController = Navigation.findNavController(this, R.id.nav_host_fragment_activity_main3); + NavController navController = Navigation.findNavController(this, R.id.nav_host_fragment_activity_main); NavigationUI.setupActionBarWithNavController(this, navController, appBarConfiguration); NavigationUI.setupWithNavController(binding.navView, navController); } diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/Main_menu_ui/edit/EditFragment.java b/app/src/main/java/org/ntlab/acanthus_client/views/Main_menu_ui/edit/EditFragment.java new file mode 100644 index 0000000..d0f7aa7 --- /dev/null +++ b/app/src/main/java/org/ntlab/acanthus_client/views/Main_menu_ui/edit/EditFragment.java @@ -0,0 +1,45 @@ +package org.ntlab.acanthus_client.views.Main_menu_ui.edit; + +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import org.ntlab.acanthus_client.databinding.FragmentMakeBinding; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +public class EditFragment extends Fragment { + + private EditViewModel editViewModel; + private FragmentMakeBinding binding; + + public View onCreateView(@NonNull LayoutInflater inflater, + ViewGroup container, Bundle savedInstanceState) { + editViewModel = + new ViewModelProvider(this).get(EditViewModel.class); + + binding = FragmentMakeBinding.inflate(inflater, container, false); + View root = binding.getRoot(); + + final TextView textView = binding.textMake; + editViewModel.getText().observe(getViewLifecycleOwner(), new Observer() { + @Override + public void onChanged(@Nullable String s) { + textView.setText(s); + } + }); + return root; + } + + @Override + public void onDestroyView() { + super.onDestroyView(); + binding = null; + } +} \ No newline at end of file diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/Main_menu_ui/edit/EditViewModel.java b/app/src/main/java/org/ntlab/acanthus_client/views/Main_menu_ui/edit/EditViewModel.java new file mode 100644 index 0000000..43f6089 --- /dev/null +++ b/app/src/main/java/org/ntlab/acanthus_client/views/Main_menu_ui/edit/EditViewModel.java @@ -0,0 +1,19 @@ +package org.ntlab.acanthus_client.views.Main_menu_ui.edit; + +import androidx.lifecycle.LiveData; +import androidx.lifecycle.MutableLiveData; +import androidx.lifecycle.ViewModel; + +public class EditViewModel extends ViewModel { + + private MutableLiveData mText; + + public EditViewModel() { + mText = new MutableLiveData<>(); + mText.setValue("This is edit fragment"); + } + + public LiveData getText() { + return mText; + } +} \ No newline at end of file diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/Main_menu_ui/home/HomeFragment.java b/app/src/main/java/org/ntlab/acanthus_client/views/Main_menu_ui/home/HomeFragment.java new file mode 100644 index 0000000..7eadc04 --- /dev/null +++ b/app/src/main/java/org/ntlab/acanthus_client/views/Main_menu_ui/home/HomeFragment.java @@ -0,0 +1,45 @@ +package org.ntlab.acanthus_client.views.Main_menu_ui.home; + +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import org.ntlab.acanthus_client.databinding.FragmentHomeBinding; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +public class HomeFragment extends Fragment { + + private HomeViewModel homeViewModel; + private FragmentHomeBinding binding; + + public View onCreateView(@NonNull LayoutInflater inflater, + ViewGroup container, Bundle savedInstanceState) { + homeViewModel = + new ViewModelProvider(this).get(HomeViewModel.class); + + binding = FragmentHomeBinding.inflate(inflater, container, false); + View root = binding.getRoot(); + + final TextView textView = binding.textHome; + homeViewModel.getText().observe(getViewLifecycleOwner(), new Observer() { + @Override + public void onChanged(@Nullable String s) { + textView.setText(s); + } + }); + return root; + } + + @Override + public void onDestroyView() { + super.onDestroyView(); + binding = null; + } +} \ No newline at end of file diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/Main_menu_ui/home/HomeViewModel.java b/app/src/main/java/org/ntlab/acanthus_client/views/Main_menu_ui/home/HomeViewModel.java new file mode 100644 index 0000000..537c0bf --- /dev/null +++ b/app/src/main/java/org/ntlab/acanthus_client/views/Main_menu_ui/home/HomeViewModel.java @@ -0,0 +1,19 @@ +package org.ntlab.acanthus_client.views.Main_menu_ui.home; + +import androidx.lifecycle.LiveData; +import androidx.lifecycle.MutableLiveData; +import androidx.lifecycle.ViewModel; + +public class HomeViewModel extends ViewModel { + + private MutableLiveData mText; + + public HomeViewModel() { + mText = new MutableLiveData<>(); + mText.setValue("This is home fragment"); + } + + public LiveData getText() { + return mText; + } +} \ No newline at end of file diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/Main_menu_ui/mypage/MyPageFragment.java b/app/src/main/java/org/ntlab/acanthus_client/views/Main_menu_ui/mypage/MyPageFragment.java new file mode 100644 index 0000000..e27cf1e --- /dev/null +++ b/app/src/main/java/org/ntlab/acanthus_client/views/Main_menu_ui/mypage/MyPageFragment.java @@ -0,0 +1,46 @@ +package org.ntlab.acanthus_client.views.Main_menu_ui.mypage; + +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + + +import org.ntlab.acanthus_client.databinding.FragmentMypageBinding; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +public class MyPageFragment extends Fragment { + + private MyPageViewModel mypageViewModel; + private FragmentMypageBinding binding; + + public View onCreateView(@NonNull LayoutInflater inflater, + ViewGroup container, Bundle savedInstanceState) { + mypageViewModel = + new ViewModelProvider(this).get(MyPageViewModel.class); + + binding = FragmentMypageBinding.inflate(inflater, container, false); + View root = binding.getRoot(); + + final TextView textView = binding.textMypage; + mypageViewModel.getText().observe(getViewLifecycleOwner(), new Observer() { + @Override + public void onChanged(@Nullable String s) { + textView.setText(s); + } + }); + return root; + } + + @Override + public void onDestroyView() { + super.onDestroyView(); + binding = null; + } +} \ No newline at end of file diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/Main_menu_ui/mypage/MyPageViewModel.java b/app/src/main/java/org/ntlab/acanthus_client/views/Main_menu_ui/mypage/MyPageViewModel.java new file mode 100644 index 0000000..d32ee78 --- /dev/null +++ b/app/src/main/java/org/ntlab/acanthus_client/views/Main_menu_ui/mypage/MyPageViewModel.java @@ -0,0 +1,19 @@ +package org.ntlab.acanthus_client.views.Main_menu_ui.mypage; + +import androidx.lifecycle.LiveData; +import androidx.lifecycle.MutableLiveData; +import androidx.lifecycle.ViewModel; + +public class MyPageViewModel extends ViewModel { + + private MutableLiveData mText; + + public MyPageViewModel() { + mText = new MutableLiveData<>(); + mText.setValue("This is mypage fragment"); + } + + public LiveData getText() { + return mText; + } +} \ No newline at end of file diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/Main_menu_ui/search/SearchFragment.java b/app/src/main/java/org/ntlab/acanthus_client/views/Main_menu_ui/search/SearchFragment.java new file mode 100644 index 0000000..00abbaa --- /dev/null +++ b/app/src/main/java/org/ntlab/acanthus_client/views/Main_menu_ui/search/SearchFragment.java @@ -0,0 +1,45 @@ +package org.ntlab.acanthus_client.views.Main_menu_ui.search; + +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import org.ntlab.acanthus_client.databinding.FragmentSearchBinding; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProvider; + +public class SearchFragment extends Fragment { + + private SearchViewModel searchViewModel; + private FragmentSearchBinding binding; + + public View onCreateView(@NonNull LayoutInflater inflater, + ViewGroup container, Bundle savedInstanceState) { + searchViewModel = + new ViewModelProvider(this).get(SearchViewModel.class); + + binding = FragmentSearchBinding.inflate(inflater, container, false); + View root = binding.getRoot(); + + final TextView textView = binding.textSearch; + searchViewModel.getText().observe(getViewLifecycleOwner(), new Observer() { + @Override + public void onChanged(@Nullable String s) { + textView.setText(s); + } + }); + return root; + } + + @Override + public void onDestroyView() { + super.onDestroyView(); + binding = null; + } +} \ No newline at end of file diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/Main_menu_ui/search/SearchViewModel.java b/app/src/main/java/org/ntlab/acanthus_client/views/Main_menu_ui/search/SearchViewModel.java new file mode 100644 index 0000000..c8d2e1d --- /dev/null +++ b/app/src/main/java/org/ntlab/acanthus_client/views/Main_menu_ui/search/SearchViewModel.java @@ -0,0 +1,19 @@ +package org.ntlab.acanthus_client.views.Main_menu_ui.search; + +import androidx.lifecycle.LiveData; +import androidx.lifecycle.MutableLiveData; +import androidx.lifecycle.ViewModel; + +public class SearchViewModel extends ViewModel { + + private MutableLiveData mText; + + public SearchViewModel() { + mText = new MutableLiveData<>(); + mText.setValue("This is Search fragment"); + } + + public LiveData getText() { + return mText; + } +} \ No newline at end of file diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/ui/dashboard/DashboardFragment.java b/app/src/main/java/org/ntlab/acanthus_client/views/ui/dashboard/DashboardFragment.java deleted file mode 100644 index fa3b1b0..0000000 --- a/app/src/main/java/org/ntlab/acanthus_client/views/ui/dashboard/DashboardFragment.java +++ /dev/null @@ -1,46 +0,0 @@ -package org.ntlab.acanthus_client.views.ui.dashboard; - -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.annotation.Nullable; -import androidx.fragment.app.Fragment; -import androidx.lifecycle.Observer; -import androidx.lifecycle.ViewModelProvider; - -import org.ntlab.acanthus_client.databinding.FragmentDashboardBinding; -import org.ntlab.acanthus_client.R; - -public class DashboardFragment extends Fragment { - - private DashboardViewModel dashboardViewModel; - private FragmentDashboardBinding binding; - - public View onCreateView(@NonNull LayoutInflater inflater, - ViewGroup container, Bundle savedInstanceState) { - dashboardViewModel = - new ViewModelProvider(this).get(DashboardViewModel.class); - - binding = FragmentDashboardBinding.inflate(inflater, container, false); - View root = binding.getRoot(); - - final TextView textView = binding.textDashboard; - dashboardViewModel.getText().observe(getViewLifecycleOwner(), new Observer() { - @Override - public void onChanged(@Nullable String s) { - textView.setText(s); - } - }); - return root; - } - - @Override - public void onDestroyView() { - super.onDestroyView(); - binding = null; - } -} \ No newline at end of file diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/ui/dashboard/DashboardViewModel.java b/app/src/main/java/org/ntlab/acanthus_client/views/ui/dashboard/DashboardViewModel.java deleted file mode 100644 index 0ad27f4..0000000 --- a/app/src/main/java/org/ntlab/acanthus_client/views/ui/dashboard/DashboardViewModel.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.ntlab.acanthus_client.views.ui.dashboard; - -import androidx.lifecycle.LiveData; -import androidx.lifecycle.MutableLiveData; -import androidx.lifecycle.ViewModel; - -public class DashboardViewModel extends ViewModel { - - private MutableLiveData mText; - - public DashboardViewModel() { - mText = new MutableLiveData<>(); - mText.setValue("This is dashboard fragment"); - } - - public LiveData getText() { - return mText; - } -} \ No newline at end of file diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/ui/home/HomeFragment.java b/app/src/main/java/org/ntlab/acanthus_client/views/ui/home/HomeFragment.java deleted file mode 100644 index 9089874..0000000 --- a/app/src/main/java/org/ntlab/acanthus_client/views/ui/home/HomeFragment.java +++ /dev/null @@ -1,47 +0,0 @@ -package org.ntlab.acanthus_client.views.ui.home; - -import android.os.Bundle; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import org.ntlab.acanthus_client.databinding.FragmentHomeBinding; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.fragment.app.Fragment; -import androidx.lifecycle.Observer; -import androidx.lifecycle.ViewModelProvider; - -import org.ntlab.acanthus_client.R; - -public class HomeFragment extends Fragment { - - private HomeViewModel homeViewModel; - private FragmentHomeBinding binding; - - public View onCreateView(@NonNull LayoutInflater inflater, - ViewGroup container, Bundle savedInstanceState) { - homeViewModel = - new ViewModelProvider(this).get(HomeViewModel.class); - - binding = FragmentHomeBinding.inflate(inflater, container, false); - View root = binding.getRoot(); - - final TextView textView = binding.textHome; - homeViewModel.getText().observe(getViewLifecycleOwner(), new Observer() { - @Override - public void onChanged(@Nullable String s) { - textView.setText(s); - } - }); - return root; - } - - @Override - public void onDestroyView() { - super.onDestroyView(); - binding = null; - } -} \ No newline at end of file diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/ui/home/HomeViewModel.java b/app/src/main/java/org/ntlab/acanthus_client/views/ui/home/HomeViewModel.java deleted file mode 100644 index 7336f79..0000000 --- a/app/src/main/java/org/ntlab/acanthus_client/views/ui/home/HomeViewModel.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.ntlab.acanthus_client.views.ui.home; - -import androidx.lifecycle.LiveData; -import androidx.lifecycle.MutableLiveData; -import androidx.lifecycle.ViewModel; - -public class HomeViewModel extends ViewModel { - - private MutableLiveData mText; - - public HomeViewModel() { - mText = new MutableLiveData<>(); - mText.setValue("This is home fragment"); - } - - public LiveData getText() { - return mText; - } -} \ No newline at end of file diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/ui/notifications/NotificationsFragment.java b/app/src/main/java/org/ntlab/acanthus_client/views/ui/notifications/NotificationsFragment.java deleted file mode 100644 index 5a7134f..0000000 --- a/app/src/main/java/org/ntlab/acanthus_client/views/ui/notifications/NotificationsFragment.java +++ /dev/null @@ -1,46 +0,0 @@ -package org.ntlab.acanthus_client.views.ui.notifications; - -import android.os.Bundle; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import org.ntlab.acanthus_client.databinding.FragmentNotificationsBinding; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.fragment.app.Fragment; -import androidx.lifecycle.Observer; -import androidx.lifecycle.ViewModelProvider; -import org.ntlab.acanthus_client.R; - -public class NotificationsFragment extends Fragment { - - private NotificationsViewModel notificationsViewModel; - private FragmentNotificationsBinding binding; - - public View onCreateView(@NonNull LayoutInflater inflater, - ViewGroup container, Bundle savedInstanceState) { - notificationsViewModel = - new ViewModelProvider(this).get(NotificationsViewModel.class); - - binding = FragmentNotificationsBinding.inflate(inflater, container, false); - View root = binding.getRoot(); - - final TextView textView = binding.textNotifications; - notificationsViewModel.getText().observe(getViewLifecycleOwner(), new Observer() { - @Override - public void onChanged(@Nullable String s) { - textView.setText(s); - } - }); - return root; - } - - @Override - public void onDestroyView() { - super.onDestroyView(); - binding = null; - } -} \ No newline at end of file diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/ui/notifications/NotificationsViewModel.java b/app/src/main/java/org/ntlab/acanthus_client/views/ui/notifications/NotificationsViewModel.java deleted file mode 100644 index 13680c3..0000000 --- a/app/src/main/java/org/ntlab/acanthus_client/views/ui/notifications/NotificationsViewModel.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.ntlab.acanthus_client.views.ui.notifications; - -import androidx.lifecycle.LiveData; -import androidx.lifecycle.MutableLiveData; -import androidx.lifecycle.ViewModel; - -public class NotificationsViewModel extends ViewModel { - - private MutableLiveData mText; - - public NotificationsViewModel() { - mText = new MutableLiveData<>(); - mText.setValue("This is notifications fragment"); - } - - public LiveData getText() { - return mText; - } -} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_baseline_palette_24.xml b/app/src/main/res/drawable/ic_baseline_palette_24.xml new file mode 100644 index 0000000..4bf1550 --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_palette_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_baseline_search_24.xml b/app/src/main/res/drawable/ic_baseline_search_24.xml new file mode 100644 index 0000000..07b76d6 --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_search_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index ccedb45..06ea6ca 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,18 +1,33 @@ + android:paddingTop="?attr/actionBarSize"> - + app:menu="@menu/bottom_nav_menu" /> + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main3.xml b/app/src/main/res/layout/activity_main3.xml deleted file mode 100644 index 631f7b1..0000000 --- a/app/src/main/res/layout/activity_main3.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_dashboard.xml b/app/src/main/res/layout/fragment_dashboard.xml deleted file mode 100644 index edccbdb..0000000 --- a/app/src/main/res/layout/fragment_dashboard.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 1c6c8d2..2b54a58 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".views.ui.home.HomeFragment"> + tools:context=".views.Main_menu_ui.home.HomeFragment"> + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_mypage.xml b/app/src/main/res/layout/fragment_mypage.xml new file mode 100644 index 0000000..6b80056 --- /dev/null +++ b/app/src/main/res/layout/fragment_mypage.xml @@ -0,0 +1,22 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_notifications.xml b/app/src/main/res/layout/fragment_notifications.xml deleted file mode 100644 index afe2594..0000000 --- a/app/src/main/res/layout/fragment_notifications.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml new file mode 100644 index 0000000..8fdf6fd --- /dev/null +++ b/app/src/main/res/layout/fragment_search.xml @@ -0,0 +1,22 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/menu/bottom_nav_menu.xml b/app/src/main/res/menu/bottom_nav_menu.xml index fb6d040..10e2bc3 100644 --- a/app/src/main/res/menu/bottom_nav_menu.xml +++ b/app/src/main/res/menu/bottom_nav_menu.xml @@ -5,15 +5,17 @@ android:id="@+id/navigation_home" android:icon="@drawable/ic_home_black_24dp" android:title="@string/title_home" /> - - + android:id="@+id/navigation_search" + android:icon="@drawable/ic_baseline_search_24" + android:title="@string/title_search" /> + + android:title="@string/title_mypage" /> \ 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 b858274..f36d44c 100644 --- a/app/src/main/res/navigation/mobile_navigation.xml +++ b/app/src/main/res/navigation/mobile_navigation.xml @@ -7,19 +7,23 @@ + - + android:id="@+id/navigation_make" + android:name="org.ntlab.acanthus_client.views.Main_menu_ui.edit.EditFragment" + android:label="@string/title_make" + tools:layout="@layout/fragment_make" /> + android:id="@+id/navigation_mypage" + android:name="org.ntlab.acanthus_client.views.Main_menu_ui.mypage.MyPageFragment" + android:label="@string/title_mypage" + tools:layout="@layout/fragment_mypage" /> \ 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 2691eda..48ea4ab 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2,6 +2,7 @@ Acanthus MainActivity Home - Dashboard - Notifications + Edit + Mypage + Search \ No newline at end of file