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; -// } + ////////////////////////////////////////////////////////////////////////////