diff --git a/app/src/main/java/com/example/oplogy/MainActivity.java b/app/src/main/java/com/example/oplogy/MainActivity.java
index cec4028..64dc27a 100644
--- a/app/src/main/java/com/example/oplogy/MainActivity.java
+++ b/app/src/main/java/com/example/oplogy/MainActivity.java
@@ -51,21 +51,26 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
creatUUID = findViewById(R.id.creatUUID);
creatUUID.setOnClickListener(this);
imageUuid = findViewById(R.id.imageUuid);
+ imageUuid.setOnClickListener(this);
// セットアップ用のインテント
setUp = findViewById(R.id.setUp);
setUp.setOnClickListener(this);
imageSetup = findViewById(R.id.imageSetup);
+ imageSetup.setOnClickListener(this);
// ルート作成用のインテント
root = findViewById(R.id.root);
root.setOnClickListener(this);
imageRoot = findViewById(R.id.imageRoot);
+ imageRoot.setOnClickListener(this);
+
// 提出状況のインテント
submission = findViewById(R.id.submission);
submission.setOnClickListener(this);
imageSubmission = findViewById(R.id.imageSubmission);
+ imageSubmission.setOnClickListener(this);
// firestoreの受信関連
db = FirebaseFirestore.getInstance();
@@ -83,15 +88,27 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
if(view == creatUUID){
imageUuid.setImageResource(R.drawable.ischecked_uuid);
showUUIDYesNoDialog();//UUIDを表示するかのダイアログ
-
+ finish(); // 画面遷移後元の状態に戻す
+ }
+ if(view == imageUuid){
+ 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 == imageSetup){
+ 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);
@@ -138,11 +155,20 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
executor.shutdown();
}
+ if(view == imageRoot){
+ imageRoot.setImageResource(R.drawable.pin);
+ Intent toRoot = new Intent(MainActivity.this,Maps.class);
+ startActivity(toRoot);
+ }
// 提出状況のクリック処理
if(view == submission){
Intent toSubmission = new Intent(MainActivity.this,SubmissionActivity.class);
startActivity(toSubmission);
}
+ if(view == imageSubmission){
+ Intent toSubmission = new Intent(MainActivity.this,SubmissionActivity.class);
+ startActivity(toSubmission);
+ }
}
private void showUUIDYesNoDialog() {
//ダイアログの表示
diff --git a/app/src/main/java/com/example/oplogy/Maps.java b/app/src/main/java/com/example/oplogy/Maps.java
index d470fc0..25c0239 100644
--- a/app/src/main/java/com/example/oplogy/Maps.java
+++ b/app/src/main/java/com/example/oplogy/Maps.java
@@ -1,20 +1,43 @@
package com.example.oplogy;
import androidx.fragment.app.FragmentActivity;
+
+import android.content.Intent;
+import android.graphics.Color;
+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.Marker;
import com.google.android.gms.maps.model.MarkerOptions;
import com.example.oplogy.databinding.MapsBinding;
+import com.google.android.gms.maps.model.Polyline;
+import com.google.android.gms.maps.model.PolylineOptions;
+import com.google.maps.DirectionsApi;
+import com.google.maps.DirectionsApiRequest;
+import com.google.maps.GeoApiContext;
+import com.google.maps.model.DirectionsResult;
-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 loc;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -27,8 +50,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 +70,51 @@ 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));
+ loc = new LatLng(35.09050879999539, 136.87845379325216);
+ mMap.addMarker(new MarkerOptions().position(loc).title("名古屋港水族館"));
+ /// 表示位置を地図に指定
+ mMap.moveCamera(CameraUpdateFactory.newLatLng(loc));
+
+ mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(loc, 17));
+
+ LatLng startLatLng = new LatLng(35.09050879999539, 136.87845379325216);
+ LatLng secandLatLng = new LatLng(35.09284820618655, 136.88165119390393);
+ LatLng thirdLatLng = new LatLng(35.09364708442631, 136.88171563326418);
+
+
+ Marker startMaker = mMap.addMarker(new MarkerOptions()
+ .position(startLatLng)
+ .title("名古屋港水族館")
+ );
+
+ Marker secondMaker = mMap.addMarker(new MarkerOptions()
+ .position(secandLatLng)
+ .title("2番目")
+ );
+
+ Marker thirdMaker = mMap.addMarker(new MarkerOptions()
+ .position(thirdLatLng)
+ .title("3番目")
+ );
+
+ drowRoute(startLatLng,secandLatLng,thirdLatLng);
+ }
+
+ private void drowRoute(LatLng startLatLng,LatLng secondLatLung,LatLng thirdLatLng){
+ GeoApiContext context = new GeoApiContext.Builder()
+ .apiKey("AIzaSyBQ1Ak-I2NL5TP4K59ZI0VgzKk6HNZuusw")
+ .build();
+ }
+
+ @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 6df088e..5af3244 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;
@@ -81,11 +83,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