diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8a85169..cf7d92a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -37,9 +37,6 @@ android:name=".Maps" android:exported="false" android:label="@string/title_activity_maps" /> - diff --git a/app/src/main/java/com/example/oplogy/MainActivity.java b/app/src/main/java/com/example/oplogy/MainActivity.java index f8450ea..7fc95ff 100644 --- a/app/src/main/java/com/example/oplogy/MainActivity.java +++ b/app/src/main/java/com/example/oplogy/MainActivity.java @@ -92,7 +92,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe // ルート作成のクリック処理 if(view == root){ imageRoot.setImageResource(R.drawable.pin); - Intent toRoot = new Intent(MainActivity.this, Map_Activity.class); + Intent toRoot = new Intent(MainActivity.this,MapsActivity.class); startActivity(toRoot); } // 提出状況のクリック処理 diff --git a/app/src/main/java/com/example/oplogy/Map_Activity.java b/app/src/main/java/com/example/oplogy/Map_Activity.java deleted file mode 100644 index 199aff2..0000000 --- a/app/src/main/java/com/example/oplogy/Map_Activity.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.example.oplogy; - -import androidx.annotation.NonNull; -import androidx.appcompat.app.AppCompatActivity; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentManager; -import androidx.fragment.app.FragmentTransaction; - -import android.content.Intent; -import android.os.Bundle; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import com.google.android.gms.maps.GoogleMap; -import com.google.android.gms.maps.MapFragment; -import com.google.android.gms.maps.OnMapReadyCallback; -import com.google.android.gms.maps.SupportMapFragment; - -public class Map_Activity extends AppCompatActivity implements View.OnClickListener, OnMapReadyCallback { - ImageView toMain; - private GoogleMap mMap; - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.map_activity); - - -// ボタンの戻る処理 - toMain = findViewById(R.id.toMain); - toMain.setOnClickListener(this); - } - - @Override - public void onClick(View view) { - if(view == toMain){ - Intent toMain = new Intent(Map_Activity.this,MainActivity.class); - startActivity(toMain); - } - } - @Override - public void onMapReady(@NonNull GoogleMap googleMap) { - mMap = googleMap; - - FragmentManager fragmentManager = getSupportFragmentManager(); - - } -} \ No newline at end of file