From 4fef2a4375b3bb033ee247c054de0a0f6d4dfb1e Mon Sep 17 00:00:00 2001
From: Ekamo-11 <148836598+Ekamo-11@users.noreply.github.com>
Date: Fri, 31 May 2024 11:51:52 +0900
Subject: [PATCH 1/3] =?UTF-8?q?=E3=83=9C=E3=82=BF=E3=83=B3=E6=8A=BC?=
 =?UTF-8?q?=E3=81=97=E3=81=9F=E4=BE=8B=E3=81=A0=E3=82=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/misc.xml                                |  2 +-
 .../java/com/example/oplogy/MainActivity.java | 26 ++++++++++++++++-
 app/src/main/res/layout/activity_main.xml     | 29 +++++++++++--------
 3 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 8978d23..773fe0f 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/src/main/java/com/example/oplogy/MainActivity.java b/app/src/main/java/com/example/oplogy/MainActivity.java
index 86bff69..f16d9aa 100644
--- a/app/src/main/java/com/example/oplogy/MainActivity.java
+++ b/app/src/main/java/com/example/oplogy/MainActivity.java
@@ -2,13 +2,37 @@ package com.example.oplogy;
 
 import androidx.appcompat.app.AppCompatActivity;
 
+import android.annotation.SuppressLint;
 import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.TextView;
 
