diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java index 6cab191..67a2615 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java @@ -44,7 +44,7 @@ init(); initView(); - paintScreenShot.onCreate(); + //paintScreenShot.onCreate(); Button button = findViewById(R.id.button_keep); button.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintToolBar.java b/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintToolBar.java index 006c203..cf37ca3 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintToolBar.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintToolBar.java @@ -5,11 +5,14 @@ import androidx.annotation.NonNull; import androidx.appcompat.app.AppCompatActivity; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentTransaction; import com.google.android.material.bottomnavigation.BottomNavigationView; import org.ntlab.acanthus_client.Acanthus; import org.ntlab.acanthus_client.R; +import org.ntlab.acanthus_client.entities.Pen; import org.ntlab.acanthus_client.views.MainActivity; import org.ntlab.acanthus_client.views.paint.page.PageActivity; @@ -18,6 +21,8 @@ public class PaintToolBar { private BottomNavigationView bottomNavigationView; private BottomNavigationView.OnNavigationItemSelectedListener onNavigationItemSelectedListener; + private FragmentManager fragmentManager; + private PenDetailsFragment penDetailsFragment = new PenDetailsFragment(); //----------------------------------------------------------------- //----------------------------------------------------------------- @@ -38,7 +43,8 @@ //----------------------------------------------------------------- // case R.id.navigation_pen: - + transitionPenDetailFragment(appCompatActivity); + return true; //----------------------------------------------------------------- // case R.id.navigation_clear: @@ -66,9 +72,14 @@ //----------------------------------------------------------------- //ペンの詳細変更ページへ移動 private void transitionPenDetailFragment(AppCompatActivity appCompatActivity){ - Acanthus acanthus =(Acanthus) appCompatActivity.getApplication(); - Intent intent = new Intent(acanthus,PenDetailsFragment.class); - appCompatActivity.startActivity(intent); + fragmentManager = appCompatActivity.getSupportFragmentManager(); + FragmentTransaction transaction = fragmentManager.beginTransaction(); + transaction.replace(R.id.dummyFragment, penDetailsFragment); + transaction.commit(); + +// Acanthus acanthus =(Acanthus) appCompatActivity.getApplication(); +// Intent intent = new Intent(acanthus,PenDetailsFragment.class); +// appCompatActivity.startActivity(intent); } //----------------------------------------------------------------- diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/paint/PenDetailsFragment.java b/app/src/main/java/org/ntlab/acanthus_client/views/paint/PenDetailsFragment.java index 196b671..70c19d9 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/paint/PenDetailsFragment.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/paint/PenDetailsFragment.java @@ -1,9 +1,27 @@ package org.ntlab.acanthus_client.views.paint; +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; +import org.ntlab.acanthus_client.databinding.FragmentPenDetailBinding; + public class PenDetailsFragment extends Fragment { private PaintCanvas paintCanvas; + private FragmentPenDetailBinding binding; + + @Override + public View onCreateView(@NonNull LayoutInflater inflater, + ViewGroup container, Bundle savedInstanceState){ + binding = FragmentPenDetailBinding.inflate(inflater,container,false); + View root = binding.getRoot(); + + return root; + } } diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/tests/TestActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/tests/TestActivity.java new file mode 100644 index 0000000..61ef6d2 --- /dev/null +++ b/app/src/main/java/org/ntlab/acanthus_client/views/tests/TestActivity.java @@ -0,0 +1,23 @@ +package org.ntlab.acanthus_client.views.tests; + +import android.content.Intent; +import android.os.Bundle; + +import androidx.appcompat.app.AppCompatActivity; + +import org.ntlab.acanthus_client.R; +import org.ntlab.acanthus_client.views.paint.PaintActivity; + +public class TestActivity extends AppCompatActivity { + //ここでActivityのテストしたい場合はAndroidManifest.xmlの + //ここのプロジェクトでは の + //TitleActivityをTestActivityに変えること。commitするときにもとに戻すこと。 + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + Intent i = new Intent(getApplication(), PaintActivity.class); + startActivity(i); + //setContentView(R.layout.activity_paint); + } +} diff --git a/app/src/main/res/drawable/ic_baseline_cancel_24.xml b/app/src/main/res/drawable/ic_baseline_cancel_24.xml new file mode 100644 index 0000000..1062dda --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_cancel_24.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/layout/activity_paint.xml b/app/src/main/res/layout/activity_paint.xml index 7befaa3..b730469 100644 --- a/app/src/main/res/layout/activity_paint.xml +++ b/app/src/main/res/layout/activity_paint.xml @@ -124,9 +124,10 @@ android:padding="@dimen/activity_vertical_margin" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.711" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:layout_constraintVertical_bias="0.206" /> + app:layout_constraintVertical_bias="0.233" /> + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_pen_detail.xml b/app/src/main/res/layout/fragment_pen_detail.xml new file mode 100644 index 0000000..ac6c239 --- /dev/null +++ b/app/src/main/res/layout/fragment_pen_detail.xml @@ -0,0 +1,19 @@ + + + + + \ No newline at end of file