diff --git a/app/src/main/java/com/example/nemophila/LoginActivity.java b/app/src/main/java/com/example/nemophila/LoginActivity.java index 033fa07..7e63aa1 100644 --- a/app/src/main/java/com/example/nemophila/LoginActivity.java +++ b/app/src/main/java/com/example/nemophila/LoginActivity.java @@ -26,6 +26,11 @@ private AccountsRest AccountsRest; private Nemophila nemophila; + //座標指定 + private double defaultLat = 34.74; + private double defaultLong = 135.26; + private float defaultZoom = 15f; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -35,6 +40,11 @@ nemophila = (Nemophila) this.getApplication(); //Nemophilaにtokenとuidがある場合ログイン画面をスキップ if ((nemophila.getUid() != null) && (nemophila.getToken() != null)){ + //座標指定(仮) + nemophila.setCameraLatitude(defaultLat); + nemophila.setCameraLongitude(defaultLong); + nemophila.setZoom(defaultZoom); + Intent intent = new Intent(LoginActivity.this,MapsActivity.class); startActivity(intent); return; @@ -71,6 +81,11 @@ nemophila.setUid(response.body().getId()); nemophila.setToken(response.body().getToken()); + //座標指定(仮) + nemophila.setCameraLatitude(defaultLat); + nemophila.setCameraLongitude(defaultLong); + nemophila.setZoom(defaultZoom); + //mainに画面遷移 Intent intent = new Intent(LoginActivity.this,MapsActivity.class); startActivity(intent); diff --git a/app/src/main/java/com/example/nemophila/PostActivity.java b/app/src/main/java/com/example/nemophila/PostActivity.java index fb9ed9b..6fbe3ce 100644 --- a/app/src/main/java/com/example/nemophila/PostActivity.java +++ b/app/src/main/java/com/example/nemophila/PostActivity.java @@ -1,10 +1,17 @@ package com.example.nemophila; +import androidx.activity.result.ActivityResultCallback; +import androidx.activity.result.ActivityResultLauncher; +import androidx.activity.result.contract.ActivityResultContract; +import androidx.activity.result.contract.ActivityResultContracts; import androidx.appcompat.app.AppCompatActivity; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; +import android.app.Activity; import android.content.Intent; +import android.graphics.Bitmap; +import android.net.Uri; import android.os.Bundle; import android.provider.MediaStore; import android.view.View; @@ -24,6 +31,7 @@ import com.example.nemophila.viewmodels.ShopsViewModel; import com.google.android.material.snackbar.Snackbar; +import java.io.IOException; import java.util.Collection; import java.util.Collections; import java.util.List; @@ -51,6 +59,14 @@ private Retrofit retrofit; private Nemophila nemophila; + private ActivityResultLauncher launcher = registerForActivityResult(new ActivityResultContracts.GetContent(), + new ActivityResultCallback() { + @Override + public void onActivityResult(Uri result) { + + } + }); + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -161,51 +177,15 @@ //製作途中 -// -// Intent intent = new Intent(MediaStore.AC); -// intent.setType("image/*"); -// -// Button selectPictureButton = (Button)findViewById(R.id.selectpicturebutton); -// selectPictureButton.setOnClickListener(new View.OnClickListener(){ -// public void onClick(View v) { -//// 画像選択(3枚) -// -// intent.setAction(Intent.ACTION_OPEN_DOCUMENT); -// intent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true); -// String title = "Select multiple images"; -// Intent chooser = Intent.createChooser(intent, title); -// startActivityForResult(chooser, REQ_CODE_CHOOSE_FILES_URI); -// } -// }); -// -// public void onActivityResult(int requestCode, int resultCode, final Intent data) { -// super.onActivityResult(requestCode, resultCode, intent); -// -// if (resultCode != Activity.RESULT_OK) { -// // Handle error -// return; -// } -// -// switch(requestCode) { -// case REQUEST_PHOTO_PICKER_SINGLE_SELECT: -// // Get photo picker response for single select. -// Uri currentUri = data.getData(); -// -// // Do stuff with the photo/video URI. -// return; -// case REQUEST_PHOTO_PICKER_MULTI_SELECT: -// // Get photo picker response for multi select -// for (int i = 0; i < data.getClipData().getItemCount(); i++) { -// Uri currentUri = data.getClipData().getItemAt(i).getUri(); -// -// // Do stuff with each photo/video URI. -// } -// return; -// } -// } -// -// -// + + Button selectPictureButton = (Button)findViewById(R.id.selectpicturebutton); + selectPictureButton.setOnClickListener(new View.OnClickListener(){ + public void onClick(View v) { +// 画像選択(3枚) + launcher.launch("image/*"); + } + }); + diff --git a/app/src/main/java/com/example/nemophila/SignUpActivity.java b/app/src/main/java/com/example/nemophila/SignUpActivity.java index e561fe7..4296898 100644 --- a/app/src/main/java/com/example/nemophila/SignUpActivity.java +++ b/app/src/main/java/com/example/nemophila/SignUpActivity.java @@ -26,6 +26,11 @@ private AccountsRest AccountsRest; private Nemophila nemophila; + //座標指定 + private double defaultLat = 34.74; + private double defaultLong = 135.26; + private float defaultZoom = 15f; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -36,6 +41,11 @@ //Nemophilaにtokenとuidがある場合サインアップ画面をスキップ if ((nemophila.getUid() != null) && (nemophila.getToken() != null)){ + //座標指定(仮) + nemophila.setCameraLatitude(defaultLat); + nemophila.setCameraLongitude(defaultLong); + nemophila.setZoom(defaultZoom); + Intent intent = new Intent(SignUpActivity.this,MapsActivity.class); startActivity(intent); System.out.println("サインアップ処理をスキップ"); @@ -74,6 +84,11 @@ nemophila.setUid(response.body().getId()); nemophila.setToken(response.body().getToken()); + //座標指定(仮) + nemophila.setCameraLatitude(defaultLat); + nemophila.setCameraLongitude(defaultLong); + nemophila.setZoom(defaultZoom); + //mainに画面遷移 Intent intent = new Intent(SignUpActivity.this, MapsActivity.class); startActivity(intent);