From 1171e66076067b4ebad39d79479766fcbf49539e Mon Sep 17 00:00:00 2001
From: Jarne Demeulemeester <jarnedemeulemeester@gmail.com>
Date: Wed, 9 Jun 2021 21:36:05 +0200
Subject: [PATCH] Improve project folder structure

---
 app/src/main/java/dev/jdtech/jellyfin/BindingAdapters.kt    | 2 +-
 .../{serverselect => adapters}/ServerGridAdapter.kt         | 2 +-
 .../jdtech/jellyfin/dialogs/DeleteServerDialogFragment.kt   | 2 +-
 .../jdtech/jellyfin/{ => fragments}/AddServerFragment.kt    | 3 ++-
 .../dev/jdtech/jellyfin/{ => fragments}/LoginFragment.kt    | 3 ++-
 .../{serverselect => fragments}/ServerSelectFragment.kt     | 5 ++++-
 .../{serverselect => viewmodels}/ServerSelectViewModel.kt   | 2 +-
 .../ServerSelectViewModelFactory.kt                         | 2 +-
 app/src/main/res/layout/fragment_add_server.xml             | 2 +-
 app/src/main/res/layout/fragment_login.xml                  | 2 +-
 app/src/main/res/layout/fragment_server_select.xml          | 4 ++--
 app/src/main/res/navigation/navigation.xml                  | 6 +++---
 12 files changed, 20 insertions(+), 15 deletions(-)
 rename app/src/main/java/dev/jdtech/jellyfin/{serverselect => adapters}/ServerGridAdapter.kt (97%)
 rename app/src/main/java/dev/jdtech/jellyfin/{ => fragments}/AddServerFragment.kt (92%)
 rename app/src/main/java/dev/jdtech/jellyfin/{ => fragments}/LoginFragment.kt (85%)
 rename app/src/main/java/dev/jdtech/jellyfin/{serverselect => fragments}/ServerSelectFragment.kt (88%)
 rename app/src/main/java/dev/jdtech/jellyfin/{serverselect => viewmodels}/ServerSelectViewModel.kt (97%)
 rename app/src/main/java/dev/jdtech/jellyfin/{serverselect => viewmodels}/ServerSelectViewModelFactory.kt (94%)

diff --git a/app/src/main/java/dev/jdtech/jellyfin/BindingAdapters.kt b/app/src/main/java/dev/jdtech/jellyfin/BindingAdapters.kt
index 4e828e89..55d290b2 100644
--- a/app/src/main/java/dev/jdtech/jellyfin/BindingAdapters.kt
+++ b/app/src/main/java/dev/jdtech/jellyfin/BindingAdapters.kt
@@ -3,7 +3,7 @@ package dev.jdtech.jellyfin
 import androidx.databinding.BindingAdapter
 import androidx.recyclerview.widget.RecyclerView
 import dev.jdtech.jellyfin.database.Server
