diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e8b75de..32a007e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + xmlns:tools="http://schemas.android.com/tools" > @@ -14,15 +14,19 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/Theme.Woka" - tools:targetApi="31"> + tools:targetApi="31" > + + android:theme="@style/FullScreenTheme" /> @@ -69,12 +73,12 @@ android:exported="false" android:screenOrientation="portrait" /> + android:theme="@style/Theme.App.Starting" > diff --git a/app/src/main/java/com/woka/audiobooks/views/AudioBooksActivity.kt b/app/src/main/java/com/woka/audiobooks/views/AudioBooksActivity.kt new file mode 100644 index 0000000..254e10d --- /dev/null +++ b/app/src/main/java/com/woka/audiobooks/views/AudioBooksActivity.kt @@ -0,0 +1,48 @@ +package com.woka.audiobooks.views + +import android.os.Bundle +import androidx.activity.enableEdgeToEdge +import androidx.core.view.ViewCompat +import androidx.core.view.WindowInsetsCompat +import com.google.android.material.appbar.CollapsingToolbarLayout +import com.woka.R +import com.woka.databinding.ActivityAudioBooksBinding +import com.woka.utils.WokaBaseActivity + +class AudioBooksActivity : WokaBaseActivity() { + + private lateinit var binding: ActivityAudioBooksBinding + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + enableEdgeToEdge() + binding = ActivityAudioBooksBinding.inflate(layoutInflater) + setContentView(binding.root) + ViewCompat.setOnApplyWindowInsetsListener(binding.root) { v, insets -> + val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()) + v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom) + insets + } + + initViews() + } + + private fun initViews(){ + binding.apply { + adjustTrailerImage() + + toolbar.title.text = getString(R.string.audio_books) + } + } + + private fun adjustTrailerImage() { + // making space for Trailer image + binding.apply { + topPinnedView.post { + val imgParams = trailerImage.layoutParams as CollapsingToolbarLayout.LayoutParams + imgParams.setMargins(0, 0, 0, topPinnedView.height) + trailerImage.layoutParams = imgParams + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/woka/home/fragments/Home1Fragment.kt b/app/src/main/java/com/woka/home/fragments/Home1Fragment.kt index 9f36555..372e063 100644 --- a/app/src/main/java/com/woka/home/fragments/Home1Fragment.kt +++ b/app/src/main/java/com/woka/home/fragments/Home1Fragment.kt @@ -18,14 +18,15 @@ import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider import com.woka.R import com.woka.WokaApp.Companion.userPrefs +import com.woka.audiobooks.views.AudioBooksActivity import com.woka.databinding.FragmentHome1Binding -import com.woka.home.FMActivity -import com.woka.home.HomeViewModel -import com.woka.home.MoreHomeActivity -import com.woka.home.TimePeriod +import com.woka.home.views.FMActivity +import com.woka.home.viewmodels.HomeViewModel +import com.woka.home.views.MoreHomeActivity +import com.woka.home.models.TimePeriod import com.woka.userdata.userDataModels.UserDataResponse import com.woka.networking.ApiResult -import com.woka.players.LiveStreamPlayerActivity +import com.woka.players.views.LiveStreamPlayerActivity import com.woka.userPreference.UserType import com.woka.utils.hide import com.woka.utils.scaleAnimate @@ -177,6 +178,12 @@ class Home1Fragment : Fragment() { startActivity(Intent(it, WebSeriesActivity::class.java)) } } + + audioBooks.setOnClickListener { + activity?.let { + startActivity(Intent(it, AudioBooksActivity::class.java)) + } + } } } diff --git a/app/src/main/java/com/woka/home/fragments/Home2Fragment.kt b/app/src/main/java/com/woka/home/fragments/Home2Fragment.kt index 26030bc..2dca361 100644 --- a/app/src/main/java/com/woka/home/fragments/Home2Fragment.kt +++ b/app/src/main/java/com/woka/home/fragments/Home2Fragment.kt @@ -10,11 +10,11 @@ import androidx.lifecycle.ViewModelProvider import com.woka.R import com.woka.WokaApp import com.woka.databinding.FragmentHome2Binding -import com.woka.home.FMActivity -import com.woka.home.HomeViewModel +import com.woka.home.views.FMActivity +import com.woka.home.viewmodels.HomeViewModel import com.woka.userdata.userDataModels.UserDataResponse import com.woka.networking.ApiResult -import com.woka.players.LiveStreamPlayerActivity +import com.woka.players.views.LiveStreamPlayerActivity import com.woka.userPreference.UserType import com.woka.utils.hide import com.woka.utils.show diff --git a/app/src/main/java/com/woka/home/fragments/MyListFragment.kt b/app/src/main/java/com/woka/home/fragments/MyListFragment.kt index b5a970e..bb593b4 100644 --- a/app/src/main/java/com/woka/home/fragments/MyListFragment.kt +++ b/app/src/main/java/com/woka/home/fragments/MyListFragment.kt @@ -13,6 +13,7 @@ import androidx.appcompat.app.AppCompatActivity import androidx.core.view.isVisible import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.SimpleItemAnimator +import com.woka.R import com.woka.databinding.FragmentMyListBinding import com.woka.home.mylist.MyListRepository import com.woka.home.mylist.adapters.AudioBooksAdapter @@ -67,6 +68,8 @@ class MyListFragment : Fragment() { private fun initViews() { binding.apply { + title.text = getString(R.string.favorites) + (rvWebSeriesEnglish.itemAnimator as SimpleItemAnimator).supportsChangeAnimations = false (rvWebSeriesHindi.itemAnimator as SimpleItemAnimator).supportsChangeAnimations = false rvWebSeriesEnglish.adapter = webSeriesEAdapter diff --git a/app/src/main/java/com/woka/home/Theme.kt b/app/src/main/java/com/woka/home/models/Theme.kt similarity index 76% rename from app/src/main/java/com/woka/home/Theme.kt rename to app/src/main/java/com/woka/home/models/Theme.kt index 8c58a78..ab9425b 100644 --- a/app/src/main/java/com/woka/home/Theme.kt +++ b/app/src/main/java/com/woka/home/models/Theme.kt @@ -1,11 +1,11 @@ -package com.woka.home +package com.woka.home.models enum class Theme(val id: Int){ THEME_ONE(1), THEME_TWO(2); companion object{ - fun create(id: Int): Theme{ + fun create(id: Int): Theme { return when(id){ 1 -> THEME_ONE else -> THEME_TWO diff --git a/app/src/main/java/com/woka/home/TimePeriod.kt b/app/src/main/java/com/woka/home/models/TimePeriod.kt similarity index 84% rename from app/src/main/java/com/woka/home/TimePeriod.kt rename to app/src/main/java/com/woka/home/models/TimePeriod.kt index 038347f..bd1322b 100644 --- a/app/src/main/java/com/woka/home/TimePeriod.kt +++ b/app/src/main/java/com/woka/home/models/TimePeriod.kt @@ -1,4 +1,4 @@ -package com.woka.home +package com.woka.home.models import java.util.Calendar @@ -9,7 +9,7 @@ enum class TimePeriod{ NIGHT; companion object{ - fun getCurrentTimePeriod(): TimePeriod{ + fun getCurrentTimePeriod(): TimePeriod { val cal = Calendar.getInstance() val hrs = cal.get(Calendar.HOUR_OF_DAY) diff --git a/app/src/main/java/com/woka/home/HomeViewModel.kt b/app/src/main/java/com/woka/home/viewmodels/HomeViewModel.kt similarity index 95% rename from app/src/main/java/com/woka/home/HomeViewModel.kt rename to app/src/main/java/com/woka/home/viewmodels/HomeViewModel.kt index 50c9e98..631b485 100644 --- a/app/src/main/java/com/woka/home/HomeViewModel.kt +++ b/app/src/main/java/com/woka/home/viewmodels/HomeViewModel.kt @@ -1,4 +1,4 @@ -package com.woka.home +package com.woka.home.viewmodels import android.content.Context import android.net.Uri @@ -8,7 +8,7 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.google.android.exoplayer2.ExoPlayer import com.google.android.exoplayer2.MediaItem -import com.woka.home.BottomNavigation.Companion.HOME +import com.woka.home.views.BottomNavigation.Companion.HOME import com.woka.networking.ApiResult import com.woka.userdata.UserRepository import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/woka/home/MoreViewModel.kt b/app/src/main/java/com/woka/home/viewmodels/MoreViewModel.kt similarity index 68% rename from app/src/main/java/com/woka/home/MoreViewModel.kt rename to app/src/main/java/com/woka/home/viewmodels/MoreViewModel.kt index f7e528d..08cc22d 100644 --- a/app/src/main/java/com/woka/home/MoreViewModel.kt +++ b/app/src/main/java/com/woka/home/viewmodels/MoreViewModel.kt @@ -1,4 +1,4 @@ -package com.woka.home +package com.woka.home.viewmodels import androidx.lifecycle.ViewModel diff --git a/app/src/main/java/com/woka/home/BottomNavigation.kt b/app/src/main/java/com/woka/home/views/BottomNavigation.kt similarity index 97% rename from app/src/main/java/com/woka/home/BottomNavigation.kt rename to app/src/main/java/com/woka/home/views/BottomNavigation.kt index 244168f..ae3b955 100644 --- a/app/src/main/java/com/woka/home/BottomNavigation.kt +++ b/app/src/main/java/com/woka/home/views/BottomNavigation.kt @@ -1,4 +1,4 @@ -package com.woka.home +package com.woka.home.views import android.content.Context import android.content.res.ColorStateList @@ -8,8 +8,6 @@ import android.widget.ImageView import android.widget.TextView import androidx.cardview.widget.CardView import com.woka.R -import com.woka.utils.toast -import org.w3c.dom.Text class BottomNavigation: FrameLayout { @@ -108,8 +106,8 @@ class BottomNavigation: FrameLayout { homeTxt?.setTextColor(darkGray) } - bottomTabSelectListener?.onBottomTabSelected(tab) selectedItem = tab + bottomTabSelectListener?.onBottomTabSelected(tab) } fun initTitles(){ diff --git a/app/src/main/java/com/woka/home/ExploreWokaActivity.kt b/app/src/main/java/com/woka/home/views/ExploreWokaActivity.kt similarity index 95% rename from app/src/main/java/com/woka/home/ExploreWokaActivity.kt rename to app/src/main/java/com/woka/home/views/ExploreWokaActivity.kt index ca659de..cf9683f 100644 --- a/app/src/main/java/com/woka/home/ExploreWokaActivity.kt +++ b/app/src/main/java/com/woka/home/views/ExploreWokaActivity.kt @@ -1,4 +1,4 @@ -package com.woka.home +package com.woka.home.views import android.content.Intent import android.os.Build @@ -11,7 +11,7 @@ import androidx.core.view.ViewCompat import androidx.core.view.WindowInsetsCompat import com.woka.R import com.woka.databinding.ActivityExploreWokaBinding -import com.woka.players.LiveStreamPlayerActivity +import com.woka.players.views.LiveStreamPlayerActivity import com.woka.utils.WokaBaseActivity import com.woka.utils.lightStatusBar diff --git a/app/src/main/java/com/woka/home/FMActivity.kt b/app/src/main/java/com/woka/home/views/FMActivity.kt similarity index 94% rename from app/src/main/java/com/woka/home/FMActivity.kt rename to app/src/main/java/com/woka/home/views/FMActivity.kt index c09e903..f80586d 100644 --- a/app/src/main/java/com/woka/home/FMActivity.kt +++ b/app/src/main/java/com/woka/home/views/FMActivity.kt @@ -1,4 +1,4 @@ -package com.woka.home +package com.woka.home.views import android.annotation.SuppressLint import android.graphics.Color @@ -7,12 +7,10 @@ import android.os.Bundle import android.webkit.WebSettings import android.webkit.WebViewClient import androidx.activity.enableEdgeToEdge -import androidx.appcompat.app.AppCompatActivity import androidx.core.view.ViewCompat import androidx.core.view.WindowInsetsCompat import com.woka.R import com.woka.databinding.ActivityFmactivityBinding -import com.woka.modules.webview.WebViewActivity import com.woka.utils.WokaBaseActivity class FMActivity : WokaBaseActivity() { diff --git a/app/src/main/java/com/woka/home/HomeActivity.kt b/app/src/main/java/com/woka/home/views/HomeActivity.kt similarity index 95% rename from app/src/main/java/com/woka/home/HomeActivity.kt rename to app/src/main/java/com/woka/home/views/HomeActivity.kt index 62e7045..927278f 100644 --- a/app/src/main/java/com/woka/home/HomeActivity.kt +++ b/app/src/main/java/com/woka/home/views/HomeActivity.kt @@ -1,4 +1,4 @@ -package com.woka.home +package com.woka.home.views import android.app.ActivityOptions import android.content.BroadcastReceiver @@ -29,9 +29,11 @@ import com.woka.BuildConfig import com.woka.R import com.woka.WokaApp.Companion.userPrefs import com.woka.databinding.ActivityHomeBinding -import com.woka.home.BottomNavigation.Companion.EXPLORE_WOKA -import com.woka.home.BottomNavigation.Companion.HOME -import com.woka.home.BottomNavigation.Companion.MY_LIST +import com.woka.home.models.Theme +import com.woka.home.models.TimePeriod +import com.woka.home.views.BottomNavigation.Companion.EXPLORE_WOKA +import com.woka.home.views.BottomNavigation.Companion.HOME +import com.woka.home.views.BottomNavigation.Companion.MY_LIST import com.woka.home.fragments.Home1Fragment import com.woka.home.fragments.Home2Fragment import com.woka.home.fragments.MyListFragment @@ -40,16 +42,17 @@ import com.woka.home.sidebar.aboutwoka.AboutActivity import com.woka.home.sidebar.faqs.FaqActivity import com.woka.home.sidebar.profile.UserProfileActivity import com.woka.home.sidebar.support.SupportActivity +import com.woka.home.viewmodels.HomeViewModel import com.woka.modules.disclaimer.DisclaimerActivity import com.woka.modules.webview.WebViewActivity import com.woka.modules.webview.WebViewActivity.Companion.WEB_VIEW_TITLE import com.woka.modules.webview.WebViewActivity.Companion.WEB_VIEW_URL import com.woka.userdata.userDataModels.UserDataResponse import com.woka.networking.ApiResult -import com.woka.onboard.OnboardActivity -import com.woka.onboard.OnboardActivity.Companion.ADD_CHILD_INTENT -import com.woka.onboard.OnboardActivity.Companion.LOG_IN_INTENT -import com.woka.onboard.OnboardActivity.Companion.ONBOARD_ACTIVITY_INTENT +import com.woka.onboard.views.OnboardActivity +import com.woka.onboard.views.OnboardActivity.Companion.ADD_CHILD_INTENT +import com.woka.onboard.views.OnboardActivity.Companion.LOG_IN_INTENT +import com.woka.onboard.views.OnboardActivity.Companion.ONBOARD_ACTIVITY_INTENT import com.woka.shop.MyOrdersActivity import com.woka.utils.DecisionDialog import com.woka.utils.LOCALE_ENGLISH @@ -465,6 +468,8 @@ class HomeActivity : WokaBaseActivity(), binding.root.backgroundTintList = ColorStateList.valueOf(getColor(R.color.color_primary)) + currentBackground = null // to update to the latest + updateBackground() } .commit() }else{ @@ -475,13 +480,15 @@ class HomeActivity : WokaBaseActivity(), window.lightStatusBar() binding.root.backgroundTintList = null + + currentBackground = null // to update to the latest + updateBackground() } .commit() } registerReceiver(minuteReceiver, IntentFilter(Intent.ACTION_TIME_TICK)) - updateBackground() viewModel.selectedBottomTab = tab } EXPLORE_WOKA -> { @@ -497,9 +504,11 @@ class HomeActivity : WokaBaseActivity(), supportFragmentManager.beginTransaction() .replace(R.id.fc_home, MyListFragment.newInstance()) .runOnCommit { - window.lightStatusBar(true) + binding.root.backgroundTintList = null + + window.lightStatusBar() binding.notifications.hide() - binding.root.backgroundTintList = ColorStateList.valueOf(getColor(R.color.orders_bg)) + binding.root.background = ContextCompat.getDrawable(this, R.drawable.grad_my_list) } .commit() diff --git a/app/src/main/java/com/woka/home/MoreHomeActivity.kt b/app/src/main/java/com/woka/home/views/MoreHomeActivity.kt similarity index 99% rename from app/src/main/java/com/woka/home/MoreHomeActivity.kt rename to app/src/main/java/com/woka/home/views/MoreHomeActivity.kt index 2f7cb54..5bac0c9 100644 --- a/app/src/main/java/com/woka/home/MoreHomeActivity.kt +++ b/app/src/main/java/com/woka/home/views/MoreHomeActivity.kt @@ -1,4 +1,4 @@ -package com.woka.home +package com.woka.home.views import android.app.Dialog import android.graphics.Color @@ -20,6 +20,7 @@ import com.woka.WokaApp import com.woka.WokaApp.Companion.userPrefs import com.woka.databinding.ActivityMoreHomeBinding import com.woka.databinding.DialogBlogsBinding +import com.woka.home.viewmodels.MoreViewModel import com.woka.modules.blogs.BlogsAdapter import com.woka.modules.blogs.BlogsRepository import com.woka.modules.blogs.models.Blog diff --git a/app/src/main/java/com/woka/onboard/AvatarAdapter.kt b/app/src/main/java/com/woka/onboard/adapters/AvatarAdapter.kt similarity index 98% rename from app/src/main/java/com/woka/onboard/AvatarAdapter.kt rename to app/src/main/java/com/woka/onboard/adapters/AvatarAdapter.kt index 08e4beb..6632dfd 100644 --- a/app/src/main/java/com/woka/onboard/AvatarAdapter.kt +++ b/app/src/main/java/com/woka/onboard/adapters/AvatarAdapter.kt @@ -1,4 +1,4 @@ -package com.woka.onboard +package com.woka.onboard.adapters import android.view.LayoutInflater import android.view.ViewGroup diff --git a/app/src/main/java/com/woka/onboard/ChildAdapter.kt b/app/src/main/java/com/woka/onboard/adapters/ChildAdapter.kt similarity index 96% rename from app/src/main/java/com/woka/onboard/ChildAdapter.kt rename to app/src/main/java/com/woka/onboard/adapters/ChildAdapter.kt index 20cdd66..4d83e43 100644 --- a/app/src/main/java/com/woka/onboard/ChildAdapter.kt +++ b/app/src/main/java/com/woka/onboard/adapters/ChildAdapter.kt @@ -1,4 +1,4 @@ -package com.woka.onboard +package com.woka.onboard.adapters import android.view.LayoutInflater import android.view.ViewGroup diff --git a/app/src/main/java/com/woka/onboard/OnboardingAdapter.kt b/app/src/main/java/com/woka/onboard/adapters/OnboardingAdapter.kt similarity index 97% rename from app/src/main/java/com/woka/onboard/OnboardingAdapter.kt rename to app/src/main/java/com/woka/onboard/adapters/OnboardingAdapter.kt index 5839d49..119c2ae 100644 --- a/app/src/main/java/com/woka/onboard/OnboardingAdapter.kt +++ b/app/src/main/java/com/woka/onboard/adapters/OnboardingAdapter.kt @@ -1,7 +1,6 @@ -package com.woka.onboard +package com.woka.onboard.adapters import android.util.DisplayMetrics -import android.util.TypedValue import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView diff --git a/app/src/main/java/com/woka/onboard/fragments/ChildListFragment.kt b/app/src/main/java/com/woka/onboard/fragments/ChildListFragment.kt index 75e818a..fa3260e 100644 --- a/app/src/main/java/com/woka/onboard/fragments/ChildListFragment.kt +++ b/app/src/main/java/com/woka/onboard/fragments/ChildListFragment.kt @@ -9,10 +9,9 @@ import androidx.lifecycle.ViewModelProvider import androidx.navigation.fragment.findNavController import com.woka.R import com.woka.databinding.FragmentChildListBinding -import com.woka.onboard.ChildAdapter +import com.woka.onboard.adapters.ChildAdapter import com.woka.onboard.fragments.GetCodeFragment.Companion.EMAIL_ARG import com.woka.onboard.fragments.GetEmailFragment.Companion.IS_UNDER_16 -import com.woka.onboard.models.Child import com.woka.onboard.mvvm.OnboardViewModel class ChildListFragment : Fragment() { diff --git a/app/src/main/java/com/woka/onboard/fragments/GetMoreInfoFragment.kt b/app/src/main/java/com/woka/onboard/fragments/GetMoreInfoFragment.kt index 0106031..906eb54 100644 --- a/app/src/main/java/com/woka/onboard/fragments/GetMoreInfoFragment.kt +++ b/app/src/main/java/com/woka/onboard/fragments/GetMoreInfoFragment.kt @@ -6,19 +6,14 @@ import android.view.LayoutInflater import android.view.View import android.view.View.VISIBLE import android.view.ViewGroup -import android.widget.DatePicker -import android.widget.TextView -import android.widget.Toast -import androidx.core.view.allViews import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProvider import androidx.navigation.fragment.findNavController import com.woka.R import com.woka.databinding.FragmentGetMoreInfoBinding import com.woka.networking.ApiResult -import com.woka.onboard.InterestTopicView +import com.woka.onboard.views.InterestTopicView import com.woka.onboard.fragments.GetEmailFragment.Companion.IS_UNDER_16 -import com.woka.onboard.models.Interest import com.woka.onboard.mvvm.OnboardViewModel import com.woka.utils.Gender import com.woka.utils.toast diff --git a/app/src/main/java/com/woka/onboard/fragments/LanguageFragment.kt b/app/src/main/java/com/woka/onboard/fragments/LanguageFragment.kt index 3a3369d..735cc22 100644 --- a/app/src/main/java/com/woka/onboard/fragments/LanguageFragment.kt +++ b/app/src/main/java/com/woka/onboard/fragments/LanguageFragment.kt @@ -9,7 +9,7 @@ import android.view.ViewGroup import androidx.core.app.ActivityOptionsCompat import androidx.fragment.app.Fragment import com.woka.databinding.FragmentLanguageBinding -import com.woka.onboard.OnboardActivity +import com.woka.onboard.views.OnboardActivity import com.woka.utils.LOCALE_ENGLISH import com.woka.utils.LOCALE_HINDI import com.woka.utils.ProgressView diff --git a/app/src/main/java/com/woka/onboard/fragments/OnboardFragment.kt b/app/src/main/java/com/woka/onboard/fragments/OnboardFragment.kt index ec7771f..51a7f66 100644 --- a/app/src/main/java/com/woka/onboard/fragments/OnboardFragment.kt +++ b/app/src/main/java/com/woka/onboard/fragments/OnboardFragment.kt @@ -15,9 +15,9 @@ import com.google.android.material.tabs.TabLayoutMediator import com.woka.R import com.woka.WokaApp.Companion.userPrefs import com.woka.databinding.FragmentOnboardBinding -import com.woka.home.HomeActivity +import com.woka.home.views.HomeActivity import com.woka.networking.ApiResult -import com.woka.onboard.OnboardingAdapter +import com.woka.onboard.adapters.OnboardingAdapter import com.woka.onboard.mvvm.OnboardViewModel import com.woka.utils.ProgressView import com.woka.userPreference.UserType diff --git a/app/src/main/java/com/woka/onboard/fragments/SelectAvatarFragment.kt b/app/src/main/java/com/woka/onboard/fragments/SelectAvatarFragment.kt index 01d8a7f..fdc1aff 100644 --- a/app/src/main/java/com/woka/onboard/fragments/SelectAvatarFragment.kt +++ b/app/src/main/java/com/woka/onboard/fragments/SelectAvatarFragment.kt @@ -11,9 +11,9 @@ import androidx.lifecycle.lifecycleScope import com.woka.R import com.woka.WokaApp.Companion.userPrefs import com.woka.databinding.FragmentSelectAvatarBinding -import com.woka.home.HomeActivity +import com.woka.home.views.HomeActivity import com.woka.networking.ApiResult -import com.woka.onboard.AvatarAdapter +import com.woka.onboard.adapters.AvatarAdapter import com.woka.onboard.fragments.GetEmailFragment.Companion.IS_UNDER_16 import com.woka.onboard.models.RegisterRequestData import com.woka.onboard.mvvm.OnboardViewModel diff --git a/app/src/main/java/com/woka/onboard/fragments/SignInFragment.kt b/app/src/main/java/com/woka/onboard/fragments/SignInFragment.kt index 6a7c8f8..81206d9 100644 --- a/app/src/main/java/com/woka/onboard/fragments/SignInFragment.kt +++ b/app/src/main/java/com/woka/onboard/fragments/SignInFragment.kt @@ -13,7 +13,7 @@ import androidx.navigation.fragment.findNavController import com.woka.R import com.woka.WokaApp.Companion.userPrefs import com.woka.databinding.FragmentSignInBinding -import com.woka.home.HomeActivity +import com.woka.home.views.HomeActivity import com.woka.networking.ApiResult import com.woka.onboard.fragments.GetEmailFragment.Companion.IS_RESET_PASSWORD_INTENT import com.woka.onboard.mvvm.OnboardViewModel diff --git a/app/src/main/java/com/woka/onboard/fragments/SplashFragment.kt b/app/src/main/java/com/woka/onboard/fragments/SplashFragment.kt index 9224d53..222496f 100644 --- a/app/src/main/java/com/woka/onboard/fragments/SplashFragment.kt +++ b/app/src/main/java/com/woka/onboard/fragments/SplashFragment.kt @@ -15,7 +15,7 @@ import androidx.navigation.fragment.findNavController import com.woka.R import com.woka.WokaApp.Companion.userPrefs import com.woka.databinding.FragmentSplashBinding -import com.woka.home.HomeActivity +import com.woka.home.views.HomeActivity import com.woka.userdata.userDataModels.UserDataResponse import com.woka.networking.ApiResult import com.woka.userPreference.UserType diff --git a/app/src/main/java/com/woka/onboard/InterestTopicView.kt b/app/src/main/java/com/woka/onboard/views/InterestTopicView.kt similarity index 97% rename from app/src/main/java/com/woka/onboard/InterestTopicView.kt rename to app/src/main/java/com/woka/onboard/views/InterestTopicView.kt index f8d689f..3b00cd3 100644 --- a/app/src/main/java/com/woka/onboard/InterestTopicView.kt +++ b/app/src/main/java/com/woka/onboard/views/InterestTopicView.kt @@ -1,4 +1,4 @@ -package com.woka.onboard +package com.woka.onboard.views import android.content.Context import android.widget.LinearLayout diff --git a/app/src/main/java/com/woka/onboard/OnboardActivity.kt b/app/src/main/java/com/woka/onboard/views/OnboardActivity.kt similarity index 94% rename from app/src/main/java/com/woka/onboard/OnboardActivity.kt rename to app/src/main/java/com/woka/onboard/views/OnboardActivity.kt index d0bb162..f285c86 100644 --- a/app/src/main/java/com/woka/onboard/OnboardActivity.kt +++ b/app/src/main/java/com/woka/onboard/views/OnboardActivity.kt @@ -1,4 +1,4 @@ -package com.woka.onboard +package com.woka.onboard.views import android.media.MediaPlayer import android.os.Bundle @@ -9,11 +9,8 @@ import androidx.navigation.NavOptions import androidx.navigation.fragment.NavHostFragment import com.woka.R import com.woka.WokaApp.Companion.userPrefs -import com.woka.onboard.fragments.GetCodeFragment import com.woka.onboard.fragments.GetCodeFragment.Companion.EMAIL_ARG -import com.woka.onboard.fragments.GetEmailFragment import com.woka.onboard.fragments.GetEmailFragment.Companion.IS_UNDER_16 -import com.woka.onboard.fragments.SignUpFragment import com.woka.onboard.fragments.SignUpFragment.Companion.ADD_CHILD_EVENT import com.woka.utils.WokaBaseActivity diff --git a/app/src/main/java/com/woka/onboard/WelcomeActivity.kt b/app/src/main/java/com/woka/onboard/views/WelcomeActivity.kt similarity index 96% rename from app/src/main/java/com/woka/onboard/WelcomeActivity.kt rename to app/src/main/java/com/woka/onboard/views/WelcomeActivity.kt index 0180ee4..4fe9ca1 100644 --- a/app/src/main/java/com/woka/onboard/WelcomeActivity.kt +++ b/app/src/main/java/com/woka/onboard/views/WelcomeActivity.kt @@ -1,4 +1,4 @@ -package com.woka.onboard +package com.woka.onboard.views import android.os.Bundle import androidx.activity.enableEdgeToEdge diff --git a/app/src/main/java/com/woka/players/LiveStreamPlayerActivity.kt b/app/src/main/java/com/woka/players/views/LiveStreamPlayerActivity.kt similarity index 97% rename from app/src/main/java/com/woka/players/LiveStreamPlayerActivity.kt rename to app/src/main/java/com/woka/players/views/LiveStreamPlayerActivity.kt index 959c789..83f52c3 100644 --- a/app/src/main/java/com/woka/players/LiveStreamPlayerActivity.kt +++ b/app/src/main/java/com/woka/players/views/LiveStreamPlayerActivity.kt @@ -1,9 +1,8 @@ -package com.woka.players +package com.woka.players.views import android.os.Bundle import android.util.Log import android.view.ViewGroup -import android.view.WindowManager import androidx.activity.enableEdgeToEdge import androidx.appcompat.app.AppCompatActivity import androidx.core.view.ViewCompat @@ -16,6 +15,7 @@ import com.jwplayer.pub.api.events.listeners.VideoPlayerEvents import com.jwplayer.pub.api.fullscreen.FullscreenHandler import com.jwplayer.pub.api.media.playlists.PlaylistItem import com.woka.databinding.ActivityLiveStreamPlayerBinding +import com.woka.players.KeepScreenOnHandler class LiveStreamPlayerActivity : AppCompatActivity(), FullscreenHandler { diff --git a/app/src/main/java/com/woka/players/PlayerActivity.kt b/app/src/main/java/com/woka/players/views/PlayerActivity.kt similarity index 91% rename from app/src/main/java/com/woka/players/PlayerActivity.kt rename to app/src/main/java/com/woka/players/views/PlayerActivity.kt index 8e78d56..ea67bbb 100644 --- a/app/src/main/java/com/woka/players/PlayerActivity.kt +++ b/app/src/main/java/com/woka/players/views/PlayerActivity.kt @@ -1,26 +1,20 @@ -package com.woka.players +package com.woka.players.views import android.os.Bundle -import android.util.Log import android.view.ViewGroup import androidx.activity.enableEdgeToEdge import androidx.appcompat.app.AppCompatActivity -import androidx.appcompat.app.AppCompatDelegate import androidx.core.view.ViewCompat import androidx.core.view.WindowCompat import androidx.core.view.WindowInsetsCompat -import com.google.common.base.Stopwatch import com.jwplayer.pub.api.JWPlayer import com.jwplayer.pub.api.configuration.PlayerConfig -import com.jwplayer.pub.api.events.EventType -import com.jwplayer.pub.api.events.listeners.VideoPlayerEvents import com.jwplayer.pub.api.fullscreen.FullscreenHandler -import com.jwplayer.pub.api.media.playlists.PlaylistItem import com.woka.databinding.ActivityPlayerBinding import com.woka.networking.RetrofitHelper +import com.woka.players.KeepScreenOnHandler +import com.woka.players.PlayerApiService import com.woka.players.models.VideoPlayList -import com.woka.utils.TAG -import com.woka.utils.formatTime import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/woka/userPreference/UserPreference.kt b/app/src/main/java/com/woka/userPreference/UserPreference.kt index ddef051..2dc6ff0 100644 --- a/app/src/main/java/com/woka/userPreference/UserPreference.kt +++ b/app/src/main/java/com/woka/userPreference/UserPreference.kt @@ -8,10 +8,10 @@ import android.content.SharedPreferences import android.provider.Settings.Secure import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import com.woka.home.Theme +import com.woka.home.models.Theme import com.woka.home.mylist.MyListRepository import com.woka.networking.ApiResult -import com.woka.onboard.OnboardActivity +import com.woka.onboard.views.OnboardActivity import com.woka.userdata.UserRepository import com.woka.userdata.userDataModels.UserData import com.woka.userdata.userDataModels.UserDataResponse diff --git a/app/src/main/java/com/woka/webseries/adapters/WebSeriesShowAdapter.kt b/app/src/main/java/com/woka/webseries/adapters/WebSeriesShowAdapter.kt index 8de8cde..6a5f873 100644 --- a/app/src/main/java/com/woka/webseries/adapters/WebSeriesShowAdapter.kt +++ b/app/src/main/java/com/woka/webseries/adapters/WebSeriesShowAdapter.kt @@ -25,7 +25,7 @@ class WebSeriesShowAdapter( private var categoryId: String? = null - private var showList: List = ArrayList() + var showList: List = ArrayList() @SuppressLint("NotifyDataSetChanged") fun submitListShowList(it: List, categoryId: String?) { diff --git a/app/src/main/java/com/woka/webseries/views/SeasonActivity.kt b/app/src/main/java/com/woka/webseries/views/SeasonActivity.kt index 890ed8d..84998d3 100644 --- a/app/src/main/java/com/woka/webseries/views/SeasonActivity.kt +++ b/app/src/main/java/com/woka/webseries/views/SeasonActivity.kt @@ -6,7 +6,6 @@ import android.graphics.Color import android.graphics.drawable.ColorDrawable import android.graphics.drawable.InsetDrawable import android.os.Bundle -import android.os.Parcelable import android.text.Html import android.view.WindowManager import androidx.activity.enableEdgeToEdge @@ -21,11 +20,10 @@ import com.woka.databinding.ActivitySeasonBinding import com.woka.databinding.DialogEpisodeBinding import com.woka.home.mylist.MyListRepository import com.woka.networking.ApiResult -import com.woka.players.PlayerActivity -import com.woka.players.PlayerActivity.Companion.EXTRA_PLAY_INDEX -import com.woka.players.PlayerActivity.Companion.EXTRA_PLAY_LIST +import com.woka.players.views.PlayerActivity +import com.woka.players.views.PlayerActivity.Companion.EXTRA_PLAY_INDEX +import com.woka.players.views.PlayerActivity.Companion.EXTRA_PLAY_LIST import com.woka.players.models.VideoPlayList -import com.woka.players.models.VideoViewRequestData import com.woka.utils.ProgressView import com.woka.utils.WokaBaseActivity import com.woka.utils.hide diff --git a/app/src/main/java/com/woka/webseries/views/WebSeriesActivity.kt b/app/src/main/java/com/woka/webseries/views/WebSeriesActivity.kt index c033409..45d2b61 100644 --- a/app/src/main/java/com/woka/webseries/views/WebSeriesActivity.kt +++ b/app/src/main/java/com/woka/webseries/views/WebSeriesActivity.kt @@ -22,17 +22,14 @@ import androidx.recyclerview.widget.SimpleItemAnimator import com.google.android.material.appbar.CollapsingToolbarLayout import com.jwplayer.pub.api.media.playlists.PlaylistItem import com.woka.R -import com.woka.WokaApp import com.woka.WokaApp.Companion.userPrefs import com.woka.databinding.ActivityWebSeriesBinding -import com.woka.databinding.DialogBlogsBinding import com.woka.databinding.DialogContinueEpisodeBinding -import com.woka.databinding.DialogEpisodeBinding import com.woka.modules.ModuleRepository import com.woka.networking.ApiResult -import com.woka.players.PlayerActivity -import com.woka.players.PlayerActivity.Companion.EXTRA_PLAY_INDEX -import com.woka.players.PlayerActivity.Companion.EXTRA_PLAY_LIST +import com.woka.players.views.PlayerActivity +import com.woka.players.views.PlayerActivity.Companion.EXTRA_PLAY_INDEX +import com.woka.players.views.PlayerActivity.Companion.EXTRA_PLAY_LIST import com.woka.players.models.VideoPlayList import com.woka.players.models.VideoViewRequestData import com.woka.utils.WokaBaseActivity @@ -165,10 +162,8 @@ class WebSeriesActivity : WokaBaseActivity(), Observer - if (position > -1 && position < showAdapter.itemCount){ - showAdapter.notifyItemChanged(position) - } + it.data?.getIntExtra(SeasonActivity.EXTRA_SHOW_ID, -1)?.let {showId -> + onWebShowItemChanged(showId) } } } @@ -300,6 +295,13 @@ class WebSeriesActivity : WokaBaseActivity(), Observer -1 && englishPosition < showAdapter.showList.size){ + showAdapter.notifyItemChanged(englishPosition) + } + } + private fun onContinueEpisodeClicked(episodeData: ContinueEpisodeData){ episodeDialogBinding.apply { episodeData.content_more_details?.let {moreDetailsList -> @@ -310,7 +312,7 @@ class WebSeriesActivity : WokaBaseActivity(), Observer 1){ + if (userPrefs?.appLanguage == "hi" && moreDetailsList.size > 1){ moreDetailsList[1].let {data -> title.text = data.title description.text = Html.fromHtml( diff --git a/app/src/main/res/drawable-hdpi/img_masila_full.png b/app/src/main/res/drawable-hdpi/img_masila_full.png new file mode 100644 index 0000000..6fcc348 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/img_masila_full.png differ diff --git a/app/src/main/res/drawable-ldpi/img_masila_full.png b/app/src/main/res/drawable-ldpi/img_masila_full.png new file mode 100644 index 0000000..50efa11 Binary files /dev/null and b/app/src/main/res/drawable-ldpi/img_masila_full.png differ diff --git a/app/src/main/res/drawable-mdpi/img_masila_full.png b/app/src/main/res/drawable-mdpi/img_masila_full.png new file mode 100644 index 0000000..0129cfa Binary files /dev/null and b/app/src/main/res/drawable-mdpi/img_masila_full.png differ diff --git a/app/src/main/res/drawable-xhdpi/img_masila_full.png b/app/src/main/res/drawable-xhdpi/img_masila_full.png new file mode 100644 index 0000000..75774a6 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/img_masila_full.png differ diff --git a/app/src/main/res/drawable-xxhdpi/img_masila_full.png b/app/src/main/res/drawable-xxhdpi/img_masila_full.png new file mode 100644 index 0000000..fdc924a Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/img_masila_full.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/img_masila_full.png b/app/src/main/res/drawable-xxxhdpi/img_masila_full.png new file mode 100644 index 0000000..a9643dc Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/img_masila_full.png differ diff --git a/app/src/main/res/drawable/grad_my_list.xml b/app/src/main/res/drawable/grad_my_list.xml new file mode 100644 index 0000000..03aaca9 --- /dev/null +++ b/app/src/main/res/drawable/grad_my_list.xml @@ -0,0 +1,8 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/gradient_audio_books.xml b/app/src/main/res/drawable/gradient_audio_books.xml new file mode 100644 index 0000000..86829d2 --- /dev/null +++ b/app/src/main/res/drawable/gradient_audio_books.xml @@ -0,0 +1,8 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/trailer_btn_bg.xml b/app/src/main/res/drawable/trailer_btn_bg.xml new file mode 100644 index 0000000..288b79a --- /dev/null +++ b/app/src/main/res/drawable/trailer_btn_bg.xml @@ -0,0 +1,11 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_audio_books.xml b/app/src/main/res/layout/activity_audio_books.xml new file mode 100644 index 0000000..3819480 --- /dev/null +++ b/app/src/main/res/layout/activity_audio_books.xml @@ -0,0 +1,223 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +