diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationActivity.java index 9a275da..d77fbd0 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationActivity.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationActivity.java @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider; import android.content.Intent; +import android.media.Image; import android.os.Bundle; import android.os.Handler; import android.os.Looper; @@ -39,14 +40,13 @@ private Timer timer; private CountUpTimerTask timerTask; private Handler handler = new Handler(Looper.getMainLooper()); - private int msec = 500; + private int msec = 100; //ボタン系 private boolean buttonView = true; private boolean player = true; private Button buttonPlayback; private Button buttonReset; - private Button buttonClose; private Button buttonDetail; private Button buttonSkip; private Button buttonBack; @@ -77,6 +77,7 @@ } }); + ////////////////////////////////////////////////////////////////////////// //以下アニメーションボタン関連 //アニメーションの再生停止 @@ -111,15 +112,6 @@ } }); - - //閉じる - buttonClose = findViewById(R.id.button_close); - buttonClose.setOnClickListener(new View.OnClickListener(){ - public void onClick(View v) { - finish(); - } - }); - //詳細画面へ移動 buttonDetail = findViewById(R.id.button_detail); buttonDetail.setOnClickListener(new View.OnClickListener(){ @@ -139,7 +131,6 @@ buttonReset.setVisibility(View.INVISIBLE); buttonPlayback.setVisibility(View.INVISIBLE); buttonDetail.setVisibility(View.INVISIBLE); - buttonClose.setVisibility(View.INVISIBLE); buttonSkip.setVisibility(View.INVISIBLE); buttonBack.setVisibility(View.INVISIBLE); @@ -149,7 +140,6 @@ buttonReset.setVisibility(View.VISIBLE); buttonPlayback.setVisibility(View.VISIBLE); buttonDetail.setVisibility(View.VISIBLE); - buttonClose.setVisibility(View.VISIBLE); buttonSkip.setVisibility(View.VISIBLE); buttonBack.setVisibility(View.VISIBLE); @@ -159,35 +149,7 @@ }); } - //Activity内のボタンの表示/非表示 -// @Override -// public boolean onTouchEvent(MotionEvent motionEvent) { -// switch (motionEvent.getAction()){ -// case MotionEvent.ACTION_DOWN: -// //画面タップで表示されてたら非表示にする。 -// if(buttonView) { -// buttonReset.setVisibility(View.INVISIBLE); -// buttonPlayback.setVisibility(View.INVISIBLE); -// buttonDetail.setVisibility(View.INVISIBLE); -// buttonClose.setVisibility(View.INVISIBLE); -// buttonSkip.setVisibility(View.INVISIBLE); -// buttonBack.setVisibility(View.INVISIBLE); -// -// buttonView = false; -// } -// else { -// buttonReset.setVisibility(View.VISIBLE); -// buttonPlayback.setVisibility(View.VISIBLE); -// buttonDetail.setVisibility(View.VISIBLE); -// buttonClose.setVisibility(View.VISIBLE); -// buttonSkip.setVisibility(View.VISIBLE); -// buttonBack.setVisibility(View.VISIBLE); -// -// buttonView = true; -// } -// } -// return false; -// } + //////////////////////////////////////////////////////////////////////////// diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationConnectionModel.java b/app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationConnectionModel.java index a45f7fc..3d9c6b7 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationConnectionModel.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationConnectionModel.java @@ -39,7 +39,7 @@ final StrokesRest strokesRest = retrofit.create(StrokesRest.class); // 筆跡追加API - Call> call = strokesRest.getPageUrls(acanthus.getAid()); + Call> call = strokesRest.getPageUrls(acanthus.getCurrentAnimation().getAid()); call.enqueue(new Callback>() { @Override public void onResponse(Call> call, Response> response) { 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 d614b1f..18a2716 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 @@ -17,12 +17,16 @@ import org.ntlab.acanthus_client.databinding.FragmentHomeBinding; import org.ntlab.acanthus_client.entities.Animation; import org.ntlab.acanthus_client.entities.AnimationJson; +import org.ntlab.acanthus_client.entities.Stroke; +import org.ntlab.acanthus_client.views.MainActivity; import org.ntlab.acanthus_client.views.animation.AnimationActivity; import org.ntlab.acanthus_client.views.paint.PaintActivity; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; +import androidx.lifecycle.LifecycleOwner; +import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; @@ -38,8 +42,12 @@ private HomeViewModel homeViewModel; private FragmentHomeBinding binding; private Acanthus acanthus; - + private MutableLiveData mdacanthus = new MutableLiveData<>(); private SwipeRefreshLayout mSwipeRefreshLayout; + //ソート用宣言 + private ArrayList createDateList = new ArrayList<>(); + private ArrayList animationJsonSortList =new ArrayList<>(); + int mdposition=0; @Override public View onCreateView(@NonNull LayoutInflater inflater, @@ -67,10 +75,11 @@ public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); Log.d("CreatedActivity", "EditFragment"); - + startObserve(); acanthus = (Acanthus) getActivity().getApplication(); Integer uid = 1; String token = "abc0"; + //updateGallery(); View header = (View)getLayoutInflater().inflate(R.layout.animation_home_header,null); @@ -86,9 +95,9 @@ @Override public void onChanged(Collection animationJsons) { Collection animationJsonList = homeViewModel.getGallery(); - //ソート用宣言 - ArrayList createDateList = new ArrayList<>(); - ArrayList animationJsonSortList =new ArrayList<>(); +// //ソート用宣言 +// ArrayList createDateList = new ArrayList<>(); +// ArrayList animationJsonSortList =new ArrayList<>(); //ソート処理 for (AnimationJson animationJson : animationJsonList){ @@ -113,8 +122,9 @@ // transitionAnimationActivity(animationJsonSortList.get(position)); if (position != 0) { try { - homeViewModel.setCurrentAnimation(animationJsonSortList.get(position-1).getAid(), acanthus); - transitionAnimationActivity(animationJsonSortList.get(position-1)); + mdposition=position; + Log.d("", "onItemClick: "+ animationJsonSortList.get(position-1).getAid()); + homeViewModel.setCurrentAnimation(animationJsonSortList.get(position-1).getAid(), mdacanthus,acanthus); } catch (IOException e) { e.printStackTrace(); } @@ -137,7 +147,7 @@ } private void transitionAnimationActivity(AnimationJson animationJson) { - Acanthus acanthus = (Acanthus) getActivity().getApplication(); + //Acanthus acanthus = (Acanthus) getActivity().getApplication(); Intent intent = new Intent(acanthus, AnimationActivity.class); intent.putExtra("AnimationJsonData", animationJson); startActivity(intent); @@ -157,4 +167,21 @@ homeViewModel.updateGallery(acanthus); mSwipeRefreshLayout.setRefreshing(false); } + + public MutableLiveData getMdacanthus(){ + return this.mdacanthus; + } + private void startObserve() { + getMdacanthus().observe(this.getViewLifecycleOwner(), new Observer() { + @Override + public void onChanged(Acanthus retroacanthus) { + try { + acanthus = retroacanthus; + transitionAnimationActivity(animationJsonSortList.get(mdposition-1)); + }catch (NullPointerException e){ + + } + } + }); + } } \ 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 index 8cb2ea0..d4dec2c 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 @@ -48,7 +48,7 @@ - public void setCurrentAnimation(int aid, Acanthus acanthus) throws IOException { + public void setCurrentAnimation(int aid, MutableLiveData mdacanthus,Acanthus acanthus) throws IOException { Retrofit retrofit = new Retrofit.Builder() .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/acanthus/") @@ -65,6 +65,7 @@ if(response.isSuccessful()){ animation = response.body(); acanthus.setCurrentAnimation(animation); + mdacanthus.setValue(acanthus); Log.d(acanthus.getCurrentAnimation().getName(), toString()); } } diff --git a/app/src/main/res/layout/activity_animation.xml b/app/src/main/res/layout/activity_animation.xml index 06571be..10e712b 100644 --- a/app/src/main/res/layout/activity_animation.xml +++ b/app/src/main/res/layout/activity_animation.xml @@ -24,8 +24,6 @@ android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="1.0" - app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.0" /> @@ -43,19 +41,6 @@ app:layout_constraintVertical_bias="0.499" /> - -