Merge branch 'development' of github.com:projectNEWM/newm-mobile into more-fixes

* 'development' of github.com:projectNEWM/newm-mobile:
  Exclude CancellationException from sentry (#333)
  Remove unnecessary assets (#334)
  Removed unused assets (#332)
  Fix crash in error logger (#331)
  Attempt to fix Google sign-in user switch (#330)
  Add shadows to make music player elements more readable (#329)
  add track duration placeholder (#328)
  Add support for track shuffling (#327)
  Pre Release Fixes (#326)

Author: martyu

android/app-newm/build.gradle.kts

@@ -154,19 +154,22 @@ fun getCurrentDateTimeVersionCode(): Int {
 /**
  * Generates a custom version name based on the provided major version and the current date and time.
  *
- * The version name follows the format: `major.YYYY.MMDDHHmm`, where:
+ * The version name follows the format: `major.yyMMdd.HHmm`, where:
  * - `major`: The major version number passed as a parameter.
- * - `YYYY`: The current year.
- * - `MMDD`: The current month and day.
- * - `HHmm`: The current hour and minute.
+ * - `yy`: The current two-digit year.
+ * - `MMdd`: The current month and day.
+ * - `HH`: The current hour in 24-hour format.
+ * - `mm`: The current minute.
  *
  * The function retrieves the current date and time using `SimpleDateFormat` to format each component.
  *
+ * Example output for `major = 1` on October 1st, 2024 at 13:45 would be: `1.241001.1345`.
+ *
  * @param major The major version number to be used as the first part of the version name.
- * @return A custom version name string in the format: `major.YYYY.MMDDHHmm`.
+ * @return A custom version name string in the format: `major.yyMMdd.HHmm`.
  */
 fun getCustomVersionName(major: Int): String {
-    val yearFormat = SimpleDateFormat("yyyy")
+    val yearFormat = SimpleDateFormat("yy")
     val monthDayFormat = SimpleDateFormat("MMdd")
     val hourFormat = SimpleDateFormat("HH")
     val minuteFormat = SimpleDateFormat("mm")
@@ -176,5 +179,5 @@ fun getCustomVersionName(major: Int): String {
     val hour = hourFormat.format(Date())
     val minute = minuteFormat.format(Date())
 
-    return "$major.$year.$monthDay$hour$minute"
+    return "$major.$year$monthDay.$hour$minute"
 }

android/app-newm/src/main/java/io/newm/Logout.kt

@@ -3,6 +3,7 @@
 package io.newm
 
 import android.content.Context
+import com.google.android.gms.auth.api.signin.GoogleSignInClient
 import com.jakewharton.processphoenix.ProcessPhoenix
 import io.newm.shared.NewmAppLogger
 import io.newm.shared.public.usecases.LoginUseCase
@@ -17,13 +18,15 @@ class Logout(
     private val userSessionUseCase: UserSessionUseCase,
     private val restartApp: RestartApp,
     private val scope: CoroutineScope,
-    private val logger: NewmAppLogger
+    private val logger: NewmAppLogger,
+    private val googleSignInClient: GoogleSignInClient
 ) {
 
     fun signOutUser() {
         scope.launch {
             try {
                 loginUseCase.logout()
+                googleSignInClient.signOut()
                 logger.info("Logout", "Logout successful")
                 restartApp.run()
             } catch (e: Exception) {

android/app-newm/src/main/java/io/newm/di/android/Dependencies.kt

@@ -14,8 +14,6 @@ import io.newm.feature.login.screen.createaccount.CreateAccountScreenPresenter
 import io.newm.feature.login.screen.login.LoginScreenPresenter
 import io.newm.feature.login.screen.resetpassword.ResetPasswordScreenPresenter
 import io.newm.feature.login.screen.welcome.WelcomeScreenPresenter
-import io.newm.feature.musicplayer.repository.MockMusicRepository
-import io.newm.feature.musicplayer.repository.MusicRepository
 import io.newm.screens.forceupdate.ForceAppUpdatePresenter
 import io.newm.screens.library.NFTLibraryPresenter
 import io.newm.screens.profile.edit.ProfileEditPresenter
@@ -41,20 +39,18 @@ val viewModule = module {
             get()
         , get())
     }
-    single<GoogleSignInLauncher> {
+    single {
         val sharedBuildConfig = get<NewmSharedBuildConfig>()
-
-        GoogleSignInLauncherImpl(
-            GoogleSignIn.getClient(
-                androidContext(),
-                GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN)
-                    .requestIdToken(sharedBuildConfig.googleAuthClientId)
-                    .requestScopes(Scope(Scopes.EMAIL), Scope(Scopes.PROFILE))
-                    .requestEmail()
-                    .build()
-            )
+        GoogleSignIn.getClient(
+            androidContext(),
+            GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN)
+                .requestIdToken(sharedBuildConfig.googleAuthClientId)
+                .requestScopes(Scope(Scopes.EMAIL), Scope(Scopes.PROFILE))
+                .requestEmail()
+                .build()
         )
     }
+    single<GoogleSignInLauncher> { GoogleSignInLauncherImpl(get()) }
     factory { params ->
         WelcomeScreenPresenter(
             navigator = params.get(),
@@ -105,10 +101,9 @@ val viewModule = module {
             params.get(),
         )
     }
-    single<MusicRepository> { MockMusicRepository(androidContext()) }
 }
 
 val androidModules = module {
-    single { Logout(get(), get(), get(), get(), get()) }
+    single { Logout(get(), get(), get(), get(), get(), get()) }
     single { RestartApp(get()) }
 }

android/app-newm/src/main/java/io/newm/screens/Screen.kt

@@ -20,14 +20,14 @@ sealed class Screen(val screenName: String) : CircuitScreen {
 
     data object ForceAppUpdate : Screen(screenName = AppScreens.ForceUpdateScreen.name)
 
-    data object TermsAndConditions : Screen(screenName = AppScreens.TermsAndConditionsScreen.name), WebBrowserScreen {
+    data object TermsOfService : Screen(screenName = AppScreens.TermsOfServiceScreen.name), WebBrowserScreen {
         @IgnoredOnParcel
-        override val url: String = "https://newm.io/terms-and-conditions"
+        override val url: String = "https://newm.io/app-tos"
     }
 
     data object PrivacyPolicy : Screen(screenName = AppScreens.PrivacyPolicyScreen.name), WebBrowserScreen {
         @IgnoredOnParcel
-        override val url: String = "https://newm.io/privacy-policy"
+        override val url: String = "https://newm.io/app-privacy"
 
     }
 }