diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index c1146ab..e5b5839 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,16 +1,17 @@
+import com.wei.picquest.PqBuildType
+
 plugins {
-    id("com.android.application")
-    id("org.jetbrains.kotlin.android")
+    alias(libs.plugins.pq.android.application)
+    alias(libs.plugins.pq.android.application.compose)
+    alias(libs.plugins.pq.android.application.flavors)
+    alias(libs.plugins.pq.android.hilt)
 }
 
 android {
     namespace = "com.wei.picquest"
-    compileSdk = 34
 
     defaultConfig {
         applicationId = "com.wei.picquest"
-        minSdk = 21
-        targetSdk = 34
         /**
          * Version Code: AABCXYZ
          *
@@ -28,7 +29,9 @@ android {
          */
         versionName = "0.0.0"
 
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        // Custom test runner to set up Hilt dependency graph
+        testInstrumentationRunner = "com.wei.picquest.core.testing.PqTestRunner"
+
         vectorDrawables {
             useSupportLibrary = true
         }
@@ -44,21 +47,20 @@ android {
         }
     }
 
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
-
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.toString()
-    }
-
-    buildFeatures {
-        compose = true
-    }
+    buildTypes {
+        debug {
+            applicationIdSuffix = PqBuildType.DEBUG.applicationIdSuffix
+        }
+        release {
+            isMinifyEnabled = true
+            applicationIdSuffix = PqBuildType.RELEASE.applicationIdSuffix
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.3"
+            // To publish on the Play store a private signing key is required, but to allow anyone
+            // who clones the code to sign and run the release variant, use the debug signing key.
+            // TODO: Abstract the signing configuration to a separate file to avoid hardcoding this.
+            signingConfig = signingConfigs.getByName("debug")
+        }
     }
 
     packaging {
@@ -66,7 +68,6 @@ android {
             excludes.add("/META-INF/{AL2.0,LGPL2.1}")
         }
     }
