Merge pull request '一部データモデル追加, 一部モック追加' (#47) from feature/add_data_mock into main

Reviewed-on: #47

.idea/gradle.xml

@@ -10,11 +10,13 @@
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
+            <option value="$PROJECT_DIR$/data" />
             <option value="$PROJECT_DIR$/feature" />
             <option value="$PROJECT_DIR$/feature/child" />
             <option value="$PROJECT_DIR$/feature/debug" />
             <option value="$PROJECT_DIR$/feature/parent" />
             <option value="$PROJECT_DIR$/feature/setting" />
+            <option value="$PROJECT_DIR$/model" />
             <option value="$PROJECT_DIR$/utils" />
           </set>
         </option>

data/.gitignore

@@ -0,0 +1 @@
+/build

data/build.gradle

@@ -0,0 +1,46 @@
+plugins {
+    alias(libs.plugins.androidLibrary)
+    id 'com.google.dagger.hilt.android'
+}
+
+android {
+    namespace 'one.nem.kidshift.data'
+    compileSdk 34
+
+    defaultConfig {
+        minSdk 28
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles "consumer-rules.pro"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+}
+
+dependencies {
+
+    implementation libs.appcompat
+    implementation libs.material
+    testImplementation libs.junit
+    androidTestImplementation libs.ext.junit
+    androidTestImplementation libs.espresso.core
+
+    // Hilt (DI)
+    implementation libs.com.google.dagger.hilt.android
+    annotationProcessor libs.com.google.dagger.hilt.compiler
+
+    // Java Faker
+    implementation 'com.github.javafaker:javafaker:1.0.2'
+
+    implementation project(':model')
+    implementation project(':utils')
+}

data/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

data/src/androidTest/java/one/nem/kidshift/data/ExampleInstrumentedTest.java

@@ -0,0 +1,26 @@
+package one.nem.kidshift.data;
+
+import android.content.Context;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+        assertEquals("one.nem.kidshift.data.test", appContext.getPackageName());
+    }
+}

data/src/main/AndroidManifest.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>

data/src/main/java/one/nem/kidshift/data/RewardData.java

@@ -0,0 +1,5 @@
+package one.nem.kidshift.data;
+
+public interface RewardData {
+    Integer getTotalReward();
+}

data/src/main/java/one/nem/kidshift/data/TaskData.java

@@ -0,0 +1,4 @@
+package one.nem.kidshift.data;
+
+public interface TaskData {
+}

data/src/main/java/one/nem/kidshift/data/impl/RewardDataDummyImpl.java

@@ -0,0 +1,31 @@
+package one.nem.kidshift.data.impl;
+
+import com.github.javafaker.Faker;
+
+import javax.inject.Inject;
+
+import one.nem.kidshift.data.RewardData;
+import one.nem.kidshift.utils.KSLogger;
+
+public class RewardDataDummyImpl implements RewardData {
+
+    private Faker faker;
+
+    @Inject
+    KSLogger logger;
+
+    @Inject
+    public RewardDataDummyImpl() {
+        faker = new Faker();
+        logger.setTag("RewardDataDummyImpl");
+
+    }
+
+    @Override
+    public Integer getTotalReward() {
+        logger.info("getTotalReward called");
+        Integer reward = faker.number().numberBetween(0, 10000);
+        logger.info("Returning reward: " + reward);
+        return reward;
+    }
+}

data/src/main/java/one/nem/kidshift/data/impl/TaskDataImpl.java

@@ -0,0 +1,4 @@
+package one.nem.kidshift.data.impl;
+
+public class TaskDataImpl {
+}

data/src/main/java/one/nem/kidshift/data/modules/RewardDataDummyModule.java

@@ -0,0 +1,16 @@
+package one.nem.kidshift.data.modules;
+
+import dagger.Binds;
+import dagger.Module;
+import dagger.hilt.InstallIn;
+import dagger.hilt.android.components.ViewModelComponent;
+import one.nem.kidshift.data.RewardData;
+import one.nem.kidshift.data.impl.RewardDataDummyImpl;
+
+@Module
+@InstallIn(ViewModelComponent.class)
+abstract public class RewardDataDummyModule {
+
+    @Binds
+    public abstract RewardData bindRewardData(RewardDataDummyImpl rewardDataDummyImpl);
+}

data/src/test/java/one/nem/kidshift/data/ExampleUnitTest.java

@@ -0,0 +1,17 @@
+package one.nem.kidshift.data;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() {
+        assertEquals(4, 2 + 2);
+    }
+}

model/.gitignore

@@ -0,0 +1 @@
+/build

model/build.gradle

