From e91bb9774aa53f448c60153190c5c51ed56752c5 Mon Sep 17 00:00:00 2001
From: Maxime Biais <maxime.biais@gmail.com>
Date: Fri, 19 Apr 2024 08:36:55 +0200
Subject: [PATCH] Change demo app namespace to avoid build warning

---
 demo-app/build.gradle.kts                                     | 2 +-
 demo-app/src/main/AndroidManifest.xml                         | 2 +-
 .../src/main/java/com/gravatar/demoapp/ui/AvatarUpdateTab.kt  | 4 ++--
 .../src/main/java/com/gravatar/demoapp/ui/DemoGravatarApp.kt  | 4 ++--
 .../java/com/gravatar/demoapp/ui/GravatarImageSettings.kt     | 2 +-
 .../com/gravatar/demoapp/ui/components/GravatarEmailInput.kt  | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/demo-app/build.gradle.kts b/demo-app/build.gradle.kts
index 914411a9..b132a113 100644
--- a/demo-app/build.gradle.kts
+++ b/demo-app/build.gradle.kts
@@ -22,7 +22,7 @@ fun localProperties(): Properties {
 }
 
 android {
-    namespace = "com.gravatar"
+    namespace = "com.gravatar.demoapp"
     compileSdk = 34
     buildFeatures.buildConfig = true
 
diff --git a/demo-app/src/main/AndroidManifest.xml b/demo-app/src/main/AndroidManifest.xml
index c4488436..24891c05 100644
--- a/demo-app/src/main/AndroidManifest.xml
+++ b/demo-app/src/main/AndroidManifest.xml
@@ -16,7 +16,7 @@
         tools:targetApi="31">
 
         <activity
-            android:name=".demoapp.MainActivity"
+            android:name=".MainActivity"
             android:exported="true"
             android:label="@string/app_name"
             android:theme="@style/Theme.Gravatar">
diff --git a/demo-app/src/main/java/com/gravatar/demoapp/ui/AvatarUpdateTab.kt b/demo-app/src/main/java/com/gravatar/demoapp/ui/AvatarUpdateTab.kt
index 93925663..7c2ab4a0 100644
--- a/demo-app/src/main/java/com/gravatar/demoapp/ui/AvatarUpdateTab.kt
+++ b/demo-app/src/main/java/com/gravatar/demoapp/ui/AvatarUpdateTab.kt
@@ -24,8 +24,8 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import com.gravatar.BuildConfig
-import com.gravatar.R
+import com.gravatar.demoapp.BuildConfig
+import com.gravatar.demoapp.R
 import com.gravatar.demoapp.ui.components.GravatarEmailInput
 import com.gravatar.demoapp.ui.components.GravatarPasswordInput
 import com.gravatar.services.ErrorType
diff --git a/demo-app/src/main/java/com/gravatar/demoapp/ui/DemoGravatarApp.kt b/demo-app/src/main/java/com/gravatar/demoapp/ui/DemoGravatarApp.kt
index 282eb1c0..83ca532c 100644
--- a/demo-app/src/main/java/com/gravatar/demoapp/ui/DemoGravatarApp.kt
+++ b/demo-app/src/main/java/com/gravatar/demoapp/ui/DemoGravatarApp.kt
@@ -45,11 +45,11 @@ import coil.request.ImageRequest
 import coil.size.Size
 import com.gravatar.AvatarQueryOptions
 import com.gravatar.AvatarUrl
-import com.gravatar.BuildConfig
 import com.gravatar.DefaultAvatarOption
 import com.gravatar.ImageRating
-import com.gravatar.R
 import com.gravatar.api.models.UserProfiles
+import com.gravatar.demoapp.BuildConfig
+import com.gravatar.demoapp.R
 import com.gravatar.demoapp.theme.GravatarDemoAppTheme
 import com.gravatar.demoapp.ui.components.GravatarEmailInput
 import com.gravatar.demoapp.ui.model.SettingsState
diff --git a/demo-app/src/main/java/com/gravatar/demoapp/ui/GravatarImageSettings.kt b/demo-app/src/main/java/com/gravatar/demoapp/ui/GravatarImageSettings.kt
index 4090c190..551fdf71 100644
--- a/demo-app/src/main/java/com/gravatar/demoapp/ui/GravatarImageSettings.kt
+++ b/demo-app/src/main/java/com/gravatar/demoapp/ui/GravatarImageSettings.kt
@@ -18,7 +18,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.gravatar.DefaultAvatarOption
 import com.gravatar.ImageRating
-import com.gravatar.R
+import com.gravatar.demoapp.R
 import com.gravatar.demoapp.theme.GravatarDemoAppTheme
 import com.gravatar.demoapp.ui.components.GravatarEmailInput
 import com.gravatar.demoapp.ui.model.SettingsState
diff --git a/demo-app/src/main/java/com/gravatar/demoapp/ui/components/GravatarEmailInput.kt b/demo-app/src/main/java/com/gravatar/demoapp/ui/components/GravatarEmailInput.kt
index 0285a9e4..972c47eb 100644
--- a/demo-app/src/main/java/com/gravatar/demoapp/ui/components/GravatarEmailInput.kt
+++ b/demo-app/src/main/java/com/gravatar/demoapp/ui/components/GravatarEmailInput.kt
@@ -5,7 +5,7 @@ import androidx.compose.material3.TextField
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
-import com.gravatar.R
+import com.gravatar.demoapp.R
 
 @Composable
 fun GravatarEmailInput(email: String, onValueChange: (String) -> Unit, modifier: Modifier = Modifier) {