Reorder packages and some cleanup.

Close #55 #56

app/src/main/java/com/uncmorfi/MainActivity.kt

@@ -9,14 +9,14 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.GravityCompat
 import androidx.fragment.app.Fragment
 import com.google.android.material.navigation.NavigationView
-import com.uncmorfi.about.AboutDialog
-import com.uncmorfi.balance.BalanceFragment
-import com.uncmorfi.faq.FaqFragment
-import com.uncmorfi.home.HomeFragment
-import com.uncmorfi.map.MapFragment
-import com.uncmorfi.menu.MenuFragment
-import com.uncmorfi.reservations.RemindersFragment
-import com.uncmorfi.servings.ServingsFragment
+import com.uncmorfi.ui.about.AboutDialog
+import com.uncmorfi.ui.balance.BalanceFragment
+import com.uncmorfi.ui.faq.FaqFragment
+import com.uncmorfi.ui.home.HomeFragment
+import com.uncmorfi.ui.map.MapFragment
+import com.uncmorfi.ui.menu.MenuFragment
+import com.uncmorfi.ui.reminders.RemindersFragment
+import com.uncmorfi.ui.servings.ServingsFragment
 import com.uncmorfi.shared.*
 import kotlinx.android.synthetic.main.activity_main.*
 
@@ -39,16 +39,6 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
             Log.i("MainActivity", "new status: $it")
             content_layout.snack(it)
         }
