From 148ac59c44efc72fea171b511c40a5c5abf7a595 Mon Sep 17 00:00:00 2001
From: Asem Abu Alrub <asem.m.abualrub@gmail.com>
Date: Mon, 30 Sep 2024 11:37:27 +0300
Subject: [PATCH] Refactor the ui class in app module

---
 app/src/main/AndroidManifest.xml              | 22 +++++++++----------
 .../asemlab/samples/{ => ui}/MainActivity.kt  |  3 ++-
 .../{ => ui}/NotificationProgressActivity.kt  |  3 ++-
 .../{ => ui}/RegisterForResultActivity.kt     |  3 ++-
 .../com/asemlab/samples/{ => ui}/TestFrag.kt  |  3 ++-
 .../com/asemlab/samples/{ => utils}/Colors.kt |  2 +-
 app/src/main/res/layout/activity_main.xml     |  2 +-
 .../layout/activity_notification_progress.xml |  2 +-
 .../layout/activity_register_for_result.xml   |  2 +-
 app/src/main/res/layout/frag.xml              |  2 +-
 app/src/main/res/layout/frag_2.xml            |  2 +-
 app/src/main/res/layout/frag_3.xml            |  2 +-
 12 files changed, 26 insertions(+), 22 deletions(-)
 rename app/src/main/java/com/asemlab/samples/{ => ui}/MainActivity.kt (96%)
 rename app/src/main/java/com/asemlab/samples/{ => ui}/NotificationProgressActivity.kt (96%)
 rename app/src/main/java/com/asemlab/samples/{ => ui}/RegisterForResultActivity.kt (98%)
 rename app/src/main/java/com/asemlab/samples/{ => ui}/TestFrag.kt (96%)
 rename app/src/main/java/com/asemlab/samples/{ => utils}/Colors.kt (97%)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b259aad..c1a0df0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -55,17 +55,7 @@
             <!-- </intent-filter> -->
         </activity>
         <activity
-            android:name=".MainActivity"
-            android:exported="true">
-<!--            <intent-filter>-->
-<!--                <action android:name="android.intent.action.MAIN" />-->
-
-<!--                <category android:name="android.intent.category.LAUNCHER" />-->
-<!--            </intent-filter>-->
-        </activity>
-        <activity android:name=".RegisterForResultActivity" />
-        <activity
-            android:name=".NotificationProgressActivity"
+            android:name=".ui.MainActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -73,6 +63,16 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity android:name=".ui.RegisterForResultActivity" />
+        <activity
+            android:name=".ui.NotificationProgressActivity"
+            android:exported="true">
+<!--            <intent-filter>-->
+<!--                <action android:name="android.intent.action.MAIN" />-->
+
+<!--                <category android:name="android.intent.category.LAUNCHER" />-->
+<!--            </intent-filter>-->
+        </activity>
 
         <receiver
             android:name=".download.DownloadCompleteReceiver"
diff --git a/app/src/main/java/com/asemlab/samples/MainActivity.kt b/app/src/main/java/com/asemlab/samples/ui/MainActivity.kt
similarity index 96%
rename from app/src/main/java/com/asemlab/samples/MainActivity.kt
rename to app/src/main/java/com/asemlab/samples/ui/MainActivity.kt
index 65e57fa..a2321df 100644
--- a/app/src/main/java/com/asemlab/samples/MainActivity.kt
+++ b/app/src/main/java/com/asemlab/samples/ui/MainActivity.kt
@@ -1,4 +1,4 @@
-package com.asemlab.samples
+package com.asemlab.samples.ui
 
 import android.Manifest
 import android.content.pm.PackageManager
@@ -9,6 +9,7 @@ import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
+import com.asemlab.samples.R
 import com.asemlab.samples.download.FileDownloaderImp
 
 
diff --git a/app/src/main/java/com/asemlab/samples/NotificationProgressActivity.kt b/app/src/main/java/com/asemlab/samples/ui/NotificationProgressActivity.kt
similarity index 96%
rename from app/src/main/java/com/asemlab/samples/NotificationProgressActivity.kt
rename to app/src/main/java/com/asemlab/samples/ui/NotificationProgressActivity.kt
index 3c2619d..67203a1 100644
--- a/app/src/main/java/com/asemlab/samples/NotificationProgressActivity.kt
+++ b/app/src/main/java/com/asemlab/samples/ui/NotificationProgressActivity.kt
@@ -1,4 +1,4 @@
-package com.asemlab.samples
+package com.asemlab.samples.ui
 
 import android.os.Bundle
 import androidx.activity.enableEdgeToEdge
