diff --git a/app/src/main/kotlin/at/bitfire/davdroid/ui/setup/DefaultLoginCredentialsFragment.kt b/app/src/main/kotlin/at/bitfire/davdroid/ui/setup/DefaultLoginCredentialsFragment.kt index 1f2b5338..a80ce6f6 100644 --- a/app/src/main/kotlin/at/bitfire/davdroid/ui/setup/DefaultLoginCredentialsFragment.kt +++ b/app/src/main/kotlin/at/bitfire/davdroid/ui/setup/DefaultLoginCredentialsFragment.kt @@ -6,7 +6,6 @@ package at.bitfire.davdroid.ui.setup import android.content.Intent import android.net.MailTo -import android.net.Uri import android.os.Bundle import android.os.Handler import android.os.Looper @@ -20,7 +19,6 @@ import androidx.fragment.app.viewModels import at.bitfire.davdroid.R import at.bitfire.davdroid.databinding.LoginCredentialsFragmentBinding import at.bitfire.davdroid.db.Credentials -import at.bitfire.davdroid.ui.UiUtils import com.google.android.material.snackbar.Snackbar import dagger.Binds 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() @@ -227,7 +225,7 @@ class DefaultLoginCredentialsFragment : Fragment() { @Binds @IntoMap @IntKey(/* priority */ 10) - abstract fun factory(impl: Factory): LoginCredentialsFragmentFactory + abstract fun factory(impl: Factory): LoginFragmentFactory } } \ No newline at end of file diff --git a/app/src/main/kotlin/at/bitfire/davdroid/ui/setup/LoginActivity.kt b/app/src/main/kotlin/at/bitfire/davdroid/ui/setup/LoginActivity.kt index 3925fcc1..2f9eb427 100644 --- a/app/src/main/kotlin/at/bitfire/davdroid/ui/setup/LoginActivity.kt +++ b/app/src/main/kotlin/at/bitfire/davdroid/ui/setup/LoginActivity.kt @@ -47,7 +47,7 @@ class LoginActivity: AppCompatActivity() { } @Inject - lateinit var loginFragmentFactories: Map + lateinit var loginFragmentFactories: Map override fun onCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/kotlin/at/bitfire/davdroid/ui/setup/LoginCredentialsFragmentFactory.kt b/app/src/main/kotlin/at/bitfire/davdroid/ui/setup/LoginFragmentFactory.kt similarity index 91% rename from app/src/main/kotlin/at/bitfire/davdroid/ui/setup/LoginCredentialsFragmentFactory.kt rename to app/src/main/kotlin/at/bitfire/davdroid/ui/setup/LoginFragmentFactory.kt index e98abc30..edf5b802 100644 --- a/app/src/main/kotlin/at/bitfire/davdroid/ui/setup/LoginCredentialsFragmentFactory.kt +++ b/app/src/main/kotlin/at/bitfire/davdroid/ui/setup/LoginFragmentFactory.kt @@ -7,7 +7,7 @@ package at.bitfire.davdroid.ui.setup import android.content.Intent import androidx.fragment.app.Fragment -interface LoginCredentialsFragmentFactory { +interface LoginFragmentFactory { fun getFragment(intent: Intent): Fragment? diff --git a/app/src/main/kotlin/at/bitfire/davdroid/ui/setup/NextcloudLoginFlowFragment.kt b/app/src/main/kotlin/at/bitfire/davdroid/ui/setup/NextcloudLoginFlowFragment.kt index 39e92a2e..2109bbd1 100644 --- a/app/src/main/kotlin/at/bitfire/davdroid/ui/setup/NextcloudLoginFlowFragment.kt +++ b/app/src/main/kotlin/at/bitfire/davdroid/ui/setup/NextcloudLoginFlowFragment.kt @@ -313,7 +313,7 @@ class NextcloudLoginFlowFragment: Fragment() { } - class Factory @Inject constructor(): LoginCredentialsFragmentFactory { + class Factory @Inject constructor(): LoginFragmentFactory { override fun getFragment(intent: Intent) = if (intent.hasExtra(EXTRA_LOGIN_FLOW) && intent.data != null) @@ -329,7 +329,7 @@ class NextcloudLoginFlowFragment: Fragment() { @Binds @IntoMap @IntKey(/* priority */ 20) - abstract fun factory(impl: Factory): LoginCredentialsFragmentFactory + abstract fun factory(impl: Factory): LoginFragmentFactory } }