-
-        observe(viewModel.reservation) {
-            content_layout.snack(it)
-        }
-
-        observe(viewModel.reserveTry) {
-            if (it > 0) {
-                content_layout.snack(getString(R.string.snack_loop).format(it), SnackType.LOADING)
-            }
-        }
     }
 
     private fun setToolbarAndNavigation() {

app/src/main/java/com/uncmorfi/MainViewModel.kt

@@ -6,11 +6,7 @@ import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
-import com.uncmorfi.data.network.clientBeta
-import com.uncmorfi.data.network.models.ReservationRes
-import com.uncmorfi.data.persistence.AppDatabase
 import com.uncmorfi.data.persistence.entities.DayMenu
-import com.uncmorfi.data.persistence.entities.Reservation
 import com.uncmorfi.data.persistence.entities.Serving
 import com.uncmorfi.data.persistence.entities.User
 import com.uncmorfi.data.repository.RepoMenu
@@ -26,23 +22,17 @@ import retrofit2.HttpException
 import java.io.IOException
 import java.time.LocalDate
 import java.util.*
-import kotlin.coroutines.coroutineContext
 
 class MainViewModel(val context: Application) : AndroidViewModel(context) {
-    private val db: AppDatabase = AppDatabase(context)
     private val repoMenu = RepoMenu(context)
     private val repoUser = RepoUser(context)
     private val repoServings = RepoServings(context)
     private val servWorkers = ServWorkers(context)
 
     val status: MutableLiveData<StatusCode> = MutableLiveData()
-    val reservation: MutableLiveData<ReserveStatus> = MutableLiveData()
-    val reserveTry: MutableLiveData<Int> = MutableLiveData()
-    var reserveJob: Job? = null
 
     init {
         status.value = BUSY
-        reservation.value = NOCACHED
     }
 
     /*
@@ -77,6 +67,7 @@ class MainViewModel(val context: Application) : AndroidViewModel(context) {
     /*
      * Menu stuff
      */
+
     fun getMenu(): LiveData<List<DayMenu>> = repoMenu.getAll()
 
     fun refreshMenu() = launchIO {
@@ -116,6 +107,7 @@ class MainViewModel(val context: Application) : AndroidViewModel(context) {
     /*
      * Serving stuff
      */
+
     fun getServings(): LiveData<List<Serving>> = repoServings.getToday()
 
     fun updateServings() = launchIO {
@@ -135,139 +127,13 @@ class MainViewModel(val context: Application) : AndroidViewModel(context) {
     }
 
     /*
-     * Reservation stuff
+     * Worker stuff
      */
+
     fun refreshWorkers() {
         servWorkers.refreshAllWorkers()
     }
 
-    fun reserveIsCached(user: User) {
-        mainDispatch {
-            val reserve = getReserve(user.card)
-            if (reserve != null) {
-                reservation.value = CACHED
-            } else {
-                reservation.value = NOCACHED
-            }
-        }
-    }
-
-    fun reserveLogin(user: User, captcha: String) {
-        mainDispatch {
-            val reserve = clientBeta.getLogin(user.card)
-            reserve.captchaText = captcha
-
-            val result = ioDispatch { clientBeta.doLogin(reserve) }
-            result?.let {
-                insertReservation(result)
-                reservation.value = CACHED
-            }
-        }
-    }
-
-    fun reserveConsult(user: User) {
-        mainDispatch {
-            val reserve = getReserve(user.card)
-            if (reserve != null) {
-                if (context.isOnline()) {
-                    reservation.value = CONSULTING
-                    val result = ioDispatch { clientBeta.status(reserve) }
-                    result?.updateReservation(reserve)
-                } else {
-                    status.value = NO_ONLINE
-                }
-            } else {
-                reservation.value = REDOLOGIN
-            }
-        }
-    }
-
-    fun reserve(user: User) {
-        mainDispatch {
-            val reserve = getReserve(user.card)
-            if (reserve != null) {
-                if (context.isOnline()) {
-                    reservation.value = RESERVING
-                    val result = ioDispatch { clientBeta.reserve(reserve) }
-                    result?.updateReservation(reserve)
-                } else {
-                    status.value = NO_ONLINE
-                }
-            } else {
-                reservation.value = REDOLOGIN
-            }
-        }
-    }
-
-    fun reserveLoop(user: User) {
-        mainDispatch {
-            val reserve = getReserve(user.card)
-            if (reserve == null) {
-                reservation.value = REDOLOGIN
-                return@mainDispatch
-            }
-            reserveJob?.cancel()
-            reserveJob = mainDispatch {
-                var intent = 0
-
-                do {
-                    intent += 1
-                    reserveTry.value = intent
-                    val result = ioDispatch { clientBeta.reserve(reserve) }
-                    val status = result?.updateReservation(reserve)
-                    delay(1500)
-                } while (status != RESERVED && status != REDOLOGIN)
-
-                reserveTry.value = 0
-            }
-        }
-    }
-
-    fun reserveStop() {
-        reserveJob?.cancel()
-        reserveJob = null
-        reserveTry.value = 0
-        status.value = BUSY
-    }
-
-    fun reserveLogout(user: User) {
-        mainDispatch {
-            db.reserveDao().delete(user.card)
-            reservation.value = NOCACHED
-        }
-    }
-
-    private suspend fun ReservationRes.updateReservation(reserve: Reservation): ReserveStatus {
-        this.path?.let { reserve.path = it }
-        this.token?.let { reserve.token = it }
-
-        val status = ReserveStatus.valueOf(this.reservationResult.toUpperCase())
-        reservation.value = status
-
-        if (status == REDOLOGIN) {
-            db.reserveDao().delete(reserve.code)
-        } else {
-            insertReservation(reserve)
-        }
-        return status
-    }
-
-    private suspend fun insertReservation(reserve: Reservation) {
-        // Guardar cookie con el codigo de la tarjeta a la que pertenece
-        reserve.cookies?.map { c -> c.code = reserve.code }
-        db.reserveDao().insert(reserve)
-    }
-
-    private suspend fun getReserve(code: String): Reservation? {
-        val reserve = db.reserveDao().getReservation(code)
-        reserve?.cookies = db.reserveDao().getCookies(code)
-        return reserve
-    }
-
-    private fun mainDispatch(f: suspend (CoroutineScope) -> Unit): Job {
-        return viewModelScope.launch(Dispatchers.Main, block = f)
-    }
-
     private fun launchIO(f: suspend (CoroutineScope) -> Unit) {
         viewModelScope.launch(Dispatchers.IO) {
             try {
@@ -288,24 +154,4 @@ class MainViewModel(val context: Application) : AndroidViewModel(context) {
         }
     }
 
-    private suspend fun <T> ioDispatch(f: suspend (CoroutineScope) -> T): T? {
-        var result: T? = null
-        try {
-            result = withContext(coroutineContext + Dispatchers.IO, block = f)
-        } catch (e: HttpException) {
-            e.printStackTrace()
-            status.value = CONNECT_ERROR
-        } catch (e: IOException) {
-            e.printStackTrace()
-            status.value = CONNECT_ERROR
-        } catch (e: JSONException) {
-            e.printStackTrace()
-            status.value = INTERNAL_ERROR
-        } catch (e: NumberFormatException) {
-            e.printStackTrace()
-            status.value = INTERNAL_ERROR
-        }
-        return result
-    }
-
 }

app/src/main/java/com/uncmorfi/about/AboutDialog.kt → app/src/main/java/com/uncmorfi/ui/about/AboutDialog.kt

@@ -1,4 +1,4 @@
-package com.uncmorfi.about
+package com.uncmorfi.ui.about
 
 import android.app.Dialog
 import android.os.Bundle

app/src/main/java/com/uncmorfi/balance/BalanceFragment.kt → app/src/main/java/com/uncmorfi/ui/balance/BalanceFragment.kt

@@ -1,4 +1,4 @@
-package com.uncmorfi.balance
+package com.uncmorfi.ui.balance
 
 import android.os.Bundle
 import android.view.*
@@ -7,10 +7,9 @@ import androidx.fragment.app.activityViewModels
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.uncmorfi.MainViewModel
 import com.uncmorfi.R
-import com.uncmorfi.balance.dialogs.UserOptionsDialog
+import com.uncmorfi.ui.balance.dialogs.UserOptionsDialog
 import com.uncmorfi.data.persistence.entities.User
 import com.uncmorfi.shared.*
-import com.uncmorfi.shared.ReserveStatus.NOCACHED
 import com.uncmorfi.shared.SnackType.*
 import com.uncmorfi.shared.StatusCode.UPDATE_SUCCESS
 import com.uncmorfi.shared.StatusCode.USER_INSERTED
@@ -156,7 +155,6 @@ class BalanceFragment : Fragment() {
         super.onStop()
         activity?.hideKeyboard()
         newUser.clearFocus()
-        viewModel.reservation.value = NOCACHED
     }
 
 }

app/src/main/java/com/uncmorfi/balance/UserAdapter.kt → app/src/main/java/com/uncmorfi/ui/balance/UserAdapter.kt

@@ -1,4 +1,4 @@
-package com.uncmorfi.balance
+package com.uncmorfi.ui.balance
 
 import android.view.LayoutInflater
 import android.view.View

app/src/main/java/com/uncmorfi/balance/dialogs/DeleteUserDialog.kt → app/src/main/java/com/uncmorfi/ui/balance/dialogs/DeleteUserDialog.kt

@@ -1,4 +1,4 @@
-package com.uncmorfi.balance.dialogs
+package com.uncmorfi.ui.balance.dialogs
 
 import android.app.Dialog
 import android.os.Bundle

app/src/main/java/com/uncmorfi/balance/dialogs/EditNameDialog.kt → app/src/main/java/com/uncmorfi/ui/balance/dialogs/EditNameDialog.kt

@@ -1,4 +1,4 @@
-package com.uncmorfi.balance.dialogs
+package com.uncmorfi.ui.balance.dialogs
 
 import android.app.Dialog
 import android.os.Bundle

app/src/main/java/com/uncmorfi/balance/dialogs/UserOptionsDialog.kt → app/src/main/java/com/uncmorfi/ui/balance/dialogs/UserOptionsDialog.kt

@@ -1,4 +1,4 @@
-package com.uncmorfi.balance.dialogs
+package com.uncmorfi.ui.balance.dialogs
 
 import android.os.Bundle
 import android.view.LayoutInflater

app/src/main/java/com/uncmorfi/balance/NewUserView.kt → app/src/main/java/com/uncmorfi/ui/balance/views/NewUserView.kt

@@ -1,4 +1,4 @@
-package com.uncmorfi.balance
+package com.uncmorfi.ui.balance.views
 
 import android.content.Context
 import android.text.InputFilter

app/src/main/java/com/uncmorfi/balance/UserCardView.kt → app/src/main/java/com/uncmorfi/ui/balance/views/UserCardView.kt

@@ -1,4 +1,4 @@
-package com.uncmorfi.balance
+package com.uncmorfi.ui.balance.views
 
 import android.content.Context
 import android.text.format.DateUtils

app/src/main/java/com/uncmorfi/faq/FaqFragment.kt → app/src/main/java/com/uncmorfi/ui/faq/FaqFragment.kt

@@ -1,4 +1,4 @@
-package com.uncmorfi.faq
+package com.uncmorfi.ui.faq
 
 import android.annotation.SuppressLint
 import android.os.Bundle

app/src/main/java/com/uncmorfi/home/HomeFragment.kt → app/src/main/java/com/uncmorfi/ui/home/HomeFragment.kt

@@ -1,4 +1,4 @@
-package com.uncmorfi.home
+package com.uncmorfi.ui.home
 
 import android.os.Bundle
 import android.view.*
@@ -8,10 +8,9 @@ import androidx.fragment.app.activityViewModels
 import com.uncmorfi.MainActivity
 import com.uncmorfi.MainViewModel
 import com.uncmorfi.R
-import com.uncmorfi.balance.dialogs.UserOptionsDialog
+import com.uncmorfi.ui.balance.dialogs.UserOptionsDialog
 import com.uncmorfi.data.persistence.entities.DayMenu
 import com.uncmorfi.data.persistence.entities.User
-import com.uncmorfi.shared.ReserveStatus.NOCACHED
 import com.uncmorfi.shared.StatusCode
 import com.uncmorfi.shared.init
 import com.uncmorfi.shared.observe
@@ -135,9 +134,4 @@ class HomeFragment : Fragment() {
         requireActivity().setTitle(R.string.app_name)
     }
 
-    override fun onStop() {
-        super.onStop()
-        viewModel.reservation.value = NOCACHED
-    }
-
 }

app/src/main/java/com/uncmorfi/map/MapFragment.kt → app/src/main/java/com/uncmorfi/ui/map/MapFragment.kt

@@ -1,4 +1,4 @@
-package com.uncmorfi.map
+package com.uncmorfi.ui.map
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment
@@ -31,7 +31,7 @@ class MapFragment : Fragment() {
         mapView.onResume()
 
         try {
-            MapsInitializer.initialize(activity!!.applicationContext)
+            MapsInitializer.initialize(requireActivity().applicationContext)
         } catch (e: Exception) {
             e.printStackTrace()
         }

app/src/main/java/com/uncmorfi/menu/DayMenuView.kt → app/src/main/java/com/uncmorfi/ui/menu/DayMenuView.kt

@@ -1,4 +1,4 @@
-package com.uncmorfi.menu
+package com.uncmorfi.ui.menu
 
 import android.content.Context
 import android.util.AttributeSet

app/src/main/java/com/uncmorfi/menu/MenuAdapter.kt → app/src/main/java/com/uncmorfi/ui/menu/MenuAdapter.kt

@@ -1,4 +1,4 @@
-package com.uncmorfi.menu
+package com.uncmorfi.ui.menu
 
 import android.view.LayoutInflater
 import android.view.View

app/src/main/java/com/uncmorfi/menu/MenuFragment.kt → app/src/main/java/com/uncmorfi/ui/menu/MenuFragment.kt

@@ -1,4 +1,4 @@
-package com.uncmorfi.menu
+package com.uncmorfi.ui.menu
 
 import android.os.Bundle
 import android.view.*