diff --git a/app/src/main/java/com/example/tampopo_client/views/FriendIconView.java b/app/src/main/java/com/example/tampopo_client/views/FriendIconView.java index 1cd3bcb..7caef5f 100644 --- a/app/src/main/java/com/example/tampopo_client/views/FriendIconView.java +++ b/app/src/main/java/com/example/tampopo_client/views/FriendIconView.java @@ -34,8 +34,7 @@ /** * TODO: document your custom view class. */ -public class FriendIconView extends FrameLayout { - //implements Observer> +public class FriendIconView extends FrameLayout implements Observer>{ private String mExampleString; // TODO: use a default from R.string... // private int mExampleColor = Color.RED; // TODO: use a default from R.color... private float mExampleDimension = 0; // TODO: use a default from R.dimen... @@ -165,8 +164,8 @@ } } - public void setActivityLiveDataObserver(String uid, ActivityViewModel viewModel){ - activityObserver = new Observer>() { +// public void setActivityLiveDataObserver(String uid, ActivityViewModel viewModel){ +// activityObserver = new Observer>() { @Override public void onChanged(List activityList) { if(activityList != null && !activityList.isEmpty()){ @@ -175,9 +174,9 @@ setAccount(act.getUserId()); } } - }; - viewModel.getActivitiesLiveDataFromUserId(uid).observeForever(activityObserver); - } +// }; +// viewModel.getActivitiesLiveDataFromUserId(uid).observeForever(activityObserver); +// } //uidを引数にカスタムビューにニックネーム,コメント,アイコンをセットする public void setAccount(String uid){ @@ -319,4 +318,4 @@ // public void onChanged(List activityList) { // activityList.get(0). // } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/example/tampopo_client/views/TestFriendIconActivity.java b/app/src/main/java/com/example/tampopo_client/views/TestFriendIconActivity.java index bb42e23..3005198 100644 --- a/app/src/main/java/com/example/tampopo_client/views/TestFriendIconActivity.java +++ b/app/src/main/java/com/example/tampopo_client/views/TestFriendIconActivity.java @@ -1,7 +1,10 @@ package com.example.tampopo_client.views; import android.os.Bundle; +import android.view.ViewGroup; +import android.widget.FrameLayout; import android.widget.ImageButton; +import android.widget.LinearLayout; import androidx.activity.EdgeToEdge; import androidx.appcompat.app.AppCompatActivity; @@ -20,18 +23,47 @@ protected void onCreate(Bundle savedInstanceState) { tampopo = (Tampopo) getApplication(); super.onCreate(savedInstanceState); - EdgeToEdge.enable(this); - setContentView(R.layout.activity_test_friend_icon); - String uid = tampopo.getUserId(); +// EdgeToEdge.enable(this); +// setContentView(R.layout.activity_test_friend_icon); +// String uid = tampopo.getUserId(); - uid = "test"; - FriendIconView friendIconView = findViewById(R.id.friendIconView); - friendIconView.setAccount(uid); + FrameLayout rootLayout = new FrameLayout(this); + float density = getResources().getDisplayMetrics().density; - //xmlで複製後uidを設定するとそのアカウントのニックネーム,コメント,アイコンが表示される - uid = "test0"; - FriendIconView friendIconView2 = findViewById(R.id.friendIconView2); - friendIconView2.setAccount(uid); + //FriendIconView 1個目 + FriendIconView view1 = new FriendIconView(this); + FrameLayout.LayoutParams params1 = new FrameLayout.LayoutParams( + (int) (160*density), + (int) (100*density) + ); + view1.setLayoutParams(params1); + view1.setX(100); + view1.setY(150); + rootLayout.addView(view1); + + //FriendIconView 2個目 + FriendIconView view2 = new FriendIconView(this); + FrameLayout.LayoutParams params2 = new FrameLayout.LayoutParams( + (int) (160*density), + (int) (100*density) + ); + view1.setLayoutParams(params2); + view1.setX(100); + view1.setY(150); + rootLayout.addView(view1); + + setContentView(rootLayout); +// +// FriendIconView friendIconView = new FriendIconView(this); +// uid = "test0"; + +// FriendIconView friendIconView = findViewById(R.id.friendIconView); +// friendIconView.setAccount(uid); +// +// //xmlで複製後uidを設定するとそのアカウントのニックネーム,コメント,アイコンが表示される +// uid = "test1"; +// FriendIconView friendIconView2 = findViewById(R.id.friendIconView2); +// friendIconView2.setAccount(uid); // friendIconView.setNickname("nitta"); // friendIconView.setComment(("kjrig"));