[update]update paint activity
1 parent 67ef922 commit bc4d33ec579fc7310c3cc481ab93eed5d45e70fd
k-fujii authored on 28 Sep 2021
Showing 4 changed files
View
26
.idea/misc.xml
<project version="4">
<component name="DesignSurface">
<option name="filePathToZoomLevelMap">
<map>
<entry key="..\:/Users/Student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/layout/fragment_home.xml" value="0.1" />
<entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/layout/activity_main.xml" value="0.17831813576494426" />
<entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/layout/activity_paint.xml" value="0.3605072463768116" />
<entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/layout/fragment_edit.xml" value="0.3605072463768116" />
<entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/menu/bottom_nav_menu.xml" value="0.36666666666666664" />
<entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/layout/activity_animation.xml" value="0.1884498480243161" />
<entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/layout/activity_main.xml" value="0.25" />
<entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/layout/activity_paint.xml" value="0.22" />
<entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/layout/activity_sign_up.xml" value="0.22" />
<entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/layout/animation_home.xml" value="0.1" />
<entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/layout/fragment_create.xml" value="0.1" />
<entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/layout/fragment_edit.xml" value="0.1" />
<entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/layout/fragment_mypage.xml" value="0.1" />
<entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/layout/fragment_pen.xml" value="0.1884498480243161" />
<entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/layout/fragment_search.xml" value="0.1" />
<entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/menu/bottom_nav_menu.xml" value="0.25" />
<entry key="..\:/Users/student/StudioProjects/org.ntlab.acanthus_client/app/src/main/res/menu/bottom_nav_paint.xml" value="0.25" />
</map>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
<option name="id" value="Android" />
View
29
app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java
package org.ntlab.acanthus_client.views.paint;
 
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProvider;
 
import android.content.Intent;
import android.os.Bundle;
import android.view.MenuItem;
import android.view.View;
import android.widget.TextView;
 
import com.google.android.material.bottomnavigation.BottomNavigationView;
 
import org.ntlab.acanthus_client.Acanthus;
import org.ntlab.acanthus_client.R;
import org.ntlab.acanthus_client.databinding.ActivityPaintBinding;
import org.ntlab.acanthus_client.views.MainActivity;
 
//-----------------------------------------------------------------
// 描画ページ
public class PaintActivity extends AppCompatActivity {
 
private PaintCanvas paintCanvas;
private ActivityPaintBinding binding;
private PaintViewModel paintViewModel;
private BottomNavigationView.OnNavigationItemReselectedListener onNavigationItemReselectedListener
= new BottomNavigationView.OnNavigationItemReselectedListener() {
@Override
public void onNavigationItemReselected(@NonNull MenuItem item) {
switch (item.getItemId()) {
case R.id.navigation_pen:
break;
 
case R.id.navigation_clear:
break;
 
case R.id.navigation_invite:
transitionInviteActivity();
break;
 
}
}
};
 
//-----------------------------------------------------------------
//-----------------------------------------------------------------
@Override
paintViewModel = new ViewModelProvider(this).get(PaintViewModel.class);
paintViewModel.init(acanthus);
 
startObserve();
 
 
}
 
//-----------------------------------------------------------------
//
 
paintCanvas = (PaintCanvas) findViewById(R.id.myCanvas);
paintCanvas.setPaintViewModel(paintViewModel);
 
 
BottomNavigationView navigation = (BottomNavigationView) findViewById(R.id.navPaint);
navigation.setOnNavigationItemReselectedListener(onNavigationItemReselectedListener);
}
 
//-----------------------------------------------------------------
//
View
app/src/main/res/layout/activity_paint.xml
View
app/src/main/res/menu/bottom_nav_paint.xml 0 → 100644