Merge branch 'master' into release

r0adkll · Feb 19, 2019 · 08badce · 08badce
2 parents 9701613 + b479252
commit 08badce
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 31 deletions.
diff --git a/app/src/main/java/com/r0adkll/deckbuilder/arch/ui/components/BaseActivity.kt b/app/src/main/java/com/r0adkll/deckbuilder/arch/ui/components/BaseActivity.kt
@@ -4,11 +4,11 @@ package com.r0adkll.deckbuilder.arch.ui.components
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
+import com.ftinc.kit.arch.presentation.delegates.ActivityDelegate
 import com.google.android.gms.common.ConnectionResult
 import com.google.android.gms.common.GoogleApiAvailability
 import com.r0adkll.deckbuilder.DeckApp
 import com.r0adkll.deckbuilder.R
-import com.r0adkll.deckbuilder.arch.ui.components.delegates.ActivityDelegate
 import com.r0adkll.deckbuilder.arch.ui.components.delegates.StateSaverActivityDelegate
 import com.r0adkll.deckbuilder.internal.di.AppComponent
 import com.r0adkll.deckbuilder.util.bindOptionalView

diff --git a/app/src/main/java/com/r0adkll/deckbuilder/arch/ui/components/BaseFragment.kt b/app/src/main/java/com/r0adkll/deckbuilder/arch/ui/components/BaseFragment.kt
@@ -3,14 +3,14 @@ package com.r0adkll.deckbuilder.arch.ui.components
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment
-import com.r0adkll.deckbuilder.arch.ui.components.delegates.FragmentDelegate
+import com.ftinc.kit.arch.presentation.delegates.FragmentDelegate
 import com.r0adkll.deckbuilder.arch.ui.components.delegates.StateSaverFragmentDelegate
 import com.r0adkll.deckbuilder.internal.di.HasComponent
 import io.reactivex.disposables.CompositeDisposable
 import kotlin.reflect.KClass
 
 
-abstract class BaseFragment : androidx.fragment.app.Fragment() {
+abstract class BaseFragment : Fragment() {
 
     private val delegates = ArrayList<FragmentDelegate>()
     protected val disposables = CompositeDisposable()

diff --git a/app/src/main/java/com/r0adkll/deckbuilder/arch/ui/components/delegates/ActivityDelegate.kt b/app/src/main/java/com/r0adkll/deckbuilder/arch/ui/components/delegates/ActivityDelegate.kt
diff --git a/app/src/main/java/com/r0adkll/deckbuilder/arch/ui/components/delegates/FragmentDelegate.kt b/app/src/main/java/com/r0adkll/deckbuilder/arch/ui/components/delegates/FragmentDelegate.kt
diff --git a/...n/java/com/r0adkll/deckbuilder/arch/ui/components/delegates/StateSaverActivityDelegate.kt b/...n/java/com/r0adkll/deckbuilder/arch/ui/components/delegates/StateSaverActivityDelegate.kt
@@ -3,6 +3,7 @@ package com.r0adkll.deckbuilder.arch.ui.components.delegates
 import android.os.Bundle
 import com.evernote.android.state.StateSaver
 import com.r0adkll.deckbuilder.arch.ui.components.BaseActivity
+import com.ftinc.kit.arch.presentation.delegates.ActivityDelegate
 
 
 class StateSaverActivityDelegate(private val activity: BaseActivity) : ActivityDelegate {

diff --git a/...n/java/com/r0adkll/deckbuilder/arch/ui/components/delegates/StateSaverFragmentDelegate.kt b/...n/java/com/r0adkll/deckbuilder/arch/ui/components/delegates/StateSaverFragmentDelegate.kt
@@ -3,6 +3,7 @@ package com.r0adkll.deckbuilder.arch.ui.components.delegates
 import android.os.Bundle
 import com.evernote.android.state.StateSaver
 import com.r0adkll.deckbuilder.arch.ui.components.BaseFragment
+import com.ftinc.kit.arch.presentation.delegates.FragmentDelegate
 
 class StateSaverFragmentDelegate(private val fragment: BaseFragment) : FragmentDelegate {