From 4a97b6cd66e11a6845c62fe5080f72ba842e9a38 Mon Sep 17 00:00:00 2001 From: Stanislav Date: Wed, 12 Feb 2020 19:49:43 +0300 Subject: [PATCH 1/3] fixed inner navigation with navigation_new & tabbarnavigation_new fixed inner navigation with navigation_new & tabbarnavigation_new --- .../tabbarnavigation_new/BottomNavigationController.kt | 2 +- .../tabbarnavigation_new/NavigationContainerFragment.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tabbar-navigation-new/src/main/java/ru/touchin/roboswag/components/tabbarnavigation_new/BottomNavigationController.kt b/tabbar-navigation-new/src/main/java/ru/touchin/roboswag/components/tabbarnavigation_new/BottomNavigationController.kt index 67c0f95..f14504b 100644 --- a/tabbar-navigation-new/src/main/java/ru/touchin/roboswag/components/tabbarnavigation_new/BottomNavigationController.kt +++ b/tabbar-navigation-new/src/main/java/ru/touchin/roboswag/components/tabbarnavigation_new/BottomNavigationController.kt @@ -84,7 +84,7 @@ class BottomNavigationController( fragment = if (wrapWithNavigationContainer) { Fragment.instantiate( context, - fragmentClass.name, + NavigationContainerFragment::class.java.name, NavigationContainerFragment.args(fragmentClass, fragmentState, contentContainerViewId, contentContainerLayoutId) ) } else { diff --git a/tabbar-navigation-new/src/main/java/ru/touchin/roboswag/components/tabbarnavigation_new/NavigationContainerFragment.kt b/tabbar-navigation-new/src/main/java/ru/touchin/roboswag/components/tabbarnavigation_new/NavigationContainerFragment.kt index 160f883..3d9e5a9 100644 --- a/tabbar-navigation-new/src/main/java/ru/touchin/roboswag/components/tabbarnavigation_new/NavigationContainerFragment.kt +++ b/tabbar-navigation-new/src/main/java/ru/touchin/roboswag/components/tabbarnavigation_new/NavigationContainerFragment.kt @@ -67,7 +67,7 @@ class NavigationContainerFragment : Fragment() { containerLayoutId = getInt(CONTAINER_LAYOUT_ID_ARG) transition = getInt(TRANSITION_ARG) } - navigation.setInitial(getFragmentClass(), args.getParcelable(FRAGMENT_STATE_ARG)) + navigation.setInitial(getFragmentClass().kotlin, args.getParcelable(FRAGMENT_STATE_ARG)) } } From 642c7f7a27dde261f72fb9e1535814328d0b51aa Mon Sep 17 00:00:00 2001 From: Stanisalv Date: Tue, 10 Mar 2020 15:56:15 +0300 Subject: [PATCH 2/3] fix outOfBoundsException in delegationListAdapter --- .../main/java/ru/touchin/adapters/DelegationListAdapter.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recyclerview-adapters/src/main/java/ru/touchin/adapters/DelegationListAdapter.kt b/recyclerview-adapters/src/main/java/ru/touchin/adapters/DelegationListAdapter.kt index 8328211..a47fbe6 100644 --- a/recyclerview-adapters/src/main/java/ru/touchin/adapters/DelegationListAdapter.kt +++ b/recyclerview-adapters/src/main/java/ru/touchin/adapters/DelegationListAdapter.kt @@ -1,10 +1,10 @@ package ru.touchin.adapters +import android.view.ViewGroup import androidx.recyclerview.widget.AsyncDifferConfig import androidx.recyclerview.widget.AsyncListDiffer import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.RecyclerView -import android.view.ViewGroup import ru.touchin.extensions.setOnRippleClickListener /** @@ -36,7 +36,7 @@ open class DelegationListAdapter(config: AsyncDifferConfig) : Recy if (collectionPosition in 0 until getList().size) { if (itemClickListener != null) { holder.itemView.setOnRippleClickListener { - itemClickListener?.invoke(getList()[getCollectionPosition(holder.adapterPosition)], holder) + getList().getOrNull(getCollectionPosition(holder.adapterPosition))?.let { item -> itemClickListener?.invoke(item, holder) } } } else { holder.itemView.setOnClickListener(null) From 7ef5facf2ec144a405206378d14916a659db513e Mon Sep 17 00:00:00 2001 From: alex Date: Fri, 24 Apr 2020 15:48:06 +0300 Subject: [PATCH 3/3] removed butterknife from base fragment --- navigation-new/build.gradle | 3 --- .../navigation_new/fragments/BaseFragment.kt | 10 ---------- 2 files changed, 13 deletions(-) diff --git a/navigation-new/build.gradle b/navigation-new/build.gradle index c53d4a0..64af432 100644 --- a/navigation-new/build.gradle +++ b/navigation-new/build.gradle @@ -32,9 +32,6 @@ dependencies { implementation "androidx.fragment:fragment:$versions.fragment" implementation "androidx.fragment:fragment-ktx:$versions.fragment" - implementation "com.jakewharton:butterknife:$versions.butterknife" - kapt "com.jakewharton:butterknife-compiler:$versions.butterknife" - implementation("com.crashlytics.sdk.android:crashlytics:$versions.crashlytics@aar") { transitive = true } diff --git a/navigation-new/src/main/java/ru/touchin/roboswag/components/navigation_new/fragments/BaseFragment.kt b/navigation-new/src/main/java/ru/touchin/roboswag/components/navigation_new/fragments/BaseFragment.kt index 830952a..a1c1128 100644 --- a/navigation-new/src/main/java/ru/touchin/roboswag/components/navigation_new/fragments/BaseFragment.kt +++ b/navigation-new/src/main/java/ru/touchin/roboswag/components/navigation_new/fragments/BaseFragment.kt @@ -15,8 +15,6 @@ import androidx.annotation.LayoutRes import androidx.core.content.ContextCompat import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentActivity -import butterknife.ButterKnife -import butterknife.Unbinder import ru.touchin.roboswag.components.navigation_new.BuildConfig import ru.touchin.roboswag.components.navigation.viewcontrollers.LifecycleLoggingObserver @@ -55,8 +53,6 @@ open class BaseFragment(@Layo protected lateinit var state: TState private set - private lateinit var butterKnifeUnbinder: Unbinder - override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -75,12 +71,6 @@ open class BaseFragment(@Layo super.onViewCreated(view, savedInstanceState) lifecycle.addObserver(LifecycleLoggingObserver(this)) - butterKnifeUnbinder = ButterKnife.bind(this, view) - } - - override fun onDestroyView() { - butterKnifeUnbinder.unbind() - super.onDestroyView() } override fun onSaveInstanceState(outState: Bundle) {