diff --git a/.idea/misc.xml b/.idea/misc.xml index d5d35ec..19aa6a5 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + 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 index f4133e2..78f985b 100644 --- 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 @@ -1,6 +1,7 @@ package org.ntlab.acanthus_client.views.main_menu_ui.home; import android.os.Bundle; +import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -9,6 +10,7 @@ import android.widget.ListView; import android.widget.TextView; +import org.ntlab.acanthus_client.Acanthus; import org.ntlab.acanthus_client.R; import org.ntlab.acanthus_client.databinding.FragmentHomeBinding; import org.ntlab.acanthus_client.entities.Animation; @@ -20,6 +22,7 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; +import java.util.ArrayList; import java.util.Collection; public class HomeFragment extends Fragment { @@ -36,19 +39,45 @@ binding = FragmentHomeBinding.inflate(inflater, container, false); View root = binding.getRoot(); - TextView listView = binding.textHome; - Collection animationJsons = null; - // BaseAdapter adapter = new ListAnimationViewAdapter(this.getActivity().getApplicationContext(), R.layout.animation_home, animationJsons); - //listView.setAdapter(adapter); + ListView listView = binding.animationView; - final TextView textView = binding.textHome; - homeViewModel.getText().observe(getViewLifecycleOwner(), new Observer() { +// homeViewModel.updateGallery(); +// +// 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 onActivityCreated(Bundle savedInstanceState) { + super.onActivityCreated(savedInstanceState); + Log.d("CreatedActivity", "EditFragment"); + + Acanthus acanthus = (Acanthus) getActivity().getApplication(); + Integer uid = 1; + String token = "abc0"; + + ListView listView = (ListView) getActivity().findViewById(R.id.animation_view); + + homeViewModel.updateGallery(); + + homeViewModel.getAnimationJson().observe(getViewLifecycleOwner(), new Observer>() { @Override - public void onChanged(@Nullable String s) { - textView.setText(s); + public void onChanged(Collection animationJsons) { + Collection animationJsonList = homeViewModel.getGallery(); + BaseAdapter adapter = new ListAnimationViewAdapter(getActivity(), R.layout.animation_home, animationJsonList); + listView.setAdapter(adapter); } }); - return root; + + homeViewModel.updateGallery(); + } public void onCreateAnimationView(Animation animation){ 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 index b21b548..87252ca 100644 --- 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 @@ -32,6 +32,7 @@ mText = new MutableLiveData<>(); homeModel= new HomeModel(); homeModel.Gethelloworld(mText); + animationMutableLiveData = new MutableLiveData<>(); } public LiveData getText() { @@ -41,15 +42,14 @@ public LiveData> getAnimationJson(){return this.animationMutableLiveData;} - public void updateGallery(EditText animationForm){ + public void updateGallery(){ Retrofit retrofit = new Retrofit.Builder() .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/acanthus/") .addConverterFactory(JacksonConverterFactory.create()) .build(); final GalleryRest galleryRest = retrofit.create(GalleryRest.class); - String animationName = animationForm.getText().toString(); - Call> call = galleryRest.getGallery(animationName); + Call> call = galleryRest.getGallery(null); call.enqueue(new Callback>() { @Override @@ -66,4 +66,6 @@ } + public Collection getGallery(){ return animationMutableLiveData.getValue(); } + } \ No newline at end of file diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/home/ListAnimationViewAdapter.java b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/home/ListAnimationViewAdapter.java index 70e14e7..e5c7584 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/home/ListAnimationViewAdapter.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/home/ListAnimationViewAdapter.java @@ -27,8 +27,8 @@ private LayoutInflater inflater; private int itemLayoutId; - private ArrayList titles; - private ArrayList> animationEditors; + private ArrayList titles = new ArrayList<>(); + private ArrayList> animationEditors =new ArrayList<>(); ListAnimationViewAdapter(Context context, int itemLayoutId, Collection animationJsons) { @@ -47,6 +47,14 @@ } } + ListAnimationViewAdapter(Context context, int itemLayoutId){ + super(); + int i = 0; + this.inflater = (LayoutInflater) + context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); + this.itemLayoutId = itemLayoutId; + } + @Override public View getView(int position, View convertView, ViewGroup parent) { ViewHolder holder; @@ -79,7 +87,7 @@ @Override public int getCount() { - return 0; + return titles.size(); } @Override diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 2c9e99b..528f9c2 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -14,98 +14,12 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file