diff --git a/app/src/main/java/org/ntlab/irisclient/DrawingCardFragment.java b/app/src/main/java/org/ntlab/irisclient/DrawingCardFragment.java index ab43f5a..206410a 100644 --- a/app/src/main/java/org/ntlab/irisclient/DrawingCardFragment.java +++ b/app/src/main/java/org/ntlab/irisclient/DrawingCardFragment.java @@ -33,22 +33,22 @@ // ImageButton16個の型を使いまわしやすいように配列で使用 imageButtons = new ImageButton[]{ - (ImageButton) view.findViewById(R.id.imageButton00), - (ImageButton) view.findViewById(R.id.imageButton01), - (ImageButton) view.findViewById(R.id.imageButton02), - (ImageButton) view.findViewById(R.id.imageButton03), + (ImageButton) view.findViewById(R.id.imageButton0), + (ImageButton) view.findViewById(R.id.imageButton1), + (ImageButton) view.findViewById(R.id.imageButton2), + (ImageButton) view.findViewById(R.id.imageButton3), + (ImageButton) view.findViewById(R.id.imageButton4), + (ImageButton) view.findViewById(R.id.imageButton5), + (ImageButton) view.findViewById(R.id.imageButton6), + (ImageButton) view.findViewById(R.id.imageButton7), + (ImageButton) view.findViewById(R.id.imageButton8), + (ImageButton) view.findViewById(R.id.imageButton9), (ImageButton) view.findViewById(R.id.imageButton10), (ImageButton) view.findViewById(R.id.imageButton11), (ImageButton) view.findViewById(R.id.imageButton12), (ImageButton) view.findViewById(R.id.imageButton13), - (ImageButton) view.findViewById(R.id.imageButton20), - (ImageButton) view.findViewById(R.id.imageButton21), - (ImageButton) view.findViewById(R.id.imageButton22), - (ImageButton) view.findViewById(R.id.imageButton23), - (ImageButton) view.findViewById(R.id.imageButton30), - (ImageButton) view.findViewById(R.id.imageButton31), - (ImageButton) view.findViewById(R.id.imageButton32), - (ImageButton) view.findViewById(R.id.imageButton33) + (ImageButton) view.findViewById(R.id.imageButton14), + (ImageButton) view.findViewById(R.id.imageButton15) }; // 16枚表示させるImage画像の配列 @@ -73,7 +73,9 @@ for(int i=0; i< imageButtons.length; i++) { imageButtons[i].setOnClickListener(this::onClick); + imageButtons[i].setBackgroundResource(R.drawable.drawingcard_red_border); imageButtons[i].setBackground(images[i]); + }; return view; diff --git a/app/src/main/res/layout/fragment_card_drawing.xml b/app/src/main/res/layout/fragment_card_drawing.xml index 171d5ea..1affc63 100644 --- a/app/src/main/res/layout/fragment_card_drawing.xml +++ b/app/src/main/res/layout/fragment_card_drawing.xml @@ -6,158 +6,356 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - - - + android:layout_centerVertical="true"> + + + - - - - - + android:layout_centerVertical="true"> + + + - - - - - - - + app:layout_constraintTop_toTopOf="parent" + android:layout_centerVertical="true"> + + + - - - - - - - - - + android:layout_centerVertical="true"> + + + - + android:layout_centerVertical="true"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file