Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16d13b6a authored by Jonathan Klee's avatar Jonathan Klee
Browse files

Merge branch '0000-u-move-loginviewmodel' into 'main' 

Move LoginViewModel to ui package

See merge request !494
parents 52b7281b aa7143ad

app/src/main/java/foundation/e/apps/data/login/LoginViewModel.kt→app/src/main/java/foundation/e/apps/ui/LoginViewModel.kt

+3 −1
Original line number Diff line number Diff line
@@ -15,13 +15,15 @@ 
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.

 */



package foundation.e.apps.data.login

package foundation.e.apps.ui



import androidx.lifecycle.MutableLiveData

import androidx.lifecycle.ViewModel

import androidx.lifecycle.viewModelScope

import dagger.hilt.android.lifecycle.HiltViewModel

import foundation.e.apps.data.enums.User

import foundation.e.apps.data.login.AuthObject

import foundation.e.apps.data.login.AuthenticatorRepository

import foundation.e.apps.ui.parentFragment.LoadingViewModel

import kotlinx.coroutines.launch

import okhttp3.Cache

app/src/main/java/foundation/e/apps/ui/MainActivity.kt

+0 −1
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ import foundation.e.apps.data.Constants 
import foundation.e.apps.data.enums.User

import foundation.e.apps.data.install.models.AppInstall

import foundation.e.apps.data.login.AuthObject

import foundation.e.apps.data.login.LoginViewModel

import foundation.e.apps.data.login.PlayStoreAuthenticator

import foundation.e.apps.data.login.exceptions.GPlayValidationException

import foundation.e.apps.databinding.ActivityMainBinding

app/src/main/java/foundation/e/apps/ui/parentFragment/TimeoutFragment.kt

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ import foundation.e.apps.R 
import foundation.e.apps.data.enums.User

import foundation.e.apps.data.login.AuthObject

import foundation.e.apps.data.login.PlayStoreAuthenticator

import foundation.e.apps.data.login.LoginViewModel

import foundation.e.apps.ui.LoginViewModel

import foundation.e.apps.data.login.exceptions.CleanApkException

import foundation.e.apps.data.login.exceptions.GPlayException

import foundation.e.apps.data.login.exceptions.GPlayLoginException

app/src/main/java/foundation/e/apps/ui/settings/SettingsFragment.kt

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ import foundation.e.apps.BuildConfig 
import foundation.e.apps.R

import foundation.e.apps.data.enums.User

import foundation.e.apps.data.application.UpdatesDao

import foundation.e.apps.data.login.LoginViewModel

import foundation.e.apps.ui.LoginViewModel

import foundation.e.apps.databinding.CustomPreferenceBinding

import foundation.e.apps.install.updates.UpdatesWorkManager

import foundation.e.apps.ui.MainActivityViewModel

app/src/main/java/foundation/e/apps/ui/setup/signin/SignInFragment.kt

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ import androidx.lifecycle.ViewModelProvider 
import androidx.navigation.findNavController

import dagger.hilt.android.AndroidEntryPoint

import foundation.e.apps.R

import foundation.e.apps.data.login.LoginViewModel

import foundation.e.apps.ui.LoginViewModel

import foundation.e.apps.databinding.FragmentSignInBinding

import foundation.e.apps.di.CommonUtilsModule.safeNavigate

import foundation.e.apps.utils.showGoogleSignInAlertDialog