Refactor folder structure

Author: daniel-stoneuk

app/src/main/AndroidManifest.xml

@@ -10,7 +10,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name="guide.graphql.toc.MainActivity">
+        <activity android:name="guide.graphql.toc.ui.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />

app/src/main/java/guide/graphql/toc/Apollo.kt renamed to app/src/main/java/guide/graphql/toc/data/Apollo.kt

@@ -1,4 +1,4 @@
-package guide.graphql.toc
+package guide.graphql.toc.data
 
 import com.apollographql.apollo.ApolloClient
 import com.apollographql.apollo.cache.normalized.lru.EvictionPolicy

app/src/main/java/guide/graphql/toc/Resource.kt renamed to app/src/main/java/guide/graphql/toc/data/Resource.kt

@@ -1,18 +1,33 @@
-package guide.graphql.toc
+package guide.graphql.toc.data
 
 //https://github.com/android/architecture-components-samples/blob/master/GithubBrowserSample/app/src/main/java/com/android/example/github/vo/Resource.kt
+/**
+ * Wrapper for a result object with loading, success and error states
+ */
 data class Resource<out T>(val status: Status, val data: T?, val message: String?) {
     companion object {
         fun <T> success(data: T?): Resource<T> {
-            return Resource(Status.SUCCESS, data, null)
+            return Resource(
+                Status.SUCCESS,
+                data,
+                null
+            )
         }
 
         fun <T> error(msg: String, data: T?): Resource<T> {
-            return Resource(Status.ERROR, data, msg)
+            return Resource(
+                Status.ERROR,
+                data,
+                msg
+            )
         }
 
         fun <T> loading(data: T?): Resource<T> {
-            return Resource(Status.LOADING, data, null)
+            return Resource(
+                Status.LOADING,
+                data,
+                null
+            )
         }
     }
 }

app/src/main/java/guide/graphql/toc/MainActivity.kt renamed to app/src/main/java/guide/graphql/toc/ui/MainActivity.kt

@@ -1,10 +1,11 @@
-package guide.graphql.toc
+package guide.graphql.toc.ui
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.navigation.NavController
 import androidx.navigation.fragment.NavHostFragment
 import androidx.navigation.ui.NavigationUI
+import guide.graphql.toc.R
 import guide.graphql.toc.databinding.ActivityMainBinding
 
 

app/src/main/java/guide/graphql/toc/ui/chapters/ChaptersFragment.kt

@@ -13,7 +13,7 @@ import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.transition.MaterialSharedAxis
 import guide.graphql.toc.R
-import guide.graphql.toc.Status
+import guide.graphql.toc.data.Status
 import guide.graphql.toc.databinding.ChaptersFragmentBinding
 
 class ChaptersFragment : Fragment() {

app/src/main/java/guide/graphql/toc/ui/chapters/ChaptersViewModel.kt

@@ -7,8 +7,8 @@ import androidx.lifecycle.liveData
 import com.apollographql.apollo.coroutines.toDeferred
 import com.apollographql.apollo.exception.ApolloException
 import guide.graphql.toc.ChaptersQuery
-import guide.graphql.toc.Resource
-import guide.graphql.toc.apolloClient
+import guide.graphql.toc.data.Resource
+import guide.graphql.toc.data.apolloClient
 
 class ChaptersViewModel : ViewModel() {
 

app/src/main/java/guide/graphql/toc/ui/sections/SectionsFragment.kt

@@ -11,7 +11,7 @@ import androidx.navigation.fragment.navArgs
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.transition.MaterialSharedAxis
-import guide.graphql.toc.Status
+import guide.graphql.toc.data.Status
 import guide.graphql.toc.databinding.SectionsFragmentBinding
 
 class SectionsFragment : Fragment() {

app/src/main/java/guide/graphql/toc/ui/sections/SectionsViewModel.kt

@@ -4,9 +4,9 @@ import android.util.Log
 import androidx.lifecycle.*
 import com.apollographql.apollo.coroutines.toDeferred
 import com.apollographql.apollo.exception.ApolloException
-import guide.graphql.toc.Resource
+import guide.graphql.toc.data.Resource
 import guide.graphql.toc.SectionsQuery
-import guide.graphql.toc.apolloClient
+import guide.graphql.toc.data.apolloClient
 
 class SectionsViewModel : ViewModel() {
 

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

@@ -5,7 +5,7 @@
     android:id="@+id/main_frame_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    tools:context=".ui.MainActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/app_bar_layout"