Merge pull request #16 from ImaginativeShohag/dev

Refactor project structure

Author: ImaginativeShohag

app/src/main/AndroidManifest.xml

@@ -21,7 +21,7 @@
         android:theme="@style/AppTheme"
         tools:ignore="GoogleAppIndexingWarning,UnusedAttribute">
         <activity
-            android:name=".ui.activities.main.MainActivity"
+            android:name=".ui.screens.MainActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -30,8 +30,8 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="org.imaginativeworld.simplemvvm.ui.activities.activitynav.DemoOneActivity" />
-        <activity android:name="org.imaginativeworld.simplemvvm.ui.activities.activitynav.DemoTwoActivity" />
+        <activity android:name="org.imaginativeworld.simplemvvm.ui.screens.demo_activity_nav.activities.DemoOneActivity" />
+        <activity android:name="org.imaginativeworld.simplemvvm.ui.screens.demo_activity_nav.activities.DemoTwoActivity" />
 
 
         <!-- https://developer.android.com/reference/androidx/core/content/FileProvider -->

app/src/main/java/org/imaginativeworld/simplemvvm/interfaces/MainActivityExtraOnFragmentInteractionListener.kt

@@ -1,6 +1,6 @@
 package org.imaginativeworld.simplemvvm.interfaces
 
