Merge pull request #220 from nitta-lab-2021/pen_detail_mifune
確認しました
commit 4f47dc1d933c0e66cef5fe50798376f977f93dd1
2 parents ed592cb + d21f9ab
fujii kouta authored on 20 Oct 2021
Showing 7 changed files
View
2
■■■
app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java
super.onCreate(savedInstanceState);
init();
initView();
 
paintScreenShot.onCreate();
//paintScreenShot.onCreate();
 
Button button = findViewById(R.id.button_keep);
button.setOnClickListener(new View.OnClickListener() {
@Override
View
25
app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintToolBar.java
 
import androidx.annotation.NonNull;
import androidx.annotation.RequiresApi;
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;
 
//-----------------------------------------------------------------
// 描画シーンの下部のツールバー
public class PaintToolBar {
private BottomNavigationView bottomNavigationView;
private BottomNavigationView.OnNavigationItemSelectedListener onNavigationItemSelectedListener;
private FragmentManager fragmentManager;
private PenDetailsFragment penDetailsFragment = new PenDetailsFragment();
 
//-----------------------------------------------------------------
//-----------------------------------------------------------------
public PaintToolBar(PaintActivity paintActivity, PaintCanvas paintCanvas) {
switch (item.getItemId()) {
//-----------------------------------------------------------------
//
case R.id.navigation_pen:
 
transitionPenDetailFragment(appCompatActivity);
return true;
//-----------------------------------------------------------------
//
case R.id.navigation_clear:
paintCanvas.clearCanvas();
}
//-----------------------------------------------------------------
//ペンの詳細変更ページへ移動
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);
}
 
//-----------------------------------------------------------------
// 招待ページへ移動
View
app/src/main/java/org/ntlab/acanthus_client/views/paint/PenDetailsFragment.java
View
app/src/main/java/org/ntlab/acanthus_client/views/tests/TestActivity.java 0 → 100644
View
app/src/main/res/drawable/ic_baseline_cancel_24.xml 0 → 100644
View
app/src/main/res/layout/activity_paint.xml
View
app/src/main/res/layout/fragment_pen_detail.xml 0 → 100644