Merge branch 'dev'

Author: aykuttasil

app/src/main/kotlin/com/aykuttasil/modernapp/di/modules/AppModule.kt

@@ -1,18 +1,3 @@
-/**
- * Designed and developed by Aykut Asil (@aykuttasil)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package com.aykuttasil.modernapp.di.modules
 
 import android.app.Application
@@ -23,7 +8,7 @@ import dagger.hilt.InstallIn
 import dagger.hilt.android.components.ApplicationComponent
 import javax.inject.Singleton
 
-@Module
+@Module(includes = [ImplModule::class])
 @InstallIn(ApplicationComponent::class)
 object AppModule {
 

app/src/main/kotlin/com/aykuttasil/modernapp/di/modules/ImplModule.kt

@@ -0,0 +1,29 @@
+package com.aykuttasil.modernapp.di.modules
+
+import com.aykuttasil.domain.util.AppExecutors
+import com.aykuttasil.domain.util.DispatcherProvider
+import com.aykuttasil.modernapp.util.AppExecutorsImpl
+import com.aykuttasil.modernapp.util.DispatcherProviderImp
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.android.components.ApplicationComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(ApplicationComponent::class)
+abstract class ImplModule {
+
+  @Singleton
+  @Binds
+  abstract fun provideDispatcherProvider(
+    dispatcherProvider: DispatcherProviderImp
+  ): DispatcherProvider
+
+  @Singleton
+  @Binds
+  abstract fun provideAppExecutors(
+    executors: AppExecutorsImpl
+  ): AppExecutors
+
+}

app/src/main/kotlin/com/aykuttasil/modernapp/ui/common/DataBoundListAdapter.kt

@@ -20,7 +20,7 @@ import androidx.databinding.ViewDataBinding
 import androidx.recyclerview.widget.AsyncDifferConfig
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
-import com.aykuttasil.modernapp.util.AppExecutors
+import com.aykuttasil.domain.util.AppExecutors
 
 /**
  * A generic RecyclerView adapter that uses Data Binding & DiffUtil.
@@ -33,7 +33,7 @@ abstract class DataBoundListAdapter<T, V : ViewDataBinding>(
   diffCallback: DiffUtil.ItemCallback<T>
 ) : ListAdapter<T, DataBoundViewHolder<V>>(
   AsyncDifferConfig.Builder<T>(diffCallback)
-    .setBackgroundThreadExecutor(appExecutors.diskIO())
+    .setBackgroundThreadExecutor(appExecutors.diskIO)
     .build()
 ) {
   override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): DataBoundViewHolder<V> {

app/src/main/kotlin/com/aykuttasil/modernapp/ui/login/LoginFormState.kt

@@ -0,0 +1,10 @@
+package com.aykuttasil.modernapp.ui.login
+
+/**
+ * Data validation state of the login form.
+ */
+data class LoginFormState(
+  val usernameError: String? = null,
+  val passwordError: String? = null,
+  val isDataValid: Boolean = false
+)

app/src/main/kotlin/com/aykuttasil/modernapp/ui/login/LoginFragment.kt

@@ -0,0 +1,42 @@
+package com.aykuttasil.modernapp.ui.login
+
+import android.os.Bundle
+import android.text.Editable
+import android.text.TextWatcher
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.Observer
+import com.aykuttasil.modernapp.ui.common.BaseFragment
+import dagger.hilt.android.AndroidEntryPoint
+
+@AndroidEntryPoint
+class LoginFragment : BaseFragment() {
+
+  private val viewModel by viewModels<LoginViewModel>()
+
+  override fun onActivityCreated(savedInstanceState: Bundle?) {
+    super.onActivityCreated(savedInstanceState)
+
+    viewModel.liveLoginFormState.observe(viewLifecycleOwner, Observer {
+
+    })
+  }
+
+  val afterTextChangedListener = object : TextWatcher {
+    override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {
+      // ignore
+    }
+
+    override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {
+      // ignore
+    }
+
+    override fun afterTextChanged(s: Editable) {
+      viewModel.loginDataChanged(
+        "", ""
+        // usernameEditText.text.toString(),
+        // passwordEditText.text.toString()
+      )
+    }
+  }
+
+}

