diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 59096d25..37b493e0 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -4,8 +4,6 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/xml/data_extraction_rules.xml b/app/src/main/res/xml/data_extraction_rules.xml deleted file mode 100644 index 9ee9997b..00000000 --- a/app/src/main/res/xml/data_extraction_rules.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/build-src/.gitignore b/build-src/.gitignore new file mode 100644 index 00000000..42afabfd --- /dev/null +++ b/build-src/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/build-src/build.gradle b/build-src/build.gradle new file mode 100644 index 00000000..8e22fd10 --- /dev/null +++ b/build-src/build.gradle @@ -0,0 +1,43 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' +} + +android { + namespace 'com.going.build_src' + compileSdk 33 + + defaultConfig { + applicationId "com.going.build_src" + minSdk 28 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.8.0' + implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'com.google.android.material:material:1.11.0' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.5' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' +} \ No newline at end of file diff --git a/core-ui/.gitignore b/core-ui/.gitignore new file mode 100644 index 00000000..42afabfd --- /dev/null +++ b/core-ui/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/core-ui/build.gradle b/core-ui/build.gradle new file mode 100644 index 00000000..cec84009 --- /dev/null +++ b/core-ui/build.gradle @@ -0,0 +1,43 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' +} + +android { + namespace 'com.going.core_ui' + compileSdk 33 + + defaultConfig { + applicationId "com.going.core_ui" + minSdk 28 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.8.0' + implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'com.google.android.material:material:1.11.0' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.5' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' +} \ No newline at end of file diff --git a/domain/proguard-rules.pro b/core-ui/proguard-rules.pro similarity index 100% rename from domain/proguard-rules.pro rename to core-ui/proguard-rules.pro diff --git a/domain/src/androidTest/java/com/going/domain/ExampleInstrumentedTest.kt b/core-ui/src/androidTest/java/com/going/core_ui/ExampleInstrumentedTest.kt similarity index 86% rename from domain/src/androidTest/java/com/going/domain/ExampleInstrumentedTest.kt rename to core-ui/src/androidTest/java/com/going/core_ui/ExampleInstrumentedTest.kt index 1f0cef51..6a24c372 100644 --- a/domain/src/androidTest/java/com/going/domain/ExampleInstrumentedTest.kt +++ b/core-ui/src/androidTest/java/com/going/core_ui/ExampleInstrumentedTest.kt @@ -1,4 +1,4 @@ -package com.going.domain +package com.going.core_ui import androidx.test.platform.app.InstrumentationRegistry import androidx.test.ext.junit.runners.AndroidJUnit4 @@ -19,6 +19,6 @@ class ExampleInstrumentedTest { fun useAppContext() { // Context of the app under test. val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("com.going.domain", appContext.packageName) + assertEquals("com.going.core_ui", appContext.packageName) } } \ No newline at end of file diff --git a/domain/src/main/AndroidManifest.xml b/core-ui/src/main/AndroidManifest.xml similarity index 100% rename from domain/src/main/AndroidManifest.xml rename to core-ui/src/main/AndroidManifest.xml diff --git a/domain/src/test/java/com/going/domain/ExampleUnitTest.kt b/core-ui/src/test/java/com/going/core_ui/ExampleUnitTest.kt similarity index 92% rename from domain/src/test/java/com/going/domain/ExampleUnitTest.kt rename to core-ui/src/test/java/com/going/core_ui/ExampleUnitTest.kt index b68f40c0..e45abb72 100644 --- a/domain/src/test/java/com/going/domain/ExampleUnitTest.kt +++ b/core-ui/src/test/java/com/going/core_ui/ExampleUnitTest.kt @@ -1,4 +1,4 @@ -package com.going.domain +package com.going.core_ui import org.junit.Test diff --git a/presentation/.gitignore b/presentation/.gitignore new file mode 100644 index 00000000..42afabfd --- /dev/null +++ b/presentation/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/presentation/build.gradle b/presentation/build.gradle new file mode 100644 index 00000000..c02371ec --- /dev/null +++ b/presentation/build.gradle @@ -0,0 +1,43 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' +} + +android { + namespace 'com.going.presentation' + compileSdk 33 + + defaultConfig { + applicationId "com.going.presentation" + minSdk 28 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.8.0' + implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'com.google.android.material:material:1.11.0' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.5' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' +} \ No newline at end of file diff --git a/presentation/proguard-rules.pro b/presentation/proguard-rules.pro new file mode 100644 index 00000000..481bb434 --- /dev/null +++ b/presentation/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/presentation/src/androidTest/java/com/going/presentation/ExampleInstrumentedTest.kt b/presentation/src/androidTest/java/com/going/presentation/ExampleInstrumentedTest.kt new file mode 100644 index 00000000..61b3ad9c --- /dev/null +++ b/presentation/src/androidTest/java/com/going/presentation/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package com.going.presentation + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("com.going.presentation", appContext.packageName) + } +} \ No newline at end of file diff --git a/presentation/src/main/AndroidManifest.xml b/presentation/src/main/AndroidManifest.xml new file mode 100644 index 00000000..a5918e68 --- /dev/null +++ b/presentation/src/main/AndroidManifest.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/presentation/src/main/res/drawable-v24/ic_launcher_foreground.xml b/presentation/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 00000000..2b068d11 --- /dev/null +++ b/presentation/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/presentation/src/main/res/drawable/ic_launcher_background.xml b/presentation/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 00000000..07d5da9c --- /dev/null +++ b/presentation/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/presentation/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/presentation/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 00000000..6f3b755b --- /dev/null +++ b/presentation/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/presentation/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/presentation/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 00000000..6f3b755b --- /dev/null +++ b/presentation/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/presentation/src/main/res/mipmap-hdpi/ic_launcher.webp b/presentation/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 00000000..c209e78e Binary files /dev/null and b/presentation/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/presentation/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/presentation/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 00000000..b2dfe3d1 Binary files /dev/null and b/presentation/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/presentation/src/main/res/mipmap-mdpi/ic_launcher.webp b/presentation/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 00000000..4f0f1d64 Binary files /dev/null and b/presentation/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/presentation/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/presentation/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 00000000..62b611da Binary files /dev/null and b/presentation/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/presentation/src/main/res/mipmap-xhdpi/ic_launcher.webp b/presentation/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 00000000..948a3070 Binary files /dev/null and b/presentation/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/presentation/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/presentation/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 00000000..1b9a6956 Binary files /dev/null and b/presentation/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/presentation/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/presentation/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 00000000..28d4b77f Binary files /dev/null and b/presentation/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/presentation/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/presentation/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 00000000..9287f508 Binary files /dev/null and b/presentation/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/presentation/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/presentation/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 00000000..aa7d6427 Binary files /dev/null and b/presentation/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/presentation/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/presentation/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 00000000..9126ae37 Binary files /dev/null and b/presentation/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/values-night/themes.xml b/presentation/src/main/res/values-night/themes.xml similarity index 100% rename from app/src/main/res/values-night/themes.xml rename to presentation/src/main/res/values-night/themes.xml diff --git a/presentation/src/main/res/values/colors.xml b/presentation/src/main/res/values/colors.xml new file mode 100644 index 00000000..f8c6127d --- /dev/null +++ b/presentation/src/main/res/values/colors.xml @@ -0,0 +1,10 @@ + + + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + \ No newline at end of file diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml new file mode 100644 index 00000000..924de34b --- /dev/null +++ b/presentation/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + presentation + \ No newline at end of file diff --git a/presentation/src/main/res/values/themes.xml b/presentation/src/main/res/values/themes.xml new file mode 100644 index 00000000..039e9f5d --- /dev/null +++ b/presentation/src/main/res/values/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/presentation/src/test/java/com/going/presentation/ExampleUnitTest.kt b/presentation/src/test/java/com/going/presentation/ExampleUnitTest.kt new file mode 100644 index 00000000..9feb3e5f --- /dev/null +++ b/presentation/src/test/java/com/going/presentation/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package com.going.presentation + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 9161ea0a..98cb8650 100644 --- a/settings.gradle +++ b/settings.gradle @@ -16,3 +16,6 @@ rootProject.name = "GoingGoing" include ':app' include ':data' include ':domain' +include ':build-src' +include ':core-ui' +include ':presentation'