-import dev.jdtech.jellyfin.serverselect.ServerGridAdapter
+import dev.jdtech.jellyfin.adapters.ServerGridAdapter
 
 @BindingAdapter("listData")
 fun bindRecyclerView(recyclerView: RecyclerView, data: List<Server>?) {
diff --git a/app/src/main/java/dev/jdtech/jellyfin/serverselect/ServerGridAdapter.kt b/app/src/main/java/dev/jdtech/jellyfin/adapters/ServerGridAdapter.kt
similarity index 97%
rename from app/src/main/java/dev/jdtech/jellyfin/serverselect/ServerGridAdapter.kt
rename to app/src/main/java/dev/jdtech/jellyfin/adapters/ServerGridAdapter.kt
index a2201d13..7b7e849e 100644
--- a/app/src/main/java/dev/jdtech/jellyfin/serverselect/ServerGridAdapter.kt
+++ b/app/src/main/java/dev/jdtech/jellyfin/adapters/ServerGridAdapter.kt
@@ -1,4 +1,4 @@
-package dev.jdtech.jellyfin.serverselect
+package dev.jdtech.jellyfin.adapters
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
diff --git a/app/src/main/java/dev/jdtech/jellyfin/dialogs/DeleteServerDialogFragment.kt b/app/src/main/java/dev/jdtech/jellyfin/dialogs/DeleteServerDialogFragment.kt
index 95f67d9d..53bedbd5 100644
--- a/app/src/main/java/dev/jdtech/jellyfin/dialogs/DeleteServerDialogFragment.kt
+++ b/app/src/main/java/dev/jdtech/jellyfin/dialogs/DeleteServerDialogFragment.kt
@@ -6,7 +6,7 @@ import android.os.Bundle
 import androidx.fragment.app.DialogFragment
 import dev.jdtech.jellyfin.R
 import dev.jdtech.jellyfin.database.Server
-import dev.jdtech.jellyfin.serverselect.ServerSelectViewModel
+import dev.jdtech.jellyfin.viewmodels.ServerSelectViewModel
 import java.lang.IllegalStateException
 
 class DeleteServerDialogFragment(private val viewModel: ServerSelectViewModel, val server: Server) : DialogFragment() {
diff --git a/app/src/main/java/dev/jdtech/jellyfin/AddServerFragment.kt b/app/src/main/java/dev/jdtech/jellyfin/fragments/AddServerFragment.kt
similarity index 92%
rename from app/src/main/java/dev/jdtech/jellyfin/AddServerFragment.kt
rename to app/src/main/java/dev/jdtech/jellyfin/fragments/AddServerFragment.kt
index 2c741e6d..9d21b723 100644
--- a/app/src/main/java/dev/jdtech/jellyfin/AddServerFragment.kt
+++ b/app/src/main/java/dev/jdtech/jellyfin/fragments/AddServerFragment.kt
@@ -1,4 +1,4 @@
-package dev.jdtech.jellyfin
+package dev.jdtech.jellyfin.fragments
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment
@@ -6,6 +6,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.navigation.findNavController
+import dev.jdtech.jellyfin.R
 import dev.jdtech.jellyfin.databinding.FragmentAddServerBinding
 
 class AddServerFragment : Fragment() {
diff --git a/app/src/main/java/dev/jdtech/jellyfin/LoginFragment.kt b/app/src/main/java/dev/jdtech/jellyfin/fragments/LoginFragment.kt
similarity index 85%
rename from app/src/main/java/dev/jdtech/jellyfin/LoginFragment.kt
rename to app/src/main/java/dev/jdtech/jellyfin/fragments/LoginFragment.kt
index 25a678f8..4e70abdd 100644
--- a/app/src/main/java/dev/jdtech/jellyfin/LoginFragment.kt
+++ b/app/src/main/java/dev/jdtech/jellyfin/fragments/LoginFragment.kt
@@ -1,10 +1,11 @@
-package dev.jdtech.jellyfin
+package dev.jdtech.jellyfin.fragments
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import dev.jdtech.jellyfin.R
 
 class LoginFragment : Fragment() {
     override fun onCreateView(
diff --git a/app/src/main/java/dev/jdtech/jellyfin/serverselect/ServerSelectFragment.kt b/app/src/main/java/dev/jdtech/jellyfin/fragments/ServerSelectFragment.kt
similarity index 88%
rename from app/src/main/java/dev/jdtech/jellyfin/serverselect/ServerSelectFragment.kt
rename to app/src/main/java/dev/jdtech/jellyfin/fragments/ServerSelectFragment.kt
index 9a98f9eb..ccfd8bec 100644
--- a/app/src/main/java/dev/jdtech/jellyfin/serverselect/ServerSelectFragment.kt
+++ b/app/src/main/java/dev/jdtech/jellyfin/fragments/ServerSelectFragment.kt
@@ -1,4 +1,4 @@
-package dev.jdtech.jellyfin.serverselect
+package dev.jdtech.jellyfin.fragments
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment
@@ -12,6 +12,9 @@ import dev.jdtech.jellyfin.R
 import dev.jdtech.jellyfin.database.ServerDatabase
 import dev.jdtech.jellyfin.databinding.FragmentServerSelectBinding
 import dev.jdtech.jellyfin.dialogs.DeleteServerDialogFragment
+import dev.jdtech.jellyfin.adapters.ServerGridAdapter
+import dev.jdtech.jellyfin.viewmodels.ServerSelectViewModelFactory
+import dev.jdtech.jellyfin.viewmodels.ServerSelectViewModel
 
 
 class ServerSelectFragment : Fragment() {
diff --git a/app/src/main/java/dev/jdtech/jellyfin/serverselect/ServerSelectViewModel.kt b/app/src/main/java/dev/jdtech/jellyfin/viewmodels/ServerSelectViewModel.kt
similarity index 97%
rename from app/src/main/java/dev/jdtech/jellyfin/serverselect/ServerSelectViewModel.kt
rename to app/src/main/java/dev/jdtech/jellyfin/viewmodels/ServerSelectViewModel.kt
index 9815f9e2..2ffd2ab5 100644
--- a/app/src/main/java/dev/jdtech/jellyfin/serverselect/ServerSelectViewModel.kt
+++ b/app/src/main/java/dev/jdtech/jellyfin/viewmodels/ServerSelectViewModel.kt
@@ -1,4 +1,4 @@
-package dev.jdtech.jellyfin.serverselect
+package dev.jdtech.jellyfin.viewmodels
 
 import android.app.Application
 import androidx.lifecycle.LiveData
diff --git a/app/src/main/java/dev/jdtech/jellyfin/serverselect/ServerSelectViewModelFactory.kt b/app/src/main/java/dev/jdtech/jellyfin/viewmodels/ServerSelectViewModelFactory.kt
similarity index 94%
rename from app/src/main/java/dev/jdtech/jellyfin/serverselect/ServerSelectViewModelFactory.kt
rename to app/src/main/java/dev/jdtech/jellyfin/viewmodels/ServerSelectViewModelFactory.kt
index 742f69eb..67d528f2 100644
--- a/app/src/main/java/dev/jdtech/jellyfin/serverselect/ServerSelectViewModelFactory.kt
+++ b/app/src/main/java/dev/jdtech/jellyfin/viewmodels/ServerSelectViewModelFactory.kt
@@ -1,4 +1,4 @@
-package dev.jdtech.jellyfin.serverselect
+package dev.jdtech.jellyfin.viewmodels
 
 import android.app.Application
 import androidx.lifecycle.ViewModel
diff --git a/app/src/main/res/layout/fragment_add_server.xml b/app/src/main/res/layout/fragment_add_server.xml
index fce1fa49..f38467e4 100644
--- a/app/src/main/res/layout/fragment_add_server.xml
+++ b/app/src/main/res/layout/fragment_add_server.xml
@@ -7,7 +7,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        tools:context=".AddServerFragment">
+        tools:context=".fragments.AddServerFragment">
 
 
         <ImageView
diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml
index 7b5425db..6cfdc35a 100644
--- a/app/src/main/res/layout/fragment_login.xml
+++ b/app/src/main/res/layout/fragment_login.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".LoginFragment">
+    tools:context=".fragments.LoginFragment">
 
     <ImageView
         android:id="@+id/image_banner"
diff --git a/app/src/main/res/layout/fragment_server_select.xml b/app/src/main/res/layout/fragment_server_select.xml
index 0fd22f7c..5d88cf4b 100644
--- a/app/src/main/res/layout/fragment_server_select.xml
+++ b/app/src/main/res/layout/fragment_server_select.xml
@@ -7,13 +7,13 @@
 
         <variable
             name="viewModel"
-            type="dev.jdtech.jellyfin.serverselect.ServerSelectViewModel" />
+            type="dev.jdtech.jellyfin.viewmodels.ServerSelectViewModel" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        tools:context=".AddServerFragment">
+        tools:context=".fragments.AddServerFragment">
 
 
         <ImageView
diff --git a/app/src/main/res/navigation/navigation.xml b/app/src/main/res/navigation/navigation.xml
index d6ea1f33..1a1c21b2 100644
--- a/app/src/main/res/navigation/navigation.xml
+++ b/app/src/main/res/navigation/navigation.xml
@@ -6,7 +6,7 @@
     app:startDestination="@id/serverSelectFragment">
     <fragment
         android:id="@+id/addServerFragment"
-        android:name="dev.jdtech.jellyfin.AddServerFragment"
+        android:name="dev.jdtech.jellyfin.fragments.AddServerFragment"
         android:label="fragment_add_server"
         tools:layout="@layout/fragment_add_server" >
         <action
@@ -19,12 +19,12 @@
     </fragment>
     <fragment
         android:id="@+id/loginFragment"
-        android:name="dev.jdtech.jellyfin.LoginFragment"
+        android:name="dev.jdtech.jellyfin.fragments.LoginFragment"
         android:label="fragment_login"
         tools:layout="@layout/fragment_login" />
     <fragment
         android:id="@+id/serverSelectFragment"
-        android:name="dev.jdtech.jellyfin.serverselect.ServerSelectFragment"
+        android:name="dev.jdtech.jellyfin.fragments.ServerSelectFragment"
         android:label="ServerSelectFragment" >
         <action
             android:id="@+id/action_serverSelectFragment_to_addServerFragment"