-public class MainActivity extends AppCompatActivity {
+public class MainActivity extends AppCompatActivity implements View.OnClickListener {
 
+    Button button;
+//    TextView textView;
+    EditText editText;
+    @SuppressLint("MissingInflatedId")
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
+
+        button = findViewById(R.id.button1);
+        button.setOnClickListener(this);
+        editText = findViewById(R.id.textview1);
+
+    }
+
+
+
+
+        @Override
+    public void onClick(View v) {
+        if (v == button){
+            editText.setText("押した");
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index c052e59..44003e4 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,22 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    tools:context=".MainActivity"
+    android:orientation="vertical">
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Hello World!"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
     <Button
-        android:layout_width="wrap_content"
+        android:id="@+id/button1"
+        android:text="押せよ"
+        android:textSize="50px"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+    <EditText
+        android:id="@+id/textview1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textSize="100px"
+        android:hint="ここだよ"
+        android:text=""
+        />
+
+</LinearLayout>
\ No newline at end of file

From 9d385dd87a1653ae0f8cef7f0a2996973fc7fd8c Mon Sep 17 00:00:00 2001
From: it232115 <it232115@trident.ac.jp>
Date: Tue, 4 Jun 2024 14:39:11 +0900
Subject: [PATCH 2/3] =?UTF-8?q?=E3=83=9E=E3=83=83=E3=83=97=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E3=81=AE=E3=83=9C=E3=82=BF=E3=83=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/example/oplogy/MainActivity.java  | 18 ++++--------------
 app/src/main/res/layout/activity_main.xml      |  4 ++--
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/com/example/oplogy/MainActivity.java b/app/src/main/java/com/example/oplogy/MainActivity.java
index f16d9aa..33e6025 100644
--- a/app/src/main/java/com/example/oplogy/MainActivity.java
+++ b/app/src/main/java/com/example/oplogy/MainActivity.java
@@ -19,20 +19,10 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
+        findViewById(R.id.mapmapcreate).setOnClickListener(
+                view->{
 
-        button = findViewById(R.id.button1);
-        button.setOnClickListener(this);
-        editText = findViewById(R.id.textview1);
-
-    }
-
-
-
-
-        @Override
-    public void onClick(View v) {
-        if (v == button){
-            editText.setText("押した");
-        }
+                }
+        );
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 44003e4..d143b77 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -8,8 +8,8 @@
     android:orientation="vertical">
 
     <Button
-        android:id="@+id/button1"
-        android:text="押せよ"
+        android:id="@+id/mapmapcreate"
+        android:text="マップ生成"
         android:textSize="50px"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

From 8a3888b8bd149595ab9aadeb3ff82f605243a15e Mon Sep 17 00:00:00 2001
From: it232115 <it232115@trident.ac.jp>
Date: Wed, 5 Jun 2024 14:18:43 +0900
Subject: [PATCH 3/3] =?UTF-8?q?GoogleMapAPI=E3=81=AE=E5=B0=8E=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |  9 ++-
 app/src/main/AndroidManifest.xml              | 27 +++++++++
 .../java/com/example/oplogy/MainActivity.java |  9 +++
 .../java/com/example/oplogy/MapsActivity.java | 56 +++++++++++++++++++
 app/src/main/res/layout/activity_maps.xml     |  9 +++
 app/src/main/res/values/strings.xml           |  1 +
 build.gradle                                  |  1 +
 7 files changed, 110 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/java/com/example/oplogy/MapsActivity.java
 create mode 100644 app/src/main/res/layout/activity_maps.xml

diff --git a/app/build.gradle b/app/build.gradle
index 7c8f3cd..30ae651 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,15 +1,16 @@
 plugins {
     id 'com.android.application'
+    id 'com.google.android.libraries.mapsplatform.secrets-gradle-plugin'
 }
 
 android {
     namespace 'com.example.oplogy'
-    compileSdk 33
+    compileSdk 34
 
     defaultConfig {
         applicationId "com.example.oplogy"
         minSdk 26
-        targetSdk 33
+        targetSdk 34
         versionCode 1
         versionName "1.0"
 
@@ -26,6 +27,9 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    buildFeatures {
+        viewBinding true
+    }
 }
 
 dependencies {
@@ -33,6 +37,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'com.google.android.material:material:1.5.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'com.google.android.gms:play-services-maps:18.2.0'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f1bbbad..a476460 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,6 +12,33 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.Oplogy"
         tools:targetApi="31">
+
+        <!--
+             TODO: Before you run your application, you need a Google Maps API key.
+
+             To get one, follow the directions here:
+
+                https://developers.google.com/maps/documentation/android-sdk/get-api-key
+
+             Once you have your API key (it starts with "AIza"), define a new property in your
+             project's local.properties file (e.g. MAPS_API_KEY=Aiza...), and replace the
+             "YOUR_API_KEY" string in this file with "${MAPS_API_KEY}".
+        -->
+        <meta-data
+            android:name="com.google.android.geo.API_KEY"
+            android:value = "AIzaSyBQ1Ak-I2NL5TP4K59ZI0VgzKk6HNZuusw" />
+
+        <activity
+            android:name=".MapsActivity"
+            android:exported="true"
+            android:label="@string/title_activity_maps">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+
         <activity
             android:name=".MainActivity"
             android:exported="true">
diff --git a/app/src/main/java/com/example/oplogy/MainActivity.java b/app/src/main/java/com/example/oplogy/MainActivity.java
index 33e6025..6db2fa5 100644
--- a/app/src/main/java/com/example/oplogy/MainActivity.java
+++ b/app/src/main/java/com/example/oplogy/MainActivity.java
@@ -19,10 +19,19 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
+
+
+
         findViewById(R.id.mapmapcreate).setOnClickListener(
                 view->{
 
+
                 }
         );
     }
+
+    @Override
+    public void onClick(View v) {
+
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/oplogy/MapsActivity.java b/app/src/main/java/com/example/oplogy/MapsActivity.java
new file mode 100644
index 0000000..51d8b34
--- /dev/null
+++ b/app/src/main/java/com/example/oplogy/MapsActivity.java
@@ -0,0 +1,56 @@
+package com.example.oplogy;
+
+import androidx.fragment.app.FragmentActivity;
+
+import android.os.Bundle;
+
+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.LatLng;
+import com.google.android.gms.maps.model.MarkerOptions;
+import com.example.oplogy.databinding.ActivityMapsBinding;
+
+public class MapsActivity extends FragmentActivity implements OnMapReadyCallback {
+
+    private GoogleMap mMap;
+    private ActivityMapsBinding binding;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        binding = ActivityMapsBinding.inflate(getLayoutInflater());
+        setContentView(binding.getRoot());
+
+        // Obtain the SupportMapFragment and get notified when the map is ready to be used.
+        SupportMapFragment mapFragment = (SupportMapFragment) getSupportFragmentManager()
+                .findFragmentById(R.id.map);
+        mapFragment.getMapAsync(this);
+    }
+
+    /**
+     * Manipulates the map once available.
+     * This callback is triggered when the map is ready to be used.
+     * This is where we can add markers or lines, add listeners or move the camera. In this case,
+     * we just add a marker near Sydney, Australia.
+     * If Google Play services is not installed on the device, the user will be prompted to install
+     * it inside the SupportMapFragment. This method will only be triggered once the user has
+     * installed Google Play services and returned to the app.
+     */
+    @Override
+    public void onMapReady(GoogleMap googleMap) {
+        mMap = googleMap;
+
+        // Add a marker in Sydney and move the camera
+        /// 緯度経度
+        LatLng loc = new LatLng(35.17260398479137, 136.88635173557998);
+        /// マーカーオプションを設定（情報ウィンドウ）
+        mMap.addMarker(new MarkerOptions().position(loc).title("トライデントコンピュータ専門学校"));
+        /// 表示位置を地図に指定
+        mMap.moveCamera(CameraUpdateFactory.newLatLng(loc));
+        /// 地図の倍率を指定
+        mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(loc, 17));
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_maps.xml b/app/src/main/res/layout/activity_maps.xml
new file mode 100644
index 0000000..ec352fc
--- /dev/null
+++ b/app/src/main/res/layout/activity_maps.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<fragment xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:map="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/map"
+    android:name="com.google.android.gms.maps.SupportMapFragment"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".MapsActivity" />
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 55922e8..8b47d1d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,4 @@
 <resources>
     <string name="app_name">oplogy</string>
+    <string name="title_activity_maps">MapsActivity</string>
 </resources>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index a100ce0..601cbe8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,4 +2,5 @@
 plugins {
     id 'com.android.application' version '8.0.2' apply false
     id 'com.android.library' version '8.0.2' apply false
+    id 'com.google.android.libraries.mapsplatform.secrets-gradle-plugin' version '2.0.1' apply false
 }
\ No newline at end of file