diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
deleted file mode 100644
index 8666e4b..0000000
--- a/.idea/deploymentTargetDropDown.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/java/com/example/nemophila/PostActivity.java b/app/src/main/java/com/example/nemophila/PostActivity.java
index f0b3d2a..6282a6f 100644
--- a/app/src/main/java/com/example/nemophila/PostActivity.java
+++ b/app/src/main/java/com/example/nemophila/PostActivity.java
@@ -1,6 +1,7 @@
package com.example.nemophila;
import androidx.appcompat.app.AppCompatActivity;
+import androidx.lifecycle.ViewModelProvider;
import android.content.Intent;
import android.os.Bundle;
@@ -8,29 +9,79 @@
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.Button;
+import android.widget.EditText;
import android.widget.Spinner;
import android.widget.TextView;
+
+import com.example.nemophila.entities.Account;
+import com.example.nemophila.entities.Shop;
+import com.example.nemophila.viewmodels.PostsViewModel;
+import com.example.nemophila.viewmodels.ShopsViewModel;
+import com.google.android.material.snackbar.Snackbar;
+
+import retrofit2.Retrofit;
+
+
public class PostActivity extends AppCompatActivity {
private String pid;
private String uid;
private String name;
private String genre;
- private String date;
private int rate;
private String comment;
+ private String token;
+ private String sid;
+ private String img1 = null;
+ private String img2 = null;
+ private String img3 = null;
+ private String shopName;
+
+ private PostsViewModel postsViewModel;
+ private ShopsViewModel shopsViewModel;
+ private Account account;
+ private Retrofit retrofit;
+ private Nemophila nemophila;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_post);
+ Shop shop;
+ nemophila = (Nemophila) this.getApplication();
+ postsViewModel = new ViewModelProvider(this).get(PostsViewModel.class);
+ shopsViewModel = new ViewModelProvider(this).get(ShopsViewModel.class);
+
+ uid = nemophila.getUid();
+ token = nemophila.getToken();
+ shop = nemophila.getCurrentShop();
+
+ if (shop == null){
+ Shop dummyShop = nemophila.getDummyShop();
+ sid = dummyShop.getSid();
+ shopName = dummyShop.getName();
+ }else{
+ sid = shop.getSid();
+ shopName = shop.getName();
+ }
+
+
+ //店名を表示
+ TextView textView = findViewById(R.id.shopNamePoatAc);
+ textView.setText(shopName);
+
+
//左上のボタンでキャンセル(ShopActivityに戻る)
//確認用ダイアログを入れたい
Button returnButton = (Button)findViewById(R.id.postAcReturnButton);
returnButton.setOnClickListener(new View.OnClickListener(){
public void onClick(View v){
- Intent intent = new Intent(getApplication(), ShopActivity.class);
+ //キャンセル時にリセット
+ nemophila.setDummyShop(null);
+ nemophila.setCurrentShop(null);
+ //画面遷移
+ Intent intent = new Intent(getApplication(), MainActivity.class);
startActivity(intent);
}
});
@@ -74,21 +125,61 @@
}
TextView rateView = (TextView) findViewById(R.id.ratePostAc);
rateView.setText(displayRate);
+ }else if (gettedRate.equals("評価を選択")){
+ rate = 0;
}
// System.out.println(gettedRate);
// System.out.println(rate);
}
});
+
//コメント入力
+ Button selectPictureButton = (Button)findViewById(R.id.selectpicturebutton);
+ selectPictureButton.setOnClickListener(new View.OnClickListener(){
+ public void onClick(View v) {
+ //画像選択(３枚)
+// 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);
+ }
+ });
+ //投稿ボタンの処理
+ Button postButton = (Button)findViewById(R.id.postButton);
+ postButton.setOnClickListener(new View.OnClickListener(){
+ public void onClick(View v){
+ System.out.println("投稿ボタンのクリック");
+
+ EditText editGenre = (EditText) findViewById(R.id.inputGenre);
+ genre = editGenre.getText().toString();
+
+ EditText editComment = (EditText) findViewById(R.id.inputComment);
+ comment = editComment.getText().toString();
+ //評価が未入力の時
+ if(rate == 0) {
+ System.out.println("評価未設定クリック");
+ Snackbar.make(v, "評価を入力してください", Snackbar.LENGTH_SHORT).show();
+// Intent intent = new Intent(getApplication(), ShopActivity.class);
+// startActivity(intent);
+ } else {
+ //評価入力済の時
+ shopsViewModel.createShop(shopName, nemophila.getCurrentLongitude(), nemophila.getCurrentLatitude());
+ postsViewModel.createPost(uid, token, sid, rate, genre, comment, img1, img2, img3);
+ //投稿時にリセット
+ nemophila.setDummyShop(null);
+ nemophila.setCurrentShop(null);
-
-
+ Intent intent = new Intent(getApplication(), MainActivity.class);
+ startActivity(intent);
+ }
+ }
+ });
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/res/layout/activity_post.xml b/app/src/main/res/layout/activity_post.xml
index ede9b97..5216c8e 100644
--- a/app/src/main/res/layout/activity_post.xml
+++ b/app/src/main/res/layout/activity_post.xml
@@ -78,7 +78,7 @@
+ app:layout_constraintTop_toBottomOf="@+id/annotationComment"
+ app:layout_constraintVertical_bias="0.0" />
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file