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 242a3b8..3be698a 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
@@ -49,6 +49,7 @@
private Button buttonDetail;
private Button buttonSkip;
private Button buttonBack;
+ private Button buttonVisible;
//animationCanvasの表示
@@ -56,7 +57,7 @@
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_animation);
- //animationCanvas = this.findViewById(R.id.animationMyCanvas);
+ animationCanvas = this.findViewById(R.id.animationMyCanvas);
init();
//intentでHomeFragmentから渡されたanimation情報を取得
@@ -131,13 +132,11 @@
startActivity(intent);
}
});
- }
- //Activity内のボタンの表示/非表示
- @Override
- public boolean onTouchEvent(MotionEvent motionEvent) {
- switch (motionEvent.getAction()){
- case MotionEvent.ACTION_DOWN:
- //画面タップで表示されてたら非表示にする。
+
+ //Activity内のボタンの表示/非表示
+ buttonVisible = findViewById(R.id.button_visible);
+ buttonVisible.setOnClickListener(new View.OnClickListener(){
+ public void onClick(View v) {
if(buttonView) {
buttonReset.setVisibility(View.INVISIBLE);
buttonPlayback.setVisibility(View.INVISIBLE);
@@ -158,10 +157,40 @@
buttonView = true;
}
- }
- return false;
+ }
+ });
}
+ //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/res/layout/activity_animation.xml b/app/src/main/res/layout/activity_animation.xml
index c325be8..bc38433 100644
--- a/app/src/main/res/layout/activity_animation.xml
+++ b/app/src/main/res/layout/activity_animation.xml
@@ -97,13 +97,27 @@
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintVertical_bias="0.947">
+
+
\ No newline at end of file