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 index e5fb17b..6554769 100644 --- 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 @@ -1,19 +1,23 @@ package org.ntlab.acanthus_client.views.main_menu_ui.edit; +import org.ntlab.acanthus_client.Acanthus; + import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModel; public class EditViewModel extends ViewModel { - private MutableLiveData mText; + private MutableLiveData acanthusMutableLiveData; public EditViewModel() { - mText = new MutableLiveData<>(); - mText.setValue("This is edit fragment"); + this.acanthusMutableLiveData = new MutableLiveData<>(); } - public LiveData getText() { - return mText; + //getter + public LiveData getAcanthus(){ + return this.acanthusMutableLiveData; } + + // } \ 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 index df5c70c..4d5365b 100644 --- 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 @@ -4,8 +4,10 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.SearchView; import android.widget.TextView; +import org.ntlab.acanthus_client.R; import org.ntlab.acanthus_client.databinding.FragmentSearchBinding; import androidx.annotation.NonNull; @@ -18,6 +20,7 @@ private SearchViewModel searchViewModel; private FragmentSearchBinding binding; + private SearchView searchView; public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { @@ -36,8 +39,7 @@ // }); return root; } - - + @Override public void onDestroyView() { diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml index ba61953..57a8112 100644 --- a/app/src/main/res/layout/fragment_search.xml +++ b/app/src/main/res/layout/fragment_search.xml @@ -33,4 +33,47 @@ app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.023" /> + + + + + + + + + + + \ No newline at end of file