Improve project folder structure
This commit is contained in:
parent
b3b19cef04
commit
1171e66076
12 changed files with 20 additions and 15 deletions
|
@ -3,7 +3,7 @@ package dev.jdtech.jellyfin
|
||||||
import androidx.databinding.BindingAdapter
|
import androidx.databinding.BindingAdapter
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import dev.jdtech.jellyfin.database.Server
|
import dev.jdtech.jellyfin.database.Server
|
||||||
import dev.jdtech.jellyfin.serverselect.ServerGridAdapter
|
import dev.jdtech.jellyfin.adapters.ServerGridAdapter
|
||||||
|
|
||||||
@BindingAdapter("listData")
|
@BindingAdapter("listData")
|
||||||
fun bindRecyclerView(recyclerView: RecyclerView, data: List<Server>?) {
|
fun bindRecyclerView(recyclerView: RecyclerView, data: List<Server>?) {
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package dev.jdtech.jellyfin.serverselect
|
package dev.jdtech.jellyfin.adapters
|
||||||
|
|
||||||
import android.view.LayoutInflater
|
import android.view.LayoutInflater
|
||||||
import android.view.ViewGroup
|
import android.view.ViewGroup
|
|
@ -6,7 +6,7 @@ import android.os.Bundle
|
||||||
import androidx.fragment.app.DialogFragment
|
import androidx.fragment.app.DialogFragment
|
||||||
import dev.jdtech.jellyfin.R
|
import dev.jdtech.jellyfin.R
|
||||||
import dev.jdtech.jellyfin.database.Server
|
import dev.jdtech.jellyfin.database.Server
|
||||||
import dev.jdtech.jellyfin.serverselect.ServerSelectViewModel
|
import dev.jdtech.jellyfin.viewmodels.ServerSelectViewModel
|
||||||
import java.lang.IllegalStateException
|
import java.lang.IllegalStateException
|
||||||
|
|
||||||
class DeleteServerDialogFragment(private val viewModel: ServerSelectViewModel, val server: Server) : DialogFragment() {
|
class DeleteServerDialogFragment(private val viewModel: ServerSelectViewModel, val server: Server) : DialogFragment() {
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package dev.jdtech.jellyfin
|
package dev.jdtech.jellyfin.fragments
|
||||||
|
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import androidx.fragment.app.Fragment
|
import androidx.fragment.app.Fragment
|
||||||
|
@ -6,6 +6,7 @@ import android.view.LayoutInflater
|
||||||
import android.view.View
|
import android.view.View
|
||||||
import android.view.ViewGroup
|
import android.view.ViewGroup
|
||||||
import androidx.navigation.findNavController
|
import androidx.navigation.findNavController
|
||||||
|
import dev.jdtech.jellyfin.R
|
||||||
import dev.jdtech.jellyfin.databinding.FragmentAddServerBinding
|
import dev.jdtech.jellyfin.databinding.FragmentAddServerBinding
|
||||||
|
|
||||||
class AddServerFragment : Fragment() {
|
class AddServerFragment : Fragment() {
|
|
@ -1,10 +1,11 @@
|
||||||
package dev.jdtech.jellyfin
|
package dev.jdtech.jellyfin.fragments
|
||||||
|
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import androidx.fragment.app.Fragment
|
import androidx.fragment.app.Fragment
|
||||||
import android.view.LayoutInflater
|
import android.view.LayoutInflater
|
||||||
import android.view.View
|
import android.view.View
|
||||||
import android.view.ViewGroup
|
import android.view.ViewGroup
|
||||||
|
import dev.jdtech.jellyfin.R
|
||||||
|
|
||||||
class LoginFragment : Fragment() {
|
class LoginFragment : Fragment() {
|
||||||
override fun onCreateView(
|
override fun onCreateView(
|
|
@ -1,4 +1,4 @@
|
||||||
package dev.jdtech.jellyfin.serverselect
|
package dev.jdtech.jellyfin.fragments
|
||||||
|
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import androidx.fragment.app.Fragment
|
import androidx.fragment.app.Fragment
|
||||||
|
@ -12,6 +12,9 @@ import dev.jdtech.jellyfin.R
|
||||||
import dev.jdtech.jellyfin.database.ServerDatabase
|
import dev.jdtech.jellyfin.database.ServerDatabase
|
||||||
import dev.jdtech.jellyfin.databinding.FragmentServerSelectBinding
|
import dev.jdtech.jellyfin.databinding.FragmentServerSelectBinding
|
||||||
import dev.jdtech.jellyfin.dialogs.DeleteServerDialogFragment
|
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() {
|
class ServerSelectFragment : Fragment() {
|
|
@ -1,4 +1,4 @@
|
||||||
package dev.jdtech.jellyfin.serverselect
|
package dev.jdtech.jellyfin.viewmodels
|
||||||
|
|
||||||
import android.app.Application
|
import android.app.Application
|
||||||
import androidx.lifecycle.LiveData
|
import androidx.lifecycle.LiveData
|
|
@ -1,4 +1,4 @@
|
||||||
package dev.jdtech.jellyfin.serverselect
|
package dev.jdtech.jellyfin.viewmodels
|
||||||
|
|
||||||
import android.app.Application
|
import android.app.Application
|
||||||
import androidx.lifecycle.ViewModel
|
import androidx.lifecycle.ViewModel
|
|
@ -7,7 +7,7 @@
|
||||||
<androidx.constraintlayout.widget.ConstraintLayout
|
<androidx.constraintlayout.widget.ConstraintLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
tools:context=".AddServerFragment">
|
tools:context=".fragments.AddServerFragment">
|
||||||
|
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
tools:context=".LoginFragment">
|
tools:context=".fragments.LoginFragment">
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/image_banner"
|
android:id="@+id/image_banner"
|
||||||
|
|
|
@ -7,13 +7,13 @@
|
||||||
|
|
||||||
<variable
|
<variable
|
||||||
name="viewModel"
|
name="viewModel"
|
||||||
type="dev.jdtech.jellyfin.serverselect.ServerSelectViewModel" />
|
type="dev.jdtech.jellyfin.viewmodels.ServerSelectViewModel" />
|
||||||
</data>
|
</data>
|
||||||
|
|
||||||
<androidx.constraintlayout.widget.ConstraintLayout
|
<androidx.constraintlayout.widget.ConstraintLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
tools:context=".AddServerFragment">
|
tools:context=".fragments.AddServerFragment">
|
||||||
|
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
app:startDestination="@id/serverSelectFragment">
|
app:startDestination="@id/serverSelectFragment">
|
||||||
<fragment
|
<fragment
|
||||||
android:id="@+id/addServerFragment"
|
android:id="@+id/addServerFragment"
|
||||||
android:name="dev.jdtech.jellyfin.AddServerFragment"
|
android:name="dev.jdtech.jellyfin.fragments.AddServerFragment"
|
||||||
android:label="fragment_add_server"
|
android:label="fragment_add_server"
|
||||||
tools:layout="@layout/fragment_add_server" >
|
tools:layout="@layout/fragment_add_server" >
|
||||||
<action
|
<action
|
||||||
|
@ -19,12 +19,12 @@
|
||||||
</fragment>
|
</fragment>
|
||||||
<fragment
|
<fragment
|
||||||
android:id="@+id/loginFragment"
|
android:id="@+id/loginFragment"
|
||||||
android:name="dev.jdtech.jellyfin.LoginFragment"
|
android:name="dev.jdtech.jellyfin.fragments.LoginFragment"
|
||||||
android:label="fragment_login"
|
android:label="fragment_login"
|
||||||
tools:layout="@layout/fragment_login" />
|
tools:layout="@layout/fragment_login" />
|
||||||
<fragment
|
<fragment
|
||||||
android:id="@+id/serverSelectFragment"
|
android:id="@+id/serverSelectFragment"
|
||||||
android:name="dev.jdtech.jellyfin.serverselect.ServerSelectFragment"
|
android:name="dev.jdtech.jellyfin.fragments.ServerSelectFragment"
|
||||||
android:label="ServerSelectFragment" >
|
android:label="ServerSelectFragment" >
|
||||||
<action
|
<action
|
||||||
android:id="@+id/action_serverSelectFragment_to_addServerFragment"
|
android:id="@+id/action_serverSelectFragment_to_addServerFragment"
|
||||||
|
|
Loading…
Reference in a new issue