mobile/davx5-ose
mobile/davx5-ose
1
0
Fork 0
mirror of https://github.com/bitfireAT/davx5-ose synced 2024-09-06 18:01:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename LoginCredentialsFragmentFactory to LoginFragmentFactory (bitfireAT/davx5#507)

Browse source 
* Renamed LoginCredentialsFragmentFactory to LoginFragmentFactory

Signed-off-by: Arnau Mora <arnyminerz@proton.me>

* Fixed fragment name

Signed-off-by: Arnau Mora <arnyminerz@proton.me>

* Rename LoginInitFragment (managed) to ManagedLoginInitFragment

---------

Signed-off-by: Arnau Mora <arnyminerz@proton.me>
Co-authored-by: Ricki Hirner <hirner@bitfire.at>
This commit is contained in:
Arnau Mora 2024-01-05 10:55:47 +01:00 committed by Ricki Hirner
parent 20652b9325
commit 6b660c2be6
No known key found for this signature in database
GPG key ID: 79A019FCAAEDD3AA
4 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/kotlin/at/bitfire/davdroid/ui/setup/DefaultLoginCredentialsFragment.kt
View file

@ -6,7 +6,6 @@ package at.bitfire.davdroid.ui.setup
import android.content.Intent import android.content.Intent
import android.net.MailTo import android.net.MailTo
import android.net.Uri
import android.os.Bundle import android.os.Bundle
import android.os.Handler import android.os.Handler
import android.os.Looper import android.os.Looper
@ -20,7 +19,6 @@ import androidx.fragment.app.viewModels
import at.bitfire.davdroid.R import at.bitfire.davdroid.R
import at.bitfire.davdroid.databinding.LoginCredentialsFragmentBinding import at.bitfire.davdroid.databinding.LoginCredentialsFragmentBinding
import at.bitfire.davdroid.db.Credentials import at.bitfire.davdroid.db.Credentials
import at.bitfire.davdroid.ui.UiUtils
import com.google.android.material.snackbar.Snackbar import com.google.android.material.snackbar.Snackbar
import dagger.Binds import dagger.Binds
import dagger.Module import dagger.Module
@ -215,7 +213,7 @@ class DefaultLoginCredentialsFragment : Fragment() {
} }
class Factory @Inject constructor() : LoginCredentialsFragmentFactory { class Factory @Inject constructor() : LoginFragmentFactory {
override fun getFragment(intent: Intent) = DefaultLoginCredentialsFragment() override fun getFragment(intent: Intent) = DefaultLoginCredentialsFragment()
@ -227,7 +225,7 @@ class DefaultLoginCredentialsFragment : Fragment() {
@Binds @Binds
@IntoMap @IntoMap
@IntKey(/* priority */ 10) @IntKey(/* priority */ 10)
abstract fun factory(impl: Factory): LoginCredentialsFragmentFactory abstract fun factory(impl: Factory): LoginFragmentFactory
} }
} }

2
app/src/main/kotlin/at/bitfire/davdroid/ui/setup/LoginActivity.kt
View file

@ -47,7 +47,7 @@ class LoginActivity: AppCompatActivity() {
} }
@Inject @Inject
lateinit var loginFragmentFactories: Map<Int, @JvmSuppressWildcards LoginCredentialsFragmentFactory> lateinit var loginFragmentFactories: Map<Int, @JvmSuppressWildcards LoginFragmentFactory>
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {

2
app/src/main/kotlin/at/bitfire/davdroid/ui/setup/LoginCredentialsFragmentFactory.kt → app/src/main/kotlin/at/bitfire/davdroid/ui/setup/LoginFragmentFactory.kt
View file

@ -7,7 +7,7 @@ package at.bitfire.davdroid.ui.setup
import android.content.Intent import android.content.Intent
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
interface LoginCredentialsFragmentFactory { interface LoginFragmentFactory {
fun getFragment(intent: Intent): Fragment? fun getFragment(intent: Intent): Fragment?

4
app/src/main/kotlin/at/bitfire/davdroid/ui/setup/NextcloudLoginFlowFragment.kt
View file

@ -313,7 +313,7 @@ class NextcloudLoginFlowFragment: Fragment() {
} }
class Factory @Inject constructor(): LoginCredentialsFragmentFactory { class Factory @Inject constructor(): LoginFragmentFactory {
override fun getFragment(intent: Intent) = override fun getFragment(intent: Intent) =
if (intent.hasExtra(EXTRA_LOGIN_FLOW) && intent.data != null) if (intent.hasExtra(EXTRA_LOGIN_FLOW) && intent.data != null)
@ -329,7 +329,7 @@ class NextcloudLoginFlowFragment: Fragment() {
@Binds @Binds
@IntoMap @IntoMap
@IntKey(/* priority */ 20) @IntKey(/* priority */ 20)
abstract fun factory(impl: Factory): LoginCredentialsFragmentFactory abstract fun factory(impl: Factory): LoginFragmentFactory
} }
} }