diff --git a/app/src/main/java/com/example/nemophila/MainActivity.java b/app/src/main/java/com/example/nemophila/MainActivity.java index 922556b..595597b 100644 --- a/app/src/main/java/com/example/nemophila/MainActivity.java +++ b/app/src/main/java/com/example/nemophila/MainActivity.java @@ -68,16 +68,16 @@ binding = ActivityMainBinding.inflate(getLayoutInflater()); setContentView(binding.getRoot()); - - nemophila = (Nemophila) this.getApplication(); - - ImageButton myPageButton = findViewById(R.id.myPageButton); - // lambda式 - myPageButton.setOnClickListener( v -> { - Log.d("debug", "myPageButton, マイページに画面遷移"); - Intent intent = new Intent(MainActivity.this, MyPageActivity.class); - startActivity(intent); - }); +// +// nemophila = (Nemophila) this.getApplication(); +// +// ImageButton myPageButton = findViewById(R.id.myPageButton); +// // lambda式 +// myPageButton.setOnClickListener( v -> { +// Log.d("debug", "myPageButton, マイページに画面遷移"); +// Intent intent = new Intent(MainActivity.this, MyPageActivity.class); +// startActivity(intent); +// }); if (ActivityCompat.checkSelfPermission(this, diff --git a/app/src/main/java/com/example/nemophila/MapsFragment.java b/app/src/main/java/com/example/nemophila/MapsFragment.java index af63342..c9db8c8 100644 --- a/app/src/main/java/com/example/nemophila/MapsFragment.java +++ b/app/src/main/java/com/example/nemophila/MapsFragment.java @@ -95,15 +95,6 @@ // binding = ActivityMainBinding.inflate(getLayoutInflater()); // getActivity().setContentView(binding.getRoot()); // -// ImageButton myPageButton = getView().findViewById(R.id.myPageButton); -// // lambda式 -// myPageButton.setOnClickListener( v -> { -// Log.d("debug", "myPageButton, マイページに画面遷移"); -// Intent intent = new Intent(getActivity(), MyPageActivity.class); -// startActivity(intent); -// }); -// -// // if (ActivityCompat.checkSelfPermission(getContext(), // Manifest.permission.ACCESS_FINE_LOCATION) // != PackageManager.PERMISSION_GRANTED) { @@ -206,20 +197,33 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); + //binding = ActivityMainBinding.inflate(getLayoutInflater()); + //getActivity().setContentView(binding.getRoot()); + + if (ActivityCompat.checkSelfPermission( + getContext(), + Manifest.permission.ACCESS_FINE_LOCATION) + != PackageManager.PERMISSION_GRANTED) { + + requestPermissionLauncher.launch( + Manifest.permission.ACCESS_FINE_LOCATION); + } + else{ + locationStart(); + } + +// // Obtain the SupportMapFragment and get notified when the map is ready to be used. +// SupportMapFragment mapFragment = (SupportMapFragment) getSupportFragmentManager() +// .findFragmentById(R.id.map); +// assert mapFragment != null; +// mapFragment.getMapAsync(this); + + SupportMapFragment mapFragment = (SupportMapFragment) getChildFragmentManager().findFragmentById(R.id.map); if (mapFragment != null) { mapFragment.getMapAsync(callback); } - - -// ImageButton myPageButton = view.findViewById(R.id.myPageButton); -// // lambda式 -// myPageButton.setOnClickListener( v -> { -// Log.d("debug", "myPageButton, マイページに画面遷移"); -// Intent intent = new Intent(getActivity(), MyPageActivity.class); -// startActivity(intent); -// }); } @@ -342,7 +346,7 @@ //↓現在地ロード後画面中心を現在地にする場合 //zoomMap(location.getLatitude(), location.getLongitude()); //ロード画面の終了 - getView().findViewById(R.id.LL_Load).setVisibility(View.GONE); + //getView().findViewById(R.id.LL_Load).setVisibility(View.GONE); //現在地ボタンを表示 getView().findViewById(R.id.currentButton).setVisibility(View.VISIBLE); diff --git a/app/src/main/java/com/example/nemophila/MyPageActivity.java b/app/src/main/java/com/example/nemophila/MyPageActivity.java index ed666bd..3b40999 100644 --- a/app/src/main/java/com/example/nemophila/MyPageActivity.java +++ b/app/src/main/java/com/example/nemophila/MyPageActivity.java @@ -38,7 +38,7 @@ Button cancelButton = (Button) findViewById(R.id.cancel); cancelButton.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { - Intent intent = new Intent(MyPageActivity.this, MainActivity.class); + Intent intent = new Intent(MyPageActivity.this, MapsActivity.class); startActivity(intent); } });