diff --git a/app/build.gradle b/app/build.gradle index 3b3362e..a0687f0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,17 +1,16 @@ plugins { id 'com.android.application' id 'org.jetbrains.kotlin.android' - id 'kotlin-android-extensions' - id 'kotlin-kapt' + id 'com.google.devtools.ksp' } android { - compileSdk 33 + compileSdk 36 defaultConfig { applicationId "me.amitshekhar.learn.kotlin.flow" - minSdk 21 - targetSdk 33 + minSdk 26 + targetSdk 36 versionCode 1 versionName "1.0" @@ -31,31 +30,36 @@ android { kotlinOptions { jvmTarget = '1.8' } + android { + buildFeatures { + viewBinding true + } + } + namespace "me.amitshekhar.learn.kotlin.flow" } dependencies { - implementation 'androidx.core:core-ktx:1.9.0' - implementation 'androidx.appcompat:appcompat:1.5.1' - implementation 'com.google.android.material:material:1.6.1' - implementation 'androidx.constraintlayout:constraintlayout:2.1.4' - implementation "androidx.recyclerview:recyclerview:1.2.1" + implementation 'androidx.core:core-ktx:1.16.0' + implementation 'androidx.appcompat:appcompat:1.7.1' + implementation 'com.google.android.material:material:1.12.0' + implementation 'androidx.constraintlayout:constraintlayout:2.2.1' + implementation "androidx.recyclerview:recyclerview:1.4.0" implementation 'com.github.bumptech.glide:glide:4.11.0' implementation 'com.squareup.retrofit2:retrofit:2.9.0' implementation 'com.squareup.retrofit2:converter-gson:2.9.0' implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' - implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1' - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1' - implementation "androidx.room:room-runtime:2.4.3" - kapt "androidx.room:room-compiler:2.4.3" - implementation "androidx.room:room-ktx:2.4.3" + implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.1' + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.9.1' + implementation "androidx.room:room-runtime:2.7.1" + ksp "androidx.room:room-compiler:2.7.1" + implementation "androidx.room:room-ktx:2.7.1" testImplementation 'junit:junit:4.13.2' testImplementation "org.mockito:mockito-core:3.4.6" - testImplementation 'androidx.arch.core:core-testing:2.1.0' - testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.1' + testImplementation 'androidx.arch.core:core-testing:2.2.0' + testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4' testImplementation 'app.cash.turbine:turbine:0.11.0' - androidTestImplementation 'androidx.test.ext:junit:1.1.3' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' - + androidTestImplementation 'androidx.test.ext:junit:1.2.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1' } \ No newline at end of file diff --git a/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/base/ApiUserAdapter.kt b/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/base/ApiUserAdapter.kt index 29e4381..16e5052 100644 --- a/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/base/ApiUserAdapter.kt +++ b/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/base/ApiUserAdapter.kt @@ -1,35 +1,30 @@ package me.amitshekhar.learn.kotlin.flow.ui.base import android.view.LayoutInflater -import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -import kotlinx.android.synthetic.main.item_layout.view.* -import me.amitshekhar.learn.kotlin.flow.R import me.amitshekhar.learn.kotlin.flow.data.model.ApiUser +import me.amitshekhar.learn.kotlin.flow.databinding.ItemLayoutBinding class ApiUserAdapter( private val users: ArrayList ) : RecyclerView.Adapter() { - class DataViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + class DataViewHolder(private val binding: ItemLayoutBinding) : RecyclerView.ViewHolder(binding.root) { fun bind(user: ApiUser) { - itemView.textViewUserName.text = user.name - itemView.textViewUserEmail.text = user.email - Glide.with(itemView.imageViewAvatar.context) + binding.textViewUserName.text = user.name + binding.textViewUserEmail.text = user.email + Glide.with(binding.imageViewAvatar.context) .load(user.avatar) - .into(itemView.imageViewAvatar) + .into(binding.imageViewAvatar) } } - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = - DataViewHolder( - LayoutInflater.from(parent.context).inflate( - R.layout.item_layout, parent, - false - ) - ) + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): DataViewHolder { + val binding = ItemLayoutBinding.inflate(LayoutInflater.from(parent.context), parent, false) + return DataViewHolder(binding) + } override fun getItemCount(): Int = users.size diff --git a/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/base/UserAdapter.kt b/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/base/UserAdapter.kt index dd74437..e20a3ec 100644 --- a/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/base/UserAdapter.kt +++ b/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/base/UserAdapter.kt @@ -1,35 +1,30 @@ package me.amitshekhar.learn.kotlin.flow.ui.base import android.view.LayoutInflater -import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -import kotlinx.android.synthetic.main.item_layout.view.* -import me.amitshekhar.learn.kotlin.flow.R import me.amitshekhar.learn.kotlin.flow.data.local.entity.User +import me.amitshekhar.learn.kotlin.flow.databinding.ItemLayoutBinding class UserAdapter( private val users: ArrayList ) : RecyclerView.Adapter() { - class DataViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + class DataViewHolder(private val binding: ItemLayoutBinding) : RecyclerView.ViewHolder(binding.root) { fun bind(user: User) { - itemView.textViewUserName.text = user.name - itemView.textViewUserEmail.text = user.email - Glide.with(itemView.imageViewAvatar.context) + binding.textViewUserName.text = user.name + binding.textViewUserEmail.text = user.email + Glide.with(binding.imageViewAvatar.context) .load(user.avatar) - .into(itemView.imageViewAvatar) + .into(binding.imageViewAvatar) } } - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = - DataViewHolder( - LayoutInflater.from(parent.context).inflate( - R.layout.item_layout, parent, - false - ) - ) + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): DataViewHolder { + val binding = ItemLayoutBinding.inflate(LayoutInflater.from(parent.context), parent, false) + return DataViewHolder(binding) + } override fun getItemCount(): Int = users.size diff --git a/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/completion/CompletionActivity.kt b/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/completion/CompletionActivity.kt index e45fb84..0bdb1ce 100644 --- a/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/completion/CompletionActivity.kt +++ b/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/completion/CompletionActivity.kt @@ -8,15 +8,13 @@ import androidx.lifecycle.Lifecycle import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle -import kotlinx.android.synthetic.main.activity_long_running_task.* -import kotlinx.android.synthetic.main.activity_recycler_view.progressBar import kotlinx.coroutines.launch import me.amitshekhar.learn.kotlin.flow.R import me.amitshekhar.learn.kotlin.flow.data.api.ApiHelperImpl import me.amitshekhar.learn.kotlin.flow.data.api.RetrofitBuilder import me.amitshekhar.learn.kotlin.flow.data.local.DatabaseBuilder import me.amitshekhar.learn.kotlin.flow.data.local.DatabaseHelperImpl -import me.amitshekhar.learn.kotlin.flow.ui.base.ApiUserAdapter +import me.amitshekhar.learn.kotlin.flow.databinding.ActivityCompletionBinding import me.amitshekhar.learn.kotlin.flow.utils.DefaultDispatcherProvider import me.amitshekhar.learn.kotlin.flow.ui.base.UiState import me.amitshekhar.learn.kotlin.flow.ui.base.ViewModelFactory @@ -24,10 +22,11 @@ import me.amitshekhar.learn.kotlin.flow.ui.base.ViewModelFactory class CompletionActivity : AppCompatActivity() { private lateinit var viewModel: CompletionViewModel - private lateinit var adapter: ApiUserAdapter + private lateinit var binding: ActivityCompletionBinding override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + binding = ActivityCompletionBinding.inflate(layoutInflater) setContentView(R.layout.activity_completion) setupViewModel() setupObserver() @@ -39,17 +38,17 @@ class CompletionActivity : AppCompatActivity() { viewModel.uiState.collect { when (it) { is UiState.Success -> { - progressBar.visibility = View.GONE - textView.text = it.data - textView.visibility = View.VISIBLE + binding.progressBar.visibility = View.GONE + binding.textView.text = it.data + binding.textView.visibility = View.VISIBLE } is UiState.Loading -> { - progressBar.visibility = View.VISIBLE - textView.visibility = View.GONE + binding.progressBar.visibility = View.VISIBLE + binding.textView.visibility = View.GONE } is UiState.Error -> { //Handle Error - progressBar.visibility = View.GONE + binding.progressBar.visibility = View.GONE Toast.makeText(this@CompletionActivity, it.message, Toast.LENGTH_SHORT) .show() } diff --git a/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/errorhandling/catch/CatchActivity.kt b/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/errorhandling/catch/CatchActivity.kt index 8c7f605..1f96450 100644 --- a/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/errorhandling/catch/CatchActivity.kt +++ b/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/errorhandling/catch/CatchActivity.kt @@ -1,5 +1,6 @@ package me.amitshekhar.learn.kotlin.flow.ui.errorhandling.catch +import android.annotation.SuppressLint import android.os.Bundle import android.view.View import android.widget.Toast @@ -10,7 +11,6 @@ import androidx.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle import androidx.recyclerview.widget.DividerItemDecoration import androidx.recyclerview.widget.LinearLayoutManager -import kotlinx.android.synthetic.main.activity_recycler_view.* import kotlinx.coroutines.launch import me.amitshekhar.learn.kotlin.flow.R import me.amitshekhar.learn.kotlin.flow.data.api.ApiHelperImpl @@ -18,6 +18,7 @@ import me.amitshekhar.learn.kotlin.flow.data.api.RetrofitBuilder import me.amitshekhar.learn.kotlin.flow.data.local.DatabaseBuilder import me.amitshekhar.learn.kotlin.flow.data.local.DatabaseHelperImpl import me.amitshekhar.learn.kotlin.flow.data.model.ApiUser +import me.amitshekhar.learn.kotlin.flow.databinding.ActivityRecyclerViewBinding import me.amitshekhar.learn.kotlin.flow.ui.base.ApiUserAdapter import me.amitshekhar.learn.kotlin.flow.utils.DefaultDispatcherProvider import me.amitshekhar.learn.kotlin.flow.ui.base.UiState @@ -27,9 +28,11 @@ class CatchActivity : AppCompatActivity() { private lateinit var viewModel: CatchViewModel private lateinit var adapter: ApiUserAdapter + private lateinit var binding: ActivityRecyclerViewBinding override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + binding = ActivityRecyclerViewBinding.inflate(layoutInflater) setContentView(R.layout.activity_recycler_view) setupUI() setupViewModel() @@ -37,18 +40,18 @@ class CatchActivity : AppCompatActivity() { } private fun setupUI() { - recyclerView.layoutManager = LinearLayoutManager(this) + binding.recyclerView.layoutManager = LinearLayoutManager(this) adapter = ApiUserAdapter( arrayListOf() ) - recyclerView.addItemDecoration( + binding.recyclerView.addItemDecoration( DividerItemDecoration( - recyclerView.context, - (recyclerView.layoutManager as LinearLayoutManager).orientation + binding.recyclerView.context, + (binding.recyclerView.layoutManager as LinearLayoutManager).orientation ) ) - recyclerView.adapter = adapter + binding.recyclerView.adapter = adapter } private fun setupObserver() { @@ -57,17 +60,17 @@ class CatchActivity : AppCompatActivity() { viewModel.uiState.collect { when (it) { is UiState.Success -> { - progressBar.visibility = View.GONE + binding.progressBar.visibility = View.GONE renderList(it.data) - recyclerView.visibility = View.VISIBLE + binding.recyclerView.visibility = View.VISIBLE } is UiState.Loading -> { - progressBar.visibility = View.VISIBLE - recyclerView.visibility = View.GONE + binding.progressBar.visibility = View.VISIBLE + binding.recyclerView.visibility = View.GONE } is UiState.Error -> { //Handle Error - progressBar.visibility = View.GONE + binding.progressBar.visibility = View.GONE Toast.makeText(this@CatchActivity, it.message, Toast.LENGTH_SHORT) .show() } @@ -77,6 +80,7 @@ class CatchActivity : AppCompatActivity() { } } + @SuppressLint("NotifyDataSetChanged") private fun renderList(users: List) { adapter.addData(users) adapter.notifyDataSetChanged() diff --git a/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/errorhandling/emitall/EmitAllActivity.kt b/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/errorhandling/emitall/EmitAllActivity.kt index ca94136..5866365 100644 --- a/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/errorhandling/emitall/EmitAllActivity.kt +++ b/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/errorhandling/emitall/EmitAllActivity.kt @@ -1,5 +1,6 @@ package me.amitshekhar.learn.kotlin.flow.ui.errorhandling.emitall +import android.annotation.SuppressLint import android.os.Bundle import android.view.View import android.widget.Toast @@ -10,7 +11,6 @@ import androidx.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle import androidx.recyclerview.widget.DividerItemDecoration import androidx.recyclerview.widget.LinearLayoutManager -import kotlinx.android.synthetic.main.activity_recycler_view.* import kotlinx.coroutines.launch import me.amitshekhar.learn.kotlin.flow.R import me.amitshekhar.learn.kotlin.flow.data.api.ApiHelperImpl @@ -18,6 +18,7 @@ import me.amitshekhar.learn.kotlin.flow.data.api.RetrofitBuilder import me.amitshekhar.learn.kotlin.flow.data.local.DatabaseBuilder import me.amitshekhar.learn.kotlin.flow.data.local.DatabaseHelperImpl import me.amitshekhar.learn.kotlin.flow.data.model.ApiUser +import me.amitshekhar.learn.kotlin.flow.databinding.ActivityRecyclerViewBinding import me.amitshekhar.learn.kotlin.flow.ui.base.ApiUserAdapter import me.amitshekhar.learn.kotlin.flow.utils.DefaultDispatcherProvider import me.amitshekhar.learn.kotlin.flow.ui.base.UiState @@ -27,9 +28,11 @@ class EmitAllActivity : AppCompatActivity() { private lateinit var viewModel: EmitAllViewModel private lateinit var adapter: ApiUserAdapter + private lateinit var binding: ActivityRecyclerViewBinding override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + binding = ActivityRecyclerViewBinding.inflate(layoutInflater) setContentView(R.layout.activity_recycler_view) setupUI() setupViewModel() @@ -37,17 +40,17 @@ class EmitAllActivity : AppCompatActivity() { } private fun setupUI() { - recyclerView.layoutManager = LinearLayoutManager(this) + binding.recyclerView.layoutManager = LinearLayoutManager(this) adapter = ApiUserAdapter( arrayListOf() ) - recyclerView.addItemDecoration( + binding.recyclerView.addItemDecoration( DividerItemDecoration( - recyclerView.context, - (recyclerView.layoutManager as LinearLayoutManager).orientation + binding.recyclerView.context, + (binding.recyclerView.layoutManager as LinearLayoutManager).orientation ) ) - recyclerView.adapter = adapter + binding.recyclerView.adapter = adapter } private fun setupObserver() { @@ -56,17 +59,17 @@ class EmitAllActivity : AppCompatActivity() { viewModel.uiState.collect { when (it) { is UiState.Success -> { - progressBar.visibility = View.GONE + binding.progressBar.visibility = View.GONE renderList(it.data) - recyclerView.visibility = View.VISIBLE + binding.recyclerView.visibility = View.VISIBLE } is UiState.Loading -> { - progressBar.visibility = View.VISIBLE - recyclerView.visibility = View.GONE + binding.progressBar.visibility = View.VISIBLE + binding.recyclerView.visibility = View.GONE } is UiState.Error -> { //Handle Error - progressBar.visibility = View.GONE + binding.progressBar.visibility = View.GONE Toast.makeText(this@EmitAllActivity, it.message, Toast.LENGTH_SHORT) .show() } @@ -76,6 +79,7 @@ class EmitAllActivity : AppCompatActivity() { } } + @SuppressLint("NotifyDataSetChanged") private fun renderList(users: List) { adapter.addData(users) adapter.notifyDataSetChanged() diff --git a/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/filter/FilterActivity.kt b/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/filter/FilterActivity.kt index 0488737..8f7136f 100644 --- a/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/filter/FilterActivity.kt +++ b/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/filter/FilterActivity.kt @@ -8,14 +8,13 @@ import androidx.lifecycle.Lifecycle import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle -import kotlinx.android.synthetic.main.activity_long_running_task.* -import kotlinx.android.synthetic.main.activity_recycler_view.progressBar import kotlinx.coroutines.launch import me.amitshekhar.learn.kotlin.flow.R import me.amitshekhar.learn.kotlin.flow.data.api.ApiHelperImpl import me.amitshekhar.learn.kotlin.flow.data.api.RetrofitBuilder import me.amitshekhar.learn.kotlin.flow.data.local.DatabaseBuilder import me.amitshekhar.learn.kotlin.flow.data.local.DatabaseHelperImpl +import me.amitshekhar.learn.kotlin.flow.databinding.ActivityLongRunningTaskBinding import me.amitshekhar.learn.kotlin.flow.utils.DefaultDispatcherProvider import me.amitshekhar.learn.kotlin.flow.ui.base.UiState import me.amitshekhar.learn.kotlin.flow.ui.base.ViewModelFactory @@ -23,9 +22,11 @@ import me.amitshekhar.learn.kotlin.flow.ui.base.ViewModelFactory class FilterActivity : AppCompatActivity() { private lateinit var viewModel: FilterViewModel + private lateinit var binding: ActivityLongRunningTaskBinding override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + binding = ActivityLongRunningTaskBinding.inflate(layoutInflater) setContentView(R.layout.activity_long_running_task) setupViewModel() setupLongRunningTask() @@ -37,17 +38,17 @@ class FilterActivity : AppCompatActivity() { viewModel.uiState.collect { when (it) { is UiState.Success -> { - progressBar.visibility = View.GONE - textView.text = it.data - textView.visibility = View.VISIBLE + binding.progressBar.visibility = View.GONE + binding.textView.text = it.data + binding.textView.visibility = View.VISIBLE } is UiState.Loading -> { - progressBar.visibility = View.VISIBLE - textView.visibility = View.GONE + binding.progressBar.visibility = View.VISIBLE + binding.textView.visibility = View.GONE } is UiState.Error -> { //Handle Error - progressBar.visibility = View.GONE + binding.progressBar.visibility = View.GONE Toast.makeText(this@FilterActivity, it.message, Toast.LENGTH_SHORT) .show() } diff --git a/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/flowon/FlowOnActivity.kt b/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/flowon/FlowOnActivity.kt index 2c5618b..fdb7fba 100644 --- a/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/flowon/FlowOnActivity.kt +++ b/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/flowon/FlowOnActivity.kt @@ -4,22 +4,23 @@ import android.os.Bundle import android.view.View import androidx.appcompat.app.AppCompatActivity import androidx.lifecycle.ViewModelProvider -import kotlinx.android.synthetic.main.activity_long_running_task.progressBar -import kotlinx.android.synthetic.main.activity_long_running_task.textView import me.amitshekhar.learn.kotlin.flow.R import me.amitshekhar.learn.kotlin.flow.data.api.ApiHelperImpl import me.amitshekhar.learn.kotlin.flow.data.api.RetrofitBuilder import me.amitshekhar.learn.kotlin.flow.data.local.DatabaseBuilder import me.amitshekhar.learn.kotlin.flow.data.local.DatabaseHelperImpl +import me.amitshekhar.learn.kotlin.flow.databinding.ActivityLongRunningTaskBinding import me.amitshekhar.learn.kotlin.flow.ui.base.ViewModelFactory import me.amitshekhar.learn.kotlin.flow.utils.DefaultDispatcherProvider class FlowOnActivity : AppCompatActivity() { private lateinit var viewModel: FlowOnViewModel + private lateinit var binding: ActivityLongRunningTaskBinding override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + binding = ActivityLongRunningTaskBinding.inflate(layoutInflater) setContentView(R.layout.activity_long_running_task) setupTextView() setupViewModel() @@ -27,9 +28,9 @@ class FlowOnActivity : AppCompatActivity() { } private fun setupTextView() { - progressBar.visibility = View.GONE - textView.text = getString(R.string.check_logcat) - textView.visibility = View.VISIBLE + binding.progressBar.visibility = View.GONE + binding.textView.text = getString(R.string.check_logcat) + binding.textView.visibility = View.VISIBLE } private fun setupTask() { diff --git a/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/map/MapActivity.kt b/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/map/MapActivity.kt index 6c2558c..0f22646 100644 --- a/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/map/MapActivity.kt +++ b/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/map/MapActivity.kt @@ -1,6 +1,7 @@ package me.amitshekhar.learn.kotlin.flow.ui.map +import android.annotation.SuppressLint import android.os.Bundle import android.view.View import android.widget.Toast @@ -11,7 +12,6 @@ import androidx.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle import androidx.recyclerview.widget.DividerItemDecoration import androidx.recyclerview.widget.LinearLayoutManager -import kotlinx.android.synthetic.main.activity_recycler_view.* import kotlinx.coroutines.launch import me.amitshekhar.learn.kotlin.flow.R import me.amitshekhar.learn.kotlin.flow.data.api.ApiHelperImpl @@ -19,6 +19,7 @@ import me.amitshekhar.learn.kotlin.flow.data.api.RetrofitBuilder import me.amitshekhar.learn.kotlin.flow.data.local.DatabaseBuilder import me.amitshekhar.learn.kotlin.flow.data.local.DatabaseHelperImpl import me.amitshekhar.learn.kotlin.flow.data.local.entity.User +import me.amitshekhar.learn.kotlin.flow.databinding.ActivityRecyclerViewBinding import me.amitshekhar.learn.kotlin.flow.ui.base.UserAdapter import me.amitshekhar.learn.kotlin.flow.utils.DefaultDispatcherProvider import me.amitshekhar.learn.kotlin.flow.ui.base.UiState @@ -28,9 +29,11 @@ class MapActivity : AppCompatActivity() { private lateinit var viewModel: MapViewModel private lateinit var adapter: UserAdapter + private lateinit var binding: ActivityRecyclerViewBinding override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + binding = ActivityRecyclerViewBinding.inflate(layoutInflater) setContentView(R.layout.activity_recycler_view) setupUI() setupViewModel() @@ -38,18 +41,18 @@ class MapActivity : AppCompatActivity() { } private fun setupUI() { - recyclerView.layoutManager = LinearLayoutManager(this) + binding.recyclerView.layoutManager = LinearLayoutManager(this) adapter = UserAdapter( arrayListOf() ) - recyclerView.addItemDecoration( + binding.recyclerView.addItemDecoration( DividerItemDecoration( - recyclerView.context, - (recyclerView.layoutManager as LinearLayoutManager).orientation + binding.recyclerView.context, + (binding.recyclerView.layoutManager as LinearLayoutManager).orientation ) ) - recyclerView.adapter = adapter + binding.recyclerView.adapter = adapter } private fun setupObserver() { @@ -58,17 +61,17 @@ class MapActivity : AppCompatActivity() { viewModel.uiState.collect { when (it) { is UiState.Success -> { - progressBar.visibility = View.GONE + binding.progressBar.visibility = View.GONE renderList(it.data) - recyclerView.visibility = View.VISIBLE + binding.recyclerView.visibility = View.VISIBLE } is UiState.Loading -> { - progressBar.visibility = View.VISIBLE - recyclerView.visibility = View.GONE + binding.progressBar.visibility = View.VISIBLE + binding.recyclerView.visibility = View.GONE } is UiState.Error -> { //Handle Error - progressBar.visibility = View.GONE + binding.progressBar.visibility = View.GONE Toast.makeText(this@MapActivity, it.message, Toast.LENGTH_SHORT).show() } } @@ -77,6 +80,7 @@ class MapActivity : AppCompatActivity() { } } + @SuppressLint("NotifyDataSetChanged") private fun renderList(users: List) { adapter.addData(users) adapter.notifyDataSetChanged() diff --git a/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/reduce/ReduceActivity.kt b/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/reduce/ReduceActivity.kt index b27eea0..9524fd4 100644 --- a/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/reduce/ReduceActivity.kt +++ b/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/reduce/ReduceActivity.kt @@ -8,13 +8,13 @@ import androidx.lifecycle.Lifecycle import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle -import kotlinx.android.synthetic.main.activity_long_running_task.* import kotlinx.coroutines.launch import me.amitshekhar.learn.kotlin.flow.R import me.amitshekhar.learn.kotlin.flow.data.api.ApiHelperImpl import me.amitshekhar.learn.kotlin.flow.data.api.RetrofitBuilder import me.amitshekhar.learn.kotlin.flow.data.local.DatabaseBuilder import me.amitshekhar.learn.kotlin.flow.data.local.DatabaseHelperImpl +import me.amitshekhar.learn.kotlin.flow.databinding.ActivityLongRunningTaskBinding import me.amitshekhar.learn.kotlin.flow.utils.DefaultDispatcherProvider import me.amitshekhar.learn.kotlin.flow.ui.base.UiState import me.amitshekhar.learn.kotlin.flow.ui.base.ViewModelFactory @@ -22,9 +22,11 @@ import me.amitshekhar.learn.kotlin.flow.ui.base.ViewModelFactory class ReduceActivity : AppCompatActivity() { private lateinit var viewModel: ReduceViewModel + private lateinit var binding: ActivityLongRunningTaskBinding override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + binding = ActivityLongRunningTaskBinding.inflate(layoutInflater) setContentView(R.layout.activity_long_running_task) setupViewModel() setupLongRunningTask() @@ -36,17 +38,17 @@ class ReduceActivity : AppCompatActivity() { viewModel.uiState.collect { when (it) { is UiState.Success -> { - progressBar.visibility = View.GONE - textView.text = it.data - textView.visibility = View.VISIBLE + binding.progressBar.visibility = View.GONE + binding.textView.text = it.data + binding.textView.visibility = View.VISIBLE } is UiState.Loading -> { - progressBar.visibility = View.VISIBLE - textView.visibility = View.GONE + binding.progressBar.visibility = View.VISIBLE + binding.textView.visibility = View.GONE } is UiState.Error -> { //Handle Error - progressBar.visibility = View.GONE + binding.progressBar.visibility = View.GONE Toast.makeText(this@ReduceActivity, it.message, Toast.LENGTH_SHORT) .show() } diff --git a/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/retrofit/parallel/ParallelNetworkCallsActivity.kt b/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/retrofit/parallel/ParallelNetworkCallsActivity.kt index 313757d..ff0c917 100644 --- a/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/retrofit/parallel/ParallelNetworkCallsActivity.kt +++ b/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/retrofit/parallel/ParallelNetworkCallsActivity.kt @@ -1,5 +1,6 @@ package me.amitshekhar.learn.kotlin.flow.ui.retrofit.parallel +import android.annotation.SuppressLint import android.os.Bundle import android.view.View import android.widget.Toast @@ -10,7 +11,6 @@ import androidx.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle import androidx.recyclerview.widget.DividerItemDecoration import androidx.recyclerview.widget.LinearLayoutManager -import kotlinx.android.synthetic.main.activity_recycler_view.* import kotlinx.coroutines.launch import me.amitshekhar.learn.kotlin.flow.R import me.amitshekhar.learn.kotlin.flow.data.api.ApiHelperImpl @@ -18,6 +18,7 @@ import me.amitshekhar.learn.kotlin.flow.data.api.RetrofitBuilder import me.amitshekhar.learn.kotlin.flow.data.local.DatabaseBuilder import me.amitshekhar.learn.kotlin.flow.data.local.DatabaseHelperImpl import me.amitshekhar.learn.kotlin.flow.data.model.ApiUser +import me.amitshekhar.learn.kotlin.flow.databinding.ActivityRecyclerViewBinding import me.amitshekhar.learn.kotlin.flow.ui.base.ApiUserAdapter import me.amitshekhar.learn.kotlin.flow.utils.DefaultDispatcherProvider import me.amitshekhar.learn.kotlin.flow.ui.base.UiState @@ -27,9 +28,11 @@ class ParallelNetworkCallsActivity : AppCompatActivity() { private lateinit var viewModel: ParallelNetworkCallsViewModel private lateinit var adapter: ApiUserAdapter + private lateinit var binding: ActivityRecyclerViewBinding override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + binding = ActivityRecyclerViewBinding.inflate(layoutInflater) setContentView(R.layout.activity_recycler_view) setupUI() setupViewModel() @@ -37,18 +40,18 @@ class ParallelNetworkCallsActivity : AppCompatActivity() { } private fun setupUI() { - recyclerView.layoutManager = LinearLayoutManager(this) + binding.recyclerView.layoutManager = LinearLayoutManager(this) adapter = ApiUserAdapter( arrayListOf() ) - recyclerView.addItemDecoration( + binding.recyclerView.addItemDecoration( DividerItemDecoration( - recyclerView.context, - (recyclerView.layoutManager as LinearLayoutManager).orientation + binding.recyclerView.context, + (binding.recyclerView.layoutManager as LinearLayoutManager).orientation ) ) - recyclerView.adapter = adapter + binding.recyclerView.adapter = adapter } private fun setupObserver() { @@ -57,17 +60,17 @@ class ParallelNetworkCallsActivity : AppCompatActivity() { viewModel.uiState.collect { when (it) { is UiState.Success -> { - progressBar.visibility = View.GONE + binding.progressBar.visibility = View.GONE renderList(it.data) - recyclerView.visibility = View.VISIBLE + binding.recyclerView.visibility = View.VISIBLE } is UiState.Loading -> { - progressBar.visibility = View.VISIBLE - recyclerView.visibility = View.GONE + binding.progressBar.visibility = View.VISIBLE + binding.recyclerView.visibility = View.GONE } is UiState.Error -> { //Handle Error - progressBar.visibility = View.GONE + binding.progressBar.visibility = View.GONE Toast.makeText( this@ParallelNetworkCallsActivity, it.message, @@ -80,6 +83,7 @@ class ParallelNetworkCallsActivity : AppCompatActivity() { } } + @SuppressLint("NotifyDataSetChanged") private fun renderList(users: List) { adapter.addData(users) adapter.notifyDataSetChanged() diff --git a/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/retrofit/series/SeriesNetworkCallsActivity.kt b/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/retrofit/series/SeriesNetworkCallsActivity.kt index d31a4fe..ba2dbd9 100644 --- a/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/retrofit/series/SeriesNetworkCallsActivity.kt +++ b/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/retrofit/series/SeriesNetworkCallsActivity.kt @@ -1,5 +1,6 @@ package me.amitshekhar.learn.kotlin.flow.ui.retrofit.series +import android.annotation.SuppressLint import android.os.Bundle import android.view.View import android.widget.Toast @@ -10,7 +11,6 @@ import androidx.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle import androidx.recyclerview.widget.DividerItemDecoration import androidx.recyclerview.widget.LinearLayoutManager -import kotlinx.android.synthetic.main.activity_recycler_view.* import kotlinx.coroutines.launch import me.amitshekhar.learn.kotlin.flow.R import me.amitshekhar.learn.kotlin.flow.data.api.ApiHelperImpl @@ -18,6 +18,7 @@ import me.amitshekhar.learn.kotlin.flow.data.api.RetrofitBuilder import me.amitshekhar.learn.kotlin.flow.data.local.DatabaseBuilder import me.amitshekhar.learn.kotlin.flow.data.local.DatabaseHelperImpl import me.amitshekhar.learn.kotlin.flow.data.model.ApiUser +import me.amitshekhar.learn.kotlin.flow.databinding.ActivityRecyclerViewBinding import me.amitshekhar.learn.kotlin.flow.ui.base.ApiUserAdapter import me.amitshekhar.learn.kotlin.flow.utils.DefaultDispatcherProvider import me.amitshekhar.learn.kotlin.flow.ui.base.UiState @@ -27,9 +28,11 @@ class SeriesNetworkCallsActivity : AppCompatActivity() { private lateinit var viewModel: SeriesNetworkCallsViewModel private lateinit var adapter: ApiUserAdapter + private lateinit var binding: ActivityRecyclerViewBinding override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + binding = ActivityRecyclerViewBinding.inflate(layoutInflater) setContentView(R.layout.activity_recycler_view) setupUI() setupViewModel() @@ -37,18 +40,18 @@ class SeriesNetworkCallsActivity : AppCompatActivity() { } private fun setupUI() { - recyclerView.layoutManager = LinearLayoutManager(this) + binding.recyclerView.layoutManager = LinearLayoutManager(this) adapter = ApiUserAdapter( arrayListOf() ) - recyclerView.addItemDecoration( + binding.recyclerView.addItemDecoration( DividerItemDecoration( - recyclerView.context, - (recyclerView.layoutManager as LinearLayoutManager).orientation + binding.recyclerView.context, + (binding.recyclerView.layoutManager as LinearLayoutManager).orientation ) ) - recyclerView.adapter = adapter + binding.recyclerView.adapter = adapter } private fun setupObserver() { @@ -57,17 +60,17 @@ class SeriesNetworkCallsActivity : AppCompatActivity() { viewModel.uiState.collect { when (it) { is UiState.Success -> { - progressBar.visibility = View.GONE + binding.progressBar.visibility = View.GONE renderList(it.data) - recyclerView.visibility = View.VISIBLE + binding.recyclerView.visibility = View.VISIBLE } is UiState.Loading -> { - progressBar.visibility = View.VISIBLE - recyclerView.visibility = View.GONE + binding.progressBar.visibility = View.VISIBLE + binding.recyclerView.visibility = View.GONE } is UiState.Error -> { //Handle Error - progressBar.visibility = View.GONE + binding.progressBar.visibility = View.GONE Toast.makeText( this@SeriesNetworkCallsActivity, it.message, @@ -80,6 +83,7 @@ class SeriesNetworkCallsActivity : AppCompatActivity() { } } + @SuppressLint("NotifyDataSetChanged") private fun renderList(users: List) { adapter.addData(users) adapter.notifyDataSetChanged() diff --git a/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/retrofit/series/SeriesNetworkCallsViewModel.kt b/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/retrofit/series/SeriesNetworkCallsViewModel.kt index a58e028..a9b31c2 100644 --- a/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/retrofit/series/SeriesNetworkCallsViewModel.kt +++ b/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/retrofit/series/SeriesNetworkCallsViewModel.kt @@ -2,6 +2,7 @@ package me.amitshekhar.learn.kotlin.flow.ui.retrofit.series import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope +import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.* import kotlinx.coroutines.launch import me.amitshekhar.learn.kotlin.flow.data.api.ApiHelper @@ -24,6 +25,7 @@ class SeriesNetworkCallsViewModel( fetchUsers() } + @OptIn(ExperimentalCoroutinesApi::class) private fun fetchUsers() { viewModelScope.launch(dispatcherProvider.main) { _uiState.value = UiState.Loading diff --git a/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/retrofit/single/SingleNetworkCallActivity.kt b/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/retrofit/single/SingleNetworkCallActivity.kt index 1f0e3f0..474f8e5 100644 --- a/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/retrofit/single/SingleNetworkCallActivity.kt +++ b/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/retrofit/single/SingleNetworkCallActivity.kt @@ -1,5 +1,6 @@ package me.amitshekhar.learn.kotlin.flow.ui.retrofit.single +import android.annotation.SuppressLint import android.os.Bundle import android.view.View import android.widget.Toast @@ -10,7 +11,6 @@ import androidx.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle import androidx.recyclerview.widget.DividerItemDecoration import androidx.recyclerview.widget.LinearLayoutManager -import kotlinx.android.synthetic.main.activity_recycler_view.* import kotlinx.coroutines.launch import me.amitshekhar.learn.kotlin.flow.R import me.amitshekhar.learn.kotlin.flow.data.api.ApiHelperImpl @@ -18,6 +18,7 @@ import me.amitshekhar.learn.kotlin.flow.data.api.RetrofitBuilder import me.amitshekhar.learn.kotlin.flow.data.local.DatabaseBuilder import me.amitshekhar.learn.kotlin.flow.data.local.DatabaseHelperImpl import me.amitshekhar.learn.kotlin.flow.data.model.ApiUser +import me.amitshekhar.learn.kotlin.flow.databinding.ActivityRecyclerViewBinding import me.amitshekhar.learn.kotlin.flow.ui.base.ApiUserAdapter import me.amitshekhar.learn.kotlin.flow.utils.DefaultDispatcherProvider import me.amitshekhar.learn.kotlin.flow.ui.base.UiState @@ -27,9 +28,11 @@ class SingleNetworkCallActivity : AppCompatActivity() { private lateinit var viewModel: SingleNetworkCallViewModel private lateinit var adapter: ApiUserAdapter + private lateinit var binding: ActivityRecyclerViewBinding override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + binding = ActivityRecyclerViewBinding.inflate(layoutInflater) setContentView(R.layout.activity_recycler_view) setupUI() setupViewModel() @@ -37,18 +40,15 @@ class SingleNetworkCallActivity : AppCompatActivity() { } private fun setupUI() { - recyclerView.layoutManager = LinearLayoutManager(this) - adapter = - ApiUserAdapter( - arrayListOf() - ) - recyclerView.addItemDecoration( + binding.recyclerView.layoutManager = LinearLayoutManager(this) + adapter = ApiUserAdapter(arrayListOf()) + binding.recyclerView.addItemDecoration( DividerItemDecoration( - recyclerView.context, - (recyclerView.layoutManager as LinearLayoutManager).orientation + binding.recyclerView.context, + (binding.recyclerView.layoutManager as LinearLayoutManager).orientation ) ) - recyclerView.adapter = adapter + binding.recyclerView.adapter = adapter } private fun setupObserver() { @@ -57,17 +57,17 @@ class SingleNetworkCallActivity : AppCompatActivity() { viewModel.uiState.collect { when (it) { is UiState.Success -> { - progressBar.visibility = View.GONE + binding.progressBar.visibility = View.GONE renderList(it.data) - recyclerView.visibility = View.VISIBLE + binding.recyclerView.visibility = View.VISIBLE } is UiState.Loading -> { - progressBar.visibility = View.VISIBLE - recyclerView.visibility = View.GONE + binding.progressBar.visibility = View.VISIBLE + binding.recyclerView.visibility = View.GONE } is UiState.Error -> { //Handle Error - progressBar.visibility = View.GONE + binding.progressBar.visibility = View.GONE Toast.makeText( this@SingleNetworkCallActivity, it.message, @@ -80,6 +80,7 @@ class SingleNetworkCallActivity : AppCompatActivity() { } } + @SuppressLint("NotifyDataSetChanged") private fun renderList(users: List) { adapter.addData(users) adapter.notifyDataSetChanged() diff --git a/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/retry/RetryActivity.kt b/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/retry/RetryActivity.kt index 57fcaae..3ce3acb 100644 --- a/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/retry/RetryActivity.kt +++ b/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/retry/RetryActivity.kt @@ -8,13 +8,13 @@ import androidx.lifecycle.Lifecycle import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle -import kotlinx.android.synthetic.main.activity_retry.* import kotlinx.coroutines.launch import me.amitshekhar.learn.kotlin.flow.R import me.amitshekhar.learn.kotlin.flow.data.api.ApiHelperImpl import me.amitshekhar.learn.kotlin.flow.data.api.RetrofitBuilder import me.amitshekhar.learn.kotlin.flow.data.local.DatabaseBuilder import me.amitshekhar.learn.kotlin.flow.data.local.DatabaseHelperImpl +import me.amitshekhar.learn.kotlin.flow.databinding.ActivityRetryBinding import me.amitshekhar.learn.kotlin.flow.utils.DefaultDispatcherProvider import me.amitshekhar.learn.kotlin.flow.ui.base.UiState.* import me.amitshekhar.learn.kotlin.flow.ui.base.ViewModelFactory @@ -22,9 +22,11 @@ import me.amitshekhar.learn.kotlin.flow.ui.base.ViewModelFactory class RetryActivity : AppCompatActivity() { private lateinit var viewModel: RetryViewModel + private lateinit var binding: ActivityRetryBinding override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + binding = ActivityRetryBinding.inflate(layoutInflater) setContentView(R.layout.activity_retry) setupViewModel() setupLongRunningTask() @@ -36,17 +38,17 @@ class RetryActivity : AppCompatActivity() { viewModel.uiState.collect { when (it) { is Success -> { - progressBar.visibility = View.GONE - textView.text = it.data - textView.visibility = View.VISIBLE + binding.progressBar.visibility = View.GONE + binding.textView.text = it.data + binding.textView.visibility = View.VISIBLE } is Loading -> { - progressBar.visibility = View.VISIBLE - textView.visibility = View.GONE + binding.progressBar.visibility = View.VISIBLE + binding.textView.visibility = View.GONE } is Error -> { //Handle Error - progressBar.visibility = View.GONE + binding.progressBar.visibility = View.GONE Toast.makeText(this@RetryActivity, it.message, Toast.LENGTH_SHORT) .show() } diff --git a/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/retryexponentialbackoff/RetryExponentialBackoffActivity.kt b/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/retryexponentialbackoff/RetryExponentialBackoffActivity.kt index 4515baa..b58f651 100644 --- a/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/retryexponentialbackoff/RetryExponentialBackoffActivity.kt +++ b/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/retryexponentialbackoff/RetryExponentialBackoffActivity.kt @@ -8,13 +8,13 @@ import androidx.lifecycle.Lifecycle import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle -import kotlinx.android.synthetic.main.activity_retry.* import kotlinx.coroutines.launch import me.amitshekhar.learn.kotlin.flow.R import me.amitshekhar.learn.kotlin.flow.data.api.ApiHelperImpl import me.amitshekhar.learn.kotlin.flow.data.api.RetrofitBuilder import me.amitshekhar.learn.kotlin.flow.data.local.DatabaseBuilder import me.amitshekhar.learn.kotlin.flow.data.local.DatabaseHelperImpl +import me.amitshekhar.learn.kotlin.flow.databinding.ActivityRetryBinding import me.amitshekhar.learn.kotlin.flow.utils.DefaultDispatcherProvider import me.amitshekhar.learn.kotlin.flow.ui.base.UiState import me.amitshekhar.learn.kotlin.flow.ui.base.ViewModelFactory @@ -22,9 +22,11 @@ import me.amitshekhar.learn.kotlin.flow.ui.base.ViewModelFactory class RetryExponentialBackoffActivity : AppCompatActivity() { private lateinit var viewModel: RetryExponentialBackoffModel + private lateinit var binding: ActivityRetryBinding override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + binding = ActivityRetryBinding.inflate(layoutInflater) setContentView(R.layout.activity_retry) setupViewModel() setupLongRunningTask() @@ -36,17 +38,17 @@ class RetryExponentialBackoffActivity : AppCompatActivity() { viewModel.uiState.collect { when (it) { is UiState.Success -> { - progressBar.visibility = View.GONE - textView.text = it.data - textView.visibility = View.VISIBLE + binding.progressBar.visibility = View.GONE + binding.textView.text = it.data + binding.textView.visibility = View.VISIBLE } is UiState.Loading -> { - progressBar.visibility = View.VISIBLE - textView.visibility = View.GONE + binding.progressBar.visibility = View.VISIBLE + binding.textView.visibility = View.GONE } is UiState.Error -> { //Handle Error - progressBar.visibility = View.GONE + binding.progressBar.visibility = View.GONE Toast.makeText( this@RetryExponentialBackoffActivity, it.message, diff --git a/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/retrywhen/RetryWhenActivity.kt b/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/retrywhen/RetryWhenActivity.kt index 62c7cd3..f37af6e 100644 --- a/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/retrywhen/RetryWhenActivity.kt +++ b/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/retrywhen/RetryWhenActivity.kt @@ -8,13 +8,13 @@ import androidx.lifecycle.Lifecycle import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle -import kotlinx.android.synthetic.main.activity_retry.* import kotlinx.coroutines.launch import me.amitshekhar.learn.kotlin.flow.R import me.amitshekhar.learn.kotlin.flow.data.api.ApiHelperImpl import me.amitshekhar.learn.kotlin.flow.data.api.RetrofitBuilder import me.amitshekhar.learn.kotlin.flow.data.local.DatabaseBuilder import me.amitshekhar.learn.kotlin.flow.data.local.DatabaseHelperImpl +import me.amitshekhar.learn.kotlin.flow.databinding.ActivityRetryBinding import me.amitshekhar.learn.kotlin.flow.utils.DefaultDispatcherProvider import me.amitshekhar.learn.kotlin.flow.ui.base.UiState import me.amitshekhar.learn.kotlin.flow.ui.base.ViewModelFactory @@ -22,9 +22,11 @@ import me.amitshekhar.learn.kotlin.flow.ui.base.ViewModelFactory class RetryWhenActivity : AppCompatActivity() { private lateinit var viewModel: RetryWhenViewModel + private lateinit var binding: ActivityRetryBinding override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + binding = ActivityRetryBinding.inflate(layoutInflater) setContentView(R.layout.activity_retry) setupViewModel() setupLongRunningTask() @@ -36,17 +38,17 @@ class RetryWhenActivity : AppCompatActivity() { viewModel.uiState.collect { when (it) { is UiState.Success -> { - progressBar.visibility = View.GONE - textView.text = it.data - textView.visibility = View.VISIBLE + binding.progressBar.visibility = View.GONE + binding.textView.text = it.data + binding.textView.visibility = View.VISIBLE } is UiState.Loading -> { - progressBar.visibility = View.VISIBLE - textView.visibility = View.GONE + binding.progressBar.visibility = View.VISIBLE + binding.textView.visibility = View.GONE } is UiState.Error -> { //Handle Error - progressBar.visibility = View.GONE + binding.progressBar.visibility = View.GONE Toast.makeText(this@RetryWhenActivity, it.message, Toast.LENGTH_SHORT) .show() } diff --git a/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/room/RoomDBActivity.kt b/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/room/RoomDBActivity.kt index 5a847b8..a7499a0 100644 --- a/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/room/RoomDBActivity.kt +++ b/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/room/RoomDBActivity.kt @@ -1,5 +1,6 @@ package me.amitshekhar.learn.kotlin.flow.ui.room +import android.annotation.SuppressLint import android.os.Bundle import android.view.View import android.widget.Toast @@ -10,7 +11,6 @@ import androidx.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle import androidx.recyclerview.widget.DividerItemDecoration import androidx.recyclerview.widget.LinearLayoutManager -import kotlinx.android.synthetic.main.activity_recycler_view.* import kotlinx.coroutines.launch import me.amitshekhar.learn.kotlin.flow.R import me.amitshekhar.learn.kotlin.flow.data.api.ApiHelperImpl @@ -18,6 +18,7 @@ import me.amitshekhar.learn.kotlin.flow.data.api.RetrofitBuilder import me.amitshekhar.learn.kotlin.flow.data.local.DatabaseBuilder import me.amitshekhar.learn.kotlin.flow.data.local.DatabaseHelperImpl import me.amitshekhar.learn.kotlin.flow.data.local.entity.User +import me.amitshekhar.learn.kotlin.flow.databinding.ActivityRecyclerViewBinding import me.amitshekhar.learn.kotlin.flow.ui.base.UserAdapter import me.amitshekhar.learn.kotlin.flow.utils.DefaultDispatcherProvider import me.amitshekhar.learn.kotlin.flow.ui.base.UiState @@ -27,9 +28,11 @@ class RoomDBActivity : AppCompatActivity() { private lateinit var viewModel: RoomDBViewModel private lateinit var adapter: UserAdapter + private lateinit var binding: ActivityRecyclerViewBinding override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + binding = ActivityRecyclerViewBinding.inflate(layoutInflater) setContentView(R.layout.activity_recycler_view) setupUI() setupViewModel() @@ -37,18 +40,18 @@ class RoomDBActivity : AppCompatActivity() { } private fun setupUI() { - recyclerView.layoutManager = LinearLayoutManager(this) + binding.recyclerView.layoutManager = LinearLayoutManager(this) adapter = UserAdapter( arrayListOf() ) - recyclerView.addItemDecoration( + binding.recyclerView.addItemDecoration( DividerItemDecoration( - recyclerView.context, - (recyclerView.layoutManager as LinearLayoutManager).orientation + binding.recyclerView.context, + (binding.recyclerView.layoutManager as LinearLayoutManager).orientation ) ) - recyclerView.adapter = adapter + binding.recyclerView.adapter = adapter } private fun setupObserver() { @@ -57,17 +60,17 @@ class RoomDBActivity : AppCompatActivity() { viewModel.uiState.collect { when (it) { is UiState.Success -> { - progressBar.visibility = View.GONE + binding.progressBar.visibility = View.GONE renderList(it.data) - recyclerView.visibility = View.VISIBLE + binding.recyclerView.visibility = View.VISIBLE } is UiState.Loading -> { - progressBar.visibility = View.VISIBLE - recyclerView.visibility = View.GONE + binding.progressBar.visibility = View.VISIBLE + binding.recyclerView.visibility = View.GONE } is UiState.Error -> { //Handle Error - progressBar.visibility = View.GONE + binding.progressBar.visibility = View.GONE Toast.makeText(this@RoomDBActivity, it.message, Toast.LENGTH_SHORT) .show() } @@ -77,6 +80,7 @@ class RoomDBActivity : AppCompatActivity() { } } + @SuppressLint("NotifyDataSetChanged") private fun renderList(users: List) { adapter.addData(users) adapter.notifyDataSetChanged() diff --git a/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/search/SearchActivity.kt b/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/search/SearchActivity.kt index c90acb0..71b0bf4 100644 --- a/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/search/SearchActivity.kt +++ b/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/search/SearchActivity.kt @@ -2,10 +2,10 @@ package me.amitshekhar.learn.kotlin.flow.ui.search import android.os.Bundle import androidx.appcompat.app.AppCompatActivity -import kotlinx.android.synthetic.main.activity_search.* import kotlinx.coroutines.* import kotlinx.coroutines.flow.* import me.amitshekhar.learn.kotlin.flow.R +import me.amitshekhar.learn.kotlin.flow.databinding.ActivitySearchBinding import me.amitshekhar.learn.kotlin.flow.utils.DefaultDispatcherProvider import me.amitshekhar.learn.kotlin.flow.utils.getQueryTextChangeStateFlow import kotlin.coroutines.CoroutineContext @@ -16,9 +16,11 @@ class SearchActivity : AppCompatActivity(), CoroutineScope { get() = Dispatchers.Main + job private lateinit var job: Job + private lateinit var binding: ActivitySearchBinding override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + binding = ActivitySearchBinding.inflate(layoutInflater) setContentView(R.layout.activity_search) job = Job() setUpSearchStateFlow() @@ -29,13 +31,14 @@ class SearchActivity : AppCompatActivity(), CoroutineScope { super.onDestroy() } + @OptIn(FlowPreview::class, ExperimentalCoroutinesApi::class) private fun setUpSearchStateFlow() { launch { - searchView.getQueryTextChangeStateFlow() + binding.searchView.getQueryTextChangeStateFlow() .debounce(300) .filter { query -> if (query.isEmpty()) { - textViewResult.text = "" + binding.textViewResult.text = "" return@filter false } else { return@filter true @@ -50,7 +53,7 @@ class SearchActivity : AppCompatActivity(), CoroutineScope { } .flowOn(DefaultDispatcherProvider().default) .collect { result -> - textViewResult.text = result + binding.textViewResult.text = result } } } diff --git a/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/task/onetask/LongRunningTaskActivity.kt b/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/task/onetask/LongRunningTaskActivity.kt index 4dfa740..37e8c2c 100644 --- a/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/task/onetask/LongRunningTaskActivity.kt +++ b/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/task/onetask/LongRunningTaskActivity.kt @@ -8,14 +8,13 @@ import androidx.lifecycle.Lifecycle import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle -import kotlinx.android.synthetic.main.activity_long_running_task.* -import kotlinx.android.synthetic.main.activity_recycler_view.progressBar import kotlinx.coroutines.launch import me.amitshekhar.learn.kotlin.flow.R import me.amitshekhar.learn.kotlin.flow.data.api.ApiHelperImpl import me.amitshekhar.learn.kotlin.flow.data.api.RetrofitBuilder import me.amitshekhar.learn.kotlin.flow.data.local.DatabaseBuilder import me.amitshekhar.learn.kotlin.flow.data.local.DatabaseHelperImpl +import me.amitshekhar.learn.kotlin.flow.databinding.ActivityLongRunningTaskBinding import me.amitshekhar.learn.kotlin.flow.utils.DefaultDispatcherProvider import me.amitshekhar.learn.kotlin.flow.ui.base.UiState import me.amitshekhar.learn.kotlin.flow.ui.base.ViewModelFactory @@ -23,9 +22,11 @@ import me.amitshekhar.learn.kotlin.flow.ui.base.ViewModelFactory class LongRunningTaskActivity : AppCompatActivity() { private lateinit var viewModel: LongRunningTaskViewModel + private lateinit var binding: ActivityLongRunningTaskBinding override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + binding = ActivityLongRunningTaskBinding.inflate(layoutInflater) setContentView(R.layout.activity_long_running_task) setupViewModel() setupLongRunningTask() @@ -37,17 +38,17 @@ class LongRunningTaskActivity : AppCompatActivity() { viewModel.uiState.collect { when (it) { is UiState.Success -> { - progressBar.visibility = View.GONE - textView.text = it.data - textView.visibility = View.VISIBLE + binding.progressBar.visibility = View.GONE + binding.textView.text = it.data + binding.textView.visibility = View.VISIBLE } is UiState.Loading -> { - progressBar.visibility = View.VISIBLE - textView.visibility = View.GONE + binding.progressBar.visibility = View.VISIBLE + binding.textView.visibility = View.GONE } is UiState.Error -> { //Handle Error - progressBar.visibility = View.GONE + binding.progressBar.visibility = View.GONE Toast.makeText( this@LongRunningTaskActivity, it.message, diff --git a/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/task/twotasks/TwoLongRunningTasksActivity.kt b/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/task/twotasks/TwoLongRunningTasksActivity.kt index 44cc7d8..14e1207 100644 --- a/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/task/twotasks/TwoLongRunningTasksActivity.kt +++ b/app/src/main/java/me/amitshekhar/learn/kotlin/flow/ui/task/twotasks/TwoLongRunningTasksActivity.kt @@ -8,14 +8,13 @@ import androidx.lifecycle.Lifecycle import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle -import kotlinx.android.synthetic.main.activity_long_running_task.* -import kotlinx.android.synthetic.main.activity_recycler_view.progressBar import kotlinx.coroutines.launch import me.amitshekhar.learn.kotlin.flow.R import me.amitshekhar.learn.kotlin.flow.data.api.ApiHelperImpl import me.amitshekhar.learn.kotlin.flow.data.api.RetrofitBuilder import me.amitshekhar.learn.kotlin.flow.data.local.DatabaseBuilder import me.amitshekhar.learn.kotlin.flow.data.local.DatabaseHelperImpl +import me.amitshekhar.learn.kotlin.flow.databinding.ActivityLongRunningTaskBinding import me.amitshekhar.learn.kotlin.flow.utils.DefaultDispatcherProvider import me.amitshekhar.learn.kotlin.flow.ui.base.UiState import me.amitshekhar.learn.kotlin.flow.ui.base.ViewModelFactory @@ -23,9 +22,12 @@ import me.amitshekhar.learn.kotlin.flow.ui.base.ViewModelFactory class TwoLongRunningTasksActivity : AppCompatActivity() { private lateinit var viewModel: TwoLongRunningTasksViewModel + private lateinit var binding: ActivityLongRunningTaskBinding override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + binding = ActivityLongRunningTaskBinding.inflate(layoutInflater) + binding = ActivityLongRunningTaskBinding.inflate(layoutInflater) setContentView(R.layout.activity_long_running_task) setupViewModel() setupLongRunningTask() @@ -37,17 +39,17 @@ class TwoLongRunningTasksActivity : AppCompatActivity() { viewModel.uiState.collect { when (it) { is UiState.Success -> { - progressBar.visibility = View.GONE - textView.text = it.data - textView.visibility = View.VISIBLE + binding.progressBar.visibility = View.GONE + binding.textView.text = it.data + binding.textView.visibility = View.VISIBLE } is UiState.Loading -> { - progressBar.visibility = View.VISIBLE - textView.visibility = View.GONE + binding.progressBar.visibility = View.VISIBLE + binding.textView.visibility = View.GONE } is UiState.Error -> { //Handle Error - progressBar.visibility = View.GONE + binding.progressBar.visibility = View.GONE Toast.makeText( this@TwoLongRunningTasksActivity, it.message, diff --git a/build.gradle b/build.gradle index 7565e1c..8b0c0a9 100644 --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,11 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '7.2.2' apply false - id 'com.android.library' version '7.2.2' apply false - id 'org.jetbrains.kotlin.android' version '1.6.10' apply false + id 'com.android.application' version '8.9.3' apply false + id 'com.android.library' version '8.9.3' apply false + id 'org.jetbrains.kotlin.android' version '2.1.21' apply false + id 'com.google.devtools.ksp' version '2.1.21-2.0.2' apply false } -task clean(type: Delete) { - delete rootProject.buildDir +tasks.register('clean', Delete) { + delete rootProject.layout.buildDirectory.get().asFile } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c..a4b76b9 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5e7b90d..f30c36c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,8 @@ -#Mon Oct 03 23:55:08 IST 2022 +#Thu Jun 12 00:04:29 IST 2025 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip distributionPath=wrapper/dists -zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 4f906e0..f5feea6 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,69 +15,104 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +122,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,88 +133,120 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index ac1b06f..9b42019 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,8 +13,10 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +27,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -56,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -75,13 +78,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal