diff --git a/app/src/main/java/com/woka/karaoke/player/KaraokePlayerActivity.kt b/app/src/main/java/com/woka/karaoke/player/KaraokePlayerActivity.kt index 31bbd27..6ff300f 100644 --- a/app/src/main/java/com/woka/karaoke/player/KaraokePlayerActivity.kt +++ b/app/src/main/java/com/woka/karaoke/player/KaraokePlayerActivity.kt @@ -57,7 +57,6 @@ import java.text.SimpleDateFormat import java.util.Calendar import java.util.Locale - class KaraokePlayerActivity : WokaBaseActivity() { companion object { @@ -99,7 +98,7 @@ class KaraokePlayerActivity : WokaBaseActivity() { private var playbackStartTime: Long = 0 private var totalPlaybackDuration: Long = 0 - + @UnstableApi override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) enableEdgeToEdge() @@ -133,7 +132,10 @@ class KaraokePlayerActivity : WokaBaseActivity() { } } - player = ExoPlayer.Builder(this).build() + player = ExoPlayer.Builder(this) + .setSeekForwardIncrementMs(15_000) + .setSeekBackIncrementMs(15_000) + .build() binding.playerView.player = player recordingState = RecordingState.NOT_RECORDING @@ -159,6 +161,11 @@ class KaraokePlayerActivity : WokaBaseActivity() { override fun onStop() { super.onStop() + + if (recordingState == RecordingState.RECORDING){ + startStopRecording() + } + if (playbackStartTime > 0) { val elapsed = System.currentTimeMillis() - playbackStartTime totalPlaybackDuration += elapsed @@ -371,8 +378,18 @@ class KaraokePlayerActivity : WokaBaseActivity() { private fun addListeners() { player?.addListener(object : Player.Listener { + + override fun onPlaybackStateChanged(playbackState: Int) { + super.onPlaybackStateChanged(playbackState) + if (playbackState == Player.STATE_READY){ + binding.mainProgressBar.hide() + } + } + override fun onIsPlayingChanged(isPlaying: Boolean) { super.onIsPlayingChanged(isPlaying) + binding.mainProgressBar.hide() + playbackState = if (isPlaying) { binding.mainView.show() binding.errorView.hide() @@ -391,6 +408,7 @@ class KaraokePlayerActivity : WokaBaseActivity() { override fun onPlayerError(error: PlaybackException) { super.onPlayerError(error) playbackState = PlayBackState.STOPPED + binding.mainProgressBar.hide() binding.mainView.hide() binding.errorView.show() } @@ -493,6 +511,7 @@ class KaraokePlayerActivity : WokaBaseActivity() { private fun playVideo() { if (karaokePlayerData?.karaokeVideoUrl == null) return + binding.mainProgressBar.show() binding.playerView.show() player?.setMediaItem(MediaItem.fromUri(karaokePlayerData?.karaokeVideoUrl!!)) diff --git a/app/src/main/java/com/woka/onboard/fragments/GetEmailFragment.kt b/app/src/main/java/com/woka/onboard/fragments/GetEmailFragment.kt index 80593ea..8c01366 100644 --- a/app/src/main/java/com/woka/onboard/fragments/GetEmailFragment.kt +++ b/app/src/main/java/com/woka/onboard/fragments/GetEmailFragment.kt @@ -30,6 +30,7 @@ import com.woka.utils.toast 1 (Default). Registration process of parent (@Param isUnder16 = false) 2. Registration process of child (@Param isUnder16 = true) 3. Forget password process ( @Param isResetPasswordIntent = true) + 4. Forgot username process ( @Param isForgotUserName = true) */ class GetEmailFragment : Fragment() { diff --git a/app/src/main/java/com/woka/onboard/views/OnboardActivity.kt b/app/src/main/java/com/woka/onboard/views/OnboardActivity.kt index 4e4db38..b477aed 100644 --- a/app/src/main/java/com/woka/onboard/views/OnboardActivity.kt +++ b/app/src/main/java/com/woka/onboard/views/OnboardActivity.kt @@ -39,29 +39,37 @@ class OnboardActivity : WokaBaseActivity() { } if (intent.getStringExtra(ONBOARD_ACTIVITY_INTENT) == LOG_IN_INTENT) { - val hostFragment = - supportFragmentManager.findFragmentById(R.id.fc_onboard) as NavHostFragment - hostFragment.navController.navigate( - R.id.action_onboardFragment_to_signInFragment, - null, - NavOptions.Builder() - .setPopUpTo(R.id.onboardFragment, true) - .build() - ) + try { + val hostFragment = + supportFragmentManager.findFragmentById(R.id.fc_onboard) as NavHostFragment + hostFragment.navController.navigate( + R.id.action_onboardFragment_to_signInFragment, + null, + NavOptions.Builder() + .setPopUpTo(R.id.onboardFragment, true) + .build() + ) + } catch (e: Exception) { + // do nothing + } }else if (intent.getStringExtra(ONBOARD_ACTIVITY_INTENT) == ADD_CHILD_INTENT){ - val hostFragment = - supportFragmentManager.findFragmentById(R.id.fc_onboard) as NavHostFragment - hostFragment.navController.navigate( - R.id.action_onboardFragment_to_signUpFragment, - Bundle().apply { - putBoolean(IS_UNDER_16, true) - putString(EMAIL_ARG, userPrefs?.userData?.email) - putBoolean(ADD_CHILD_EVENT, true) - }, - NavOptions.Builder() - .setPopUpTo(R.id.onboardFragment, true) - .build() - ) + try { + val hostFragment = + supportFragmentManager.findFragmentById(R.id.fc_onboard) as NavHostFragment + hostFragment.navController.navigate( + R.id.action_onboardFragment_to_signUpFragment, + Bundle().apply { + putBoolean(IS_UNDER_16, true) + putString(EMAIL_ARG, userPrefs?.userData?.email) + putBoolean(ADD_CHILD_EVENT, true) + }, + NavOptions.Builder() + .setPopUpTo(R.id.onboardFragment, true) + .build() + ) + } catch (e: Exception) { + // do nothing + } }else{ player = MediaPlayer.create(this, R.raw.audiotwo) player?.isLooping = true diff --git a/app/src/main/java/com/woka/wokagames/playerr/GamePlayerActivity.kt b/app/src/main/java/com/woka/wokagames/playerr/GamePlayerActivity.kt index 2dcccf3..ab5d3a0 100644 --- a/app/src/main/java/com/woka/wokagames/playerr/GamePlayerActivity.kt +++ b/app/src/main/java/com/woka/wokagames/playerr/GamePlayerActivity.kt @@ -67,6 +67,11 @@ class GamePlayerActivity : WokaBaseActivity() { } return@setOnTouchListener false } + + binding.backBtn.setOnClickListener { + @Suppress("DEPRECATION") + onBackPressed() + } } override fun onStop() { diff --git a/app/src/main/res/drawable-hdpi/ic_green_tick.png b/app/src/main/res/drawable-hdpi/ic_green_tick.png new file mode 100644 index 0000000..55e65ea Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_green_tick.png differ diff --git a/app/src/main/res/drawable-ldpi/ic_green_tick.png b/app/src/main/res/drawable-ldpi/ic_green_tick.png new file mode 100644 index 0000000..21fa8cd Binary files /dev/null and b/app/src/main/res/drawable-ldpi/ic_green_tick.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_green_tick.png b/app/src/main/res/drawable-mdpi/ic_green_tick.png new file mode 100644 index 0000000..772404b Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_green_tick.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_green_tick.png b/app/src/main/res/drawable-xhdpi/ic_green_tick.png new file mode 100644 index 0000000..1d6c056 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_green_tick.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_green_tick.png b/app/src/main/res/drawable-xxhdpi/ic_green_tick.png new file mode 100644 index 0000000..e0e489b Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_green_tick.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_green_tick.png b/app/src/main/res/drawable-xxxhdpi/ic_green_tick.png new file mode 100644 index 0000000..39b1561 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_green_tick.png differ diff --git a/app/src/main/res/drawable/ic_green_tick.xml b/app/src/main/res/drawable/ic_green_tick.xml deleted file mode 100644 index 12b646a..0000000 --- a/app/src/main/res/drawable/ic_green_tick.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - diff --git a/app/src/main/res/layout/activity_explore_woka.xml b/app/src/main/res/layout/activity_explore_woka.xml index a820053..84770e8 100644 --- a/app/src/main/res/layout/activity_explore_woka.xml +++ b/app/src/main/res/layout/activity_explore_woka.xml @@ -200,7 +200,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/blogs" + android:text="@string/blogs_all_caps" android:textColor="@color/white" android:fontFamily="@font/exo_2_bold" diff --git a/app/src/main/res/layout/activity_game_player.xml b/app/src/main/res/layout/activity_game_player.xml index 7a6eed1..00541e7 100644 --- a/app/src/main/res/layout/activity_game_player.xml +++ b/app/src/main/res/layout/activity_game_player.xml @@ -1,9 +1,42 @@ - \ No newline at end of file + tools:context=".wokagames.playerr.GamePlayerActivity"> + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_karaoke_playerr.xml b/app/src/main/res/layout/activity_karaoke_playerr.xml index 304867b..9dc61d9 100644 --- a/app/src/main/res/layout/activity_karaoke_playerr.xml +++ b/app/src/main/res/layout/activity_karaoke_playerr.xml @@ -14,7 +14,15 @@ android:layout_height="match_parent" > - + + @@ -65,13 +73,15 @@ - diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 638f862..3ce7984 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -153,4 +153,5 @@ लॉगइन पर जाएं उपयोक्तानाम मिले आपके खाते से जुड़े उपयोगकर्ता नाम + ब्लॉग \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index aef2d1e..d278728 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -136,7 +136,7 @@ Do you want to log out of Woka app? WOKA FM GAMES - Coming soonn on Woka + Coming soon on Woka WOKA LIVE TV Blogs MASILA @@ -311,4 +311,5 @@ New update available Unlock enhanced features and improved performance with our latest app update. Please select a subject + BLOGS \ No newline at end of file