app/src/main/kotlin/com/aykuttasil/modernapp/ui/login/LoginResult.kt

@@ -0,0 +1,11 @@
+package com.aykuttasil.modernapp.ui.login
+
+import com.aykuttasil.domain.entities.UserEntity
+
+/**
+ * Authentication result : success (user details) or error message.
+ */
+data class LoginResult(
+  val success: UserEntity? = null,
+  val errorMessage: String? = null
+)

app/src/main/kotlin/com/aykuttasil/modernapp/ui/login/LoginViewModel.kt

@@ -0,0 +1,78 @@
+package com.aykuttasil.modernapp.ui.login
+
+import android.util.Patterns
+import androidx.hilt.lifecycle.ViewModelInject
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.viewModelScope
+import com.aykuttasil.domain.usecases.user.LoginParams
+import com.aykuttasil.domain.usecases.user.LoginUseCase
+import com.aykuttasil.domain.util.Resource
+import com.aykuttasil.modernapp.App
+import com.aykuttasil.modernapp.ui.common.BaseViewModel
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.launch
+
+@ExperimentalCoroutinesApi
+class LoginViewModel @ViewModelInject constructor(
+  val app: App,
+  val loginUseCase: LoginUseCase
+) : BaseViewModel(app) {
+
+  private val _loginForm = MutableLiveData<LoginFormState>()
+  val liveLoginFormState: LiveData<LoginFormState> = _loginForm
+
+  private val _loginResult = MutableLiveData<LoginResult>()
+  val liveLoginResult: LiveData<LoginResult> = _loginResult
+
+  fun login(username: String, password: String) {
+    loginDataChanged(username, password)
+    val isValid = liveLoginFormState.value?.isDataValid ?: false
+
+    viewModelScope.launch {
+      loginUseCase(LoginParams(username, password)) { state ->
+        state.onEach {
+          when (it) {
+            is Resource.Success -> {
+              _loginResult.value =
+                LoginResult(success = it.data)
+            }
+            is Resource.Error -> {
+              _loginResult.value = LoginResult(errorMessage = it.error?.message ?: "HATA")
+            }
+            is Resource.Loading -> {
+
+            }
+          }
+        }
+      }
+    }
+  }
+
+  fun loginDataChanged(username: String, password: String) {
+    if (!isUserNameValid(username)) {
+      _loginForm.value = LoginFormState(usernameError = "Invalid username")
+    } else if (!isPasswordValid(password)) {
+      _loginForm.value = LoginFormState(passwordError = "Invalid password")
+    } else {
+      _loginForm.value = LoginFormState(isDataValid = true)
+    }
+  }
+
+  // A placeholder username validation check
+  private fun isUserNameValid(username: String): Boolean {
+    return if (username.contains("@")) {
+      Patterns.EMAIL_ADDRESS.matcher(username).matches()
+    } else {
+      username.isNotBlank()
+    }
+  }
+
+  // A placeholder password validation check
+  private fun isPasswordValid(password: String): Boolean {
+    return password.length > 5
+  }
+
+
+}

app/src/main/kotlin/com/aykuttasil/modernapp/ui/user/UserActivity.kt

