diff --git a/app/src/main/java/com/example/tampopo_client/models/FriendRequest.java b/app/src/main/java/com/example/tampopo_client/models/FriendRequest.java index a417827..af9c8ff 100644 --- a/app/src/main/java/com/example/tampopo_client/models/FriendRequest.java +++ b/app/src/main/java/com/example/tampopo_client/models/FriendRequest.java @@ -1,4 +1,36 @@ -package com.example.tampopo_client.models; +package org.ntlab.tampoposerver.models; public class FriendRequest { -} + private Integer id; + private String senderId; + private String receiverId; + + public FriendRequest(String senderId, String receiverId) { + this.senderId = senderId; + this.receiverId = receiverId; + } + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getSenderId() { + return senderId; + } + + public void setSenderId(String senderId) { + this.senderId = senderId; + } + + public String getReceiverId() { + return receiverId; + } + + public void setReceiverId(String receiverId) { + this.receiverId = receiverId; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/tampopo_client/views/FriendListFragment.java b/app/src/main/java/com/example/tampopo_client/views/FriendListFragment.java index 203ab3b..1d68ef5 100644 --- a/app/src/main/java/com/example/tampopo_client/views/FriendListFragment.java +++ b/app/src/main/java/com/example/tampopo_client/views/FriendListFragment.java @@ -4,6 +4,7 @@ import android.os.Bundle; import androidx.fragment.app.Fragment; +import androidx.lifecycle.ViewModelProvider; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -13,8 +14,12 @@ import android.view.ViewGroup; import com.example.tampopo_client.R; +import com.example.tampopo_client.viewmodels.FriendViewModel; import com.example.tampopo_client.views.placeholder.FriendContent; +import java.util.List; +import androidx.lifecycle.Observer; + /** * A fragment representing a list of Items. */ @@ -56,6 +61,11 @@ Bundle savedInstanceState) { View view = inflater.inflate(R.layout.fragment_friend_list_list, container, false); + // Add some sample items. + //for (int i = 1; i <= 30; i++) { + // FriendContent.addItem(new FriendContent.FriendItem(Integer.toString(i), "ユーザ" + i)); + //} + // Set the adapter if (view instanceof RecyclerView) { Context context = view.getContext(); @@ -69,4 +79,21 @@ } return view; } + + + @Override + public void onViewCreated(View view, Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + FriendViewModel friendViewModel = new ViewModelProvider(this).get(FriendViewModel.class); + + friendViewModel.getFriendIdsLiveData().observe(getViewLifecycleOwner(), new Observer>() { + + @Override + public void onChanged(List friendIds) { + for (String i : friendIds) { + FriendContent.addItem(new FriendContent.FriendItem(i, "")); + } + } + }); + } } \ No newline at end of file diff --git a/app/src/main/java/com/example/tampopo_client/views/MyFriendRecyclerViewAdapter.java b/app/src/main/java/com/example/tampopo_client/views/MyFriendRecyclerViewAdapter.java index 1bdcbeb..22ef86b 100644 --- a/app/src/main/java/com/example/tampopo_client/views/MyFriendRecyclerViewAdapter.java +++ b/app/src/main/java/com/example/tampopo_client/views/MyFriendRecyclerViewAdapter.java @@ -34,7 +34,7 @@ public void onBindViewHolder(final ViewHolder holder, int position) { holder.mItem = mValues.get(position); //holder.mIdView.setText(mValues.get(position).id); - holder.mContentView.setText(mValues.get(position).content); + holder.mContentView.setText(mValues.get(position).name); } @Override diff --git a/app/src/main/java/com/example/tampopo_client/views/RegisterActivity.java b/app/src/main/java/com/example/tampopo_client/views/RegisterActivity.java index 2bcf88e..bc194c6 100644 --- a/app/src/main/java/com/example/tampopo_client/views/RegisterActivity.java +++ b/app/src/main/java/com/example/tampopo_client/views/RegisterActivity.java @@ -43,13 +43,10 @@ EditText userIdEditText = findViewById(R.id.editTextUserId); EditText passwordEditText = findViewById(R.id.editTextPassword); + // ユーザー登録後に login を呼び出す userViewModel.getUser().observe(this, user -> { if (user != null) { userViewModel.login(userId, password); - -// Intent intent = new Intent(RegisterActivity.this, MainActivity.class); -// startActivity(intent); -// finish(); } else { Toast.makeText(RegisterActivity.this, "アカウント作成に失敗しました", Toast.LENGTH_SHORT).show(); } @@ -62,6 +59,7 @@ public void onClick(View view) { userId = userIdEditText.getText().toString().trim(); password = passwordEditText.getText().toString().trim(); + //空文字チェック if (userId.isEmpty() || password.isEmpty()) { Toast.makeText(RegisterActivity.this, "IDとパスワードを入力してください", Toast.LENGTH_SHORT).show(); @@ -72,16 +70,12 @@ userViewModel.createUser(userId, password); - //アカウントの確認、問題なければ通信 - //if (userViewModel.getUser().getValue() != null) { -// userViewModel.login(userId, password); - tampopo.setUserId(userId); - tampopo.setPassword(password); -// Intent intent = new Intent(RegisterActivity.this, MainActivity.class); -// startActivity(intent); -// } else { -// Toast.makeText(RegisterActivity.this, "アカウント作成に失敗しました", Toast.LENGTH_SHORT).show(); -// } + // tampopo に一旦IDとパスワードを保存（トークン取得後にも使用） + tampopo.setUserId(userId); + tampopo.setPassword(password); + + userViewModel.login(userId, password); + } }); @@ -90,13 +84,11 @@ if (token != null && !token.isEmpty()) { // トークンをTampopoに保存 tampopo.setToken(token); - tampopo.setUserId(userIdEditText.getText().toString().trim()); - tampopo.setPassword(passwordEditText.getText().toString().trim()); // 画面遷移 Intent intent = new Intent(RegisterActivity.this, MainActivity.class); startActivity(intent); - finish(); // 戻れないようにする + finish(); } else { Toast.makeText(RegisterActivity.this, "トークン取得に失敗しました", Toast.LENGTH_SHORT).show(); } diff --git a/app/src/main/java/com/example/tampopo_client/views/placeholder/FriendContent.java b/app/src/main/java/com/example/tampopo_client/views/placeholder/FriendContent.java index 4521cdc..3c48f8e 100644 --- a/app/src/main/java/com/example/tampopo_client/views/placeholder/FriendContent.java +++ b/app/src/main/java/com/example/tampopo_client/views/placeholder/FriendContent.java @@ -26,25 +26,25 @@ private static final int COUNT = 30; - static { - // Add some sample items. - for (int i = 1; i <= COUNT; i++) { - addItem(createPlaceholderItem(i)); - } - } + //static { + // // Add some sample items. + // for (int i = 1; i <= COUNT; i++) { + // addItem(createPlaceholderItem(i)); + // } + //} - private static void addItem(FriendItem item) { + public static void addItem(FriendItem item) { ITEMS.add(item); ITEM_MAP.put(item.id, item); } - private static FriendItem createPlaceholderItem(int position) { - return new FriendItem(String.valueOf(position), "ユーザー名 " , makeDetails(position)); + //private static FriendItem createPlaceholderItem(int position) { + // return new FriendItem(String.valueOf(position), "ユーザー名 " , makeDetails(position)); - } + //} private static String makeDetails(int position) { StringBuilder builder = new StringBuilder(); @@ -62,20 +62,19 @@ public static class FriendItem { public final String id; - public final String content; - public final String details; + public final String name; - public FriendItem(String id, String content, String details) { + + public FriendItem(String id, String name) { this.id = id; - this.content = content; - this.details = details; + this.name = name; } @Override public String toString() { - return content; + return name; } } } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index b6caa6f..f1cfc92 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -87,18 +87,6 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.844" /> - + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_friend_list.xml b/app/src/main/res/layout/fragment_friend_list.xml index e408406..c0a60be 100644 --- a/app/src/main/res/layout/fragment_friend_list.xml +++ b/app/src/main/res/layout/fragment_friend_list.xml @@ -14,9 +14,28 @@ + + + + \ No newline at end of file