kidshift/KidShift
3
0
Fork 0
Code Issues 9 Pull Requests Wiki Activity

リファクタ WIP

Browse Source
This commit is contained in:
rca 2024-07-06 12:43:16 +09:00
parent 01c9f84a61
commit dbe706ccbf
1 changed files with 25 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
feature/parent/src/main/java/one/nem/kidshift/feature/parent/ParentMainFragment.java
View File

@ -9,17 +9,14 @@ import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.Button;
import android.widget.Toast; import android.widget.Toast;
import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import java.util.List; import java.util.List;
import java.util.concurrent.CompletableFuture;
import javax.inject.Inject; import javax.inject.Inject;
@ -47,6 +44,7 @@ public class ParentMainFragment extends Fragment {
ParentAdapter parentAdapter; ParentAdapter parentAdapter;
SwipeRefreshLayout swipeRefreshLayout; SwipeRefreshLayout swipeRefreshLayout;
LayoutInflater layoutInflater;
@SuppressLint("DatasetChange") @SuppressLint("DatasetChange")
private void updateTaskInfo(){ private void updateTaskInfo(){
@ -84,6 +82,7 @@ public class ParentMainFragment extends Fragment {
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
this.logger = ksLoggerFactory.create("ParentMainFragment"); this.logger = ksLoggerFactory.create("ParentMainFragment");
this.layoutInflater = requireActivity().getLayoutInflater();
} }
@SuppressLint("MissingInflatedId") @SuppressLint("MissingInflatedId")
@ -105,48 +104,38 @@ public class ParentMainFragment extends Fragment {
recyclerView.setLayoutManager(layoutManager); recyclerView.setLayoutManager(layoutManager);
parentAdapter = new ParentAdapter(); parentAdapter = new ParentAdapter();
parentAdapter.setCallback(new ParentAdapter.CompleteButtonClickedCallback() { parentAdapter.setCallback(taskId -> {
@Override View childListView = layoutInflater.inflate(R.layout.act_child_select_dialog, null);
public void onClicked(String taskId) { RecyclerView recyclerView2 = childListView.findViewById(R.id.act_recycle_view);
Toast.makeText(requireContext(), "TaskID: " + taskId, Toast.LENGTH_LONG).show();
//お手伝い完了処理
LayoutInflater inflater2 = requireActivity().getLayoutInflater();
View view2 = inflater2.inflate(R.layout.act_child_select_dialog,null);
//子供一覧表示 RecyclerView.LayoutManager layoutManager2 = new LinearLayoutManager(getContext());
RecyclerView recyclerView2 = view2.findViewById(R.id.act_recycle_view); recyclerView2.setLayoutManager(layoutManager2);
recyclerView2.setHasFixedSize(true); List<ChildModel> child1 = childData.getChildList(new ChildModelCallback() {
@Override
public void onUnchanged() {
RecyclerView.LayoutManager layoutManager2 = new LinearLayoutManager(getContext()); }
recyclerView2.setLayoutManager(layoutManager2);
List<ChildModel> child1 = childData.getChildList(new ChildModelCallback() { @Override
@Override public void onUpdated(List<ChildModel> childModelList) {
public void onUnchanged() {
} }
@Override @Override
public void onUpdated(List<ChildModel> childModelList) { public void onFailed(String message) {
} }
}).join();
@Override DialogChildListAdapter mainAdapter2 = new DialogChildListAdapter(child1);
public void onFailed(String message) { recyclerView2.setAdapter(mainAdapter2);
} MaterialAlertDialogBuilder builder1 = new MaterialAlertDialogBuilder(requireContext());
}).join(); builder1.setTitle("お手伝いをしたお子様の名前を選択してください")
.setView(childListView)
RecyclerView.Adapter mainAdapter2 = new ChildListAdapter2(child1); .setNeutralButton("閉じる",null);
recyclerView2.setAdapter(mainAdapter2); builder1.create().show();
MaterialAlertDialogBuilder builder1 = new MaterialAlertDialogBuilder(getContext());
builder1.setTitle("お手伝いをしたお子様の名前を選択してください")
.setView(view2)
.setNeutralButton("閉じる",null);
builder1.create().show();
}
}); });
recyclerView.setAdapter(parentAdapter); recyclerView.setAdapter(parentAdapter);
updateTaskInfo(); updateTaskInfo();