Bug fixes after merge

1RandomDev · Sep 10, 2023 · d02aab7 · d02aab7
1 parent 16d7b54
commit d02aab7
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/app/src/main/java/com/michaldrabik/showly_oss/ui/main/MainActivity.kt b/app/src/main/java/com/michaldrabik/showly_oss/ui/main/MainActivity.kt
@@ -22,13 +22,13 @@ import com.michaldrabik.common.Mode
 import com.michaldrabik.common.Mode.MOVIES
 import com.michaldrabik.common.Mode.SHOWS
 import com.michaldrabik.repository.settings.SettingsRepository
-import com.michaldrabik.showly_oss.BuildConfig
 import com.michaldrabik.showly_oss.R
 import com.michaldrabik.showly_oss.databinding.ActivityMainBinding
 import com.michaldrabik.showly_oss.ui.BaseActivity
+import com.michaldrabik.showly_oss.ui.main.delegates.MainTipsDelegate
+import com.michaldrabik.showly_oss.ui.main.delegates.TipsDelegate
 import com.michaldrabik.showly_oss.ui.views.WhatsNewView
 import com.michaldrabik.showly_oss.utilities.deeplink.DeepLinkResolver
-import com.michaldrabik.ui_base.Analytics
 import com.michaldrabik.ui_base.Logger
 import com.michaldrabik.ui_base.common.OnShowsMoviesSyncedListener
 import com.michaldrabik.ui_base.common.OnTabReselectedListener
@@ -91,6 +91,8 @@ class MainActivity :
 
     //onUpdateDownloaded() TODO: Implement own updater from GitHub
 
+    registerTipsDelegate(viewModel, binding)
+
     setupViewModel()
     setupNavigation()
     setupView()

diff --git a/app/src/main/java/com/michaldrabik/showly_oss/ui/main/cases/MainInitialsCase.kt b/app/src/main/java/com/michaldrabik/showly_oss/ui/main/cases/MainInitialsCase.kt
@@ -14,6 +14,7 @@ import com.michaldrabik.repository.UserTraktManager
 import com.michaldrabik.repository.settings.SettingsRepository
 import com.michaldrabik.showly_oss.BuildConfig
 import com.michaldrabik.ui_base.common.AppCountry
+import com.michaldrabik.ui_base.utilities.extensions.withApiAtLeast
 import com.michaldrabik.ui_settings.helpers.AppLanguage
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.android.scopes.ViewModelScoped

diff --git a/...showly2/ui/main/delegates/TipsDelegate.kt → ...wly_oss/ui/main/delegates/TipsDelegate.kt b/...showly2/ui/main/delegates/TipsDelegate.kt → ...wly_oss/ui/main/delegates/TipsDelegate.kt
@@ -1,8 +1,8 @@
-package com.michaldrabik.showly2.ui.main.delegates
+package com.michaldrabik.showly_oss.ui.main.delegates
 
 import androidx.lifecycle.DefaultLifecycleObserver
-import com.michaldrabik.showly2.databinding.ActivityMainBinding
-import com.michaldrabik.showly2.ui.main.MainViewModel
+import com.michaldrabik.showly_oss.databinding.ActivityMainBinding
+import com.michaldrabik.showly_oss.ui.main.MainViewModel
 import com.michaldrabik.ui_base.utilities.TipsHost
 import com.michaldrabik.ui_base.utilities.extensions.gone
 import com.michaldrabik.ui_base.utilities.extensions.onClick

diff --git a/ui-base/build.gradle b/ui-base/build.gradle
@@ -55,7 +55,6 @@ dependencies {
   api libs.android.work
   api libs.android.material
   api libs.android.dynamicanimation
-  api libs.android.annotation
   api libs.overscrollDecor
   api libs.timber