feature/updateupdate #138
|
@ -15,10 +15,16 @@ import one.nem.kidshift.model.tasks.TaskItemModel;
|
||||||
|
|
||||||
public class ParentAdapter extends RecyclerView.Adapter<ParentAdapter.MainViewHolder> {
|
public class ParentAdapter extends RecyclerView.Adapter<ParentAdapter.MainViewHolder> {
|
||||||
|
|
||||||
private final List<TaskItemModel> taskDataList;
|
private List<TaskItemModel> taskDataList;
|
||||||
|
|
||||||
ParentAdapter(List<TaskItemModel> taskDataList) { this.taskDataList = taskDataList; }
|
// ParentAdapter(List<TaskItemModel> taskDataList) { this.taskDataList = taskDataList; }
|
||||||
|
ParentAdapter(){
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setTaskDataList(List<TaskItemModel> taskDataList){
|
||||||
|
this.taskDataList = taskDataList;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
static class MainViewHolder extends RecyclerView.ViewHolder{
|
static class MainViewHolder extends RecyclerView.ViewHolder{
|
||||||
|
@ -47,6 +53,6 @@ public class ParentAdapter extends RecyclerView.Adapter<ParentAdapter.MainViewHo
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getItemCount(){
|
public int getItemCount(){
|
||||||
return taskDataList.size();
|
return taskDataList == null ? 0 : taskDataList.size();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -44,6 +44,7 @@ public class ParentMainFragment extends Fragment {
|
||||||
|
|
||||||
@SuppressLint("DatasetChange")
|
@SuppressLint("DatasetChange")
|
||||||
private void updateTaskInfo(){
|
private void updateTaskInfo(){
|
||||||
|
swipeRefreshLayout.setRefreshing(true);
|
||||||
taskData.getTasks(new TaskItemModelCallback() {
|
taskData.getTasks(new TaskItemModelCallback() {
|
||||||
@Override
|
@Override
|
||||||
public void onUnchanged() {
|
public void onUnchanged() {
|
||||||
|
@ -60,6 +61,7 @@ public class ParentMainFragment extends Fragment {
|
||||||
|
|
||||||
}
|
}
|
||||||
}).thenAccept(taskItemModel -> {
|
}).thenAccept(taskItemModel -> {
|
||||||
|
parentAdapter.setTaskDataList(taskItemModel);
|
||||||
requireActivity().runOnUiThread(()->{
|
requireActivity().runOnUiThread(()->{
|
||||||
parentAdapter.notifyDataSetChanged();
|
parentAdapter.notifyDataSetChanged();
|
||||||
});
|
});
|
||||||
|
@ -72,40 +74,6 @@ public class ParentMainFragment extends Fragment {
|
||||||
// Required empty public constructor
|
// Required empty public constructor
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private void dataRefresh(){
|
|
||||||
swipeRefreshLayout = requireView().findViewById(R.id.swipe_refresh_layout);
|
|
||||||
swipeRefreshLayout.setRefreshing(true);
|
|
||||||
|
|
||||||
RecyclerView recyclerView =requireView().findViewById(R.id.main_recycle_view);
|
|
||||||
|
|
||||||
recyclerView.setHasFixedSize(true);
|
|
||||||
|
|
||||||
RecyclerView.LayoutManager layoutManager = new LinearLayoutManager(getContext());
|
|
||||||
recyclerView.setLayoutManager(layoutManager);
|
|
||||||
|
|
||||||
List<TaskItemModel> task = taskData.getTasks(new TaskItemModelCallback() {
|
|
||||||
@Override
|
|
||||||
public void onUnchanged() {
|
|
||||||
// TODO
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onUpdated(List<TaskItemModel> taskItem) {
|
|
||||||
// TODO
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onFailed(String message) {
|
|
||||||
// TODO
|
|
||||||
}
|
|
||||||
}).join();
|
|
||||||
|
|
||||||
RecyclerView.Adapter mainAdapter = new ParentAdapter(task);
|
|
||||||
recyclerView.setAdapter(mainAdapter);
|
|
||||||
|
|
||||||
swipeRefreshLayout.setRefreshing(false);
|
|
||||||
}
|
|
||||||
@Override
|
@Override
|
||||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||||
Bundle savedInstanceState) {
|
Bundle savedInstanceState) {
|
||||||
|
@ -114,6 +82,32 @@ public class ParentMainFragment extends Fragment {
|
||||||
//タスク一覧表示
|
//タスク一覧表示
|
||||||
View view = inflater.inflate(R.layout.fragment_parent_main, container, false);
|
View view = inflater.inflate(R.layout.fragment_parent_main, container, false);
|
||||||
|
|
||||||
|
swipeRefreshLayout = view.findViewById(R.id.swipe_refresh_layout);
|
||||||
|
|
||||||
|
RecyclerView recyclerView = view.findViewById(R.id.main_recycle_view);
|
||||||
|
|
||||||
|
recyclerView.setHasFixedSize(true);
|
||||||
|
|
||||||
|
RecyclerView.LayoutManager layoutManager = new LinearLayoutManager(getContext());
|
||||||
|
recyclerView.setLayoutManager(layoutManager);
|
||||||
|
|
||||||
|
parentAdapter = new ParentAdapter();
|
||||||
|
recyclerView.setAdapter(parentAdapter);
|
||||||
|
updateTaskInfo();
|
||||||
|
|
||||||
|
//Pull-to-refresh(スワイプで更新)
|
||||||
|
try {
|
||||||
|
|
||||||
|
swipeRefreshLayout.setOnRefreshListener(() ->{
|
||||||
|
updateTaskInfo();
|
||||||
|
});
|
||||||
|
} catch (Exception e){
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//お手伝い追加ダイアログ
|
//お手伝い追加ダイアログ
|
||||||
LayoutInflater inflater1 = requireActivity().getLayoutInflater();
|
LayoutInflater inflater1 = requireActivity().getLayoutInflater();
|
||||||
View view1 = inflater1.inflate(R.layout.add_task_list_dialog,null);
|
View view1 = inflater1.inflate(R.layout.add_task_list_dialog,null);
|
||||||
|
@ -126,6 +120,8 @@ public class ParentMainFragment extends Fragment {
|
||||||
RecyclerView.LayoutManager layoutManager1 = new LinearLayoutManager(getContext());
|
RecyclerView.LayoutManager layoutManager1 = new LinearLayoutManager(getContext());
|
||||||
recyclerView1.setLayoutManager(layoutManager1);
|
recyclerView1.setLayoutManager(layoutManager1);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
ksLogger.debug("子供一覧取得開始");
|
ksLogger.debug("子供一覧取得開始");
|
||||||
List<ChildModel> child = childData.getChildList().join();
|
List<ChildModel> child = childData.getChildList().join();
|
||||||
ksLogger.debug("子供一覧取得完了");
|
ksLogger.debug("子供一覧取得完了");
|
||||||
|
@ -151,10 +147,6 @@ public class ParentMainFragment extends Fragment {
|
||||||
public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
|
public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
|
||||||
super.onViewCreated(view, savedInstanceState);
|
super.onViewCreated(view, savedInstanceState);
|
||||||
// Do something...
|
// Do something...
|
||||||
SwipeRefreshLayout swipeRefreshLayout = view.findViewById(R.id.swipe_refresh_layout);
|
|
||||||
swipeRefreshLayout.setOnRefreshListener(()->{
|
|
||||||
dataRefresh();
|
|
||||||
});
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
Reference in New Issue
Block a user