菊池
マップとスクロールを表示できました。確認をお願いします
This commit is contained in:
parent
0f74ea09cf
commit
e26c482dc2
|
@ -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();
|
||||
|
|
|
@ -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();
|
||||
|
||||
}
|
||||
}
|
BIN
app/src/main/res/drawable/back_button.png
Normal file
BIN
app/src/main/res/drawable/back_button.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 17 KiB |
BIN
app/src/main/res/drawable/submission.png
Normal file
BIN
app/src/main/res/drawable/submission.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 46 KiB |
|
@ -75,10 +75,11 @@
|
|||
|
||||
<!-- ルート表示のレイアウト-->
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_width="400dp"
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight="3"
|
||||
android:weightSum="2"
|
||||
android:layout_gravity="center"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<ImageView
|
||||
|
@ -104,19 +105,37 @@
|
|||
<Space
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="5"/>
|
||||
android:layout_weight="3"/>
|
||||
|
||||
|
||||
<!-- 提出状況のレイアウト-->
|
||||
<TextView
|
||||
android:id="@+id/submission"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="提出状況"
|
||||
android:textSize="40dp"
|
||||
android:textStyle="bold"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center"
|
||||
android:layout_gravity="center"/>
|
||||
<LinearLayout
|
||||
android:layout_width="350dp"
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight="3"
|
||||
android:layout_gravity="center"
|
||||
android:weightSum="2"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/imageSubmission"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:src="@drawable/submission"
|
||||
android:layout_weight="1"
|
||||
/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/submission"
|
||||
android:layout_width="99dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="提出状況"
|
||||
android:textSize="40dp"
|
||||
android:textStyle="bold"
|
||||
android:layout_weight="1"
|
||||
android:gravity="left"
|
||||
android:layout_gravity="center"/>
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -15,21 +15,18 @@
|
|||
android:orientation="horizontal"
|
||||
android:weightSum="10">
|
||||
|
||||
<TextView
|
||||
<ImageView
|
||||
android:id="@+id/toMain"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center"
|
||||
android:layout_weight="4"
|
||||
android:textAlignment="center"
|
||||
android:text="🔙"
|
||||
android:textSize="50dp"
|
||||
android:layout_width="40dp"
|
||||
android:layout_height="90dp"
|
||||
android:src="@drawable/back_button"
|
||||
android:layout_weight="5"
|
||||
/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="5"
|
||||
android:layout_weight="4"
|
||||
android:id="@+id/date"
|
||||
android:hint="今日の日付"
|
||||
android:textSize="40dp"
|
||||
|
@ -40,7 +37,7 @@
|
|||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_height="0dp"
|
||||
android:id="@+id/map_fragment_container"
|
||||
tools:context=".Map"
|
||||
android:layout_weight="6"
|
||||
|
@ -48,7 +45,7 @@
|
|||
/>
|
||||
|
||||
<ScrollView
|
||||
android:id="@+id/schoolName"
|
||||
android:id="@+id/scrollName"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="3"
|
||||
|
|
Loading…
Reference in New Issue
Block a user