diff --git a/app/src/main/java/com/example/nemophila/LoginActivity.java b/app/src/main/java/com/example/nemophila/LoginActivity.java index 18169eb..033fa07 100644 --- a/app/src/main/java/com/example/nemophila/LoginActivity.java +++ b/app/src/main/java/com/example/nemophila/LoginActivity.java @@ -35,7 +35,7 @@ nemophila = (Nemophila) this.getApplication(); //Nemophilaにtokenとuidがある場合ログイン画面をスキップ if ((nemophila.getUid() != null) && (nemophila.getToken() != null)){ - Intent intent = new Intent(LoginActivity.this,MainActivity.class); + Intent intent = new Intent(LoginActivity.this,MapsActivity.class); startActivity(intent); return; } @@ -72,7 +72,7 @@ nemophila.setToken(response.body().getToken()); //mainに画面遷移 - Intent intent = new Intent(LoginActivity.this,MainActivity.class); + Intent intent = new Intent(LoginActivity.this,MapsActivity.class); startActivity(intent); } else { System.out.println("通信可能:changeBelongsAndMaster: " + response.code()); diff --git a/app/src/main/java/com/example/nemophila/PostActivity.java b/app/src/main/java/com/example/nemophila/PostActivity.java index cf0b6b2..a3c5824 100644 --- a/app/src/main/java/com/example/nemophila/PostActivity.java +++ b/app/src/main/java/com/example/nemophila/PostActivity.java @@ -6,6 +6,7 @@ import android.content.Intent; import android.os.Bundle; +import android.provider.MediaStore; import android.view.View; import android.widget.AdapterView; import android.widget.ArrayAdapter; @@ -159,18 +160,53 @@ }); - //コメント入力 + //製作途中 +// +// 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枚) -// final int maxNumPhotosAndVideos = 10; -// Intent intent = new Intent(MediaStore.ACTION_PICK_IMAGES); -// intent.putExtra(MediaStore.EXTRA_PICK_IMAGES_MAX, maxNumPhotosAndVideos); -// startActivityForResult(intent, PHOTO_PICKER_MULTI_SELECT_REQUEST_CODE); - } - }); //投稿ボタンの処理 diff --git a/app/src/main/java/com/example/nemophila/SignUpActivity.java b/app/src/main/java/com/example/nemophila/SignUpActivity.java index b867654..e561fe7 100644 --- a/app/src/main/java/com/example/nemophila/SignUpActivity.java +++ b/app/src/main/java/com/example/nemophila/SignUpActivity.java @@ -36,7 +36,7 @@ //Nemophilaにtokenとuidがある場合サインアップ画面をスキップ if ((nemophila.getUid() != null) && (nemophila.getToken() != null)){ - Intent intent = new Intent(SignUpActivity.this,MainActivity.class); + Intent intent = new Intent(SignUpActivity.this,MapsActivity.class); startActivity(intent); System.out.println("サインアップ処理をスキップ"); return; @@ -75,7 +75,7 @@ nemophila.setToken(response.body().getToken()); //mainに画面遷移 - Intent intent = new Intent(SignUpActivity.this, MainActivity.class); + Intent intent = new Intent(SignUpActivity.this, MapsActivity.class); startActivity(intent); } else { System.out.println("通信可能:changeBelongsAndMaster: " + response.code()); diff --git a/app/src/main/res/layout/activity_sign_up.xml b/app/src/main/res/layout/activity_sign_up.xml index 261ee26..73a479a 100644 --- a/app/src/main/res/layout/activity_sign_up.xml +++ b/app/src/main/res/layout/activity_sign_up.xml @@ -41,10 +41,10 @@ android:id="@+id/SignUpButton" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="144dp" + android:layout_marginTop="4dp" android:text="@string/make_a_new_account" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.498" + app:layout_constraintHorizontal_bias="0.497" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/editTextTextNewPassword" /> @@ -52,8 +52,13 @@ android:id="@+id/LoginTrans" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginTop="72dp" + android:background="@color/teal_200" + android:backgroundTint="@color/teal_200" android:text="I have an Account" app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.497" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/SignUpButton" /> + app:layout_constraintTop_toBottomOf="@+id/SignUpButton" + app:rippleColor="#3F51B5" /> \ No newline at end of file