diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml index 861bdab..04991d8 100644 --- a/.idea/deploymentTargetDropDown.xml +++ b/.idea/deploymentTargetDropDown.xml @@ -4,18 +4,6 @@ - - - - - - - - - - - - diff --git a/app/src/main/java/com/woka/home/ExploreWokaActivity.kt b/app/src/main/java/com/woka/home/ExploreWokaActivity.kt index b7c705c..710230c 100644 --- a/app/src/main/java/com/woka/home/ExploreWokaActivity.kt +++ b/app/src/main/java/com/woka/home/ExploreWokaActivity.kt @@ -1,14 +1,10 @@ package com.woka.home -import android.graphics.RenderEffect -import android.graphics.Shader import android.os.Build import android.os.Bundle -import android.view.View -import android.view.View.OnAttachStateChangeListener -import android.view.WindowManager +import android.transition.Fade +import android.view.Window import androidx.activity.enableEdgeToEdge -import androidx.annotation.RequiresApi import androidx.core.content.ContextCompat import androidx.core.view.ViewCompat import androidx.core.view.WindowInsetsCompat @@ -16,8 +12,7 @@ import com.woka.R import com.woka.databinding.ActivityExploreWokaBinding import com.woka.utils.WokaBaseActivity import com.woka.utils.lightStatusBar -import java.util.function.Consumer - +import com.woka.utils.toast class ExploreWokaActivity : WokaBaseActivity() { @@ -25,6 +20,12 @@ class ExploreWokaActivity : WokaBaseActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + with(window){ + lightStatusBar() + + requestFeature(Window.FEATURE_ACTIVITY_TRANSITIONS) + enterTransition = Fade().apply { duration = 200 } + } enableEdgeToEdge() binding = ActivityExploreWokaBinding.inflate(layoutInflater) setContentView(binding.root) @@ -34,9 +35,26 @@ class ExploreWokaActivity : WokaBaseActivity() { insets } - window.lightStatusBar() + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S){ + binding.root.setBackgroundColor(ContextCompat.getColor(this, R.color.black_50)) + } - binding.root.setRenderEffect(RenderEffect.createBlurEffect(50f, 50f, Shader.TileMode.MIRROR)) + clickEvents() + } + private fun clickEvents() { + binding.apply { + closeBtn.setOnClickListener { + finish() + } + + root.setOnClickListener { + finish() + } + + wokaFm.setOnClickListener { + + } + } } } \ No newline at end of file diff --git a/app/src/main/java/com/woka/home/HomeActivity.kt b/app/src/main/java/com/woka/home/HomeActivity.kt index fa8a8ad..9bd4378 100644 --- a/app/src/main/java/com/woka/home/HomeActivity.kt +++ b/app/src/main/java/com/woka/home/HomeActivity.kt @@ -1,17 +1,23 @@ package com.woka.home +import android.app.ActivityOptions import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import android.content.IntentFilter import android.content.res.ColorStateList import android.graphics.Color +import android.graphics.RenderEffect +import android.graphics.Shader +import android.os.Build import android.os.Bundle import android.util.Log import android.view.View.GONE import android.view.View.VISIBLE import android.view.WindowManager +import android.view.animation.Animation import androidx.activity.enableEdgeToEdge +import androidx.core.app.ActivityCompat import androidx.core.content.ContextCompat import androidx.core.view.GravityCompat import androidx.core.view.ViewCompat @@ -124,6 +130,16 @@ class HomeActivity : WokaBaseActivity(), } } + override fun onResume() { + super.onResume() + if (viewModel.isHomeBackgroundBlurred){ + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S){ + viewModel.isHomeBackgroundBlurred = false + binding.root.setRenderEffect(null) + } + } + } + override fun onBackPressed() { if (binding.bottomNav.getSelectedTab() != HOME){ binding.bottomNav.selectTab(HOME) @@ -186,6 +202,10 @@ class HomeActivity : WokaBaseActivity(), selectTheme(userPrefs?.appTheme?: Theme.THEME_ONE, true) selectLanguage(userPrefs?.appLanguage?: LOCALE_ENGLISH, true) + + if (viewModel.isHomeBackgroundBlurred){ + blurBackground() + } } private fun clickEvents() { @@ -305,19 +325,34 @@ class HomeActivity : WokaBaseActivity(), .replace(R.id.fc_home, Home1Fragment.newInstance()) .commit() } + + updateBackground() + viewModel.selectedBottomTab = tab } EXPLORE_WOKA -> { - startActivity(Intent(this, ExploreWokaActivity::class.java)) + + blurBackground() + + startActivity(Intent(this, ExploreWokaActivity::class.java) + , ActivityOptions.makeSceneTransitionAnimation(this).toBundle()) } MY_LIST -> { supportFragmentManager.beginTransaction() .replace(R.id.fc_home, MyListFragment.newInstance()) .commit() + + updateBackground() + viewModel.selectedBottomTab = tab } } + } - updateBackground() - viewModel.selectedBottomTab = tab + // blurring root view + private fun blurBackground(){ + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && !viewModel.isHomeBackgroundBlurred){ + binding.root.setRenderEffect(RenderEffect.createBlurEffect(60f, 60f, Shader.TileMode.REPEAT)) + viewModel.isHomeBackgroundBlurred = true + } } // updating background diff --git a/app/src/main/java/com/woka/home/HomeViewModel.kt b/app/src/main/java/com/woka/home/HomeViewModel.kt index 59666e3..849eb7f 100644 --- a/app/src/main/java/com/woka/home/HomeViewModel.kt +++ b/app/src/main/java/com/woka/home/HomeViewModel.kt @@ -16,6 +16,7 @@ class HomeViewModel: ViewModel(){ private val userRepository = UserRepository(RetrofitHelper.getRetrofit().create(UserApiService::class.java)) var selectedBottomTab: Int = HOME + var isHomeBackgroundBlurred: Boolean = false private val _localeChangeLiveData = MutableLiveData() val localeChangeLiveData: LiveData diff --git a/app/src/main/res/drawable-hdpi/img_audio_book_exp.png b/app/src/main/res/drawable-hdpi/img_audio_book_exp.png new file mode 100644 index 0000000..8a685c3 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/img_audio_book_exp.png differ diff --git a/app/src/main/res/drawable-hdpi/img_blogs_exp.png b/app/src/main/res/drawable-hdpi/img_blogs_exp.png new file mode 100644 index 0000000..ee26c8d Binary files /dev/null and b/app/src/main/res/drawable-hdpi/img_blogs_exp.png differ diff --git a/app/src/main/res/drawable-hdpi/img_games_exp.png b/app/src/main/res/drawable-hdpi/img_games_exp.png new file mode 100644 index 0000000..dea32a2 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/img_games_exp.png differ diff --git a/app/src/main/res/drawable-hdpi/img_karaoke_exp.png b/app/src/main/res/drawable-hdpi/img_karaoke_exp.png new file mode 100644 index 0000000..e458b56 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/img_karaoke_exp.png differ diff --git a/app/src/main/res/drawable-hdpi/img_live_tv_exp.png b/app/src/main/res/drawable-hdpi/img_live_tv_exp.png new file mode 100644 index 0000000..3551db7 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/img_live_tv_exp.png differ diff --git a/app/src/main/res/drawable-hdpi/img_shop_exp.png b/app/src/main/res/drawable-hdpi/img_shop_exp.png new file mode 100644 index 0000000..ada8fba Binary files /dev/null and b/app/src/main/res/drawable-hdpi/img_shop_exp.png differ diff --git a/app/src/main/res/drawable-hdpi/img_web_series_exp.png b/app/src/main/res/drawable-hdpi/img_web_series_exp.png new file mode 100644 index 0000000..18fd974 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/img_web_series_exp.png differ diff --git a/app/src/main/res/drawable-hdpi/img_woka_fm_exp.png b/app/src/main/res/drawable-hdpi/img_woka_fm_exp.png new file mode 100644 index 0000000..d8fb90a Binary files /dev/null and b/app/src/main/res/drawable-hdpi/img_woka_fm_exp.png differ diff --git a/app/src/main/res/drawable-ldpi/img_audio_book_exp.png b/app/src/main/res/drawable-ldpi/img_audio_book_exp.png new file mode 100644 index 0000000..ca38aa5 Binary files /dev/null and b/app/src/main/res/drawable-ldpi/img_audio_book_exp.png differ diff --git a/app/src/main/res/drawable-ldpi/img_blogs_exp.png b/app/src/main/res/drawable-ldpi/img_blogs_exp.png new file mode 100644 index 0000000..af07792 Binary files /dev/null and b/app/src/main/res/drawable-ldpi/img_blogs_exp.png differ diff --git a/app/src/main/res/drawable-ldpi/img_games_exp.png b/app/src/main/res/drawable-ldpi/img_games_exp.png new file mode 100644 index 0000000..9eb26e1 Binary files /dev/null and b/app/src/main/res/drawable-ldpi/img_games_exp.png differ diff --git a/app/src/main/res/drawable-ldpi/img_karaoke_exp.png b/app/src/main/res/drawable-ldpi/img_karaoke_exp.png new file mode 100644 index 0000000..a7b25e5 Binary files /dev/null and b/app/src/main/res/drawable-ldpi/img_karaoke_exp.png differ diff --git a/app/src/main/res/drawable-ldpi/img_live_tv_exp.png b/app/src/main/res/drawable-ldpi/img_live_tv_exp.png new file mode 100644 index 0000000..3874ca7 Binary files /dev/null and b/app/src/main/res/drawable-ldpi/img_live_tv_exp.png differ diff --git a/app/src/main/res/drawable-ldpi/img_shop_exp.png b/app/src/main/res/drawable-ldpi/img_shop_exp.png new file mode 100644 index 0000000..b01fd80 Binary files /dev/null and b/app/src/main/res/drawable-ldpi/img_shop_exp.png differ diff --git a/app/src/main/res/drawable-ldpi/img_web_series_exp.png b/app/src/main/res/drawable-ldpi/img_web_series_exp.png new file mode 100644 index 0000000..476f687 Binary files /dev/null and b/app/src/main/res/drawable-ldpi/img_web_series_exp.png differ diff --git a/app/src/main/res/drawable-ldpi/img_woka_fm_exp.png b/app/src/main/res/drawable-ldpi/img_woka_fm_exp.png new file mode 100644 index 0000000..66bda2f Binary files /dev/null and b/app/src/main/res/drawable-ldpi/img_woka_fm_exp.png differ diff --git a/app/src/main/res/drawable-mdpi/img_audio_book_exp.png b/app/src/main/res/drawable-mdpi/img_audio_book_exp.png new file mode 100644 index 0000000..74fca36 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/img_audio_book_exp.png differ diff --git a/app/src/main/res/drawable-mdpi/img_blogs_exp.png b/app/src/main/res/drawable-mdpi/img_blogs_exp.png new file mode 100644 index 0000000..8a30ef0 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/img_blogs_exp.png differ diff --git a/app/src/main/res/drawable-mdpi/img_games_exp.png b/app/src/main/res/drawable-mdpi/img_games_exp.png new file mode 100644 index 0000000..1b402af Binary files /dev/null and b/app/src/main/res/drawable-mdpi/img_games_exp.png differ diff --git a/app/src/main/res/drawable-mdpi/img_karaoke_exp.png b/app/src/main/res/drawable-mdpi/img_karaoke_exp.png new file mode 100644 index 0000000..7ff9e5e Binary files /dev/null and b/app/src/main/res/drawable-mdpi/img_karaoke_exp.png differ diff --git a/app/src/main/res/drawable-mdpi/img_live_tv_exp.png b/app/src/main/res/drawable-mdpi/img_live_tv_exp.png new file mode 100644 index 0000000..b76ce88 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/img_live_tv_exp.png differ diff --git a/app/src/main/res/drawable-mdpi/img_shop_exp.png b/app/src/main/res/drawable-mdpi/img_shop_exp.png new file mode 100644 index 0000000..5a625e6 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/img_shop_exp.png differ diff --git a/app/src/main/res/drawable-mdpi/img_web_series_exp.png b/app/src/main/res/drawable-mdpi/img_web_series_exp.png new file mode 100644 index 0000000..195a285 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/img_web_series_exp.png differ diff --git a/app/src/main/res/drawable-mdpi/img_woka_fm_exp.png b/app/src/main/res/drawable-mdpi/img_woka_fm_exp.png new file mode 100644 index 0000000..013d829 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/img_woka_fm_exp.png differ diff --git a/app/src/main/res/drawable-xhdpi/img_audio_book_exp.png b/app/src/main/res/drawable-xhdpi/img_audio_book_exp.png new file mode 100644 index 0000000..130473f Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/img_audio_book_exp.png differ diff --git a/app/src/main/res/drawable-xhdpi/img_blogs_exp.png b/app/src/main/res/drawable-xhdpi/img_blogs_exp.png new file mode 100644 index 0000000..4dee48c Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/img_blogs_exp.png differ diff --git a/app/src/main/res/drawable-xhdpi/img_games_exp.png b/app/src/main/res/drawable-xhdpi/img_games_exp.png new file mode 100644 index 0000000..12a67c0 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/img_games_exp.png differ diff --git a/app/src/main/res/drawable-xhdpi/img_karaoke_exp.png b/app/src/main/res/drawable-xhdpi/img_karaoke_exp.png new file mode 100644 index 0000000..399b195 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/img_karaoke_exp.png differ diff --git a/app/src/main/res/drawable-xhdpi/img_live_tv_exp.png b/app/src/main/res/drawable-xhdpi/img_live_tv_exp.png new file mode 100644 index 0000000..04a65cc Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/img_live_tv_exp.png differ diff --git a/app/src/main/res/drawable-xhdpi/img_shop_exp.png b/app/src/main/res/drawable-xhdpi/img_shop_exp.png new file mode 100644 index 0000000..84b35ee Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/img_shop_exp.png differ diff --git a/app/src/main/res/drawable-xhdpi/img_web_series_exp.png b/app/src/main/res/drawable-xhdpi/img_web_series_exp.png new file mode 100644 index 0000000..506ae8d Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/img_web_series_exp.png differ diff --git a/app/src/main/res/drawable-xhdpi/img_woka_fm_exp.png b/app/src/main/res/drawable-xhdpi/img_woka_fm_exp.png new file mode 100644 index 0000000..223944e Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/img_woka_fm_exp.png differ diff --git a/app/src/main/res/drawable-xxhdpi/img_audio_book_exp.png b/app/src/main/res/drawable-xxhdpi/img_audio_book_exp.png new file mode 100644 index 0000000..4c04106 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/img_audio_book_exp.png differ diff --git a/app/src/main/res/drawable-xxhdpi/img_blogs_exp.png b/app/src/main/res/drawable-xxhdpi/img_blogs_exp.png new file mode 100644 index 0000000..faf300a Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/img_blogs_exp.png differ diff --git a/app/src/main/res/drawable-xxhdpi/img_games_exp.png b/app/src/main/res/drawable-xxhdpi/img_games_exp.png new file mode 100644 index 0000000..88086dc Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/img_games_exp.png differ diff --git a/app/src/main/res/drawable-xxhdpi/img_karaoke_exp.png b/app/src/main/res/drawable-xxhdpi/img_karaoke_exp.png new file mode 100644 index 0000000..ce55a81 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/img_karaoke_exp.png differ diff --git a/app/src/main/res/drawable-xxhdpi/img_live_tv_exp.png b/app/src/main/res/drawable-xxhdpi/img_live_tv_exp.png new file mode 100644 index 0000000..de4426f Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/img_live_tv_exp.png differ diff --git a/app/src/main/res/drawable-xxhdpi/img_shop_exp.png b/app/src/main/res/drawable-xxhdpi/img_shop_exp.png new file mode 100644 index 0000000..db090c7 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/img_shop_exp.png differ diff --git a/app/src/main/res/drawable-xxhdpi/img_web_series_exp.png b/app/src/main/res/drawable-xxhdpi/img_web_series_exp.png new file mode 100644 index 0000000..0a61263 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/img_web_series_exp.png differ diff --git a/app/src/main/res/drawable-xxhdpi/img_woka_fm_exp.png b/app/src/main/res/drawable-xxhdpi/img_woka_fm_exp.png new file mode 100644 index 0000000..782b7d1 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/img_woka_fm_exp.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/img_audio_book_exp.png b/app/src/main/res/drawable-xxxhdpi/img_audio_book_exp.png new file mode 100644 index 0000000..55390a9 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/img_audio_book_exp.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/img_blogs_exp.png b/app/src/main/res/drawable-xxxhdpi/img_blogs_exp.png new file mode 100644 index 0000000..21a2be2 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/img_blogs_exp.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/img_games_exp.png b/app/src/main/res/drawable-xxxhdpi/img_games_exp.png new file mode 100644 index 0000000..e5c8ac8 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/img_games_exp.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/img_karaoke_exp.png b/app/src/main/res/drawable-xxxhdpi/img_karaoke_exp.png new file mode 100644 index 0000000..bd50f48 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/img_karaoke_exp.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/img_live_tv_exp.png b/app/src/main/res/drawable-xxxhdpi/img_live_tv_exp.png new file mode 100644 index 0000000..c466556 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/img_live_tv_exp.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/img_shop_exp.png b/app/src/main/res/drawable-xxxhdpi/img_shop_exp.png new file mode 100644 index 0000000..9746f4a Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/img_shop_exp.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/img_web_series_exp.png b/app/src/main/res/drawable-xxxhdpi/img_web_series_exp.png new file mode 100644 index 0000000..6b21c74 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/img_web_series_exp.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/img_woka_fm_exp.png b/app/src/main/res/drawable-xxxhdpi/img_woka_fm_exp.png new file mode 100644 index 0000000..8813727 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/img_woka_fm_exp.png differ diff --git a/app/src/main/res/drawable/bottom_round_25.xml b/app/src/main/res/drawable/bottom_round_25.xml new file mode 100644 index 0000000..7da1fe8 --- /dev/null +++ b/app/src/main/res/drawable/bottom_round_25.xml @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/round_bg_25.xml b/app/src/main/res/drawable/round_bg_25.xml new file mode 100644 index 0000000..ede3637 --- /dev/null +++ b/app/src/main/res/drawable/round_bg_25.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/top_round_25_white.xml b/app/src/main/res/drawable/top_round_25_white.xml new file mode 100644 index 0000000..87496b0 --- /dev/null +++ b/app/src/main/res/drawable/top_round_25_white.xml @@ -0,0 +1,10 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_explore_woka.xml b/app/src/main/res/layout/activity_explore_woka.xml index 5563c10..e6696ad 100644 --- a/app/src/main/res/layout/activity_explore_woka.xml +++ b/app/src/main/res/layout/activity_explore_woka.xml @@ -5,9 +5,278 @@ android:id="@+id/main" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@android:color/transparent" tools:context=".home.ExploreWokaActivity"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #FF000000 + #80000000 #FFFFFFFF #80FFFFFF #09005D diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a75d568..9957167 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -134,4 +134,6 @@ WOKA FM GAMES Coming soonn on Woka + WOKA LIVE TV + BLOGS \ No newline at end of file