From e2caa11ed25fd0bbda1265dd8d4a6cf8ecda47ae Mon Sep 17 00:00:00 2001 From: yamamoto Date: Wed, 12 Jun 2024 14:22:30 +0900 Subject: [PATCH 001/149] =?UTF-8?q?=E9=87=91=E9=A1=8D=E8=A1=A8=E7=A4=BA?= =?UTF-8?q?=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F=E3=82=88=E3=83=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/impl/RewardDataDummyImpl.java | 6 ++-- .../kidshift/data/impl/TaskDataDummyImpl.java | 8 ++--- .../data/modules/RewardDataDummyModule.java | 3 +- .../data/modules/TaskDataDummyModule.java | 8 ++++- feature/child/build.gradle | 4 +++ .../feature/child/ChildMainFragment.java | 34 +++++++++++++++++++ .../main/res/layout/fragment_child_main.xml | 1 + 7 files changed, 55 insertions(+), 9 deletions(-) diff --git a/data/src/main/java/one/nem/kidshift/data/impl/RewardDataDummyImpl.java b/data/src/main/java/one/nem/kidshift/data/impl/RewardDataDummyImpl.java index 2592424..13e8c8a 100644 --- a/data/src/main/java/one/nem/kidshift/data/impl/RewardDataDummyImpl.java +++ b/data/src/main/java/one/nem/kidshift/data/impl/RewardDataDummyImpl.java @@ -17,15 +17,15 @@ public class RewardDataDummyImpl implements RewardData { @Inject public RewardDataDummyImpl() { faker = new Faker(); - logger.setTag("RewardDataDummyImpl"); +// logger.setTag("RewardDataDummyImpl"); } @Override public Integer getTotalReward() { - logger.info("getTotalReward called"); +// logger.info("getTotalReward called"); Integer reward = faker.number().numberBetween(0, 10000); - logger.info("Returning reward: " + reward); +// logger.info("Returning reward: " + reward); return reward; } } diff --git a/data/src/main/java/one/nem/kidshift/data/impl/TaskDataDummyImpl.java b/data/src/main/java/one/nem/kidshift/data/impl/TaskDataDummyImpl.java index ca0433c..6f8f874 100644 --- a/data/src/main/java/one/nem/kidshift/data/impl/TaskDataDummyImpl.java +++ b/data/src/main/java/one/nem/kidshift/data/impl/TaskDataDummyImpl.java @@ -24,15 +24,15 @@ public class TaskDataDummyImpl implements TaskData { @Inject public TaskDataDummyImpl() { faker = new Faker(); - logger.setTag("TaskDataDummyImpl"); +// logger.setTag("TaskDataDummyImpl"); } @Override public List getTasks() { - logger.info("getTotalReward called"); +// logger.info("getTotalReward called"); List tasks = new ArrayList<>(); int totalTasks = faker.number().numberBetween(1, 15); - logger.info("Returning total tasks: " + totalTasks); +// logger.info("Returning total tasks: " + totalTasks); for (int i = 0; i < totalTasks; i++) { tasks.add(new TaskItemModel( UUID.randomUUID().toString(), @@ -40,7 +40,7 @@ public class TaskDataDummyImpl implements TaskData { new TaskConditionNoneModel(), faker.number().numberBetween(1, 1000))); } - logger.info("Returning tasks: " + tasks); +// logger.info("Returning tasks: " + tasks); return tasks; } } diff --git a/data/src/main/java/one/nem/kidshift/data/modules/RewardDataDummyModule.java b/data/src/main/java/one/nem/kidshift/data/modules/RewardDataDummyModule.java index 2a14fb2..ebd794e 100644 --- a/data/src/main/java/one/nem/kidshift/data/modules/RewardDataDummyModule.java +++ b/data/src/main/java/one/nem/kidshift/data/modules/RewardDataDummyModule.java @@ -3,12 +3,13 @@ package one.nem.kidshift.data.modules; 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; @Module -@InstallIn(ViewModelComponent.class) +@InstallIn(FragmentComponent.class) abstract public class RewardDataDummyModule { @Binds diff --git a/data/src/main/java/one/nem/kidshift/data/modules/TaskDataDummyModule.java b/data/src/main/java/one/nem/kidshift/data/modules/TaskDataDummyModule.java index 71e9149..7271349 100644 --- a/data/src/main/java/one/nem/kidshift/data/modules/TaskDataDummyModule.java +++ b/data/src/main/java/one/nem/kidshift/data/modules/TaskDataDummyModule.java @@ -1,11 +1,17 @@ package one.nem.kidshift.data.modules; 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.TaskData; import one.nem.kidshift.data.impl.TaskDataDummyImpl; +@Module +@InstallIn(FragmentComponent.class) abstract public class TaskDataDummyModule { @Binds - abstract TaskData bindTaskData(TaskDataDummyImpl taskDataDummyImpl); + public abstract TaskData bindTaskData(TaskDataDummyImpl taskDataDummyImpl); } diff --git a/feature/child/build.gradle b/feature/child/build.gradle index 843c188..3befb06 100644 --- a/feature/child/build.gradle +++ b/feature/child/build.gradle @@ -36,6 +36,10 @@ dependencies { androidTestImplementation libs.ext.junit androidTestImplementation libs.espresso.core + implementation project(':utils') + implementation project(':model') + implementation project(':data') + // Hilt (DI) implementation libs.com.google.dagger.hilt.android annotationProcessor libs.com.google.dagger.hilt.compiler diff --git a/feature/child/src/main/java/one/nem/kidshift/feature/child/ChildMainFragment.java b/feature/child/src/main/java/one/nem/kidshift/feature/child/ChildMainFragment.java index 46ab671..c305903 100644 --- a/feature/child/src/main/java/one/nem/kidshift/feature/child/ChildMainFragment.java +++ b/feature/child/src/main/java/one/nem/kidshift/feature/child/ChildMainFragment.java @@ -7,13 +7,29 @@ import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.TextView; + +import java.text.NumberFormat; + +import javax.inject.Inject; + +import dagger.hilt.android.AndroidEntryPoint; +import one.nem.kidshift.data.RewardData; +import one.nem.kidshift.utils.KSLogger; /** * A simple {@link Fragment} subclass. * Use the {@link ChildMainFragment#newInstance} factory method to * create an instance of this fragment. */ + +@AndroidEntryPoint public class ChildMainFragment extends Fragment { + @Inject + KSLogger ksLogger; + + @Inject + RewardData rewardData; // TODO: Rename parameter arguments, choose names that match // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER @@ -61,4 +77,22 @@ public class ChildMainFragment extends Fragment { // Inflate the layout for this fragment return inflater.inflate(R.layout.fragment_child_main, container, false); } + + @Override + public void onViewCreated(View view, Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + + + ksLogger.addTag("ChildMainFragment"); + + Integer reward = rewardData.getTotalReward(); + + ksLogger.debug("取得したデータ: " + reward); + + TextView totalReward = view.findViewById(R.id.totalReward); + + NumberFormat nf = NumberFormat.getNumberInstance(); + + totalReward.setText("¥" + nf.format(reward).toString()); + } } \ No newline at end of file diff --git a/feature/child/src/main/res/layout/fragment_child_main.xml b/feature/child/src/main/res/layout/fragment_child_main.xml index d588fac..67d96f6 100644 --- a/feature/child/src/main/res/layout/fragment_child_main.xml +++ b/feature/child/src/main/res/layout/fragment_child_main.xml @@ -8,6 +8,7 @@ Date: Fri, 14 Jun 2024 10:31:15 +0900 Subject: [PATCH 002/149] =?UTF-8?q?=E6=97=A5=E4=BB=98=E5=8F=96=E5=BE=97?= =?UTF-8?q?=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F=E3=82=88=E3=83=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kidshift/feature/child/ChildMainFragment.java | 14 ++++++++++++-- .../src/main/res/layout/fragment_child_main.xml | 13 ++++++++++++- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/feature/child/src/main/java/one/nem/kidshift/feature/child/ChildMainFragment.java b/feature/child/src/main/java/one/nem/kidshift/feature/child/ChildMainFragment.java index c305903..9a02a8b 100644 --- a/feature/child/src/main/java/one/nem/kidshift/feature/child/ChildMainFragment.java +++ b/feature/child/src/main/java/one/nem/kidshift/feature/child/ChildMainFragment.java @@ -10,6 +10,9 @@ import android.view.ViewGroup; import android.widget.TextView; import java.text.NumberFormat; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import javax.inject.Inject; @@ -89,10 +92,17 @@ public class ChildMainFragment extends Fragment { ksLogger.debug("取得したデータ: " + reward); - TextView totalReward = view.findViewById(R.id.totalReward); + Calendar cl = Calendar.getInstance(); + TextView tr = view.findViewById(R.id.totalReward); + TextView dv = view.findViewById(R.id.dateView); + Date date = new Date(); + NumberFormat nf = NumberFormat.getNumberInstance(); + SimpleDateFormat sdf = new SimpleDateFormat(); + sdf.applyPattern("yyyy年MM月"); - totalReward.setText("¥" + nf.format(reward).toString()); + dv.setText(sdf.format(cl.getTime()) + " お小遣い総額"); + tr.setText("¥" + nf.format(reward).toString()); } } \ No newline at end of file diff --git a/feature/child/src/main/res/layout/fragment_child_main.xml b/feature/child/src/main/res/layout/fragment_child_main.xml index 67d96f6..eddcbbb 100644 --- a/feature/child/src/main/res/layout/fragment_child_main.xml +++ b/feature/child/src/main/res/layout/fragment_child_main.xml @@ -11,11 +11,22 @@ android:id="@+id/totalReward" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="🧒CHILD" android:textAppearance="@style/TextAppearance.AppCompat.Display3" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> + + \ No newline at end of file From bc55ae929a3bb632c3df316853a6656709c3fad3 Mon Sep 17 00:00:00 2001 From: Niki Date: Tue, 18 Jun 2024 14:52:23 +0900 Subject: [PATCH 003/149] =?UTF-8?q?=E3=83=AD=E3=82=B0=E3=82=A4=E3=83=B3?= =?UTF-8?q?=E7=94=BB=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feature/debug/DebugTempLoginFragment.java | 39 ++++++++++- .../res/layout/fragment_debug_temp_login.xml | 64 +++++++++++++++++-- 2 files changed, 96 insertions(+), 7 deletions(-) diff --git a/feature/debug/src/main/java/one/nem/kidshift/feature/debug/DebugTempLoginFragment.java b/feature/debug/src/main/java/one/nem/kidshift/feature/debug/DebugTempLoginFragment.java index 7e5ba60..6fd17d8 100644 --- a/feature/debug/src/main/java/one/nem/kidshift/feature/debug/DebugTempLoginFragment.java +++ b/feature/debug/src/main/java/one/nem/kidshift/feature/debug/DebugTempLoginFragment.java @@ -4,17 +4,31 @@ import android.os.Bundle; import androidx.fragment.app.Fragment; +import android.text.Editable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.EditText; +import android.widget.TextClock; +import android.widget.TextView; + +import javax.inject.Inject; + +import dagger.hilt.android.AndroidEntryPoint; +import one.nem.kidshift.utils.KSLogger; /** * A simple {@link Fragment} subclass. * Use the {@link DebugTempLoginFragment#newInstance} factory method to * create an instance of this fragment. */ +@AndroidEntryPoint public class DebugTempLoginFragment extends Fragment { + @Inject + KSLogger logger; + + // TODO: Rename parameter arguments, choose names that match // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER private static final String ARG_PARAM1 = "param1"; @@ -59,6 +73,29 @@ public class DebugTempLoginFragment extends Fragment { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { // Inflate the layout for this fragment - return inflater.inflate(R.layout.fragment_debug_temp_login, container, false); + View view = inflater.inflate(R.layout.fragment_debug_temp_login, container, false); + + logger.setTag("Login"); + + + //xmlレイアウトからid取得 + EditText id = (EditText) view.findViewById(R.id.idtext); + EditText pass = (EditText) view.findViewById(R.id.pass); + + //ログインボタンを押したときの処理 + view.findViewById(R.id.button).setOnClickListener( + view1 -> { + //入力された値（id,pass）を取得 + Editable getText = id.getText(); + Editable getPass = pass.getText(); + //入力された値（id,pass）をログに表示 + logger.debug(getText.toString()); + logger.debug(getPass.toString()); + } + ); + + + + return view; } } \ No newline at end of file diff --git a/feature/debug/src/main/res/layout/fragment_debug_temp_login.xml b/feature/debug/src/main/res/layout/fragment_debug_temp_login.xml index ffed15f..c62079f 100644 --- a/feature/debug/src/main/res/layout/fragment_debug_temp_login.xml +++ b/feature/debug/src/main/res/layout/fragment_debug_temp_login.xml @@ -1,14 +1,66 @@ - - - \ No newline at end of file + + + + + + + + + +