@@ -6,6 +6,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.lifecycle.coroutineScope
+import com.asemlab.samples.R
 import com.asemlab.samples.utils.NotificationsUtils
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
diff --git a/app/src/main/java/com/asemlab/samples/RegisterForResultActivity.kt b/app/src/main/java/com/asemlab/samples/ui/RegisterForResultActivity.kt
similarity index 98%
rename from app/src/main/java/com/asemlab/samples/RegisterForResultActivity.kt
rename to app/src/main/java/com/asemlab/samples/ui/RegisterForResultActivity.kt
index dc644f6..9e728f5 100644
--- a/app/src/main/java/com/asemlab/samples/RegisterForResultActivity.kt
+++ b/app/src/main/java/com/asemlab/samples/ui/RegisterForResultActivity.kt
@@ -1,4 +1,4 @@
-package com.asemlab.samples
+package com.asemlab.samples.ui
 
 import android.Manifest
 import android.annotation.SuppressLint
@@ -15,6 +15,7 @@ import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory
 import androidx.databinding.DataBindingUtil
+import com.asemlab.samples.R
 import com.asemlab.samples.databinding.ActivityRegisterForResultBinding
 
 
diff --git a/app/src/main/java/com/asemlab/samples/TestFrag.kt b/app/src/main/java/com/asemlab/samples/ui/TestFrag.kt
similarity index 96%
rename from app/src/main/java/com/asemlab/samples/TestFrag.kt
rename to app/src/main/java/com/asemlab/samples/ui/TestFrag.kt
index 83bfa94..c065dc6 100644
--- a/app/src/main/java/com/asemlab/samples/TestFrag.kt
+++ b/app/src/main/java/com/asemlab/samples/ui/TestFrag.kt
@@ -1,4 +1,4 @@
-package com.asemlab.samples
+package com.asemlab.samples.ui
 
 import android.content.res.Configuration
 import android.graphics.Color
@@ -9,6 +9,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import androidx.fragment.app.Fragment
+import com.asemlab.samples.utils.Colors
 import com.asemlab.samples.databinding.FragBinding
 
 class TestFrag(private val title: String) : Fragment() {
diff --git a/app/src/main/java/com/asemlab/samples/Colors.kt b/app/src/main/java/com/asemlab/samples/utils/Colors.kt
similarity index 97%
rename from app/src/main/java/com/asemlab/samples/Colors.kt
rename to app/src/main/java/com/asemlab/samples/utils/Colors.kt
index 2cbd489..7404c8f 100644
--- a/app/src/main/java/com/asemlab/samples/Colors.kt
+++ b/app/src/main/java/com/asemlab/samples/utils/Colors.kt
@@ -1,4 +1,4 @@
-package com.asemlab.samples
+package com.asemlab.samples.utils
 
 import android.graphics.Color
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 4a5c58c..7d715e9 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -5,7 +5,7 @@
     android:id="@+id/main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.asemlab.samples.MainActivity">
+    tools:context="com.asemlab.samples.ui.MainActivity">
 
     <Button
         android:id="@+id/frag1"
diff --git a/app/src/main/res/layout/activity_notification_progress.xml b/app/src/main/res/layout/activity_notification_progress.xml
index 4d0fa5c..f6add67 100644
--- a/app/src/main/res/layout/activity_notification_progress.xml
+++ b/app/src/main/res/layout/activity_notification_progress.xml
@@ -4,6 +4,6 @@
     android:id="@+id/main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".NotificationProgressActivity">
+    tools:context=".ui.NotificationProgressActivity">
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_register_for_result.xml b/app/src/main/res/layout/activity_register_for_result.xml
index b0af612..1691d57 100644
--- a/app/src/main/res/layout/activity_register_for_result.xml
+++ b/app/src/main/res/layout/activity_register_for_result.xml
@@ -7,7 +7,7 @@
         android:id="@+id/constraintLayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        tools:context=".RegisterForResultActivity">
+        tools:context=".ui.RegisterForResultActivity">
 
         <ImageView
             android:id="@+id/img"
diff --git a/app/src/main/res/layout/frag.xml b/app/src/main/res/layout/frag.xml
index cfecfb3..c8a60e2 100644
--- a/app/src/main/res/layout/frag.xml
+++ b/app/src/main/res/layout/frag.xml
@@ -6,7 +6,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        tools:context=".TestFrag">
+        tools:context=".ui.TestFrag">
 
         <TextView
             android:id="@+id/title"
diff --git a/app/src/main/res/layout/frag_2.xml b/app/src/main/res/layout/frag_2.xml
index 380db9f..780ace1 100644
--- a/app/src/main/res/layout/frag_2.xml
+++ b/app/src/main/res/layout/frag_2.xml
@@ -6,7 +6,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        tools:context=".TestFrag">
+        tools:context=".ui.TestFrag">
 
         <TextView
             android:id="@+id/title"
diff --git a/app/src/main/res/layout/frag_3.xml b/app/src/main/res/layout/frag_3.xml
index 4dbf2ed..9678c09 100644
--- a/app/src/main/res/layout/frag_3.xml
+++ b/app/src/main/res/layout/frag_3.xml
@@ -6,7 +6,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        tools:context=".TestFrag">
+        tools:context=".ui.TestFrag">
 
 
         <TextView