diff --git a/app/src/main/java/com/example/oplogy/MainActivity.java b/app/src/main/java/com/example/oplogy/MainActivity.java index 997d3c6..e8edf30 100644 --- a/app/src/main/java/com/example/oplogy/MainActivity.java +++ b/app/src/main/java/com/example/oplogy/MainActivity.java @@ -30,6 +30,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe private ImageView imageRoot; // 提出状況のTextViewとImageView private TextView submission; + private ImageView imageSubmission; //firestoreの受信関連 private FirebaseFirestore db; @@ -58,6 +59,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe // 提出状況のインテント submission = findViewById(R.id.submission); submission.setOnClickListener(this); + imageSubmission = findViewById(R.id.imageSubmission); // firestoreの受信関連 db = FirebaseFirestore.getInstance(); diff --git a/app/src/main/java/com/example/oplogy/Map_Activity.java b/app/src/main/java/com/example/oplogy/Map_Activity.java index c231a6c..199aff2 100644 --- a/app/src/main/java/com/example/oplogy/Map_Activity.java +++ b/app/src/main/java/com/example/oplogy/Map_Activity.java @@ -2,6 +2,7 @@ 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; @@ -10,6 +11,7 @@ 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; @@ -18,7 +20,7 @@ import com.google.android.gms.maps.OnMapReadyCallback; import com.google.android.gms.maps.SupportMapFragment; public class Map_Activity extends AppCompatActivity implements View.OnClickListener, OnMapReadyCallback { - TextView toMain; + ImageView toMain; private GoogleMap mMap; @Override protected void onCreate(Bundle savedInstanceState) { @@ -41,5 +43,8 @@ public class Map_Activity extends AppCompatActivity implements View.OnClickListe @Override public void onMapReady(@NonNull GoogleMap googleMap) { mMap = googleMap; + + FragmentManager fragmentManager = getSupportFragmentManager(); + } } \ No newline at end of file diff --git a/app/src/main/res/drawable/back_button.png b/app/src/main/res/drawable/back_button.png new file mode 100644 index 0000000..c54cff3 Binary files /dev/null and b/app/src/main/res/drawable/back_button.png differ diff --git a/app/src/main/res/drawable/submission.png b/app/src/main/res/drawable/submission.png new file mode 100644 index 0000000..94353a9 Binary files /dev/null and b/app/src/main/res/drawable/submission.png differ diff --git a/app/src/main/res/layout/main.xml b/app/src/main/res/layout/main.xml index 1a9a870..25f6f25 100644 --- a/app/src/main/res/layout/main.xml +++ b/app/src/main/res/layout/main.xml @@ -75,10 +75,11 @@ + android:layout_weight="3"/> + - + + + + + + diff --git a/app/src/main/res/layout/map_activity.xml b/app/src/main/res/layout/map_activity.xml index 67ce4e6..fb4efb8 100644 --- a/app/src/main/res/layout/map_activity.xml +++ b/app/src/main/res/layout/map_activity.xml @@ -15,21 +15,18 @@ android:orientation="horizontal" android:weightSum="10"> -