diff --git a/.idea/misc.xml b/.idea/misc.xml
index 891d4fc..7eb3fc9 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -16,7 +16,7 @@
-
+
diff --git a/app/src/main/java/com/example/nemophila/ShopActivity.java b/app/src/main/java/com/example/nemophila/ShopActivity.java
index b1d0143..a351c71 100644
--- a/app/src/main/java/com/example/nemophila/ShopActivity.java
+++ b/app/src/main/java/com/example/nemophila/ShopActivity.java
@@ -3,6 +3,7 @@
import static android.app.PendingIntent.getActivity;
import androidx.appcompat.app.AppCompatActivity;
+import androidx.lifecycle.ViewModelProvider;
import androidx.recyclerview.widget.DividerItemDecoration;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
@@ -12,6 +13,8 @@
import android.view.View;
import android.widget.Button;
+import com.example.nemophila.viewmodels.PostsViewModel;
+
import java.util.ArrayList;
import java.util.List;
@@ -22,9 +25,9 @@
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_shop);
- //右上のボタンで投稿画面へ遷移
- Button postButton = (Button)findViewById(R.id.postButton);
- postButton.setOnClickListener(new View.OnClickListener(){
+ //右上のボタンで投稿画面(PostActivity)へ遷移
+ Button buttonToPost = (Button)findViewById(R.id.buttonToPostActivity);
+ buttonToPost.setOnClickListener(new View.OnClickListener(){
public void onClick(View v){
Intent intent = new Intent(getApplication(), PostActivity.class);
startActivity(intent);
@@ -46,7 +49,9 @@
rv.setLayoutManager(llm);
rv.setAdapter(adapter);
-
+ //通信テスト
+ PostsViewModel postsViewModel = new ViewModelProvider(this).get(PostsViewModel.class);
+ postsViewModel.getShopPostJson("151347fa-2c90-44d7-ba48-f23f475b910d");
}
diff --git a/app/src/main/java/com/example/nemophila/ShopCreateActivity.java b/app/src/main/java/com/example/nemophila/ShopCreateActivity.java
index 811ddd9..a0dcc9b 100644
--- a/app/src/main/java/com/example/nemophila/ShopCreateActivity.java
+++ b/app/src/main/java/com/example/nemophila/ShopCreateActivity.java
@@ -2,7 +2,10 @@
import androidx.appcompat.app.AppCompatActivity;
+import android.content.Intent;
import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
public class ShopCreateActivity extends AppCompatActivity {
@@ -10,5 +13,19 @@
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_shop_create);
+
+
+ // お店の名前を取得
+
+ //右下のボタンでShopActivityへ遷移
+ //sidを発行してピンを立てたい
+ Button shopCreateButton = (Button)findViewById(R.id.buttonShopCreate);
+ shopCreateButton.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View v) {
+ Intent intent = new Intent(getApplication(), ShopActivity.class);
+ startActivity(intent);
+ }
+ });
+
}
}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_shop.xml b/app/src/main/res/layout/activity_shop.xml
index 397f53f..57ac42b 100644
--- a/app/src/main/res/layout/activity_shop.xml
+++ b/app/src/main/res/layout/activity_shop.xml
@@ -22,7 +22,7 @@
app:layout_constraintVertical_bias="0.06" />