diff --git a/app/src/main/java/org/ntlab/irisclient/DrawingCardFragment.java b/app/src/main/java/org/ntlab/irisclient/DrawingCardFragment.java index c949eec..6bded86 100644 --- a/app/src/main/java/org/ntlab/irisclient/DrawingCardFragment.java +++ b/app/src/main/java/org/ntlab/irisclient/DrawingCardFragment.java @@ -3,28 +3,39 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.TextView; +import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentTransaction; public class DrawingCardFragment extends Fragment { - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); + + // コンストラクタ + public static DrawingCardFragment newInstance(String str){ + // インスタンス生成 + DrawingCardFragment fragment = new DrawingCardFragment(); + return fragment; } @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - return inflater.inflate(R.layout.fragment_card_drawing, null); + return inflater.inflate(R.layout.fragment_card_drawing, container, false); } @Override - public void onActivityCreated (Bundle savedInstanceState) { - super.onActivityCreated(savedInstanceState); - } + public void onViewCreated(@NonNull View view, Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); - @Override - public void onViewCreated(View view, @Nullable Bundle savedInstanceState) { + FragmentManager fragmentManager = getChildFragmentManager(); + FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction(); + fragmentTransaction.addToBackStack(null); + fragmentTransaction.replace(R.id.container, + DrawingCardFragment.newInstance("Fragment")); + fragmentTransaction.commit(); + } } diff --git a/app/src/main/java/org/ntlab/irisclient/GameMemberActivity.java b/app/src/main/java/org/ntlab/irisclient/GameMemberActivity.java index daab8c1..3b880c5 100644 --- a/app/src/main/java/org/ntlab/irisclient/GameMemberActivity.java +++ b/app/src/main/java/org/ntlab/irisclient/GameMemberActivity.java @@ -1,6 +1,8 @@ package org.ntlab.irisclient; import androidx.appcompat.app.AppCompatActivity; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentTransaction; import android.os.Bundle; @@ -10,13 +12,17 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_member_game); - } - // 16個の画像表示 - // 絵の長押しでポップアップ - // ポップアップで「はい」「いいえ」のボタン - // 推測終了ボタンをマスターのみ非表示に - // ヒントの表示 - // + FragmentManager fragmentManager = getSupportFragmentManager(); + FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction(); + + // BackStackを設定 + fragmentTransaction.addToBackStack(null); + + // パラメータを設定 + fragmentTransaction.replace(R.id.container, + DrawingCardFragment.newInstance("Fragment")); + fragmentTransaction.commit(); + } } diff --git a/app/src/main/res/layout/activity_member_game.xml b/app/src/main/res/layout/activity_member_game.xml index 5bfe024..49cc2f8 100644 --- a/app/src/main/res/layout/activity_member_game.xml +++ b/app/src/main/res/layout/activity_member_game.xml @@ -15,40 +15,6 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/timeTextView" /> -