@@ -25,7 +25,9 @@ import com.aykuttasil.modernapp.ui.common.BaseActivity
 import com.aykuttasil.modernapp.util.delegates.contentView
 import com.aykuttasil.domain.util.logd
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 
+@ExperimentalCoroutinesApi
 @AndroidEntryPoint
 class UserActivity : BaseActivity() {
 
@@ -37,27 +39,10 @@ class UserActivity : BaseActivity() {
     super.onCreate(savedInstanceState)
     logd { "onCreate" }
 
-    /*
-    viewModel.getUser().observe(this, Observer {
-      when (it) {
-        is Resource.Loading -> {
-          Toast.makeText(this, "Loading...", Toast.LENGTH_SHORT).show()
-        }
-        is Resource.Success -> {
-          Toast.makeText(this, it.data?.userEmail, Toast.LENGTH_SHORT).show()
-        }
-        is Resource.Error -> {
-          Toast.makeText(this, it.throwable?.message, Toast.LENGTH_SHORT).show()
-        }
-      }
-    })
-
-     */
-
     viewModel.viewState.observe(this, Observer {
       if (it.isLoading) {
         Toast.makeText(this, "Lütfen Bekleyiniz", Toast.LENGTH_SHORT).show()
-      } else {
+      } else if (it.userEntity != null) {
         Toast.makeText(this, "İşlem Tamamlandı", Toast.LENGTH_SHORT).show()
         Toast.makeText(this, it.userEntity?.userName, Toast.LENGTH_SHORT).show()
       }

app/src/main/kotlin/com/aykuttasil/modernapp/ui/user/UserActivityModule.kt

@@ -21,7 +21,9 @@ import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.components.ActivityComponent
 import dagger.hilt.android.qualifiers.ActivityContext
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 
+@ExperimentalCoroutinesApi
 @Module
 @InstallIn(ActivityComponent::class)
 class UserActivityModule {

app/src/main/kotlin/com/aykuttasil/modernapp/ui/user/UserViewModel.kt

@@ -19,18 +19,25 @@ import androidx.hilt.Assisted
 import androidx.hilt.lifecycle.ViewModelInject
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.SavedStateHandle
-import androidx.lifecycle.liveData
 import androidx.lifecycle.viewModelScope
 import com.aykuttasil.modernapp.util.SingleLiveEvent
 import com.aykuttasil.domain.entities.UserEntity
 import com.aykuttasil.domain.usecases.user.GetUserUseCase
-import com.aykuttasil.domain.util.Result
+import com.aykuttasil.domain.util.Resource
 import com.aykuttasil.modernapp.App
 import com.aykuttasil.modernapp.ui.common.BaseViewModel
-import kotlinx.coroutines.delay
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
-import timber.log.Timber
 
+data class UserActivityViewState(
+  var isLoading: Boolean = true,
+  var userEntity: UserEntity? = null,
+  var error: String? = null
+)
+
+@ExperimentalCoroutinesApi
 class UserViewModel @ViewModelInject constructor(
   @Assisted private val savedStateHandle: SavedStateHandle,
   private val app: App,
@@ -48,38 +55,23 @@ class UserViewModel @ViewModelInject constructor(
 
   fun getUser() {
     viewModelScope.launch {
-      try {
-        viewState.value = viewState.value?.copy(isLoading = true)
-        delay(1000)
-
-        getUserUseCase("aykuttasil123") {
+      getUserUseCase("aykuttasil") { state ->
+        state.onEach {
           when (it) {
-            is Result.Success -> {
-              viewState.value = viewState.value?.copy(isLoading = false, userEntity = it.data)
+            is Resource.Loading -> {
+              viewState.value = viewState.value?.copy(isLoading = true)
             }
-            is Result.Error -> {
-              Timber.e(it.msg)
-
-              viewState.value =
-                viewState.value?.copy(
-                  isLoading = true,
-                  userEntity = UserEntity(userName = "HOHOHOHO")
-                )
+            is Resource.Success -> {
+              viewState.value = viewState.value?.copy(isLoading = false, userEntity = it.data)
             }
-            else -> {
+            is Resource.Error -> {
+              errorState.value = it.error
             }
           }
-        }
-      } catch (ex: Exception) {
-        errorState.value = ex
+        }.launchIn(viewModelScope)
+
       }
     }
   }
 
 }
-
-data class UserActivityViewState(
-  var isLoading: Boolean = true,
-  var userEntity: UserEntity? = null,
-  var error: String? = null
-)