-
     testOptions {
         unitTests {
             isIncludeAndroidResources = true
@@ -75,20 +76,46 @@ android {
 }
 
 dependencies {
+    // TODO Wei
+//    implementation(project(":feature:login"))
+//    implementation(project(":feature:home"))
+//    implementation(project(":feature:contactme"))
+
+    implementation(project(":core:designsystem"))
+    implementation(project(":core:common"))
+    implementation(project(":core:data"))
+    implementation(project(":core:model"))
+//    implementation(project(":core:datastore"))
+
+    androidTestImplementation(project(":core:designsystem"))
+//    androidTestImplementation(project(":core:datastore-test"))
+    androidTestImplementation(project(":core:testing"))
+    androidTestImplementation(libs.androidx.navigation.testing)
+    androidTestImplementation(libs.accompanist.testharness)
+//    testImplementation(project(":core:datastore-test"))
+    testImplementation(project(":core:testing"))
+    testImplementation(libs.androidx.navigation.testing)
+    testImplementation(libs.accompanist.testharness)
+    debugImplementation(project(":ui-test-hilt-manifest"))
+    debugImplementation(libs.androidx.compose.ui.testManifest)
+
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.activity.compose)
+
+    // LifeCycle
+    implementation(libs.androidx.lifecycle.livedata.ktx)
+    implementation(libs.androidx.lifecycle.runtimeCompose)
+
+    // Navigation
+    implementation(libs.androidx.hilt.navigation.compose)
+    implementation(libs.androidx.navigation.compose)
+
+    // Coroutines
+    implementation(libs.kotlinx.coroutines.android)
+
+    // Splashscreen
+    implementation(libs.androidx.core.splashscreen)
 
-    implementation("androidx.core:core-ktx:1.12.0")
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2")
-    implementation("androidx.activity:activity-compose:1.8.1")
-    implementation(platform("androidx.compose:compose-bom:2023.08.00"))
-    implementation("androidx.compose.ui:ui")
-    implementation("androidx.compose.ui:ui-graphics")
-    implementation("androidx.compose.ui:ui-tooling-preview")
-    implementation("androidx.compose.material3:material3")
-    testImplementation("junit:junit:4.13.2")
-    androidTestImplementation("androidx.test.ext:junit:1.1.5")
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
-    androidTestImplementation(platform("androidx.compose:compose-bom:2023.08.00"))
-    androidTestImplementation("androidx.compose.ui:ui-test-junit4")
-    debugImplementation("androidx.compose.ui:ui-tooling")
-    debugImplementation("androidx.compose.ui:ui-test-manifest")
+    // Timber
+    implementation(libs.timber)
 }
\ No newline at end of file
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 481bb43..e89647e 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -1,6 +1,6 @@
 # Add project specific ProGuard rules here.
 # You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
+# proguardFiles setting in build.gradle.kts.
 #
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html
@@ -18,4 +18,24 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
\ No newline at end of file
+#-renamesourcefileattribute SourceFile
+
+-dontwarn org.bouncycastle.jsse.BCSSLParameters
+-dontwarn org.bouncycastle.jsse.BCSSLSocket
+-dontwarn org.bouncycastle.jsse.provider.BouncyCastleJsseProvider
+-dontwarn org.conscrypt.Conscrypt$Version
+-dontwarn org.conscrypt.Conscrypt
+-dontwarn org.conscrypt.ConscryptHostnameVerifier
+-dontwarn org.openjsse.javax.net.ssl.SSLParameters
+-dontwarn org.openjsse.javax.net.ssl.SSLSocket
+-dontwarn org.openjsse.net.ssl.OpenJSSE
+
+# Fix for Retrofit issue https://github.com/square/retrofit/issues/3751
+# Keep generic signature of Call, Response (R8 full mode strips signatures from non-kept items).
+-keep,allowobfuscation,allowshrinking interface retrofit2.Call
+-keep,allowobfuscation,allowshrinking class retrofit2.Response
+
+# With R8 full mode generic signatures are stripped for classes that are not
+# kept. Suspend functions are wrapped in continuations where the type argument
+# is used.
+-keep,allowobfuscation,allowshrinking class kotlin.coroutines.Continuation
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d3d9fc9..0a4ddd4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,26 +2,33 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
     <application
+        android:name=".PqApplication"
         android:allowBackup="true"
+        android:enableOnBackInvokedCallback="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.PicQuest"
+        android:theme="@style/Theme.Pq.Splash"
         tools:targetApi="31">
         <activity
             android:name=".MainActivity"
-            android:exported="true"
-            android:label="@string/app_name"
-            android:theme="@style/Theme.PicQuest">
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+
+            <meta-data
+                android:name="android.app.lib_name"
+                android:value="" />
         </activity>
     </application>
 
diff --git a/app/src/main/java/com/wei/picquest/MainActivity.kt b/app/src/main/java/com/wei/picquest/MainActivity.kt
index 24fe677..ce186b5 100644
--- a/app/src/main/java/com/wei/picquest/MainActivity.kt
+++ b/app/src/main/java/com/wei/picquest/MainActivity.kt
@@ -10,19 +10,19 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
-import com.wei.picquest.ui.theme.PicQuestTheme
+import com.wei.picquest.core.designsystem.theme.PqTheme
 
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContent {
-            PicQuestTheme {
+            PqTheme {
                 // A surface container using the 'background' color from the theme
                 Surface(
                     modifier = Modifier.fillMaxSize(),
                     color = MaterialTheme.colorScheme.background,
                 ) {
-                    Greeting("Android")
+                    Greeting("PicQuest")
                 }
             }
         }
@@ -40,7 +40,7 @@ fun Greeting(name: String, modifier: Modifier = Modifier) {
 @Preview(showBackground = true)
 @Composable
 fun GreetingPreview() {
-    PicQuestTheme {
-        Greeting("Android")
+    PqTheme {
+        Greeting("PicQuest")
     }
 }
diff --git a/app/src/main/java/com/wei/picquest/PqApplication.kt b/app/src/main/java/com/wei/picquest/PqApplication.kt
new file mode 100644
index 0000000..e07879f
--- /dev/null
+++ b/app/src/main/java/com/wei/picquest/PqApplication.kt
@@ -0,0 +1,17 @@
+package com.wei.picquest
+
+import android.app.Application
+import dagger.hilt.android.HiltAndroidApp
+import timber.log.Timber
+
+@HiltAndroidApp
+class PqApplication : Application() {
+
+    override fun onCreate() {
+        super.onCreate()
+
+        if (BuildConfig.DEBUG) {
+            Timber.plant(Timber.DebugTree())
+        }
+    }
+}
diff --git a/app/src/main/java/com/wei/picquest/ui/theme/Color.kt b/app/src/main/java/com/wei/picquest/ui/theme/Color.kt
deleted file mode 100644
index c87d8ae..0000000
--- a/app/src/main/java/com/wei/picquest/ui/theme/Color.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.wei.picquest.ui.theme
-
-import androidx.compose.ui.graphics.Color
-
-val Purple80 = Color(0xFFD0BCFF)
-val PurpleGrey80 = Color(0xFFCCC2DC)
-val Pink80 = Color(0xFFEFB8C8)
-
-val Purple40 = Color(0xFF6650a4)
-val PurpleGrey40 = Color(0xFF625b71)
-val Pink40 = Color(0xFF7D5260)
diff --git a/app/src/main/java/com/wei/picquest/ui/theme/Theme.kt b/app/src/main/java/com/wei/picquest/ui/theme/Theme.kt
deleted file mode 100644
index b3e2be8..0000000
--- a/app/src/main/java/com/wei/picquest/ui/theme/Theme.kt
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.wei.picquest.ui.theme
-
-import android.app.Activity
-import android.os.Build
-import androidx.compose.foundation.isSystemInDarkTheme
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.darkColorScheme
-import androidx.compose.material3.dynamicDarkColorScheme
-import androidx.compose.material3.dynamicLightColorScheme
-import androidx.compose.material3.lightColorScheme
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.SideEffect
-import androidx.compose.ui.graphics.toArgb
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalView
-import androidx.core.view.WindowCompat
-
-private val DarkColorScheme = darkColorScheme(
-    primary = Purple80,
-    secondary = PurpleGrey80,
-    tertiary = Pink80,
-)
-
-private val LightColorScheme = lightColorScheme(
-    primary = Purple40,
-    secondary = PurpleGrey40,
-    tertiary = Pink40,
-
-    /* Other default colors to override
-    background = Color(0xFFFFFBFE),
-    surface = Color(0xFFFFFBFE),
-    onPrimary = Color.White,
-    onSecondary = Color.White,
-    onTertiary = Color.White,
-    onBackground = Color(0xFF1C1B1F),
-    onSurface = Color(0xFF1C1B1F),
-    */
-)
-
-@Composable
-fun PicQuestTheme(
-    darkTheme: Boolean = isSystemInDarkTheme(),
-    // Dynamic color is available on Android 12+
-    dynamicColor: Boolean = true,
-    content: @Composable () -> Unit,
-) {
-    val colorScheme = when {
-        dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
-            val context = LocalContext.current
-            if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
-        }
-
-        darkTheme -> DarkColorScheme
-        else -> LightColorScheme
-    }
-    val view = LocalView.current
-    if (!view.isInEditMode) {
-        SideEffect {
-            val window = (view.context as Activity).window
-            window.statusBarColor = colorScheme.primary.toArgb()
-            WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = darkTheme
-        }
-    }
-
-    MaterialTheme(
-        colorScheme = colorScheme,
-        typography = Typography,
-        content = content,
-    )
-}
diff --git a/app/src/main/java/com/wei/picquest/ui/theme/Type.kt b/app/src/main/java/com/wei/picquest/ui/theme/Type.kt
deleted file mode 100644
index e0ecbb4..0000000
--- a/app/src/main/java/com/wei/picquest/ui/theme/Type.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.wei.picquest.ui.theme
-
-import androidx.compose.material3.Typography
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.FontFamily
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.sp
-
-// Set of Material typography styles to start with
-val Typography = Typography(
-    bodyLarge = TextStyle(
-        fontFamily = FontFamily.Default,
-        fontWeight = FontWeight.Normal,
-        fontSize = 16.sp,
-        lineHeight = 24.sp,
-        letterSpacing = 0.5.sp,
-    ),
-    /* Other default text styles to override
-    titleLarge = TextStyle(
-        fontFamily = FontFamily.Default,
-        fontWeight = FontWeight.Normal,
-        fontSize = 22.sp,
-        lineHeight = 28.sp,
-        letterSpacing = 0.sp
-    ),
-    labelSmall = TextStyle(
-        fontFamily = FontFamily.Default,
-        fontWeight = FontWeight.Medium,
-        fontSize = 11.sp,
-        lineHeight = 16.sp,
-        letterSpacing = 0.5.sp
-    )
-    */
-)
diff --git a/app/src/main/res/drawable/ic_splash.xml b/app/src/main/res/drawable/ic_splash.xml
new file mode 100644
index 0000000..2b068d1
--- /dev/null
+++ b/app/src/main/res/drawable/ic_splash.xml
@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="85.84757"
+                android:endY="92.4963"
+                android:startX="42.9492"
+                android:startY="49.59793"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
new file mode 100644
index 0000000..3e8d70b
--- /dev/null
+++ b/app/src/main/res/values-night/colors.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background_tint">#FCFCFC</color>
+    <color name="ic_launcher_foreground_tint">#000000</color>
+</resources>
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
new file mode 100644
index 0000000..5e83fb3
--- /dev/null
+++ b/app/src/main/res/values-night/themes.xml
@@ -0,0 +1,10 @@
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+    <style name="NightAdjusted.Theme.Pq" parent="android:Theme.Material.NoActionBar" />
+
+    <style name="NightAdjusted.Theme.Splash" parent="Theme.SplashScreen">
+        <item name="android:windowLightStatusBar" tools:targetApi="23">false</item>
+        <item name="android:windowLightNavigationBar" tools:targetApi="27">false</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index f8c6127..be71fcc 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="purple_200">#FFBB86FC</color>
-    <color name="purple_500">#FF6200EE</color>
-    <color name="purple_700">#FF3700B3</color>
-    <color name="teal_200">#FF03DAC5</color>
-    <color name="teal_700">#FF018786</color>
-    <color name="black">#FF000000</color>
-    <color name="white">#FFFFFFFF</color>
-</resources>
\ No newline at end of file
+    <!-- Status bar -->
+    <color name="black30">#4D000000</color>
+
+    <color name="ic_launcher_background_tint">#000000</color>
+    <color name="ic_launcher_foreground_tint">#FCFCFC</color>
+</resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index d8c2e94..58046e0 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,5 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+    <!-- Allows us to override night specific attributes in the
+         values-night folder. -->
+    <style name="NightAdjusted.Theme.Pq" parent="android:Theme.Material.Light.NoActionBar" />
+
+    <!-- The final theme we use -->
+    <style name="Theme.Pq" parent="NightAdjusted.Theme.Pq" />
+
+    <style name="NightAdjusted.Theme.Splash" parent="Theme.SplashScreen">
+        <item name="android:windowLightStatusBar" tools:targetApi="23">true</item>
+        <item name="android:windowLightNavigationBar" tools:targetApi="27">true</item>
+    </style>
+
+    <style name="Theme.Pq.Splash" parent="NightAdjusted.Theme.Splash">
+        <item name="windowSplashScreenAnimatedIcon">@drawable/ic_splash</item>
+        <item name="postSplashScreenTheme">@style/Theme.Pq</item>
+    </style>
 
-    <style name="Theme.PicQuest" parent="android:Theme.Material.Light.NoActionBar" />
 </resources>
\ No newline at end of file
diff --git a/build-logic/README.md b/build-logic/README.md
new file mode 100644
index 0000000..a0deaf8
--- /dev/null
+++ b/build-logic/README.md
@@ -0,0 +1,38 @@
+# Convention Plugins
+
+The `build-logic` folder defines project-specific convention plugins, used to keep a single
+source of truth for common module configurations.
+
+This approach is heavily based on
+[https://developer.squareup.com/blog/herding-elephants/](https://developer.squareup.com/blog/herding-elephants/)
+and
+[https://github.com/jjohannes/idiomatic-gradle](https://github.com/jjohannes/idiomatic-gradle).
+
+By setting up convention plugins in `build-logic`, we can avoid duplicated build script setup,
+messy `subproject` configurations, without the pitfalls of the `buildSrc` directory.
+
+`build-logic` is an included build, as configured in the root
+[`settings.gradle.kts`](../settings.gradle.kts).
+
+Inside `build-logic` is a `convention` module, which defines a set of plugins that all normal
+modules can use to configure themselves.
+
+`build-logic` also includes a set of `Kotlin` files used to share logic between plugins themselves,
+which is most useful for configuring Android components (libraries vs applications) with shared
+code.
+
+These plugins are *additive* and *composable*, and try to only accomplish a single responsibility.
+Modules can then pick and choose the configurations they need.
+If there is one-off logic for a module without shared code, it's preferable to define that directly
+in the module's `build.gradle`, as opposed to creating a convention plugin with module-specific
+setup.
+
+Current list of convention plugins:
+
+- [`pq.android.application`](convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt),
+  [`pq.android.library`](convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt),
+  [`pq.android.test`](convention/src/main/kotlin/AndroidTestConventionPlugin.kt):
+  Configures common Android and Kotlin options.
+- [`pq.android.application.compose`](convention/src/main/kotlin/AndroidApplicationComposeConventionPlugin.kt),
+  [`pq.android.library.compose`](convention/src/main/kotlin/AndroidLibraryComposeConventionPlugin.kt):
+  Configures Jetpack Compose options
\ No newline at end of file
diff --git a/build-logic/convention/.gitignore b/build-logic/convention/.gitignore
new file mode 100644
index 0000000..42afabf
--- /dev/null
+++ b/build-logic/convention/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/build-logic/convention/build.gradle.kts b/build-logic/convention/build.gradle.kts
new file mode 100644
index 0000000..d41674d
--- /dev/null
+++ b/build-logic/convention/build.gradle.kts
@@ -0,0 +1,66 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+plugins {
+    `kotlin-dsl`
+}
+
+group = "com.wei.picquest.buildlogic"
+
+// Configure the build-logic plugins to target JDK 17
+// This matches the JDK used to build the project, and is not related to what is running on device.
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
+tasks.withType<KotlinCompile>().configureEach {
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_17.toString()
+    }
+}
+
+dependencies {
+    compileOnly(libs.android.gradlePlugin)
+    compileOnly(libs.kotlin.gradlePlugin)
+    compileOnly(libs.ksp.gradlePlugin)
+}
+
+gradlePlugin {
+    plugins {
+        register("androidApplicationCompose") {
+            id = "pq.android.application.compose"
+            implementationClass = "AndroidApplicationComposeConventionPlugin"
+        }
+        register("androidApplication") {
+            id = "pq.android.application"
+            implementationClass = "AndroidApplicationConventionPlugin"
+        }
+        register("androidLibraryCompose") {
+            id = "pq.android.library.compose"
+            implementationClass = "AndroidLibraryComposeConventionPlugin"
+        }
+        register("androidLibrary") {
+            id = "pq.android.library"
+            implementationClass = "AndroidLibraryConventionPlugin"
+        }
+        register("androidFeature") {
+            id = "pq.android.feature"
+            implementationClass = "AndroidFeatureConventionPlugin"
+        }
+        register("androidTest") {
+            id = "pq.android.test"
+            implementationClass = "AndroidTestConventionPlugin"
+        }
+        register("androidHilt") {
+            id = "pq.android.hilt"
+            implementationClass = "AndroidHiltConventionPlugin"
+        }
+        register("androidFlavors") {
+            id = "pq.android.application.flavors"
+            implementationClass = "AndroidApplicationFlavorsConventionPlugin"
+        }
+        register("jvmLibrary") {
+            id = "pq.jvm.library"
+            implementationClass = "JvmLibraryConventionPlugin"
+        }
+    }
+}
diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationComposeConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationComposeConventionPlugin.kt
new file mode 100644
index 0000000..273f21c
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/AndroidApplicationComposeConventionPlugin.kt
@@ -0,0 +1,19 @@
+import com.android.build.api.dsl.ApplicationExtension
+import com.wei.picquest.configureAndroidCompose
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.getByType
+
+class AndroidApplicationComposeConventionPlugin : Plugin<Project> {
+    override fun apply(target: Project) {
+        with(target) {
+            pluginManager.apply("com.android.application")
+            // Screenshot Tests
+            pluginManager.apply("io.github.takahirom.roborazzi")
+
+            val extension = extensions.getByType<ApplicationExtension>()
+            configureAndroidCompose(extension)
+        }
+    }
+
+}
diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt
new file mode 100644
index 0000000..61a3896
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt
@@ -0,0 +1,29 @@
+import com.android.build.api.dsl.ApplicationExtension
+import com.wei.picquest.configureGradleManagedDevices
+import com.android.build.api.variant.ApplicationAndroidComponentsExtension
+import com.wei.picquest.configureKotlinAndroid
+import com.wei.picquest.configurePrintApksTask
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.configure
+
+class AndroidApplicationConventionPlugin : Plugin<Project> {
+    override fun apply(target: Project) {
+        with(target) {
+            with(pluginManager) {
+                apply("com.android.application")
+                apply("org.jetbrains.kotlin.android")
+            }
+
+            extensions.configure<ApplicationExtension> {
+                configureKotlinAndroid(this)
+                defaultConfig.targetSdk = 34
+                configureGradleManagedDevices(this)
+            }
+            extensions.configure<ApplicationAndroidComponentsExtension> {
+                configurePrintApksTask(this)
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationFlavorsConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationFlavorsConventionPlugin.kt
new file mode 100644
index 0000000..e4cddc9
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/AndroidApplicationFlavorsConventionPlugin.kt
@@ -0,0 +1,15 @@
+import com.android.build.api.dsl.ApplicationExtension
+import com.wei.picquest.configureFlavors
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.configure
+
+class AndroidApplicationFlavorsConventionPlugin : Plugin<Project> {
+    override fun apply(target: Project) {
+        with(target) {
+            extensions.configure<ApplicationExtension> {
+                configureFlavors(this)
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt
new file mode 100644
index 0000000..c652ee5
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt
@@ -0,0 +1,52 @@
+import com.android.build.gradle.LibraryExtension
+import com.wei.picquest.configureGradleManagedDevices
+import com.wei.picquest.libs
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.dependencies
+import org.gradle.kotlin.dsl.kotlin
+
+class AndroidFeatureConventionPlugin : Plugin<Project> {
+    override fun apply(target: Project) {
+        with(target) {
+            pluginManager.apply {
+                apply("pq.android.library")
+                apply("pq.android.hilt")
+                apply("androidx.navigation.safeargs.kotlin")
+            }
+            extensions.configure<LibraryExtension> {
+                defaultConfig {
+                    testInstrumentationRunner =
+                        "com.wei.picquest.core.testing.AtTestRunner"
+                }
+                configureGradleManagedDevices(this)
+            }
+
+            dependencies {
+                add("implementation", project(":core:network"))
+                add("implementation", project(":core:common"))
+                add("implementation", project(":core:designsystem"))
+                add("implementation", project(":core:data"))
+                add("implementation", project(":core:model"))
+                add("implementation", project(":core:domain"))
+
+                add("testImplementation", kotlin("test"))
+                add("testImplementation", project(":core:testing"))
+                add("androidTestImplementation", kotlin("test"))
+                add("androidTestImplementation", project(":core:testing"))
+                add("androidTestImplementation", project(":core:designsystem"))
+
+                add("implementation", libs.findLibrary("coil.kt").get())
+                add("implementation", libs.findLibrary("coil.kt.compose").get())
+                add("implementation", libs.findLibrary("coil.kt.svg").get())
+
+                add("implementation", libs.findLibrary("androidx.hilt.navigation.compose").get())
+                add("implementation", libs.findLibrary("androidx.lifecycle.runtimeCompose").get())
+                add("implementation", libs.findLibrary("androidx.lifecycle.viewModelCompose").get())
+
+                add("implementation", libs.findLibrary("kotlinx.coroutines.android").get())
+            }
+        }
+    }
+}
diff --git a/build-logic/convention/src/main/kotlin/AndroidHiltConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidHiltConventionPlugin.kt
new file mode 100644
index 0000000..9def536
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/AndroidHiltConventionPlugin.kt
@@ -0,0 +1,26 @@
+import com.wei.picquest.libs
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.dependencies
+
+class AndroidHiltConventionPlugin : Plugin<Project> {
+    override fun apply(target: Project) {
+        with(target) {
+            with(pluginManager) {
+                apply("dagger.hilt.android.plugin")
+                // KAPT must go last to avoid build warnings.
+                // See: https://stackoverflow.com/questions/70550883/warning-the-following-options-were-not-recognized-by-any-processor-dagger-f
+                apply("org.jetbrains.kotlin.kapt")
+            }
+
+            dependencies {
+                "implementation"(libs.findLibrary("hilt.android").get())
+                "kapt"(libs.findLibrary("hilt.compiler").get())
+                "kaptAndroidTest"(libs.findLibrary("hilt.compiler").get())
+                "kaptTest"(libs.findLibrary("hilt.compiler").get())
+            }
+
+        }
+    }
+
+}
diff --git a/build-logic/convention/src/main/kotlin/AndroidLibraryComposeConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLibraryComposeConventionPlugin.kt
new file mode 100644
index 0000000..cb2da40
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/AndroidLibraryComposeConventionPlugin.kt
@@ -0,0 +1,19 @@
+import com.android.build.gradle.LibraryExtension
+import com.wei.picquest.configureAndroidCompose
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.getByType
+
+class AndroidLibraryComposeConventionPlugin : Plugin<Project> {
+    override fun apply(target: Project) {
+        with(target) {
+            pluginManager.apply("com.android.library")
+            // Screenshot Tests
+            pluginManager.apply("io.github.takahirom.roborazzi")
+
+            val extension = extensions.getByType<LibraryExtension>()
+            configureAndroidCompose(extension)
+        }
+    }
+
+}
diff --git a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
new file mode 100644
index 0000000..9cf2027
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
@@ -0,0 +1,44 @@
+import com.android.build.api.variant.LibraryAndroidComponentsExtension
+import com.android.build.gradle.LibraryExtension
+import com.wei.picquest.configureFlavors
+import com.wei.picquest.configureGradleManagedDevices
+import com.wei.picquest.configureKotlinAndroid
+import com.wei.picquest.configurePrintApksTask
+import com.wei.picquest.disableUnnecessaryAndroidTests
+import com.wei.picquest.libs
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.dependencies
+import org.gradle.kotlin.dsl.kotlin
+
+class AndroidLibraryConventionPlugin : Plugin<Project> {
+    override fun apply(target: Project) {
+        with(target) {
+            with(pluginManager) {
+                apply("com.android.library")
+                apply("org.jetbrains.kotlin.android")
+            }
+
+            extensions.configure<LibraryExtension> {
+                configureKotlinAndroid(this)
+                defaultConfig.targetSdk = 34
+                configureFlavors(this)
+                configureGradleManagedDevices(this)
+            }
+            extensions.configure<LibraryAndroidComponentsExtension> {
+                configurePrintApksTask(this)
+                disableUnnecessaryAndroidTests(target)
+            }
+            dependencies {
+                add("testImplementation", kotlin("test"))
+                add("testImplementation", project(":core:testing"))
+                add("androidTestImplementation", kotlin("test"))
+                add("androidTestImplementation", project(":core:testing"))
+
+                // Timber
+                add("implementation", libs.findLibrary("timber").get())
+            }
+        }
+    }
+}
diff --git a/build-logic/convention/src/main/kotlin/AndroidTestConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidTestConventionPlugin.kt
new file mode 100644
index 0000000..9baf003
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/AndroidTestConventionPlugin.kt
@@ -0,0 +1,24 @@
+import com.android.build.gradle.TestExtension
+import com.wei.picquest.configureGradleManagedDevices
+import com.wei.picquest.configureKotlinAndroid
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.configure
+
+class AndroidTestConventionPlugin : Plugin<Project> {
+    override fun apply(target: Project) {
+        with(target) {
+            with(pluginManager) {
+                apply("com.android.test")
+                apply("org.jetbrains.kotlin.android")
+            }
+
+            extensions.configure<TestExtension> {
+                configureKotlinAndroid(this)
+                defaultConfig.targetSdk = 34
+                configureGradleManagedDevices(this)
+            }
+        }
+    }
+
+}
diff --git a/build-logic/convention/src/main/kotlin/JvmLibraryConventionPlugin.kt b/build-logic/convention/src/main/kotlin/JvmLibraryConventionPlugin.kt
new file mode 100644
index 0000000..43fdffd
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/JvmLibraryConventionPlugin.kt
@@ -0,0 +1,14 @@
+import com.wei.picquest.configureKotlinJvm
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+
+class JvmLibraryConventionPlugin : Plugin<Project> {
+    override fun apply(target: Project) {
+        with(target) {
+            with(pluginManager) {
+                apply("org.jetbrains.kotlin.jvm")
+            }
+            configureKotlinJvm()
+        }
+    }
+}
diff --git a/build-logic/convention/src/main/kotlin/com/wei/picquest/AndroidCompose.kt b/build-logic/convention/src/main/kotlin/com/wei/picquest/AndroidCompose.kt
new file mode 100644
index 0000000..4939afa
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/com/wei/picquest/AndroidCompose.kt
@@ -0,0 +1,74 @@
+package com.wei.picquest
+
+import com.android.build.api.dsl.CommonExtension
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.dependencies
+import org.gradle.kotlin.dsl.withType
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+/**
+ * Configure Compose-specific options
+ */
+internal fun Project.configureAndroidCompose(
+    commonExtension: CommonExtension<*, *, *, *, *>,
+) {
+    commonExtension.apply {
+        buildFeatures {
+            compose = true
+        }
+
+        composeOptions {
+            kotlinCompilerExtensionVersion = libs.findVersion("androidxComposeCompiler").get().toString()
+        }
+
+        dependencies {
+            val bom = libs.findLibrary("androidx-compose-bom").get()
+            add("implementation", platform(bom))
+            add("androidTestImplementation", platform(bom))
+            // Add ComponentActivity to debug manifest
+            add("debugImplementation", libs.findLibrary("androidx.compose.ui.testManifest").get())
+            // Screenshot Tests on JVM
+            add("testImplementation", libs.findLibrary("robolectric").get())
+            add("testImplementation", libs.findLibrary("roborazzi").get())
+        }
+
+        testOptions {
+            unitTests {
+                // For Robolectric
+                isIncludeAndroidResources = true
+            }
+        }
+    }
+
+    tasks.withType<KotlinCompile>().configureEach {
+        kotlinOptions {
+            freeCompilerArgs = freeCompilerArgs + buildComposeMetricsParameters()
+        }
+    }
+}
+
+private fun Project.buildComposeMetricsParameters(): List<String> {
+    val metricParameters = mutableListOf<String>()
+    val enableMetricsProvider = project.providers.gradleProperty("enableComposeCompilerMetrics")
+    val relativePath = projectDir.relativeTo(rootDir)
+
+    val enableMetrics = (enableMetricsProvider.orNull == "true")
+    if (enableMetrics) {
+        val metricsFolder = rootProject.buildDir.resolve("compose-metrics").resolve(relativePath)
+        metricParameters.add("-P")
+        metricParameters.add(
+            "plugin:androidx.compose.compiler.plugins.kotlin:metricsDestination=" + metricsFolder.absolutePath
+        )
+    }
+
+    val enableReportsProvider = project.providers.gradleProperty("enableComposeCompilerReports")
+    val enableReports = (enableReportsProvider.orNull == "true")
+    if (enableReports) {
+        val reportsFolder = rootProject.buildDir.resolve("compose-reports").resolve(relativePath)
+        metricParameters.add("-P")
+        metricParameters.add(
+            "plugin:androidx.compose.compiler.plugins.kotlin:reportsDestination=" + reportsFolder.absolutePath
+        )
+    }
+    return metricParameters.toList()
+}
diff --git a/build-logic/convention/src/main/kotlin/com/wei/picquest/AndroidInstrumentedTests.kt b/build-logic/convention/src/main/kotlin/com/wei/picquest/AndroidInstrumentedTests.kt
new file mode 100644
index 0000000..fbe1a4b
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/com/wei/picquest/AndroidInstrumentedTests.kt
@@ -0,0 +1,19 @@
+package com.wei.picquest
+
+import com.android.build.api.variant.LibraryAndroidComponentsExtension
+import org.gradle.api.Project
+
+/**
+ * Disable unnecessary Android instrumented tests for the [project] if there is no `androidTest` folder.
+ * Otherwise, these projects would be compiled, packaged, installed and ran only to end-up with the following message:
+ *
+ * > Starting 0 tests on AVD
+ *
+ * Note: this could be improved by checking other potential sourceSets based on buildTypes and flavors.
+ */
+internal fun LibraryAndroidComponentsExtension.disableUnnecessaryAndroidTests(
+    project: Project,
+) = beforeVariants {
+    it.enableAndroidTest = it.enableAndroidTest
+        && project.projectDir.resolve("src/androidTest").exists()
+}
diff --git a/build-logic/convention/src/main/kotlin/com/wei/picquest/GradleManagedDevices.kt b/build-logic/convention/src/main/kotlin/com/wei/picquest/GradleManagedDevices.kt
new file mode 100644
index 0000000..dd326f4
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/com/wei/picquest/GradleManagedDevices.kt
@@ -0,0 +1,54 @@
+package com.wei.picquest
+
+import com.android.build.api.dsl.CommonExtension
+import com.android.build.api.dsl.ManagedVirtualDevice
+import org.gradle.kotlin.dsl.get
+import org.gradle.kotlin.dsl.invoke
+
+/**
+ * Configure project for Gradle managed devices
+ */
+internal fun configureGradleManagedDevices(
+    commonExtension: CommonExtension<*, *, *, *, *>,
+) {
+    val pixel4 = DeviceConfig("Pixel 4", 30, "aosp-atd")
+    val pixel6 = DeviceConfig("Pixel 6", 31, "aosp")
+    val pixelC = DeviceConfig("Pixel C", 30, "aosp-atd")
+
+    val allDevices = listOf(pixel4, pixel6, pixelC)
+    val ciDevices = listOf(pixel4, pixelC)
+
+    commonExtension.testOptions {
+        managedDevices {
+            devices {
+                allDevices.forEach { deviceConfig ->
+                    maybeCreate(deviceConfig.taskName, ManagedVirtualDevice::class.java).apply {
+                        device = deviceConfig.device
+                        apiLevel = deviceConfig.apiLevel
+                        systemImageSource = deviceConfig.systemImageSource
+                    }
+                }
+            }
+            groups {
+                maybeCreate("ci").apply {
+                    ciDevices.forEach { deviceConfig ->
+                        targetDevices.add(devices[deviceConfig.taskName])
+                    }
+                }
+            }
+        }
+    }
+}
+
+private data class DeviceConfig(
+    val device: String,
+    val apiLevel: Int,
+    val systemImageSource: String,
+) {
+    val taskName = buildString {
+        append(device.lowercase().replace(" ", ""))
+        append("api")
+        append(apiLevel.toString())
+        append(systemImageSource.replace("-", ""))
+    }
+}
diff --git a/build-logic/convention/src/main/kotlin/com/wei/picquest/KotlinAndroid.kt b/build-logic/convention/src/main/kotlin/com/wei/picquest/KotlinAndroid.kt
new file mode 100644
index 0000000..ef0a2f1
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/com/wei/picquest/KotlinAndroid.kt
@@ -0,0 +1,73 @@
+package com.wei.picquest
+
+import com.android.build.api.dsl.CommonExtension
+import org.gradle.api.JavaVersion
+import org.gradle.api.Project
+import org.gradle.api.plugins.JavaPluginExtension
+import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.dependencies
+import org.gradle.kotlin.dsl.provideDelegate
+import org.gradle.kotlin.dsl.withType
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+/**
+ * Configure base Kotlin with Android options
+ */
+internal fun Project.configureKotlinAndroid(
+    commonExtension: CommonExtension<*, *, *, *, *>,
+) {
+    commonExtension.apply {
+        compileSdk = 34
+
+        defaultConfig {
+            minSdk = 21
+        }
+
+        compileOptions {
+            sourceCompatibility = JavaVersion.VERSION_17
+            targetCompatibility = JavaVersion.VERSION_17
+            isCoreLibraryDesugaringEnabled = true
+        }
+    }
+
+    configureKotlin()
+
+    dependencies {
+        add("coreLibraryDesugaring", libs.findLibrary("android.desugarJdkLibs").get())
+    }
+}
+
+/**
+ * Configure base Kotlin options for JVM (non-Android)
+ */
+internal fun Project.configureKotlinJvm() {
+    extensions.configure<JavaPluginExtension> {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
+    configureKotlin()
+}
+
+/**
+ * Configure base Kotlin options
+ */
+private fun Project.configureKotlin() {
+    // Use withType to workaround https://youtrack.jetbrains.com/issue/KT-55947
+    tasks.withType<KotlinCompile>().configureEach {
+        kotlinOptions {
+            // Set JVM target to 17
+            jvmTarget = JavaVersion.VERSION_17.toString()
+            // Treat all Kotlin warnings as errors (disabled by default)
+            // Override by setting warningsAsErrors=true in your ~/.gradle/gradle.properties
+            val warningsAsErrors: String? by project
+            allWarningsAsErrors = warningsAsErrors.toBoolean()
+            freeCompilerArgs = freeCompilerArgs + listOf(
+                "-opt-in=kotlin.RequiresOptIn",
+                // Enable experimental coroutines APIs, including Flow
+                "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
+                "-opt-in=kotlinx.coroutines.FlowPreview",
+            )
+        }
+    }
+}
diff --git a/build-logic/convention/src/main/kotlin/com/wei/picquest/PqBuildType.kt b/build-logic/convention/src/main/kotlin/com/wei/picquest/PqBuildType.kt
new file mode 100644
index 0000000..aa9604f
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/com/wei/picquest/PqBuildType.kt
@@ -0,0 +1,9 @@
+package com.wei.picquest
+
+/**
+ * This is shared between :app module to provide configurations type safety.
+ */
+enum class PqBuildType(val applicationIdSuffix: String? = null) {
+    DEBUG(".debug"),
+    RELEASE
+}
diff --git a/build-logic/convention/src/main/kotlin/com/wei/picquest/PqFlavor.kt b/build-logic/convention/src/main/kotlin/com/wei/picquest/PqFlavor.kt
new file mode 100644
index 0000000..0d0d7b0
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/com/wei/picquest/PqFlavor.kt
@@ -0,0 +1,42 @@
+package com.wei.picquest
+
+import com.android.build.api.dsl.ApplicationExtension
+import com.android.build.api.dsl.ApplicationProductFlavor
+import com.android.build.api.dsl.CommonExtension
+import com.android.build.api.dsl.ProductFlavor
+
+@Suppress("EnumEntryName")
+enum class FlavorDimension {
+    contentType
+}
+
+// The content for the app can either come from local static data which is useful for demo
+// purposes, or from a production backend server which supplies up-to-date, real content.
+// These two product flavors reflect this behaviour.
+@Suppress("EnumEntryName")
+enum class PqFlavor(val dimension: FlavorDimension, val applicationIdSuffix: String? = null) {
+    demo(FlavorDimension.contentType, applicationIdSuffix = ".demo"),
+    prod(FlavorDimension.contentType)
+}
+
+fun configureFlavors(
+    commonExtension: CommonExtension<*, *, *, *, *>,
+    flavorConfigurationBlock: ProductFlavor.(flavor: PqFlavor) -> Unit = {}
+) {
+    commonExtension.apply {
+        flavorDimensions += FlavorDimension.contentType.name
+        productFlavors {
+            PqFlavor.values().forEach {
+                create(it.name) {
+                    dimension = it.dimension.name
+                    flavorConfigurationBlock(this, it)
+                    if (this@apply is ApplicationExtension && this is ApplicationProductFlavor) {
+                        if (it.applicationIdSuffix != null) {
+                            applicationIdSuffix = it.applicationIdSuffix
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/build-logic/convention/src/main/kotlin/com/wei/picquest/PrintTestApks.kt b/build-logic/convention/src/main/kotlin/com/wei/picquest/PrintTestApks.kt
new file mode 100644
index 0000000..76ec407
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/com/wei/picquest/PrintTestApks.kt
@@ -0,0 +1,82 @@
+package com.wei.picquest
+
+import com.android.build.api.artifact.SingleArtifact
+import com.android.build.api.variant.AndroidComponentsExtension
+import com.android.build.api.variant.BuiltArtifactsLoader
+import com.android.build.api.variant.HasAndroidTest
+import org.gradle.api.DefaultTask
+import org.gradle.api.Project
+import org.gradle.api.file.Directory
+import org.gradle.api.file.DirectoryProperty
+import org.gradle.api.provider.ListProperty
+import org.gradle.api.provider.Property
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.InputDirectory
+import org.gradle.api.tasks.InputFiles
+import org.gradle.api.tasks.Internal
+import org.gradle.api.tasks.TaskAction
+import java.io.File
+
+internal fun Project.configurePrintApksTask(extension: AndroidComponentsExtension<*, *, *>) {
+    extension.onVariants { variant ->
+        if (variant is HasAndroidTest) {
+            val loader = variant.artifacts.getBuiltArtifactsLoader()
+            val artifact = variant.androidTest?.artifacts?.get(SingleArtifact.APK)
+            val javaSources = variant.androidTest?.sources?.java?.all
+            val kotlinSources = variant.androidTest?.sources?.kotlin?.all
+
+            val testSources = if (javaSources != null && kotlinSources != null) {
+                javaSources.zip(kotlinSources) { javaDirs, kotlinDirs ->
+                    javaDirs + kotlinDirs
+                }
+            } else javaSources ?: kotlinSources
+
+            if (artifact != null && testSources != null) {
+                tasks.register(
+                    "${variant.name}PrintTestApk",
+                    PrintApkLocationTask::class.java
+                ) {
+                    apkFolder.set(artifact)
+                    builtArtifactsLoader.set(loader)
+                    variantName.set(variant.name)
+                    sources.set(testSources)
+                }
+            }
+        }
+    }
+}
+
+internal abstract class PrintApkLocationTask : DefaultTask() {
+    @get:InputDirectory
+    abstract val apkFolder: DirectoryProperty
+
+    @get:InputFiles
+    abstract val sources: ListProperty<Directory>
+
+    @get:Internal
+    abstract val builtArtifactsLoader: Property<BuiltArtifactsLoader>
+
+    @get:Input
+    abstract val variantName: Property<String>
+
+    @TaskAction
+    fun taskAction() {
+        val hasFiles = sources.orNull?.any { directory ->
+            directory.asFileTree.files.any {
+                it.isFile && it.parentFile.path.contains("build${File.separator}generated").not()
+            }
+        } ?: throw RuntimeException("Cannot check androidTest sources")
+
+        // Don't print APK location if there are no androidTest source files
+        if (!hasFiles) {
+            return
+        }
+
+        val builtArtifacts = builtArtifactsLoader.get().load(apkFolder.get())
+            ?: throw RuntimeException("Cannot load APKs")
+        if (builtArtifacts.elements.size != 1)
+            throw RuntimeException("Expected one APK !")
+        val apk = File(builtArtifacts.elements.single().outputFile).toPath()
+        println(apk)
+    }
+}
\ No newline at end of file
diff --git a/build-logic/convention/src/main/kotlin/com/wei/picquest/ProjectExtensions.kt b/build-logic/convention/src/main/kotlin/com/wei/picquest/ProjectExtensions.kt
new file mode 100644
index 0000000..cfeb772
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/com/wei/picquest/ProjectExtensions.kt
@@ -0,0 +1,9 @@
+package com.wei.picquest
+
+import org.gradle.api.Project
+import org.gradle.api.artifacts.VersionCatalog
+import org.gradle.api.artifacts.VersionCatalogsExtension
+import org.gradle.kotlin.dsl.getByType
+
+val Project.libs
+    get(): VersionCatalog = extensions.getByType<VersionCatalogsExtension>().named("libs")
diff --git a/build-logic/gradle.properties b/build-logic/gradle.properties
new file mode 100644
index 0000000..1c9073e
--- /dev/null
+++ b/build-logic/gradle.properties
@@ -0,0 +1,4 @@
+# Gradle properties are not passed to included builds https://github.com/gradle/gradle/issues/2534
+org.gradle.parallel=true
+org.gradle.caching=true
+org.gradle.configureondemand=true
diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts
new file mode 100644
index 0000000..2907fbf
--- /dev/null
+++ b/build-logic/settings.gradle.kts
@@ -0,0 +1,14 @@
+dependencyResolutionManagement {
+    repositories {
+        google()
+        mavenCentral()
+    }
+    versionCatalogs {
+        create("libs") {
+            from(files("../gradle/libs.versions.toml"))
+        }
+    }
+}
+
+rootProject.name = "build-logic"
+include(":convention")
diff --git a/build.gradle.kts b/build.gradle.kts
index b9dd0ae..cc82128 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,5 +1,20 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
+buildscript {
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
 plugins {
-    id("com.android.application") version "8.1.0-rc01" apply false
-    id("org.jetbrains.kotlin.android") version "1.9.10" apply false
-}
\ No newline at end of file
+    alias(libs.plugins.android.application) apply false
+    alias(libs.plugins.android.library) apply false
+    alias(libs.plugins.kotlin.android) apply false
+    alias(libs.plugins.navigation.safeargs.kotlin) apply false
+    alias(libs.plugins.hilt) apply false
+    alias(libs.plugins.kotlin.jvm) apply false
+    alias(libs.plugins.kotlin.serialization) apply false
+    alias(libs.plugins.ksp) apply false
+    alias(libs.plugins.secrets) apply false
+    alias(libs.plugins.roborazzi) apply false
+}
diff --git a/core/common/.gitignore b/core/common/.gitignore
new file mode 100644
index 0000000..42afabf
--- /dev/null
+++ b/core/common/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/core/common/build.gradle.kts b/core/common/build.gradle.kts
new file mode 100644
index 0000000..60fac82
--- /dev/null
+++ b/core/common/build.gradle.kts
@@ -0,0 +1,23 @@
+plugins {
+    alias(libs.plugins.pq.android.library)
+    alias(libs.plugins.pq.android.library.compose)
+    alias(libs.plugins.pq.android.hilt)
+}
+
+android {
+    namespace = "com.wei.picquest.core.common"
+
+    defaultConfig {
+        testInstrumentationRunner = "com.wei.picquest.core.testing.PqTestRunner"
+    }
+}
+
+dependencies {
+    implementation(project(":core:model"))
+
+    // LifeCycle
+    implementation(libs.androidx.lifecycle.runtimeCompose)
+
+    // Coroutines
+    implementation(libs.kotlinx.coroutines.android)
+}
\ No newline at end of file
diff --git a/core/common/src/main/AndroidManifest.xml b/core/common/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..a5918e6
--- /dev/null
+++ b/core/common/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>
\ No newline at end of file
diff --git a/core/data/.gitignore b/core/data/.gitignore
new file mode 100644
index 0000000..42afabf
--- /dev/null
+++ b/core/data/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/core/data/build.gradle.kts b/core/data/build.gradle.kts
new file mode 100644
index 0000000..1bd5ff9
--- /dev/null
+++ b/core/data/build.gradle.kts
@@ -0,0 +1,22 @@
+plugins {
+    alias(libs.plugins.pq.android.library)
+    alias(libs.plugins.pq.android.hilt)
+}
+
+android {
+    namespace = "com.wei.picquest.core.data"
+    testOptions {
+        unitTests {
+            isIncludeAndroidResources = true
+            isReturnDefaultValues = true
+        }
+    }
+}
+
+dependencies {
+    implementation(project(":core:common"))
+    implementation(project(":core:network"))
+    implementation(project(":core:model"))
+    // TODO Wei
+//    implementation(project(":core:datastore"))
+}
\ No newline at end of file
diff --git a/core/data/src/main/AndroidManifest.xml b/core/data/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..8c4c982
--- /dev/null
+++ b/core/data/src/main/AndroidManifest.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+</manifest>
\ No newline at end of file
diff --git a/core/designsystem/.gitignore b/core/designsystem/.gitignore
new file mode 100644
index 0000000..42afabf
--- /dev/null
+++ b/core/designsystem/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/core/designsystem/build.gradle.kts b/core/designsystem/build.gradle.kts
new file mode 100644
index 0000000..3ff0255
--- /dev/null
+++ b/core/designsystem/build.gradle.kts
@@ -0,0 +1,51 @@
+plugins {
+    alias(libs.plugins.pq.android.library)
+    alias(libs.plugins.pq.android.library.compose)
+    alias(libs.plugins.pq.android.hilt)
+}
+
+android {
+    namespace = "com.wei.picquest.core.designsystem"
+
+    defaultConfig {
+        testInstrumentationRunner = "com.wei.picquest.core.testing.PqTestRunner"
+    }
+}
+
+dependencies {
+    androidTestImplementation(project(":core:testing"))
+
+    // Write trace events to the system trace buffer.
+    api(libs.androidx.tracing.ktx)
+    // Material Design 3
+    api(libs.androidx.compose.material3)
+    api(libs.androidx.compose.material3.windowSizeClass)
+    api(libs.androidx.compose.material.iconsExtended)
+    // main APIs for the underlying toolkit systems,
+    // such as input and measurement/layout
+    api(libs.androidx.compose.ui.util)
+    api(libs.androidx.compose.foundation)
+    api(libs.androidx.compose.foundation.layout)
+    api(libs.androidx.compose.runtime)
+    // Android Studio Preview support
+    api(libs.androidx.compose.ui.tooling.preview)
+    api(libs.androidx.compose.ui.tooling)
+    // Optional - Integration with window
+    api(libs.androidx.window)
+    // Optional - Integration with LiveData
+    api(libs.androidx.compose.runtime.livedata)
+    // Optional - accompanist adaptive
+    api(libs.accompanist.adaptive)
+
+    implementation(libs.androidx.core.ktx)
+    // Optional - Integration with activities
+    implementation(libs.androidx.activity.compose)
+    // Optional - Integration with browser
+    implementation(libs.androidx.browser)
+    // Coil
+    implementation(libs.coil.kt)
+    implementation(libs.coil.kt.compose)
+    implementation(libs.coil.kt.svg)
+    // kotlin datetime
+    implementation(libs.kotlinx.datetime)
+}
\ No newline at end of file
diff --git a/core/designsystem/src/main/AndroidManifest.xml b/core/designsystem/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..a5918e6
--- /dev/null
+++ b/core/designsystem/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>
\ No newline at end of file
diff --git a/core/designsystem/src/main/java/com/wei/picquest/core/designsystem/theme/Background.kt b/core/designsystem/src/main/java/com/wei/picquest/core/designsystem/theme/Background.kt
new file mode 100644
index 0000000..4f80a6a
--- /dev/null
+++ b/core/designsystem/src/main/java/com/wei/picquest/core/designsystem/theme/Background.kt
@@ -0,0 +1,20 @@
+package com.wei.picquest.core.designsystem.theme
+
+import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.staticCompositionLocalOf
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.Dp
+
+/**
+ * A class to model background color and tonal elevation values for PicQuest.
+ */
+@Immutable
+data class BackgroundTheme(
+    val color: Color = Color.Unspecified,
+    val tonalElevation: Dp = Dp.Unspecified,
+)
+
+/**
+ * A composition local for [BackgroundTheme].
+ */
+val LocalBackgroundTheme = staticCompositionLocalOf { BackgroundTheme() }
diff --git a/core/designsystem/src/main/java/com/wei/picquest/core/designsystem/theme/Color.kt b/core/designsystem/src/main/java/com/wei/picquest/core/designsystem/theme/Color.kt
new file mode 100644
index 0000000..776c262
--- /dev/null
+++ b/core/designsystem/src/main/java/com/wei/picquest/core/designsystem/theme/Color.kt
@@ -0,0 +1,66 @@
+package com.wei.picquest.core.designsystem.theme
+import androidx.compose.ui.graphics.Color
+
+val md_theme_light_primary = Color(0xFF7A5900)
+val md_theme_light_onPrimary = Color(0xFFFFFFFF)
+val md_theme_light_primaryContainer = Color(0xFFFFDEA2)
+val md_theme_light_onPrimaryContainer = Color(0xFF261900)
+val md_theme_light_secondary = Color(0xFF6C5C3F)
+val md_theme_light_onSecondary = Color(0xFFFFFFFF)
+val md_theme_light_secondaryContainer = Color(0xFFF6E0BB)
+val md_theme_light_onSecondaryContainer = Color(0xFF251A04)
+val md_theme_light_tertiary = Color(0xFF4B6545)
+val md_theme_light_onTertiary = Color(0xFFFFFFFF)
+val md_theme_light_tertiaryContainer = Color(0xFFCDEBC3)
+val md_theme_light_onTertiaryContainer = Color(0xFF092008)
+val md_theme_light_error = Color(0xFFBA1A1A)
+val md_theme_light_errorContainer = Color(0xFFFFDAD6)
+val md_theme_light_onError = Color(0xFFFFFFFF)
+val md_theme_light_onErrorContainer = Color(0xFF410002)
+val md_theme_light_background = Color(0xFFFFFBFF)
+val md_theme_light_onBackground = Color(0xFF1E1B16)
+val md_theme_light_surface = Color(0xFFFFFBFF)
+val md_theme_light_onSurface = Color(0xFF1E1B16)
+val md_theme_light_surfaceVariant = Color(0xFFEDE1CF)
+val md_theme_light_onSurfaceVariant = Color(0xFF4D4639)
+val md_theme_light_outline = Color(0xFF7F7667)
+val md_theme_light_inverseOnSurface = Color(0xFFF8EFE7)
+val md_theme_light_inverseSurface = Color(0xFF34302A)
+val md_theme_light_inversePrimary = Color(0xFFF4BE48)
+val md_theme_light_shadow = Color(0xFF000000)
+val md_theme_light_surfaceTint = Color(0xFF7A5900)
+val md_theme_light_outlineVariant = Color(0xFFD1C5B4)
+val md_theme_light_scrim = Color(0xFF000000)
+
+val md_theme_dark_primary = Color(0xFFF4BE48)
+val md_theme_dark_onPrimary = Color(0xFF402D00)
+val md_theme_dark_primaryContainer = Color(0xFF5C4200)
+val md_theme_dark_onPrimaryContainer = Color(0xFFFFDEA2)
+val md_theme_dark_secondary = Color(0xFFD9C4A0)
+val md_theme_dark_onSecondary = Color(0xFF3B2F15)
+val md_theme_dark_secondaryContainer = Color(0xFF53452A)
+val md_theme_dark_onSecondaryContainer = Color(0xFFF6E0BB)
+val md_theme_dark_tertiary = Color(0xFFB1CFA8)
+val md_theme_dark_onTertiary = Color(0xFF1E361B)
+val md_theme_dark_tertiaryContainer = Color(0xFF344D2F)
+val md_theme_dark_onTertiaryContainer = Color(0xFFCDEBC3)
+val md_theme_dark_error = Color(0xFFFFB4AB)
+val md_theme_dark_errorContainer = Color(0xFF93000A)
+val md_theme_dark_onError = Color(0xFF690005)
+val md_theme_dark_onErrorContainer = Color(0xFFFFDAD6)
+val md_theme_dark_background = Color(0xFF1E1B16)
+val md_theme_dark_onBackground = Color(0xFFE9E1D9)
+val md_theme_dark_surface = Color(0xFF1E1B16)
+val md_theme_dark_onSurface = Color(0xFFE9E1D9)
+val md_theme_dark_surfaceVariant = Color(0xFF4D4639)
+val md_theme_dark_onSurfaceVariant = Color(0xFFD1C5B4)
+val md_theme_dark_outline = Color(0xFF9A8F80)
+val md_theme_dark_inverseOnSurface = Color(0xFF1E1B16)
+val md_theme_dark_inverseSurface = Color(0xFFE9E1D9)
+val md_theme_dark_inversePrimary = Color(0xFF7A5900)
+val md_theme_dark_shadow = Color(0xFF000000)
+val md_theme_dark_surfaceTint = Color(0xFFF4BE48)
+val md_theme_dark_outlineVariant = Color(0xFF4D4639)
+val md_theme_dark_scrim = Color(0xFF000000)
+
+val seed = Color(0xFFB69553)
diff --git a/core/designsystem/src/main/java/com/wei/picquest/core/designsystem/theme/Shapes.kt b/core/designsystem/src/main/java/com/wei/picquest/core/designsystem/theme/Shapes.kt
new file mode 100644
index 0000000..817d1c7
--- /dev/null
+++ b/core/designsystem/src/main/java/com/wei/picquest/core/designsystem/theme/Shapes.kt
@@ -0,0 +1,13 @@
+package com.wei.picquest.core.designsystem.theme
+
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Shapes
+import androidx.compose.ui.unit.dp
+
+val shapes = Shapes(
+    extraSmall = RoundedCornerShape(4.dp),
+    small = RoundedCornerShape(8.dp),
+    medium = RoundedCornerShape(12.dp),
+    large = RoundedCornerShape(16.dp),
+    extraLarge = RoundedCornerShape(24.dp),
+)
diff --git a/core/designsystem/src/main/java/com/wei/picquest/core/designsystem/theme/Spacing.kt b/core/designsystem/src/main/java/com/wei/picquest/core/designsystem/theme/Spacing.kt
new file mode 100644
index 0000000..3576592
--- /dev/null
+++ b/core/designsystem/src/main/java/com/wei/picquest/core/designsystem/theme/Spacing.kt
@@ -0,0 +1,7 @@
+package com.wei.picquest.core.designsystem.theme
+
+const val SPACING_EXTRA_SMALL = 4
+const val SPACING_SMALL = 8
+const val SPACING_MEDIUM = 12
+const val SPACING_LARGE = 16
+const val SPACING_EXTRA_LARGE = 24
diff --git a/core/designsystem/src/main/java/com/wei/picquest/core/designsystem/theme/Theme.kt b/core/designsystem/src/main/java/com/wei/picquest/core/designsystem/theme/Theme.kt
new file mode 100644
index 0000000..a234c9c
--- /dev/null
+++ b/core/designsystem/src/main/java/com/wei/picquest/core/designsystem/theme/Theme.kt
@@ -0,0 +1,119 @@
+package com.wei.picquest.core.designsystem.theme
+
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.darkColorScheme
+import androidx.compose.material3.lightColorScheme
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.ui.unit.dp
+
+private val LightColors = lightColorScheme(
+    primary = md_theme_light_primary,
+    onPrimary = md_theme_light_onPrimary,
+    primaryContainer = md_theme_light_primaryContainer,
+    onPrimaryContainer = md_theme_light_onPrimaryContainer,
+    secondary = md_theme_light_secondary,
+    onSecondary = md_theme_light_onSecondary,
+    secondaryContainer = md_theme_light_secondaryContainer,
+    onSecondaryContainer = md_theme_light_onSecondaryContainer,
+    tertiary = md_theme_light_tertiary,
+    onTertiary = md_theme_light_onTertiary,
+    tertiaryContainer = md_theme_light_tertiaryContainer,
+    onTertiaryContainer = md_theme_light_onTertiaryContainer,
+    error = md_theme_light_error,
+    errorContainer = md_theme_light_errorContainer,
+    onError = md_theme_light_onError,
+    onErrorContainer = md_theme_light_onErrorContainer,
+    background = md_theme_light_background,
+    onBackground = md_theme_light_onBackground,
+    surface = md_theme_light_surface,
+    onSurface = md_theme_light_onSurface,
+    surfaceVariant = md_theme_light_surfaceVariant,
+    onSurfaceVariant = md_theme_light_onSurfaceVariant,
+    outline = md_theme_light_outline,
+    inverseOnSurface = md_theme_light_inverseOnSurface,
+    inverseSurface = md_theme_light_inverseSurface,
+    inversePrimary = md_theme_light_inversePrimary,
+    surfaceTint = md_theme_light_surfaceTint,
+    outlineVariant = md_theme_light_outlineVariant,
+    scrim = md_theme_light_scrim,
+)
+
+private val DarkColors = darkColorScheme(
+    primary = md_theme_dark_primary,
+    onPrimary = md_theme_dark_onPrimary,
+    primaryContainer = md_theme_dark_primaryContainer,
+    onPrimaryContainer = md_theme_dark_onPrimaryContainer,
+    secondary = md_theme_dark_secondary,
+    onSecondary = md_theme_dark_onSecondary,
+    secondaryContainer = md_theme_dark_secondaryContainer,
+    onSecondaryContainer = md_theme_dark_onSecondaryContainer,
+    tertiary = md_theme_dark_tertiary,
+    onTertiary = md_theme_dark_onTertiary,
+    tertiaryContainer = md_theme_dark_tertiaryContainer,
+    onTertiaryContainer = md_theme_dark_onTertiaryContainer,
+    error = md_theme_dark_error,
+    errorContainer = md_theme_dark_errorContainer,
+    onError = md_theme_dark_onError,
+    onErrorContainer = md_theme_dark_onErrorContainer,
+    background = md_theme_dark_background,
+    onBackground = md_theme_dark_onBackground,
+    surface = md_theme_dark_surface,
+    onSurface = md_theme_dark_onSurface,
+    surfaceVariant = md_theme_dark_surfaceVariant,
+    onSurfaceVariant = md_theme_dark_onSurfaceVariant,
+    outline = md_theme_dark_outline,
+    inverseOnSurface = md_theme_dark_inverseOnSurface,
+    inverseSurface = md_theme_dark_inverseSurface,
+    inversePrimary = md_theme_dark_inversePrimary,
+    surfaceTint = md_theme_dark_surfaceTint,
+    outlineVariant = md_theme_dark_outlineVariant,
+    scrim = md_theme_dark_scrim,
+)
+
+/**
+ * Light Android background theme
+ */
+val LightAndroidBackgroundTheme = BackgroundTheme(color = LightColors.background)
+
+/**
+ * Dark Android background theme
+ */
+val DarkAndroidBackgroundTheme = BackgroundTheme(color = DarkColors.background)
+
+@Composable
+fun PqTheme(
+    darkTheme: Boolean = isSystemInDarkTheme(),
+    androidTheme: Boolean = true,
+    content: @Composable () -> Unit,
+) {
+    val typography = getAppTypography()
+
+    // Color scheme
+    val colorScheme = when {
+        androidTheme -> if (darkTheme) DarkColors else LightColors
+        else -> if (darkTheme) DarkColors else LightColors
+    }
+    // Background theme
+    val defaultBackgroundTheme = BackgroundTheme(
+        color = colorScheme.surface,
+        tonalElevation = 2.dp,
+    )
+
+    val backgroundTheme = when {
+        androidTheme -> if (darkTheme) DarkAndroidBackgroundTheme else LightAndroidBackgroundTheme
+        else -> defaultBackgroundTheme
+    }
+
+    // Composition locals
+    CompositionLocalProvider(
+        LocalBackgroundTheme provides backgroundTheme,
+    ) {
+        MaterialTheme(
+            colorScheme = colorScheme,
+            typography = typography,
+            content = content,
+        )
+    }
+}
diff --git a/core/designsystem/src/main/java/com/wei/picquest/core/designsystem/theme/Type.kt b/core/designsystem/src/main/java/com/wei/picquest/core/designsystem/theme/Type.kt
new file mode 100644
index 0000000..b9a4bb6
--- /dev/null
+++ b/core/designsystem/src/main/java/com/wei/picquest/core/designsystem/theme/Type.kt
@@ -0,0 +1,151 @@
+package com.wei.picquest.core.designsystem.theme
+
+import androidx.compose.material3.Typography
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.Font
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.sp
+import com.wei.picquest.core.designsystem.R
+
+val atFontFamily = FontFamily(
+    Font(R.font.gilroy_black, FontWeight.Black),
+    Font(R.font.gilroy_black_italic, FontWeight.Black, FontStyle.Italic),
+    Font(R.font.gilroy_bold, FontWeight.Bold),
+    Font(R.font.gilroy_bold_italic, FontWeight.Bold, FontStyle.Italic),
+    Font(R.font.gilroy_extra_bold, FontWeight.ExtraBold),
+    Font(R.font.gilroy_extra_bold_italic, FontWeight.ExtraBold, FontStyle.Italic),
+    Font(R.font.gilroy_light, FontWeight.Light),
+    Font(R.font.gilroy_light_italic, FontWeight.Light, FontStyle.Italic),
+    Font(R.font.gilroy_medium, FontWeight.SemiBold),
+    Font(R.font.gilroy_medium_italic, FontWeight.SemiBold, FontStyle.Italic),
+    Font(R.font.gilroy_regular, FontWeight.Medium),
+    Font(R.font.gilroy_regular_italic, FontWeight.Normal, FontStyle.Italic),
+    Font(R.font.gilroy_semi_bold, FontWeight.SemiBold),
+    Font(R.font.gilroy_semi_bold_italic, FontWeight.SemiBold, FontStyle.Italic),
+    Font(R.font.gilroy_thin, FontWeight.Thin),
+    Font(R.font.gilroy_thin_italic, FontWeight.Thin, FontStyle.Italic),
+    Font(R.font.gilroy_ultra_light, FontWeight.ExtraLight),
+    Font(R.font.gilroy_ultra_light_italic, FontWeight.ExtraLight, FontStyle.Italic),
+)
+
+val notoSansTCFontFamily = FontFamily(
+    Font(R.font.noto_sans_tc_variablefont_wght),
+)
+
+val abrilFatfaceFontFamily = FontFamily(
+    Font(R.font.abril_fatface),
+)
+
+@Composable
+fun getAppTypography(): Typography {
+    return Typography(
+        displayLarge = TextStyle(
+            fontFamily = atFontFamily,
+            fontWeight = FontWeight.SemiBold,
+            fontSize = 57.sp,
+            lineHeight = 64.sp,
+            letterSpacing = (-0.25).sp,
+        ),
+        displayMedium = TextStyle(
+            fontFamily = atFontFamily,
+            fontWeight = FontWeight.SemiBold,
+            fontSize = 45.sp,
+            lineHeight = 52.sp,
+            letterSpacing = 0.sp,
+        ),
+        displaySmall = TextStyle(
+            fontFamily = atFontFamily,
+            fontWeight = FontWeight.SemiBold,
+            fontSize = 36.sp,
+            lineHeight = 44.sp,
+            letterSpacing = 0.sp,
+        ),
+        headlineLarge = TextStyle(
+            fontFamily = atFontFamily,
+            fontWeight = FontWeight.SemiBold,
+            fontSize = 32.sp,
+            lineHeight = 40.sp,
+            letterSpacing = 0.sp,
+        ),
+        headlineMedium = TextStyle(
+            fontFamily = atFontFamily,
+            fontWeight = FontWeight.SemiBold,
+            fontSize = 28.sp,
+            lineHeight = 36.sp,
+            letterSpacing = 0.sp,
+        ),
+        headlineSmall = TextStyle(
+            fontFamily = atFontFamily,
+            fontWeight = FontWeight.SemiBold,
+            fontSize = 24.sp,
+            lineHeight = 32.sp,
+            letterSpacing = 0.sp,
+        ),
+        titleLarge = TextStyle(
+            fontFamily = atFontFamily,
+            fontWeight = FontWeight.SemiBold,
+            fontSize = 22.sp,
+            lineHeight = 28.sp,
+            letterSpacing = 0.sp,
+        ),
+        titleMedium = TextStyle(
+            fontFamily = atFontFamily,
+            fontWeight = FontWeight.SemiBold,
+            fontSize = 18.sp,
+            lineHeight = 24.sp,
+            letterSpacing = 0.15.sp,
+        ),
+        titleSmall = TextStyle(
+            fontFamily = atFontFamily,
+            fontWeight = FontWeight.SemiBold,
+            fontSize = 14.sp,
+            lineHeight = 20.sp,
+            letterSpacing = 0.1.sp,
+        ),
+        bodyLarge = TextStyle(
+            fontFamily = atFontFamily,
+            fontWeight = FontWeight.SemiBold,
+            fontSize = 16.sp,
+            lineHeight = 24.sp,
+            letterSpacing = 0.15.sp,
+        ),
+        bodyMedium = TextStyle(
+            fontFamily = atFontFamily,
+            fontWeight = FontWeight.SemiBold,
+            fontSize = 14.sp,
+            lineHeight = 20.sp,
+            letterSpacing = 0.25.sp,
+        ),
+        bodySmall = TextStyle(
+            fontFamily = atFontFamily,
+            fontWeight = FontWeight.SemiBold,
+            fontSize = 12.sp,
+            lineHeight = 16.sp,
+            letterSpacing = 0.4.sp,
+        ),
+        labelLarge = TextStyle(
+            fontFamily = atFontFamily,
+            fontWeight = FontWeight.SemiBold,
+            fontSize = 14.sp,
+            lineHeight = 20.sp,
+            letterSpacing = 0.1.sp,
+        ),
+        labelMedium = TextStyle(
+            fontFamily = atFontFamily,
+            fontWeight = FontWeight.SemiBold,
+            fontSize = 12.sp,
+            lineHeight = 16.sp,
+            letterSpacing = 0.5.sp,
+        ),
+        labelSmall = TextStyle(
+            fontFamily = atFontFamily,
+            fontWeight = FontWeight.SemiBold,
+            fontSize = 10.sp,
+            lineHeight = 16.sp,
+            letterSpacing = 0.5.sp,
+        ),
+    )
+}
diff --git a/core/designsystem/src/main/res/font/abril_fatface.ttf b/core/designsystem/src/main/res/font/abril_fatface.ttf
new file mode 100644
index 0000000..e761f7b
Binary files /dev/null and b/core/designsystem/src/main/res/font/abril_fatface.ttf differ
diff --git a/core/designsystem/src/main/res/font/gilroy_black.ttf b/core/designsystem/src/main/res/font/gilroy_black.ttf
new file mode 100644
index 0000000..3e1a57e
Binary files /dev/null and b/core/designsystem/src/main/res/font/gilroy_black.ttf differ
diff --git a/core/designsystem/src/main/res/font/gilroy_black_italic.ttf b/core/designsystem/src/main/res/font/gilroy_black_italic.ttf
new file mode 100644
index 0000000..6f0b4c4
Binary files /dev/null and b/core/designsystem/src/main/res/font/gilroy_black_italic.ttf differ
diff --git a/core/designsystem/src/main/res/font/gilroy_bold.ttf b/core/designsystem/src/main/res/font/gilroy_bold.ttf
new file mode 100644
index 0000000..1aea716
Binary files /dev/null and b/core/designsystem/src/main/res/font/gilroy_bold.ttf differ
diff --git a/core/designsystem/src/main/res/font/gilroy_bold_italic.ttf b/core/designsystem/src/main/res/font/gilroy_bold_italic.ttf
new file mode 100644
index 0000000..6754019
Binary files /dev/null and b/core/designsystem/src/main/res/font/gilroy_bold_italic.ttf differ
diff --git a/core/designsystem/src/main/res/font/gilroy_extra_bold.ttf b/core/designsystem/src/main/res/font/gilroy_extra_bold.ttf
new file mode 100644
index 0000000..01eb343
Binary files /dev/null and b/core/designsystem/src/main/res/font/gilroy_extra_bold.ttf differ
diff --git a/core/designsystem/src/main/res/font/gilroy_extra_bold_italic.ttf b/core/designsystem/src/main/res/font/gilroy_extra_bold_italic.ttf
new file mode 100644
index 0000000..86000c1
Binary files /dev/null and b/core/designsystem/src/main/res/font/gilroy_extra_bold_italic.ttf differ
diff --git a/core/designsystem/src/main/res/font/gilroy_heavy.ttf b/core/designsystem/src/main/res/font/gilroy_heavy.ttf
new file mode 100644
index 0000000..726e371
Binary files /dev/null and b/core/designsystem/src/main/res/font/gilroy_heavy.ttf differ
diff --git a/core/designsystem/src/main/res/font/gilroy_heavy_italic.ttf b/core/designsystem/src/main/res/font/gilroy_heavy_italic.ttf
new file mode 100644
index 0000000..12a7e55
Binary files /dev/null and b/core/designsystem/src/main/res/font/gilroy_heavy_italic.ttf differ
diff --git a/core/designsystem/src/main/res/font/gilroy_light.ttf b/core/designsystem/src/main/res/font/gilroy_light.ttf
new file mode 100644
index 0000000..b08db4e
Binary files /dev/null and b/core/designsystem/src/main/res/font/gilroy_light.ttf differ
diff --git a/core/designsystem/src/main/res/font/gilroy_light_italic.ttf b/core/designsystem/src/main/res/font/gilroy_light_italic.ttf
new file mode 100644
index 0000000..ea4bee4
Binary files /dev/null and b/core/designsystem/src/main/res/font/gilroy_light_italic.ttf differ
diff --git a/core/designsystem/src/main/res/font/gilroy_medium.ttf b/core/designsystem/src/main/res/font/gilroy_medium.ttf
new file mode 100644
index 0000000..06d6a94
Binary files /dev/null and b/core/designsystem/src/main/res/font/gilroy_medium.ttf differ
diff --git a/core/designsystem/src/main/res/font/gilroy_medium_italic.ttf b/core/designsystem/src/main/res/font/gilroy_medium_italic.ttf
new file mode 100644
index 0000000..9fbb898
Binary files /dev/null and b/core/designsystem/src/main/res/font/gilroy_medium_italic.ttf differ
diff --git a/core/designsystem/src/main/res/font/gilroy_regular.ttf b/core/designsystem/src/main/res/font/gilroy_regular.ttf
new file mode 100644
index 0000000..ad17f71
Binary files /dev/null and b/core/designsystem/src/main/res/font/gilroy_regular.ttf differ
diff --git a/core/designsystem/src/main/res/font/gilroy_regular_italic.ttf b/core/designsystem/src/main/res/font/gilroy_regular_italic.ttf
new file mode 100644
index 0000000..628a732
Binary files /dev/null and b/core/designsystem/src/main/res/font/gilroy_regular_italic.ttf differ
diff --git a/core/designsystem/src/main/res/font/gilroy_semi_bold.ttf b/core/designsystem/src/main/res/font/gilroy_semi_bold.ttf
new file mode 100644
index 0000000..cb3cbb6
Binary files /dev/null and b/core/designsystem/src/main/res/font/gilroy_semi_bold.ttf differ
diff --git a/core/designsystem/src/main/res/font/gilroy_semi_bold_italic.ttf b/core/designsystem/src/main/res/font/gilroy_semi_bold_italic.ttf
new file mode 100644
index 0000000..fc82a10
Binary files /dev/null and b/core/designsystem/src/main/res/font/gilroy_semi_bold_italic.ttf differ
diff --git a/core/designsystem/src/main/res/font/gilroy_thin.ttf b/core/designsystem/src/main/res/font/gilroy_thin.ttf
new file mode 100644
index 0000000..c6daeb7
Binary files /dev/null and b/core/designsystem/src/main/res/font/gilroy_thin.ttf differ
diff --git a/core/designsystem/src/main/res/font/gilroy_thin_italic.ttf b/core/designsystem/src/main/res/font/gilroy_thin_italic.ttf
new file mode 100644
index 0000000..4bc3561
Binary files /dev/null and b/core/designsystem/src/main/res/font/gilroy_thin_italic.ttf differ
diff --git a/core/designsystem/src/main/res/font/gilroy_ultra_light.ttf b/core/designsystem/src/main/res/font/gilroy_ultra_light.ttf
new file mode 100644
index 0000000..adc3e33
Binary files /dev/null and b/core/designsystem/src/main/res/font/gilroy_ultra_light.ttf differ
diff --git a/core/designsystem/src/main/res/font/gilroy_ultra_light_italic.ttf b/core/designsystem/src/main/res/font/gilroy_ultra_light_italic.ttf
new file mode 100644
index 0000000..3403fe8
Binary files /dev/null and b/core/designsystem/src/main/res/font/gilroy_ultra_light_italic.ttf differ
diff --git a/core/designsystem/src/main/res/font/noto_sans_tc_variablefont_wght.ttf b/core/designsystem/src/main/res/font/noto_sans_tc_variablefont_wght.ttf
new file mode 100644
index 0000000..6e429c5
Binary files /dev/null and b/core/designsystem/src/main/res/font/noto_sans_tc_variablefont_wght.ttf differ
diff --git a/core/domain/.gitignore b/core/domain/.gitignore
new file mode 100644
index 0000000..42afabf
--- /dev/null
+++ b/core/domain/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/core/domain/build.gradle.kts b/core/domain/build.gradle.kts
new file mode 100644
index 0000000..4ed745b
--- /dev/null
+++ b/core/domain/build.gradle.kts
@@ -0,0 +1,15 @@
+plugins {
+    alias(libs.plugins.pq.android.library)
+    alias(libs.plugins.pq.android.hilt)
+}
+
+android {
+    namespace = "com.wei.picquest.core.domain"
+}
+
+dependencies {
+    implementation(project(":core:common"))
+    implementation(project(":core:data"))
+    implementation(project(":core:model"))
+    implementation(project(":core:network"))
+}
\ No newline at end of file
diff --git a/core/domain/src/main/AndroidManifest.xml b/core/domain/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..a5918e6
--- /dev/null
+++ b/core/domain/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>
\ No newline at end of file
diff --git a/core/model/.gitignore b/core/model/.gitignore
new file mode 100644
index 0000000..42afabf
--- /dev/null
+++ b/core/model/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/core/model/build.gradle.kts b/core/model/build.gradle.kts
new file mode 100644
index 0000000..66420fb
--- /dev/null
+++ b/core/model/build.gradle.kts
@@ -0,0 +1,15 @@
+plugins {
+    alias(libs.plugins.pq.android.library)
+    alias(libs.plugins.pq.android.library.compose)
+    alias(libs.plugins.pq.android.hilt)
+    id("kotlin-parcelize")
+}
+
+android {
+    namespace = "com.wei.picquest.core.model"
+}
+
+dependencies {
+    // For androidx.compose.runtime.Stable
+    implementation(libs.androidx.compose.runtime)
+}
\ No newline at end of file
diff --git a/core/model/src/main/AndroidManifest.xml b/core/model/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..a5918e6
--- /dev/null
+++ b/core/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>
\ No newline at end of file
diff --git a/core/network/.gitignore b/core/network/.gitignore
new file mode 100644
index 0000000..42afabf
--- /dev/null
+++ b/core/network/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/core/network/build.gradle.kts b/core/network/build.gradle.kts
new file mode 100644
index 0000000..9c3e18c
--- /dev/null
+++ b/core/network/build.gradle.kts
@@ -0,0 +1,38 @@
+plugins {
+    alias(libs.plugins.pq.android.library)
+    alias(libs.plugins.pq.android.hilt)
+    alias(libs.plugins.secrets)
+    id("kotlinx-serialization")
+}
+
+android {
+    namespace = "com.wei.core.network"
+
+    buildFeatures {
+        buildConfig = true
+    }
+
+    testOptions {
+        unitTests {
+            isIncludeAndroidResources = true
+        }
+    }
+}
+
+secrets {
+    defaultPropertiesFileName = "secrets.defaults.properties"
+}
+
+dependencies {
+    // Okhttp Interceptor
+    implementation(libs.okhttp.logging)
+
+    // Retrofit2
+    implementation(libs.retrofit.core)
+
+    // RetrofitKotlinxSerializationJson
+    implementation(libs.retrofit.kotlin.serialization)
+
+    // KotlinxSerializationJson
+    implementation(libs.kotlinx.serialization.json)
+}
\ No newline at end of file
diff --git a/core/network/src/main/AndroidManifest.xml b/core/network/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..0b8a353
--- /dev/null
+++ b/core/network/src/main/AndroidManifest.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
+</manifest>
\ No newline at end of file
diff --git a/core/testing/.gitignore b/core/testing/.gitignore
new file mode 100644
index 0000000..42afabf
--- /dev/null
+++ b/core/testing/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/core/testing/build.gradle.kts b/core/testing/build.gradle.kts
new file mode 100644
index 0000000..6e9c5e3
--- /dev/null
+++ b/core/testing/build.gradle.kts
@@ -0,0 +1,41 @@
+plugins {
+    alias(libs.plugins.pq.android.library)
+    alias(libs.plugins.pq.android.library.compose)
+    alias(libs.plugins.pq.android.hilt)
+}
+
+android {
+    namespace = "com.wei.picquest.core.testing"
+}
+
+
+dependencies {
+    implementation(project(":core:common"))
+    implementation(project(":core:data"))
+    implementation(project(":core:model"))
+    implementation(project(":core:domain"))
+    implementation(project(":core:network"))
+    implementation(project(":core:designsystem"))
+
+    api(libs.junit4)
+    api(libs.androidx.activity.compose)
+    api(libs.androidx.compose.ui.test)
+    api(libs.androidx.test.espresso.core)
+    api(libs.androidx.test.core)
+    api(libs.androidx.test.runner)
+    // testharness
+    api(libs.accompanist.testharness)
+    // Coroutines test
+    api(libs.kotlinx.coroutines.test)
+    api(libs.hilt.android.testing)
+    // Google truth
+    api(libs.google.truth)
+    // For flow test
+    api(libs.turbine)
+    // Android Unit Testing Framework
+    api(libs.robolectric.shadows)
+    // For screenshot tests
+    api(libs.roborazzi)
+
+    debugApi(libs.androidx.compose.ui.testManifest)
+}
diff --git a/core/testing/src/main/AndroidManifest.xml b/core/testing/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..a5918e6
--- /dev/null
+++ b/core/testing/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>
\ No newline at end of file
diff --git a/core/testing/src/main/java/com/wei/picquest/core/testing/PqTestRunner.kt b/core/testing/src/main/java/com/wei/picquest/core/testing/PqTestRunner.kt
new file mode 100644
index 0000000..5a86b7e
--- /dev/null
+++ b/core/testing/src/main/java/com/wei/picquest/core/testing/PqTestRunner.kt
@@ -0,0 +1,15 @@
+package com.wei.picquest.core.testing
+
+import android.app.Application
+import android.content.Context
+import androidx.test.runner.AndroidJUnitRunner
+import dagger.hilt.android.testing.HiltTestApplication
+
+/**
+ * A custom runner to set up the instrumented application class for tests.
+ */
+class PqTestRunner : AndroidJUnitRunner() {
+    override fun newApplication(cl: ClassLoader?, name: String?, context: Context?): Application {
+        return super.newApplication(cl, HiltTestApplication::class.java.name, context)
+    }
+}
diff --git a/gradlew b/gradlew
old mode 100644
new mode 100755
diff --git a/secrets.defaults.properties b/secrets.defaults.properties
new file mode 100644
index 0000000..a7f254e
--- /dev/null
+++ b/secrets.defaults.properties
@@ -0,0 +1,4 @@
+## This file provides default values to modules using the secrets-gradle-plugin. It is necessary
+# because the secrets properties file is not under source control so CI builds will fail without
+# default values.
+BACKEND_URL="https://pixabay.com/api/"
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 6949e8c..cfd3d6a 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,10 +1,12 @@
 pluginManagement {
+    includeBuild("build-logic")
     repositories {
         google()
         mavenCentral()
         gradlePluginPortal()
     }
 }
+
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {
@@ -15,4 +17,13 @@ dependencyResolutionManagement {
 
 rootProject.name = "PicQuest"
 include(":app")
- 
\ No newline at end of file
+
+include(":core:designsystem")
+include(":core:testing")
+include(":core:common")
+include(":core:data")
+include(":core:domain")
+include(":core:model")
+include(":core:network")
+
+include(":ui-test-hilt-manifest")
diff --git a/ui-test-hilt-manifest/.gitignore b/ui-test-hilt-manifest/.gitignore
new file mode 100644
index 0000000..42afabf
--- /dev/null
+++ b/ui-test-hilt-manifest/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/ui-test-hilt-manifest/build.gradle.kts b/ui-test-hilt-manifest/build.gradle.kts
new file mode 100644
index 0000000..04b9b3c
--- /dev/null
+++ b/ui-test-hilt-manifest/build.gradle.kts
@@ -0,0 +1,8 @@
+plugins {
+    alias(libs.plugins.pq.android.library)
+    alias(libs.plugins.pq.android.hilt)
+}
+
+android {
+    namespace = "com.wei.picquest.uitesthiltmanifest"
+}
diff --git a/ui-test-hilt-manifest/src/main/AndroidManifest.xml b/ui-test-hilt-manifest/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..b70164f
--- /dev/null
+++ b/ui-test-hilt-manifest/src/main/AndroidManifest.xml
@@ -0,0 +1,7 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application>
+        <activity android:name=".HiltComponentActivity" />
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/ui-test-hilt-manifest/src/main/java/com/wei/picquest/uitesthiltmanifest/HiltComponentActivity.kt b/ui-test-hilt-manifest/src/main/java/com/wei/picquest/uitesthiltmanifest/HiltComponentActivity.kt
new file mode 100644
index 0000000..3890ab4
--- /dev/null
+++ b/ui-test-hilt-manifest/src/main/java/com/wei/picquest/uitesthiltmanifest/HiltComponentActivity.kt
@@ -0,0 +1,11 @@
+package com.wei.picquest.uitesthiltmanifest
+
+import androidx.activity.ComponentActivity
+import dagger.hilt.android.AndroidEntryPoint
+
+/**
+ * A [ComponentActivity] annotated with [AndroidEntryPoint] for use in tests, as a workaround
+ * for https://github.com/google/dagger/issues/3394
+ */
+@AndroidEntryPoint
+class HiltComponentActivity : ComponentActivity()