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

リファクタ, 微修正 #65

Merged
Fujimatsu merged 16 commits from improve/improve1 into main 2024-06-13 07:19:53 +00:00
Conversation 0 Commits 16 Files Changed 11 +13 -231
11 changed files with 13 additions and 231 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/src/main/java/one/nem/kidshift/data/RewardData.java
View File

@ -1,5 +1,9 @@
package one.nem.kidshift.data;
public interface RewardData {
/**
* 現時点の合計報酬額を取得する
* @return Integer 合計報酬額
*/
Integer getTotalReward();
}

4
data/src/main/java/one/nem/kidshift/data/TaskData.java
View File

@ -5,5 +5,9 @@ import java.util.List;
import one.nem.kidshift.model.tasks.TaskItemModel;
public interface TaskData {
/**
* 存在する全てのタスクを取得する
* @return List<TaskItemModel> タスクリスト
*/
List<TaskItemModel> getTasks();
}

2
data/src/main/java/one/nem/kidshift/data/impl/RewardDataDummyImpl.java
View File

@ -9,7 +9,7 @@ import one.nem.kidshift.utils.KSLogger;
public class RewardDataDummyImpl implements RewardData {
private Faker faker;
private final Faker faker;
@Inject
KSLogger logger;

1
data/src/main/java/one/nem/kidshift/data/modules/RewardDataDummyModule.java
View File

@ -4,7 +4,6 @@ import dagger.Binds;
import dagger.Module;
import dagger.hilt.InstallIn;
import dagger.hilt.android.components.FragmentComponent;
import dagger.hilt.android.components.ViewModelComponent;
import one.nem.kidshift.data.RewardData;
import one.nem.kidshift.data.impl.RewardDataDummyImpl;

0
data/src/main/java/one/nem/kidshift/data/modules/placeholder
View File

43
feature/debug/src/main/java/one/nem/kidshift/feature/debug/DebugDebugConsoleFragment.java
View File

@ -17,68 +17,25 @@ import javax.inject.Inject;
import dagger.hilt.android.AndroidEntryPoint;
import one.nem.kidshift.feature.debug.adapter.DebugCommandListItemAdapter;
import one.nem.kidshift.feature.debug.adapter.DebugMenuListItemAdapter;
import one.nem.kidshift.feature.debug.model.DebugCommandItemModel;
import one.nem.kidshift.utils.FeatureFlag;
import one.nem.kidshift.utils.KSLogger;
/**
* A simple {@link Fragment} subclass.
* Use the {@link DebugDebugConsoleFragment#newInstance} factory method to
* create an instance of this fragment.
*/
@AndroidEntryPoint
public class DebugDebugConsoleFragment extends Fragment {
@Inject
KSLogger ksLogger;
@Inject
FeatureFlag featureFlag;
private final List<DebugCommandItemModel> debugCommandItemModels = new ArrayList<>();
DebugCommandListItemAdapter debugCommandItemAdapter;
// TODO: Rename parameter arguments, choose names that match
// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
private static final String ARG_PARAM1 = "param1";
private static final String ARG_PARAM2 = "param2";
// TODO: Rename and change types of parameters
private String mParam1;
private String mParam2;
public DebugDebugConsoleFragment() {
// Required empty public constructor
}
/**
* Use this factory method to create a new instance of
* this fragment using the provided parameters.
*
* @param param1 Parameter 1.
* @param param2 Parameter 2.
* @return A new instance of fragment DebugDebugConsoleFragment.
*/
// TODO: Rename and change types and number of parameters
public static DebugDebugConsoleFragment newInstance(String param1, String param2) {
DebugDebugConsoleFragment fragment = new DebugDebugConsoleFragment();
Bundle args = new Bundle();
args.putString(ARG_PARAM1, param1);
args.putString(ARG_PARAM2, param2);
fragment.setArguments(args);
return fragment;
}
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (getArguments() != null) {
mParam1 = getArguments().getString(ARG_PARAM1);
mParam2 = getArguments().getString(ARG_PARAM2);
}
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {

43
feature/debug/src/main/java/one/nem/kidshift/feature/debug/DebugMainFragment.java
View File

@ -3,7 +3,6 @@ package one.nem.kidshift.feature.debug;
import android.os.Bundle;
import androidx.fragment.app.Fragment;
import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
@ -14,57 +13,16 @@ import javax.inject.Inject;
import dagger.hilt.android.AndroidEntryPoint;
import one.nem.kidshift.utils.KSLogger;
/**
* A simple {@link Fragment} subclass.
* Use the {@link DebugMainFragment#newInstance} factory method to
* create an instance of this fragment.
*/
@AndroidEntryPoint
public class DebugMainFragment extends Fragment {
@Inject
KSLogger ksLogger;
// TODO: Rename parameter arguments, choose names that match
// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
private static final String ARG_PARAM1 = "param1";
private static final String ARG_PARAM2 = "param2";
// TODO: Rename and change types of parameters
private String mParam1;
private String mParam2;
public DebugMainFragment() {
// Required empty public constructor
}
/**
* Use this factory method to create a new instance of
* this fragment using the provided parameters.
*
* @param param1 Parameter 1.
* @param param2 Parameter 2.
* @return A new instance of fragment DebugMainFragment.
*/
// TODO: Rename and change types and number of parameters
public static DebugMainFragment newInstance(String param1, String param2) {
DebugMainFragment fragment = new DebugMainFragment();
Bundle args = new Bundle();
args.putString(ARG_PARAM1, param1);
args.putString(ARG_PARAM2, param2);
fragment.setArguments(args);
return fragment;
}
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (getArguments() != null) {
mParam1 = getArguments().getString(ARG_PARAM1);
mParam2 = getArguments().getString(ARG_PARAM2);
}
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
@ -74,7 +32,6 @@ public class DebugMainFragment extends Fragment {
@Override
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
// NONE
}
}

41
feature/debug/src/main/java/one/nem/kidshift/feature/debug/DebugMockTestFragment.java
View File

@ -15,11 +15,6 @@ import dagger.hilt.android.AndroidEntryPoint;
import one.nem.kidshift.data.RewardData;
import one.nem.kidshift.data.TaskData;
/**
* A simple {@link Fragment} subclass.
* Use the {@link DebugMockTestFragment#newInstance} factory method to
* create an instance of this fragment.
*/
@AndroidEntryPoint
public class DebugMockTestFragment extends Fragment {
@ -29,46 +24,10 @@ public class DebugMockTestFragment extends Fragment {
@Inject
RewardData rewardData;
// TODO: Rename parameter arguments, choose names that match
// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
private static final String ARG_PARAM1 = "param1";
private static final String ARG_PARAM2 = "param2";
// TODO: Rename and change types of parameters
private String mParam1;
private String mParam2;
public DebugMockTestFragment() {
// Required empty public constructor
}
/**
* Use this factory method to create a new instance of
* this fragment using the provided parameters.
*
* @param param1 Parameter 1.
* @param param2 Parameter 2.
* @return A new instance of fragment DebugMockTestFragment.
*/
// TODO: Rename and change types and number of parameters
public static DebugMockTestFragment newInstance(String param1, String param2) {
DebugMockTestFragment fragment = new DebugMockTestFragment();
Bundle args = new Bundle();
args.putString(ARG_PARAM1, param1);
args.putString(ARG_PARAM2, param2);
fragment.setArguments(args);
return fragment;
}
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (getArguments() != null) {
mParam1 = getArguments().getString(ARG_PARAM1);
mParam2 = getArguments().getString(ARG_PARAM2);
}
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {

41
feature/debug/src/main/java/one/nem/kidshift/feature/debug/DebugTopMenuFragment.java
View File

@ -15,53 +15,12 @@ import java.util.List;
import one.nem.kidshift.feature.debug.adapter.DebugMenuListItemAdapter;
import one.nem.kidshift.feature.debug.model.DebugMenuListItemModel;
/**
* A simple {@link Fragment} subclass.
* Use the {@link DebugTopMenuFragment#newInstance} factory method to
* create an instance of this fragment.
*/
public class DebugTopMenuFragment extends Fragment {
// TODO: Rename parameter arguments, choose names that match
// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
private static final String ARG_PARAM1 = "param1";
private static final String ARG_PARAM2 = "param2";
// TODO: Rename and change types of parameters
private String mParam1;
private String mParam2;
public DebugTopMenuFragment() {
// Required empty public constructor
}
/**
* Use this factory method to create a new instance of
* this fragment using the provided parameters.
*
* @param param1 Parameter 1.
* @param param2 Parameter 2.
* @return A new instance of fragment DebugTopMenuFragment.
*/
// TODO: Rename and change types and number of parameters
public static DebugTopMenuFragment newInstance(String param1, String param2) {
DebugTopMenuFragment fragment = new DebugTopMenuFragment();
Bundle args = new Bundle();
args.putString(ARG_PARAM1, param1);
args.putString(ARG_PARAM2, param2);
fragment.setArguments(args);
return fragment;
}
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (getArguments() != null) {
mParam1 = getArguments().getString(ARG_PARAM1);
mParam2 = getArguments().getString(ARG_PARAM2);
}
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {

2
feature/parent/src/main/java/one/nem/kidshift/feature/parent/ParentAdapter.java
View File

@ -14,7 +14,7 @@ import one.nem.kidshift.model.tasks.TaskItemModel;
public class ParentAdapter extends RecyclerView.Adapter<ParentAdapter.MainViewHolder> {
private List<TaskItemModel> taskDataList;
private final List<TaskItemModel> taskDataList;
ParentAdapter(List<TaskItemModel> taskDataList) { this.taskDataList = taskDataList; }

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

@ -1,8 +1,8 @@
package one.nem.kidshift.feature.parent;
import android.content.Context;
import android.os.Bundle;
import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
@ -20,66 +20,17 @@ import one.nem.kidshift.data.TaskData;
import one.nem.kidshift.model.tasks.TaskItemModel;
import one.nem.kidshift.utils.KSLogger;
/**
* A simple {@link Fragment} subclass.
* Use the {@link ParentMainFragment#newInstance} factory method to
* create an instance of this fragment.
*/
@AndroidEntryPoint
public class ParentMainFragment extends Fragment {
@Inject
KSLogger ksLogger;
@Inject
TaskData taskData;
// TODO: Rename parameter arguments, choose names that match
// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
private static final String ARG_PARAM1 = "param1";
private static final String ARG_PARAM2 = "param2";
// TODO: Rename and change types of parameters
private String mParam1;
private String mParam2;
public ParentMainFragment() {
// Required empty public constructor
}
/**
* Use this factory method to create a new instance of
* this fragment using the provided parameters.
*
* @param param1 Parameter 1.
* @param param2 Parameter 2.
* @return A new instance of fragment FeatureParentFragment.
*/
// TODO: Rename and change types and number of parameters
public static ParentMainFragment newInstance(String param1, String param2) {
ParentMainFragment fragment = new ParentMainFragment();
Bundle args = new Bundle();
args.putString(ARG_PARAM1, param1);
args.putString(ARG_PARAM2, param2);
fragment.setArguments(args);
return fragment;
}
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (getArguments() != null) {
mParam1 = getArguments().getString(ARG_PARAM1);
mParam2 = getArguments().getString(ARG_PARAM2);
}
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
@ -98,20 +49,12 @@ public class ParentMainFragment extends Fragment {
RecyclerView.Adapter mainAdapter = new ParentAdapter(task);
recyclerView.setAdapter(mainAdapter);
return view;
}
@Override
public void onViewCreated(View view, Bundle savedInstanceState) {
public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
ksLogger.addTag("ParentFragment");
List<TaskItemModel> task = taskData.getTasks();
ksLogger.debug("取得したデータ: " + task);
// Do something...
}
}