-import org.imaginativeworld.simplemvvm.ui.activities.main.MainViewModel
+import org.imaginativeworld.simplemvvm.ui.screens.MainViewModel
 
 interface MainActivityExtraOnFragmentInteractionListener {
     fun getActivityViewModel(): MainViewModel

app/src/main/java/org/imaginativeworld/simplemvvm/ui/activities/main/MainActivity.kt renamed to app/src/main/java/org/imaginativeworld/simplemvvm/ui/screens/MainActivity.kt

@@ -1,4 +1,4 @@
-package org.imaginativeworld.simplemvvm.ui.activities.main
+package org.imaginativeworld.simplemvvm.ui.screens
 
 import android.animation.Animator
 import android.os.Bundle

app/src/main/java/org/imaginativeworld/simplemvvm/ui/activities/main/MainViewModel.kt renamed to app/src/main/java/org/imaginativeworld/simplemvvm/ui/screens/MainViewModel.kt

@@ -1,4 +1,4 @@
-package org.imaginativeworld.simplemvvm.ui.activities.main
+package org.imaginativeworld.simplemvvm.ui.screens
 
 import androidx.lifecycle.ViewModel
 import javax.inject.Inject

app/src/main/java/org/imaginativeworld/simplemvvm/ui/fragments/demo_activity_nav/DemoActivityNavFragment.kt renamed to app/src/main/java/org/imaginativeworld/simplemvvm/ui/screens/demo_activity_nav/DemoActivityNavFragment.kt

@@ -1,4 +1,4 @@
-package org.imaginativeworld.simplemvvm.ui.fragments.demo_activity_nav
+package org.imaginativeworld.simplemvvm.ui.screens.demo_activity_nav
 
 import android.app.Activity
 import android.content.Context
@@ -13,9 +13,9 @@ import org.imaginativeworld.simplemvvm.R
 import org.imaginativeworld.simplemvvm.databinding.FragmentDemoActivityNavBinding
 import org.imaginativeworld.simplemvvm.interfaces.CommonFunctions
 import org.imaginativeworld.simplemvvm.interfaces.OnFragmentInteractionListener
-import org.imaginativeworld.simplemvvm.ui.activities.activitynav.DemoOneActivity
-import org.imaginativeworld.simplemvvm.ui.activities.activitynav.DemoTwoActivity
-import org.imaginativeworld.simplemvvm.ui.activities.activitynav.DemoTwoActivityData
+import org.imaginativeworld.simplemvvm.ui.screens.demo_activity_nav.activities.DemoOneActivity
+import org.imaginativeworld.simplemvvm.ui.screens.demo_activity_nav.activities.DemoTwoActivity
+import org.imaginativeworld.simplemvvm.ui.screens.demo_activity_nav.activities.DemoTwoActivityData
 
 class DemoActivityNavFragment : Fragment(), CommonFunctions {
 

app/src/main/java/org/imaginativeworld/simplemvvm/ui/activities/activitynav/DemoOneActivity.kt renamed to app/src/main/java/org/imaginativeworld/simplemvvm/ui/screens/demo_activity_nav/activities/DemoOneActivity.kt

@@ -1,4 +1,4 @@
-package org.imaginativeworld.simplemvvm.ui.activities.activitynav
+package org.imaginativeworld.simplemvvm.ui.screens.demo_activity_nav.activities
 
 import android.app.Activity
 import android.content.Intent

app/src/main/java/org/imaginativeworld/simplemvvm/ui/activities/activitynav/DemoTwoActivity.kt renamed to app/src/main/java/org/imaginativeworld/simplemvvm/ui/screens/demo_activity_nav/activities/DemoTwoActivity.kt

@@ -1,4 +1,4 @@
-package org.imaginativeworld.simplemvvm.ui.activities.activitynav
+package org.imaginativeworld.simplemvvm.ui.screens.demo_activity_nav.activities
 
 import android.content.Intent
 import android.os.Bundle

app/src/main/java/org/imaginativeworld/simplemvvm/ui/fragments/demo_carousel/DemoCarouselFragment.kt renamed to app/src/main/java/org/imaginativeworld/simplemvvm/ui/screens/demo_carousel/DemoCarouselFragment.kt

@@ -1,4 +1,4 @@
-package org.imaginativeworld.simplemvvm.ui.fragments.demo_carousel
+package org.imaginativeworld.simplemvvm.ui.screens.demo_carousel
 
 import android.content.Context
 import android.os.Bundle

app/src/main/java/org/imaginativeworld/simplemvvm/ui/fragments/demo_fragment_nav/DemoFragmentNavDetails.kt renamed to app/src/main/java/org/imaginativeworld/simplemvvm/ui/screens/demo_fragment_nav/DemoFragmentNavDetails.kt

@@ -1,4 +1,4 @@
-package org.imaginativeworld.simplemvvm.ui.fragments.demo_fragment_nav
+package org.imaginativeworld.simplemvvm.ui.screens.demo_fragment_nav
 
 import android.os.Bundle
 import android.view.View
@@ -9,7 +9,7 @@ import androidx.fragment.app.viewModels
 import org.imaginativeworld.simplemvvm.R
 import org.imaginativeworld.simplemvvm.databinding.FragmentDemoFragmentNavDetailsBinding
 import org.imaginativeworld.simplemvvm.interfaces.CommonFunctions
-import org.imaginativeworld.simplemvvm.ui.fragments.demo_fragment_nav.viewmodel.DemoFragmentNavViewModel
+import org.imaginativeworld.simplemvvm.ui.screens.demo_fragment_nav.viewmodel.DemoFragmentNavViewModel
 
 class DemoFragmentNavDetails :
     Fragment(R.layout.fragment_demo_fragment_nav_details),

app/src/main/java/org/imaginativeworld/simplemvvm/ui/fragments/demo_fragment_nav/DemoFragmentNavFragment.kt renamed to app/src/main/java/org/imaginativeworld/simplemvvm/ui/screens/demo_fragment_nav/DemoFragmentNavFragment.kt

@@ -1,4 +1,4 @@
-package org.imaginativeworld.simplemvvm.ui.fragments.demo_fragment_nav
+package org.imaginativeworld.simplemvvm.ui.screens.demo_fragment_nav
 
 import android.content.Context
 import android.os.Bundle
@@ -13,7 +13,7 @@ import org.imaginativeworld.simplemvvm.R
 import org.imaginativeworld.simplemvvm.databinding.FragmentDemoFragmentNavBinding
 import org.imaginativeworld.simplemvvm.interfaces.CommonFunctions
 import org.imaginativeworld.simplemvvm.interfaces.OnFragmentInteractionListener
-import org.imaginativeworld.simplemvvm.ui.fragments.demo_fragment_nav.viewmodel.DemoFragmentNavViewModel
+import org.imaginativeworld.simplemvvm.ui.screens.demo_fragment_nav.viewmodel.DemoFragmentNavViewModel
 import timber.log.Timber
 
 class DemoFragmentNavFragment : Fragment(), CommonFunctions {

app/src/main/java/org/imaginativeworld/simplemvvm/ui/fragments/demo_fragment_nav/DemoFragmentNavList.kt renamed to app/src/main/java/org/imaginativeworld/simplemvvm/ui/screens/demo_fragment_nav/DemoFragmentNavList.kt

@@ -1,4 +1,4 @@
-package org.imaginativeworld.simplemvvm.ui.fragments.demo_fragment_nav
+package org.imaginativeworld.simplemvvm.ui.screens.demo_fragment_nav
 
 import android.os.Bundle
 import android.view.View
@@ -10,7 +10,7 @@ import androidx.fragment.app.viewModels
 import org.imaginativeworld.simplemvvm.R
 import org.imaginativeworld.simplemvvm.databinding.FragmentDemoFragmentNavListBinding
 import org.imaginativeworld.simplemvvm.interfaces.CommonFunctions
-import org.imaginativeworld.simplemvvm.ui.fragments.demo_fragment_nav.viewmodel.DemoFragmentNavViewModel
+import org.imaginativeworld.simplemvvm.ui.screens.demo_fragment_nav.viewmodel.DemoFragmentNavViewModel
 import timber.log.Timber
 
 class DemoFragmentNavList : Fragment(R.layout.fragment_demo_fragment_nav_list), CommonFunctions {

app/src/main/java/org/imaginativeworld/simplemvvm/ui/fragments/demo_fragment_nav/viewmodel/DemoFragmentNavViewModel.kt renamed to app/src/main/java/org/imaginativeworld/simplemvvm/ui/screens/demo_fragment_nav/viewmodel/DemoFragmentNavViewModel.kt

@@ -1,4 +1,4 @@
-package org.imaginativeworld.simplemvvm.ui.fragments.demo_fragment_nav.viewmodel
+package org.imaginativeworld.simplemvvm.ui.screens.demo_fragment_nav.viewmodel
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData

app/src/main/java/org/imaginativeworld/simplemvvm/ui/fragments/demo_home/DemoHomeFragment.kt renamed to app/src/main/java/org/imaginativeworld/simplemvvm/ui/screens/demo_home/DemoHomeFragment.kt

@@ -1,4 +1,4 @@
-package org.imaginativeworld.simplemvvm.ui.fragments.demo_home
+package org.imaginativeworld.simplemvvm.ui.screens.demo_home
 
 import android.content.Context
 import android.content.res.Configuration

app/src/main/java/org/imaginativeworld/simplemvvm/ui/fragments/demo_home/DemoHomeViewModel.kt renamed to app/src/main/java/org/imaginativeworld/simplemvvm/ui/screens/demo_home/DemoHomeViewModel.kt

@@ -1,4 +1,4 @@
-package org.imaginativeworld.simplemvvm.ui.fragments.demo_home
+package org.imaginativeworld.simplemvvm.ui.screens.demo_home
 
 import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel

app/src/main/java/org/imaginativeworld/simplemvvm/ui/fragments/demo_latex/DemoLatexFragment.kt renamed to app/src/main/java/org/imaginativeworld/simplemvvm/ui/screens/demo_latex/DemoLatexFragment.kt

@@ -1,4 +1,4 @@
-package org.imaginativeworld.simplemvvm.ui.fragments.demo_latex
+package org.imaginativeworld.simplemvvm.ui.screens.demo_latex
 
 import android.content.Context
 import android.os.Bundle

app/src/main/java/org/imaginativeworld/simplemvvm/ui/fragments/demo_latex/DemoLatexViewModel.kt renamed to app/src/main/java/org/imaginativeworld/simplemvvm/ui/screens/demo_latex/DemoLatexViewModel.kt

@@ -1,4 +1,4 @@
-package org.imaginativeworld.simplemvvm.ui.fragments.demo_latex
+package org.imaginativeworld.simplemvvm.ui.screens.demo_latex
 
 import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel

app/src/main/java/org/imaginativeworld/simplemvvm/ui/fragments/demo_post/DemoPostFragment.kt renamed to app/src/main/java/org/imaginativeworld/simplemvvm/ui/screens/demo_post/DemoPostFragment.kt

@@ -1,4 +1,4 @@
-package org.imaginativeworld.simplemvvm.ui.fragments.demo_post
+package org.imaginativeworld.simplemvvm.ui.screens.demo_post
 
 import android.content.Context
 import android.os.Bundle

app/src/main/java/org/imaginativeworld/simplemvvm/ui/fragments/demo_post/DemoPostViewModel.kt renamed to app/src/main/java/org/imaginativeworld/simplemvvm/ui/screens/demo_post/DemoPostViewModel.kt

@@ -1,4 +1,4 @@
-package org.imaginativeworld.simplemvvm.ui.fragments.demo_post
+package org.imaginativeworld.simplemvvm.ui.screens.demo_post
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData

app/src/main/java/org/imaginativeworld/simplemvvm/ui/fragments/demo_postpaged/DemoPostPagedFragment.kt renamed to app/src/main/java/org/imaginativeworld/simplemvvm/ui/screens/demo_postpaged/DemoPostPagedFragment.kt

@@ -1,4 +1,4 @@
-package org.imaginativeworld.simplemvvm.ui.fragments.demo_postpaged
+package org.imaginativeworld.simplemvvm.ui.screens.demo_postpaged
 
 import android.content.Context
 import android.os.Bundle

app/src/main/java/org/imaginativeworld/simplemvvm/ui/fragments/demo_postpaged/DemoPostPagedViewModel.kt renamed to app/src/main/java/org/imaginativeworld/simplemvvm/ui/screens/demo_postpaged/DemoPostPagedViewModel.kt

@@ -1,4 +1,4 @@
-package org.imaginativeworld.simplemvvm.ui.fragments.demo_postpaged
+package org.imaginativeworld.simplemvvm.ui.screens.demo_postpaged
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope

app/src/main/java/org/imaginativeworld/simplemvvm/ui/fragments/demo_user/DemoUserFragment.kt renamed to app/src/main/java/org/imaginativeworld/simplemvvm/ui/screens/demo_user/DemoUserFragment.kt

@@ -1,4 +1,4 @@
-package org.imaginativeworld.simplemvvm.ui.fragments.demo_user
+package org.imaginativeworld.simplemvvm.ui.screens.demo_user
 
 import android.content.Context
 import android.os.Bundle

app/src/main/java/org/imaginativeworld/simplemvvm/ui/fragments/demo_user/DemoUserViewModel.kt renamed to app/src/main/java/org/imaginativeworld/simplemvvm/ui/screens/demo_user/DemoUserViewModel.kt

@@ -1,4 +1,4 @@
-package org.imaginativeworld.simplemvvm.ui.fragments.demo_user
+package org.imaginativeworld.simplemvvm.ui.screens.demo_user
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData

app/src/main/java/org/imaginativeworld/simplemvvm/usecase/UserUseCase.kt

@@ -1,8 +1,8 @@
 package org.imaginativeworld.simplemvvm.usecase
 
+import javax.inject.Inject
 import org.imaginativeworld.simplemvvm.models.DemoUserEntity
 import org.imaginativeworld.simplemvvm.repositories.AppRepository
-import javax.inject.Inject
 
 class UserUseCase @Inject constructor(
     private val repository: AppRepository
@@ -22,4 +22,4 @@ class UserUseCase @Inject constructor(
     suspend fun updateUser(user: DemoUserEntity) {
         return repository.updateUser(user)
     }
-}
+}

app/src/main/java/org/imaginativeworld/simplemvvm/utils/onesignal/MyNotificationOpenedHandler.kt

@@ -4,7 +4,7 @@ import android.app.Application
 import android.content.Intent
 import com.onesignal.OSNotificationOpenedResult
 import com.onesignal.OneSignal.OSNotificationOpenedHandler
-import org.imaginativeworld.simplemvvm.ui.activities.main.MainActivity
+import org.imaginativeworld.simplemvvm.ui.screens.MainActivity
 import org.imaginativeworld.simplemvvm.utils.Constants
 import timber.log.Timber
 

app/src/main/res/layout/activity_main.xml

@@ -2,7 +2,7 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".ui.activities.main.MainActivity">
+    tools:context=".ui.screens.MainActivity">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/main_container"

app/src/main/res/layout/demo_fragment_carousel.xml

@@ -2,7 +2,7 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".ui.fragments.demo_home.DemoHomeFragment">
+    tools:context=".ui.screens.demo_home.DemoHomeFragment">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/main_container"

app/src/main/res/layout/demo_fragment_home.xml

@@ -2,13 +2,13 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".ui.fragments.demo_home.DemoHomeFragment">
+    tools:context=".ui.screens.demo_home.DemoHomeFragment">
 
     <data>
 
         <variable
             name="viewModel"
-            type="org.imaginativeworld.simplemvvm.ui.fragments.demo_home.DemoHomeViewModel" />
+            type="org.imaginativeworld.simplemvvm.ui.screens.demo_home.DemoHomeViewModel" />
 
     </data>
 

app/src/main/res/layout/demo_fragment_latex.xml

@@ -2,13 +2,13 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".ui.fragments.demo_home.DemoHomeFragment">
+    tools:context=".ui.screens.demo_home.DemoHomeFragment">
 
     <data>
 
         <variable
             name="viewModel"
-            type="org.imaginativeworld.simplemvvm.ui.fragments.demo_latex.DemoLatexViewModel" />
+            type="org.imaginativeworld.simplemvvm.ui.screens.demo_latex.DemoLatexViewModel" />
 
     </data>
 

app/src/main/res/layout/demo_fragment_post.xml

@@ -2,13 +2,13 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".ui.fragments.demo_post.DemoPostFragment">
+    tools:context=".ui.screens.demo_post.DemoPostFragment">
 
     <data>
 
         <variable
             name="viewModel"
-            type="org.imaginativeworld.simplemvvm.ui.fragments.demo_post.DemoPostViewModel" />
+            type="org.imaginativeworld.simplemvvm.ui.screens.demo_post.DemoPostViewModel" />
 
     </data>
 

app/src/main/res/layout/demo_fragment_post_paged.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".ui.fragments.demo_postpaged.DemoPostPagedFragment">
+    tools:context=".ui.screens.demo_postpaged.DemoPostPagedFragment">
 
     <FrameLayout
         android:layout_width="match_parent"

app/src/main/res/layout/demo_fragment_user.xml

@@ -2,13 +2,13 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".ui.fragments.demo_user.DemoUserFragment">
+    tools:context=".ui.screens.demo_user.DemoUserFragment">
 
     <data>
 
         <variable
             name="viewModel"
-            type="org.imaginativeworld.simplemvvm.ui.fragments.demo_user.DemoUserViewModel" />
+            type="org.imaginativeworld.simplemvvm.ui.screens.demo_user.DemoUserViewModel" />
 
     </data>
 

app/src/main/res/layout/fragment_demo_fragment_nav.xml

@@ -8,7 +8,7 @@
     <!-- List fragment is initialized from XML -->
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/fragment_container_list"
-        android:name="org.imaginativeworld.simplemvvm.ui.fragments.demo_fragment_nav.DemoFragmentNavList"
+        android:name="org.imaginativeworld.simplemvvm.ui.screens.demo_fragment_nav.DemoFragmentNavList"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"

app/src/main/res/navigation/demo_nav_graph.xml

@@ -7,7 +7,7 @@
 
     <fragment
         android:id="@+id/homeFragment"
-        android:name="org.imaginativeworld.simplemvvm.ui.fragments.demo_home.DemoHomeFragment"
+        android:name="org.imaginativeworld.simplemvvm.ui.screens.demo_home.DemoHomeFragment"
         android:label="fragment_home"
         tools:layout="@layout/demo_fragment_home" >
         <action
@@ -34,33 +34,33 @@
     </fragment>
     <fragment
         android:id="@+id/postFragment"
-        android:name="org.imaginativeworld.simplemvvm.ui.fragments.demo_post.DemoPostFragment"
+        android:name="org.imaginativeworld.simplemvvm.ui.screens.demo_post.DemoPostFragment"
         android:label="fragment_post"
         tools:layout="@layout/demo_fragment_post" />
     <fragment
         android:id="@+id/userFragment"
-        android:name="org.imaginativeworld.simplemvvm.ui.fragments.demo_user.DemoUserFragment"
+        android:name="org.imaginativeworld.simplemvvm.ui.screens.demo_user.DemoUserFragment"
         android:label="fragment_user"
         tools:layout="@layout/demo_fragment_user" />
     <fragment
         android:id="@+id/postPagedFragment"
-        android:name="org.imaginativeworld.simplemvvm.ui.fragments.demo_postpaged.DemoPostPagedFragment"
+        android:name="org.imaginativeworld.simplemvvm.ui.screens.demo_postpaged.DemoPostPagedFragment"
         android:label="fragment_post_paged"
         tools:layout="@layout/demo_fragment_post_paged" />
     <fragment
         android:id="@+id/demoCarouselFragment"
-        android:name="org.imaginativeworld.simplemvvm.ui.fragments.demo_carousel.DemoCarouselFragment"
+        android:name="org.imaginativeworld.simplemvvm.ui.screens.demo_carousel.DemoCarouselFragment"
         android:label="DemoCarouselFragment" />
     <fragment
         android:id="@+id/demoLatexFragment"
-        android:name="org.imaginativeworld.simplemvvm.ui.fragments.demo_latex.DemoLatexFragment"
+        android:name="org.imaginativeworld.simplemvvm.ui.screens.demo_latex.DemoLatexFragment"
         android:label="DemoLatexFragment" />
     <fragment
         android:id="@+id/demoActivityNavFragment"
-        android:name="org.imaginativeworld.simplemvvm.ui.fragments.demo_activity_nav.DemoActivityNavFragment"
+        android:name="org.imaginativeworld.simplemvvm.ui.screens.demo_activity_nav.DemoActivityNavFragment"
         android:label="DemoActivityNavFragment" />
     <fragment
         android:id="@+id/demoFragmentNavFragment"
-        android:name="org.imaginativeworld.simplemvvm.ui.fragments.demo_fragment_nav.DemoFragmentNavFragment"
+        android:name="org.imaginativeworld.simplemvvm.ui.screens.demo_fragment_nav.DemoFragmentNavFragment"
         android:label="DemoFragmentNavFragment" />
 </navigation>