@@ -0,0 +1,35 @@
+plugins {
+    alias(libs.plugins.androidLibrary)
+}
+
+android {
+    namespace 'one.nem.kidshift.model'
+    compileSdk 34
+
+    defaultConfig {
+        minSdk 28
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles "consumer-rules.pro"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+}
+
+dependencies {
+
+    implementation libs.appcompat
+    implementation libs.material
+    testImplementation libs.junit
+    androidTestImplementation libs.ext.junit
+    androidTestImplementation libs.espresso.core
+}

model/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

model/src/androidTest/java/one/nem/kidshift/model/ExampleInstrumentedTest.java

@@ -0,0 +1,26 @@
+package one.nem.kidshift.model;
+
+import android.content.Context;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+        assertEquals("one.nem.kidshift.model.test", appContext.getPackageName());
+    }
+}

model/src/main/AndroidManifest.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>

model/src/main/java/one/nem/kidshift/model/enums/WeekdayEnum.java

@@ -0,0 +1,40 @@
+package one.nem.kidshift.model.enums;
+
+public enum WeekdayEnum {
+
+    MONDAY("月曜日"),
+    TUESDAY("火曜日"),
+    WEDNESDAY("水曜日"),
+    THURSDAY("木曜日"),
+    FRIDAY("金曜日"),
+    SATURDAY("土曜日"),
+    SUNDAY("日曜日");
+
+    private final String displayName;
+
+    private WeekdayEnum(String displayName) {
+        this.displayName = displayName;
+    }
+
+    public String getDisplayName() {
+        return displayName;
+    }
+
+    public static WeekdayEnum fromDisplayName(String displayName) {
+        for (WeekdayEnum value : WeekdayEnum.values()) {
+            if (value.getDisplayName().equals(displayName)) {
+                return value;
+            }
+        }
+        return null;
+    }
+
+    public static WeekdayEnum fromOrdinal(int ordinal) {
+        for (WeekdayEnum value : WeekdayEnum.values()) {
+            if (value.ordinal() == ordinal) {
+                return value;
+            }
+        }
+        return null;
+    }
+}

model/src/main/java/one/nem/kidshift/model/tasks/TaskItemModel.java

@@ -0,0 +1,53 @@
+package one.nem.kidshift.model.tasks;
+
+import one.nem.kidshift.model.tasks.condition.TaskConditionBaseModel;
+
+public class TaskItemModel {
+
+    String internalId;
+    String displayName;
+    TaskConditionBaseModel condition;
+    long reward;
+
+    // constructor
+    public TaskItemModel(String internalId, String displayName, TaskConditionBaseModel condition, long reward) {
+        this.internalId = internalId;
+        this.displayName = displayName;
+        this.condition = condition;
+        this.reward = reward;
+    }
+
+    // getter setter
+
+    public String getInternalId() {
+        return internalId;
+    }
+
+    public void setInternalId(String internalId) {
+        this.internalId = internalId;
+    }
+
+    public String getDisplayName() {
+        return displayName;
+    }
+
+    public void setDisplayName(String displayName) {
+        this.displayName = displayName;
+    }
+
+    public TaskConditionBaseModel getCondition() {
+        return condition;
+    }
+
+    public void setCondition(TaskConditionBaseModel condition) {
+        this.condition = condition;
+    }
+
+    public long getReward() {
+        return reward;
+    }
+
+    public void setReward(long reward) {
+        this.reward = reward;
+    }
+}

model/src/main/java/one/nem/kidshift/model/tasks/condition/TaskConditionBaseModel.java

@@ -0,0 +1,7 @@
+package one.nem.kidshift.model.tasks.condition;
+
+public class TaskConditionBaseModel {
+
+    // base class for task conditions
+
+}

model/src/main/java/one/nem/kidshift/model/tasks/condition/TaskConditionWeekdayModel.java

@@ -0,0 +1,24 @@
+package one.nem.kidshift.model.tasks.condition;
+
+import one.nem.kidshift.model.enums.WeekdayEnum;
+
+public class TaskConditionWeekdayModel extends TaskConditionBaseModel {
+
+    WeekdayEnum weekday;
+
+    // constructor
+    public TaskConditionWeekdayModel(WeekdayEnum weekday) {
+        this.weekday = weekday;
+    }
+
+    // getter
+    public WeekdayEnum getWeekday() {
+        return weekday;
+    }
+
+    // setter
+    public void setWeekday(WeekdayEnum weekday) {
+        this.weekday = weekday;
+    }
+
+}

model/src/test/java/one/nem/kidshift/model/ExampleUnitTest.java

@@ -0,0 +1,17 @@
+package one.nem.kidshift.model;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() {
+        assertEquals(4, 2 + 2);
+    }
+}

settings.gradle

@@ -26,3 +26,5 @@ include ':feature:child'
 include ':feature:setting'
 include ':feature:debug'
 include ':utils'
+include ':data'
+include ':model'