From 7ec27264ffc89f8151b7b8167ebbab2350aaa943 Mon Sep 17 00:00:00 2001 From: AdityaGaikwad Date: Thu, 22 Aug 2024 20:25:22 +0530 Subject: [PATCH] Bug solving: 41 to 63 Major ones : Validation checks, Karaoke loading, game in background. --- .../karaoke/player/KaraokePlayerActivity.kt | 25 ++++++++- .../onboard/fragments/GetEmailFragment.kt | 1 + .../com/woka/onboard/views/OnboardActivity.kt | 52 ++++++++++-------- .../wokagames/playerr/GamePlayerActivity.kt | 5 ++ .../main/res/drawable-hdpi/ic_green_tick.png | Bin 0 -> 877 bytes .../main/res/drawable-ldpi/ic_green_tick.png | Bin 0 -> 445 bytes .../main/res/drawable-mdpi/ic_green_tick.png | Bin 0 -> 537 bytes .../main/res/drawable-xhdpi/ic_green_tick.png | Bin 0 -> 719 bytes .../res/drawable-xxhdpi/ic_green_tick.png | Bin 0 -> 2672 bytes .../res/drawable-xxxhdpi/ic_green_tick.png | Bin 0 -> 4116 bytes app/src/main/res/drawable/ic_green_tick.xml | 13 ----- .../main/res/layout/activity_explore_woka.xml | 2 +- .../main/res/layout/activity_game_player.xml | 39 ++++++++++++- .../res/layout/activity_karaoke_playerr.xml | 22 ++++++-- .../res/layout/fragment_get_more_info.xml | 1 - app/src/main/res/values-hi/strings.xml | 1 + app/src/main/res/values/strings.xml | 3 +- 17 files changed, 114 insertions(+), 50 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/ic_green_tick.png create mode 100644 app/src/main/res/drawable-ldpi/ic_green_tick.png create mode 100644 app/src/main/res/drawable-mdpi/ic_green_tick.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_green_tick.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_green_tick.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_green_tick.png delete mode 100644 app/src/main/res/drawable/ic_green_tick.xml 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 0000000000000000000000000000000000000000..55e65eac7e37c5b53e80ff73ccae43ceb2152b4b GIT binary patch literal 877 zcmV-z1CsoSP)g{v-$&c&_n9o*flev$ax=j=XU3hsOUF|NTIz1B9T!f^bisFAT}lPMK`FP za=V(MNti+S1I0kJHZw&>^x_oPLl1iBoO`cx_wMTElLrpl{eI8)bH3--=bM&xkdkG} zFmkVsWxC7QG zsq`P$+?Z!kz;;uzAzLB9&fD5^Zxe zFtRN{WamrT@|=XF#i!ewFx2r>Z@vv&DHh35D3Kt>7-6ZvjoBGS^xRbbLCSdo&~92a zSPIQkkKjsQam+~>Vj$L&!}0Yv`@&=rx~)^Hf+o>xeI+ow(hs4vS-3M)0cC*#X`L{r zyPPe#IWY&=*Dlf^62LF_ode(ZHV8+T;BD|Veiy54|DctHoCk!mThx(D5 zP#!3h*3b8xg4XG$u)OgL-UU0PNVFG_9k5Z}Yk9a6ftPt8XdKjhbi>^0H<(|WgN83v zaH;nUJfFA^D;tY2v@Al^fJ1Ii9S3gNLE}yY$So9B{FGLRh4A=mEd(Pou(19^x^XzV z2orxs;O?i32qG6%R})f%1);)d4arHv$SwGZQLO)q!0hUDa&W&CLD=49amE}FD^hFe zwJGJl{__o~9`}Z?;&)Q;O;A^XU4^E2DC#8$>NUW%IS6H4CHY#cSlZiHD zoAQ$xFGRV-ilsiYiw1|rpVZ#T)HyoMF4|Mk@WkX9Fq4 zlxkX0s_O`P%bB1NI}-%&aIf2GAhKEz%c{*9N}e?lz+tkcYD+bsD%NOoJq?+Ov>)+lAY&OW43oMCP6_2vpFL#7$?=G*3u`6>A13 z&vPGbGEg9nX(}FTk(FCb9kJ3I$-2#+|Haxr>Txe#jE&3Lph2riFG02NaA`c8;S;<= nJ%5MmEYeBl2* zpeEpwyqA`n4Q z0*V@BXQBrt!udM?JU1HLaqV|dfExfx!r+9o4VsW3sSlgY;Dls1RV|W7nu`@~00OW5Vp=&&yD)Pq^umpErXVnVE~qyK#2qxu*aQ&u>-mnEX(F3CNQ=D_7(}IH+Cv9$ z-AJ-r^*AlCA}A`0XSnJ(t{la-# zX1s4ch*IdnG+q6?U{JES+F9%yD0q9BttKS%@))T%KamfsZ@Cy?INCh6W}2||5u7Z` zsq8TMxK<{h#`k$HzD3$rhp<0vy9YQ?2FuY&eksSyz27V3@~abE&NjAo5Bn=-aJ=%# z5t;t{oSFaJ@X7T;hKu)M>v`<2&@EEu5+m|#?g=yB=yu5M(p4@lpoaZn27EyxW1(4L z-}K_l7#Dj~zDYJWyNrkB8(e%BeC!Vour5esfH~+(tI_umw~ALtr`u++rH$!b!N2WFOo~MsycQ&G18)v90Q$P# zAZx#t+4Y-mv&3>!Tz)8`Mc8XJ_~aezoC#3HdrwYhN4UH}&@Foh`?GEbCyIcXs5j@> z!h}-~$D?3Ot4FbaVn^{Hc0Gzg&_>|_Nn_diB=-HQU=~VvP=XY(C8zY%k^N>etr*5T zIi(-MenS0^mdtQcqu3`@(3Dz^wk#+ni+oeMrCwVeXH690lj6E^f`v)jDA+y%10lWK zGq_Z2K_^2W<}MtiX7G0menEjMyGLWfZf8#+`UA?hlV^jg{SyEH002ovPDHLkV1hIV BPyqk{ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..e0e489be334667698e9a88827d7ac1facc4e0bcb GIT binary patch literal 2672 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 SoO$d30000 - - - - - 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