diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e648d47..c0bc81e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -30,7 +30,7 @@ - + diff --git a/app/src/main/java/com/gamedog/vididin/di/ComponentModule.kt b/app/src/main/java/com/gamedog/vididin/di/ComponentModule.kt index 2df6540..e3675f3 100644 --- a/app/src/main/java/com/gamedog/vididin/di/ComponentModule.kt +++ b/app/src/main/java/com/gamedog/vididin/di/ComponentModule.kt @@ -12,12 +12,14 @@ import com.gamedog.vididin.router.DefaultFeedbackRouter import com.gamedog.vididin.router.DefaultPrivacyRouter import com.gamedog.vididin.router.DefaultSplashRouter import com.gamedog.vididin.router.DefaultVersionRouter +import com.gamedog.vididin.router.DefaultWatchAdRouter import com.gamedog.vididin.router.DefaultWithdrawRecordRouter import com.gamedog.vididin.router.IRouterFeedback import com.gamedog.vididin.router.IRouterPrivacy import com.gamedog.vididin.router.IRouterSplash import com.gamedog.vididin.router.IRouterVersion import com.gamedog.vididin.router.IRouterWithdrawRecord +import com.gamedog.vididin.router.IRouterWatchAd import dagger.Module import dagger.Provides import dagger.hilt.InstallIn @@ -98,4 +100,12 @@ object VersionModule { @Provides @Singleton fun provideRouter(): IRouterVersion = DefaultVersionRouter() +} + +@Module +@InstallIn(SingletonComponent::class) +object WatchAd { + @Provides + @Singleton + fun provideRouter(): IRouterWatchAd = DefaultWatchAdRouter() } \ No newline at end of file diff --git a/app/src/main/java/com/gamedog/vididin/di/RouterEntryPoints.kt b/app/src/main/java/com/gamedog/vididin/di/RouterEntryPoints.kt index afdc636..f8ea0b3 100644 --- a/app/src/main/java/com/gamedog/vididin/di/RouterEntryPoints.kt +++ b/app/src/main/java/com/gamedog/vididin/di/RouterEntryPoints.kt @@ -13,6 +13,7 @@ import com.gamedog.vididin.router.IRouterPrivacy import com.gamedog.vididin.router.IRouterSplash import com.gamedog.vididin.router.IRouterVersion import com.gamedog.vididin.router.IRouterWithdrawRecord +import com.gamedog.vididin.router.IRouterWatchAd import dagger.hilt.EntryPoint import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent @@ -38,6 +39,7 @@ interface RouterEntryPoint { fun feedbackRouter(): IRouterFeedback fun splashRouter(): IRouterSplash fun withdrawRecordRouter(): IRouterWithdrawRecord + fun watchAdRouter(): IRouterWatchAd } diff --git a/app/src/main/java/com/gamedog/vididin/features/splash/SplashActivity.kt b/app/src/main/java/com/gamedog/vididin/features/splash/SplashActivity.kt new file mode 100644 index 0000000..1d757d5 --- /dev/null +++ b/app/src/main/java/com/gamedog/vididin/features/splash/SplashActivity.kt @@ -0,0 +1,64 @@ +package com.gamedog.vididin.features.splash + +import android.app.Activity +import android.content.Intent +import android.view.LayoutInflater +import androidx.activity.viewModels +import androidx.core.view.ViewCompat +import androidx.core.view.WindowInsetsCompat +import androidx.core.view.updatePadding +import com.ama.core.architecture.appBase.AppViewsActivity +import com.gamedog.vididin.main.interfaces.OnTabStyleListener +import dagger.hilt.android.AndroidEntryPoint +import kotlin.getValue +import com.gamedog.vididin.databinding.ActivitySplashBinding as ViewBinding +import com.gamedog.vididin.main.MainUiState as UiState +import com.gamedog.vididin.main.MainViewModel as ViewModel + + +@AndroidEntryPoint +class SplashActivity : AppViewsActivity(), OnTabStyleListener { + + override val mViewModel: ViewModel by viewModels() + override fun inflateViewBinding(inflater: LayoutInflater) = ViewBinding.inflate(inflater) + + override fun ViewBinding.initViews() { + with(binding) { + + } + + } + + override fun ViewBinding.initWindowInsets() { + ViewCompat.setOnApplyWindowInsetsListener(contentRoot) { v, insets -> + val systemBars = + insets.getInsets(WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout()) + v.updatePadding(top = systemBars.top) + insets + } + } + + override fun ViewBinding.initListeners() { + //TODO("Not yet implemented") + } + + override fun ViewBinding.initObservers() { + //TODO("Not yet implemented") + } + + override fun ViewBinding.onUiStateCollect(uiState: UiState) { + //TODO("Not yet implemented") + } + + override fun onTabIsDarkFont(isDarkFont: Boolean) { + //TODO("Not yet implemented") + } + + + companion object { + internal fun startActivity(activity: Activity) { + activity.startActivity(Intent(activity.applicationContext, SplashActivity::class.java)) + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/gamedog/vididin/features/splash/WatchAdActivity.kt b/app/src/main/java/com/gamedog/vididin/features/watchad/WatchAdActivity.kt similarity index 93% rename from app/src/main/java/com/gamedog/vididin/features/splash/WatchAdActivity.kt rename to app/src/main/java/com/gamedog/vididin/features/watchad/WatchAdActivity.kt index e9995f1..7a5ed8d 100644 --- a/app/src/main/java/com/gamedog/vididin/features/splash/WatchAdActivity.kt +++ b/app/src/main/java/com/gamedog/vididin/features/watchad/WatchAdActivity.kt @@ -1,4 +1,4 @@ -package com.gamedog.vididin.features.splash +package com.gamedog.vididin.features.watchad import android.app.Activity import android.content.Intent @@ -11,7 +11,7 @@ import com.ama.core.architecture.appBase.AppViewsActivity import com.gamedog.vididin.main.interfaces.OnTabStyleListener import dagger.hilt.android.AndroidEntryPoint import kotlin.getValue -import com.gamedog.vididin.databinding.ActivitySplashBinding as ViewBinding +import com.gamedog.vididin.databinding.ActivityWatchAdBinding as ViewBinding import com.gamedog.vididin.main.MainUiState as UiState import com.gamedog.vididin.main.MainViewModel as ViewModel diff --git a/app/src/main/java/com/gamedog/vididin/router/Router.kt b/app/src/main/java/com/gamedog/vididin/router/Router.kt index 5be2956..1be6596 100644 --- a/app/src/main/java/com/gamedog/vididin/router/Router.kt +++ b/app/src/main/java/com/gamedog/vididin/router/Router.kt @@ -39,7 +39,11 @@ object Router : RouterContract { get() = routerEntryPoint.feedbackRouter() override val WithdrawRecord: IRouterWithdrawRecord get() = routerEntryPoint.withdrawRecordRouter() + override val Splash: IRouterSplash get() = routerEntryPoint.splashRouter() + + override val WatchAd: IRouterWatchAd + get() = routerEntryPoint.watchAdRouter() } diff --git a/app/src/main/java/com/gamedog/vididin/router/RouterContract.kt b/app/src/main/java/com/gamedog/vididin/router/RouterContract.kt index 05934aa..f4697af 100644 --- a/app/src/main/java/com/gamedog/vididin/router/RouterContract.kt +++ b/app/src/main/java/com/gamedog/vididin/router/RouterContract.kt @@ -27,5 +27,7 @@ interface RouterContract { val Feedback: IRouterFeedback val WithdrawRecord: IRouterWithdrawRecord val Splash: IRouterSplash + val WatchAd: IRouterWatchAd + } \ No newline at end of file diff --git a/app/src/main/java/com/gamedog/vididin/router/RouterDefault.kt b/app/src/main/java/com/gamedog/vididin/router/RouterDefault.kt index 2a7f904..20bb54e 100644 --- a/app/src/main/java/com/gamedog/vididin/router/RouterDefault.kt +++ b/app/src/main/java/com/gamedog/vididin/router/RouterDefault.kt @@ -3,8 +3,9 @@ package com.gamedog.vididin.router import android.app.Activity import com.gamedog.vididin.features.feedback.FeedbackActivity import com.gamedog.vididin.features.privacy.PrivacyActivity -import com.gamedog.vididin.features.splash.WatchAdActivity +import com.gamedog.vididin.features.splash.SplashActivity import com.gamedog.vididin.features.version.VersionActivity +import com.gamedog.vididin.features.watchad.WatchAdActivity import com.gamedog.vididin.features.withdrawrecord.WithdrawRecordActivity @@ -16,7 +17,7 @@ class DefaultPrivacyRouter: IRouterPrivacy { class DefaultSplashRouter: IRouterSplash { override fun startActivity(activity: Activity) { - WatchAdActivity.Companion.startActivity(activity) + SplashActivity.Companion.startActivity(activity) } } @@ -38,3 +39,9 @@ class DefaultVersionRouter: IRouterVersion { } } + +class DefaultWatchAdRouter: IRouterWatchAd { + override fun startActivity(activity: Activity) { + WatchAdActivity.Companion.startActivity(activity) + } +} diff --git a/app/src/main/java/com/gamedog/vididin/router/RouterInterfaces.kt b/app/src/main/java/com/gamedog/vididin/router/RouterInterfaces.kt index 21aa89a..a61ac2a 100644 --- a/app/src/main/java/com/gamedog/vididin/router/RouterInterfaces.kt +++ b/app/src/main/java/com/gamedog/vididin/router/RouterInterfaces.kt @@ -23,4 +23,8 @@ interface IRouterSplash { fun startActivity(activity: Activity) } +interface IRouterWatchAd { + fun startActivity(activity: Activity) +} + diff --git a/app/src/main/res/layout/activity_watch_ad.xml b/app/src/main/res/layout/activity_watch_ad.xml new file mode 100644 index 0000000..8cab800 --- /dev/null +++ b/app/src/main/res/layout/activity_watch_ad.xml @@ -0,0 +1,19 @@ + + + + + + + + +