diff --git a/app/src/main/java/com/example/oplogy/MainActivity.java b/app/src/main/java/com/example/oplogy/MainActivity.java
index 3506cf6..7bedb9d 100644
--- a/app/src/main/java/com/example/oplogy/MainActivity.java
+++ b/app/src/main/java/com/example/oplogy/MainActivity.java
@@ -80,20 +80,22 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
if(view == creatUUID){
imageUuid.setImageResource(R.drawable.ischecked_uuid);
showUUIDYesNoDialog();//UUIDを表示するかのダイアログ
-
+ finish();
}
// セットアップのクリック処理
if(view == setUp){
imageSetup.setImageResource(R.drawable.ischecked_uuid);
Intent toSetup = new Intent(MainActivity.this,SetUpActivity.class);
startActivity(toSetup);
-
+ finish();
}
+
// ルート作成のクリック処理
if(view == root){
imageRoot.setImageResource(R.drawable.pin);
Intent toRoot = new Intent(MainActivity.this,Maps.class);
startActivity(toRoot);
+
}
// 提出状況のクリック処理
if(view == submission){
diff --git a/app/src/main/java/com/example/oplogy/Maps.java b/app/src/main/java/com/example/oplogy/Maps.java
index d470fc0..c5883b1 100644
--- a/app/src/main/java/com/example/oplogy/Maps.java
+++ b/app/src/main/java/com/example/oplogy/Maps.java
@@ -1,20 +1,35 @@
package com.example.oplogy;
import androidx.fragment.app.FragmentActivity;
+
+import android.content.Intent;
+import android.media.Image;
import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.ImageView;
+import android.widget.TextView;
import com.google.android.gms.maps.CameraUpdateFactory;
import com.google.android.gms.maps.GoogleMap;
import com.google.android.gms.maps.OnMapReadyCallback;
import com.google.android.gms.maps.SupportMapFragment;
+import com.google.android.gms.maps.model.BitmapDescriptorFactory;
import com.google.android.gms.maps.model.LatLng;
import com.google.android.gms.maps.model.MarkerOptions;
import com.example.oplogy.databinding.MapsBinding;
-public class Maps extends FragmentActivity implements OnMapReadyCallback {
+import java.util.Locale;
+import java.util.Map;
+public class Maps extends FragmentActivity implements OnMapReadyCallback,View.OnClickListener{
+
+ // ボタンの戻る処理
+ ImageView backMain;
private GoogleMap mMap;
-private MapsBinding binding;
+ private MapsBinding binding;
+
+ private LatLng location;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -27,8 +42,13 @@ private MapsBinding binding;
SupportMapFragment mapFragment = (SupportMapFragment) getSupportFragmentManager()
.findFragmentById(R.id.map);
mapFragment.getMapAsync(this);
+
+ backMain = findViewById(R.id.BackMain);
+ backMain.setOnClickListener(this);
}
+
+
/**
* Manipulates the map once available.
* This callback is triggered when the map is ready to be used.
@@ -42,9 +62,37 @@ private MapsBinding binding;
public void onMapReady(GoogleMap googleMap) {
mMap = googleMap;
- // Add a marker in Sydney and move the camera
- LatLng sydney = new LatLng(-34, 151);
- mMap.addMarker(new MarkerOptions().position(sydney).title("Marker in Sydney"));
- mMap.moveCamera(CameraUpdateFactory.newLatLng(sydney));
+ // ↓ここに地点の処理を書いておく↓
+
+ location = new LatLng(35.09050879999539, 136.87845379325216);
+ mMap.addMarker(new MarkerOptions().position(location).title("名古屋港水族館"));
+
+ /// 地図の倍率を指定
+ mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(location, 17));
+ mMap.setMapType(GoogleMap.MAP_TYPE_NORMAL);
+ mMap.setOnMapClickListener(tapLocation -> {
+ // tapされた位置の緯度経度
+ location = new LatLng(tapLocation.latitude, tapLocation.longitude);
+ String str = String.format(Locale.JAPAN, "%f, %f", tapLocation.latitude, tapLocation.longitude);
+ mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(location, 17));
+
+// ピンの処理
+ mMap.addMarker(new MarkerOptions()
+ .position(location)
+ .title(str)
+ .icon(BitmapDescriptorFactory.defaultMarker(BitmapDescriptorFactory.HUE_CYAN))
+ .anchor(0.5f, 0.5f)
+ );
+
+
+ });
+ }
+
+ @Override
+ public void onClick(View view) {
+ if(view == backMain){
+ Intent backMain = new Intent(Maps.this,MainActivity.class);
+ startActivity(backMain);
+ }
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/oplogy/SetUpActivity.java b/app/src/main/java/com/example/oplogy/SetUpActivity.java
index 98b85b7..2a69911 100644
--- a/app/src/main/java/com/example/oplogy/SetUpActivity.java
+++ b/app/src/main/java/com/example/oplogy/SetUpActivity.java
@@ -6,9 +6,11 @@ import android.annotation.SuppressLint;
import android.app.TimePickerDialog;
import android.content.Intent;
import android.graphics.Paint;
+import android.media.Image;
import android.os.Bundle;
import android.util.Log;
import android.widget.Button;
+import android.widget.ImageView;
import android.widget.RadioButton;
import android.widget.TextView;
import android.widget.TimePicker;
@@ -75,11 +77,11 @@ public class SetUpActivity extends FragmentActivity
startTimeSetButton = findViewById(R.id.startTimeSetButton); //開始時刻を設定するためのボタン
endTimeSetButton = findViewById(R.id.endTimeSetButton); //終了時刻を設定するためのボタン
- TextView backMain = findViewById(R.id.backMain);
+ ImageView toMain = findViewById(R.id.toMain);
Button setUp = findViewById(R.id.setUpButton); //画面下の設定ボタン
Button reset = findViewById(R.id.resetButton);
- backMain.setOnClickListener(view -> {
+ toMain.setOnClickListener(view -> {
Intent intent = new Intent(SetUpActivity.this,MainActivity.class); //main画面へ戻る処理
startActivity(intent);
});
diff --git a/app/src/main/res/layout/activity_maps.xml b/app/src/main/res/layout/activity_maps.xml
deleted file mode 100644
index 814d983..0000000
--- a/app/src/main/res/layout/activity_maps.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_set_up.xml b/app/src/main/res/layout/activity_set_up.xml
index f40102c..ef20b8a 100644
--- a/app/src/main/res/layout/activity_set_up.xml
+++ b/app/src/main/res/layout/activity_set_up.xml
@@ -9,15 +9,24 @@
android:gravity="center">
-
+
+
+
+
+
+
+
+
+
+
+ android:layout_marginLeft="20dp"
+ android:src="@drawable/back_button"/>
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/maps.xml b/app/src/main/res/layout/maps.xml
index 096d691..49af058 100644
--- a/app/src/main/res/layout/maps.xml
+++ b/app/src/main/res/layout/maps.xml
@@ -1,9 +1,61 @@
-
\ No newline at end of file
+ android:weightSum="10"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:orientation="vertical"
+ tools:context=".Maps">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/setup.xml b/app/src/main/res/layout/setup.xml
deleted file mode 100644
index ff1c3eb..0000000
--- a/app/src/main/res/layout/setup.xml
+++ /dev/null
@@ -1,296 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml
new file mode 100644
index 0000000..ba94917
--- /dev/null
+++ b/app/src/main/res/values/ids.xml
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file