From 9346c325504f8909e1c323d5db64dd0a9e1138b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Fri, 7 Jun 2024 11:58:15 +0900 Subject: [PATCH 1/3] =?UTF-8?q?shared=E3=83=A2=E3=82=B8=E3=83=A5=E3=83=BC?= =?UTF-8?q?=E3=83=AB=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/gradle.xml | 1 + settings.gradle | 1 + shared/.gitignore | 1 + shared/build.gradle | 35 +++++++++++++++++++ shared/consumer-rules.pro | 0 shared/proguard-rules.pro | 21 +++++++++++ .../shared/ExampleInstrumentedTest.java | 26 ++++++++++++++ shared/src/main/AndroidManifest.xml | 4 +++ .../nem/kidshift/shared/ExampleUnitTest.java | 17 +++++++++ 9 files changed, 106 insertions(+) create mode 100644 shared/.gitignore create mode 100644 shared/build.gradle create mode 100644 shared/consumer-rules.pro create mode 100644 shared/proguard-rules.pro create mode 100644 shared/src/androidTest/java/one/nem/kidshift/shared/ExampleInstrumentedTest.java create mode 100644 shared/src/main/AndroidManifest.xml create mode 100644 shared/src/test/java/one/nem/kidshift/shared/ExampleUnitTest.java diff --git a/.idea/gradle.xml b/.idea/gradle.xml index d8c84a2..3cd2a4c 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -17,6 +17,7 @@ diff --git a/settings.gradle b/settings.gradle index cf9fd6a..c809618 100644 --- a/settings.gradle +++ b/settings.gradle @@ -28,3 +28,4 @@ include ':feature:debug' include ':utils' include ':data' include ':model' +include ':shared' diff --git a/shared/.gitignore b/shared/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/shared/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/shared/build.gradle b/shared/build.gradle new file mode 100644 index 0000000..010ee0d --- /dev/null +++ b/shared/build.gradle @@ -0,0 +1,35 @@ +plugins { + alias(libs.plugins.androidLibrary) +} + +android { + namespace 'one.nem.kidshift.shared' + 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 +} \ No newline at end of file diff --git a/shared/consumer-rules.pro b/shared/consumer-rules.pro new file mode 100644 index 0000000..e69de29 diff --git a/shared/proguard-rules.pro b/shared/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/shared/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 \ No newline at end of file diff --git a/shared/src/androidTest/java/one/nem/kidshift/shared/ExampleInstrumentedTest.java b/shared/src/androidTest/java/one/nem/kidshift/shared/ExampleInstrumentedTest.java new file mode 100644 index 0000000..d74750f --- /dev/null +++ b/shared/src/androidTest/java/one/nem/kidshift/shared/ExampleInstrumentedTest.java @@ -0,0 +1,26 @@ +package one.nem.kidshift.shared; + +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 Testing documentation + */ +@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.shared.test", appContext.getPackageName()); + } +} \ No newline at end of file diff --git a/shared/src/main/AndroidManifest.xml b/shared/src/main/AndroidManifest.xml new file mode 100644 index 0000000..a5918e6 --- /dev/null +++ b/shared/src/main/AndroidManifest.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/shared/src/test/java/one/nem/kidshift/shared/ExampleUnitTest.java b/shared/src/test/java/one/nem/kidshift/shared/ExampleUnitTest.java new file mode 100644 index 0000000..b625fe8 --- /dev/null +++ b/shared/src/test/java/one/nem/kidshift/shared/ExampleUnitTest.java @@ -0,0 +1,17 @@ +package one.nem.kidshift.shared; + +import org.junit.Test; + +import static org.junit.Assert.*; + +/** + * Example local unit test, which will execute on the development machine (host). + * + * @see Testing documentation + */ +public class ExampleUnitTest { + @Test + public void addition_isCorrect() { + assertEquals(4, 2 + 2); + } +} \ No newline at end of file -- 2.45.1 From e5400fd407540ee40fed59e9837bfe001c5984fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Fri, 7 Jun 2024 12:02:48 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=E3=82=A2=E3=82=A4=E3=82=B3=E3=83=B3?= =?UTF-8?q?=E3=83=AA=E3=82=BD=E3=83=BC=E3=82=B9=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shared/src/main/res/drawable/add_24px.xml | 10 ++++++++++ shared/src/main/res/drawable/check_24px.xml | 10 ++++++++++ shared/src/main/res/drawable/child_care_24px.xml | 10 ++++++++++ .../src/main/res/drawable/developer_mode_24px.xml | 10 ++++++++++ shared/src/main/res/drawable/done_all_24px.xml | 10 ++++++++++ shared/src/main/res/drawable/error_24px.xml | 10 ++++++++++ .../res/drawable/ic_device_unknown_gm2_24px.xml | Bin 0 -> 112 bytes shared/src/main/res/drawable/info_24px.xml | 10 ++++++++++ shared/src/main/res/drawable/pending_24px.xml | 10 ++++++++++ shared/src/main/res/drawable/settings_24px.xml | 10 ++++++++++ .../res/drawable/supervised_user_circle_24px.xml | 10 ++++++++++ shared/src/main/res/drawable/task_alt_24px.xml | 10 ++++++++++ shared/src/main/res/drawable/warning_24px.xml | 10 ++++++++++ 13 files changed, 120 insertions(+) create mode 100644 shared/src/main/res/drawable/add_24px.xml create mode 100644 shared/src/main/res/drawable/check_24px.xml create mode 100644 shared/src/main/res/drawable/child_care_24px.xml create mode 100644 shared/src/main/res/drawable/developer_mode_24px.xml create mode 100644 shared/src/main/res/drawable/done_all_24px.xml create mode 100644 shared/src/main/res/drawable/error_24px.xml create mode 100644 shared/src/main/res/drawable/ic_device_unknown_gm2_24px.xml create mode 100644 shared/src/main/res/drawable/info_24px.xml create mode 100644 shared/src/main/res/drawable/pending_24px.xml create mode 100644 shared/src/main/res/drawable/settings_24px.xml create mode 100644 shared/src/main/res/drawable/supervised_user_circle_24px.xml create mode 100644 shared/src/main/res/drawable/task_alt_24px.xml create mode 100644 shared/src/main/res/drawable/warning_24px.xml diff --git a/shared/src/main/res/drawable/add_24px.xml b/shared/src/main/res/drawable/add_24px.xml new file mode 100644 index 0000000..b3577d4 --- /dev/null +++ b/shared/src/main/res/drawable/add_24px.xml @@ -0,0 +1,10 @@ + + + diff --git a/shared/src/main/res/drawable/check_24px.xml b/shared/src/main/res/drawable/check_24px.xml new file mode 100644 index 0000000..0a6ad86 --- /dev/null +++ b/shared/src/main/res/drawable/check_24px.xml @@ -0,0 +1,10 @@ + + + diff --git a/shared/src/main/res/drawable/child_care_24px.xml b/shared/src/main/res/drawable/child_care_24px.xml new file mode 100644 index 0000000..bd534df --- /dev/null +++ b/shared/src/main/res/drawable/child_care_24px.xml @@ -0,0 +1,10 @@ + + + diff --git a/shared/src/main/res/drawable/developer_mode_24px.xml b/shared/src/main/res/drawable/developer_mode_24px.xml new file mode 100644 index 0000000..3e78cb3 --- /dev/null +++ b/shared/src/main/res/drawable/developer_mode_24px.xml @@ -0,0 +1,10 @@ + + + diff --git a/shared/src/main/res/drawable/done_all_24px.xml b/shared/src/main/res/drawable/done_all_24px.xml new file mode 100644 index 0000000..01176c6 --- /dev/null +++ b/shared/src/main/res/drawable/done_all_24px.xml @@ -0,0 +1,10 @@ + + + diff --git a/shared/src/main/res/drawable/error_24px.xml b/shared/src/main/res/drawable/error_24px.xml new file mode 100644 index 0000000..a22c42c --- /dev/null +++ b/shared/src/main/res/drawable/error_24px.xml @@ -0,0 +1,10 @@ + + + diff --git a/shared/src/main/res/drawable/ic_device_unknown_gm2_24px.xml b/shared/src/main/res/drawable/ic_device_unknown_gm2_24px.xml new file mode 100644 index 0000000000000000000000000000000000000000..3192edb7fd098441c64c641b13648904b354483b GIT binary patch literal 112 zcmZQ(;9w|VU|?WmkYP{((?9|Q7#SE8zzhh%$XLP9z{mkq&A`CKC;(Q=1Z4k*0+1>Z PAcO&Cpc)Av2VD&ST|p9Q literal 0 HcmV?d00001 diff --git a/shared/src/main/res/drawable/info_24px.xml b/shared/src/main/res/drawable/info_24px.xml new file mode 100644 index 0000000..3c6efdf --- /dev/null +++ b/shared/src/main/res/drawable/info_24px.xml @@ -0,0 +1,10 @@ + + + diff --git a/shared/src/main/res/drawable/pending_24px.xml b/shared/src/main/res/drawable/pending_24px.xml new file mode 100644 index 0000000..8afa7cd --- /dev/null +++ b/shared/src/main/res/drawable/pending_24px.xml @@ -0,0 +1,10 @@ + + + diff --git a/shared/src/main/res/drawable/settings_24px.xml b/shared/src/main/res/drawable/settings_24px.xml new file mode 100644 index 0000000..f20bbdd --- /dev/null +++ b/shared/src/main/res/drawable/settings_24px.xml @@ -0,0 +1,10 @@ + + + diff --git a/shared/src/main/res/drawable/supervised_user_circle_24px.xml b/shared/src/main/res/drawable/supervised_user_circle_24px.xml new file mode 100644 index 0000000..72faa0f --- /dev/null +++ b/shared/src/main/res/drawable/supervised_user_circle_24px.xml @@ -0,0 +1,10 @@ + + + diff --git a/shared/src/main/res/drawable/task_alt_24px.xml b/shared/src/main/res/drawable/task_alt_24px.xml new file mode 100644 index 0000000..be56883 --- /dev/null +++ b/shared/src/main/res/drawable/task_alt_24px.xml @@ -0,0 +1,10 @@ + + + diff --git a/shared/src/main/res/drawable/warning_24px.xml b/shared/src/main/res/drawable/warning_24px.xml new file mode 100644 index 0000000..4764406 --- /dev/null +++ b/shared/src/main/res/drawable/warning_24px.xml @@ -0,0 +1,10 @@ + + + -- 2.45.1 From a115bf2aa12ff905884b11870a5d9160c4c5a156 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Fri, 7 Jun 2024 12:03:12 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A3=8A=E3=82=8C=E3=81=9F=E3=83=AA?= =?UTF-8?q?=E3=82=BD=E3=83=BC=E3=82=B9=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/drawable/ic_device_unknown_gm2_24px.xml | Bin 112 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 shared/src/main/res/drawable/ic_device_unknown_gm2_24px.xml diff --git a/shared/src/main/res/drawable/ic_device_unknown_gm2_24px.xml b/shared/src/main/res/drawable/ic_device_unknown_gm2_24px.xml deleted file mode 100644 index 3192edb7fd098441c64c641b13648904b354483b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 112 zcmZQ(;9w|VU|?WmkYP{((?9|Q7#SE8zzhh%$XLP9z{mkq&A`CKC;(Q=1Z4k*0+1>Z PAcO&Cpc)Av2VD&ST|p9Q -- 2.45.1