DROID-3710 Release 40

.github/workflows/build-and-upload-release-apks-to-server.yml

@@ -66,6 +66,10 @@ jobs:
             --project-path . \
             --who "CI" \
             --why "MIT (verified manually from anyproto/any-crypto-kotlin)"
+          license_finder permitted_licenses add "ML Kit Terms of Service" \
+            --project-path . \
+            --who "CI" \
+            --why "Google ML Kit components required; legal reviewed"
 
           # finally run the scan
           license_finder --gradle-command="./gradlew \

.github/workflows/build-release-apks-as-github-actions-artefacts.yml

@@ -82,6 +82,10 @@ jobs:
             --project-path . \
             --who "CI" \
             --why "MIT (verified manually from anyproto/any-crypto-kotlin)"
+          license_finder permitted_licenses add "ML Kit Terms of Service" \
+            --project-path . \
+            --who "CI" \
+            --why "Google ML Kit components required; legal reviewed"
 
           # finally run the scan
           license_finder --gradle-command="./gradlew \

.github/workflows/check.yml

@@ -53,6 +53,10 @@ jobs:
             --project-path . \
             --who "CI" \
             --why "MIT (verified manually from anyproto/any-crypto-kotlin)"
+          license_finder permitted_licenses add "ML Kit Terms of Service" \
+            --project-path . \
+            --who "CI" \
+            --why "Google ML Kit components required; legal reviewed"
 
           # finally run the scan
           license_finder --gradle-command="./gradlew \

analytics/src/main/java/com/anytypeio/anytype/analytics/base/EventsDictionary.kt

@@ -180,6 +180,7 @@ object EventsDictionary {
     const val clickLogin = "ClickLogin"
     const val screenOnboardingEnterEmail = "ScreenOnboardingEnterEmail"
     const val screenOnboardingSkipEmail = "ScreenOnboardingSkipEmail"
+    const val onboardingTooltip = "OnboardingTooltip"
 
     //Primitives
     const val logScreenEditType = "ScreenEditType"
@@ -461,6 +462,7 @@ object EventsPropertiesKey {
     const val tab = "tab"
     const val route = "route"
     const val type = "type"
+    const val uxType = "uxType"
     const val format = "format"
     const val objectType = "objectType"
     const val length = "length"

app/build.gradle

@@ -47,7 +47,7 @@ android {
         testInstrumentationRunner config.test_runner
         buildConfigField "boolean", "USE_NEW_WINDOW_INSET_API", "true"
         buildConfigField "boolean", "USE_EDGE_TO_EDGE", "true"
-        buildConfigField "boolean", "MANDATORY_EMAIL_COLLECTION", "false"
+        buildConfigField "boolean", "MANDATORY_EMAIL_COLLECTION", "true"
         buildConfigField "boolean", "SHOW_CHATS", "true"
         buildConfigField "boolean", "LOG_FROM_MW_LIBRARY", localProperties.getProperty("LOG_FROM_MW_LIBRARY", "false")
         buildConfigField "boolean", "LOG_MW_INTERACTION", localProperties.getProperty("LOG_MW_INTERACTION", "true")

app/gradle.properties

@@ -1,4 +1,4 @@
 version.versionMajor=0
 version.versionMinor=40
-version.versionPatch=9
+version.versionPatch=19
 version.useDatedVersionName=false

app/src/debug/res/drawable/ic_launcher_foreground.xml

@@ -1,5 +1,4 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
     android:width="108dp"
     android:height="108dp"
     android:viewportWidth="110"
@@ -14,7 +13,7 @@
       <path
           android:pathData="M62.5,45.43V38H41.5V45.5L62.5,45.43ZM62.5,45.5H70.5V72H62.5V45.5ZM48.5,72.5C54.58,72.5 59.5,67.58 59.5,61.5C59.5,55.42 54.58,50.5 48.5,50.5C42.42,50.5 37.5,55.42 37.5,61.5C37.5,67.58 42.42,72.5 48.5,72.5Z"
           android:fillType="evenOdd"
-          android:fillColor="#000000">
+          android:fillColor="#FFFFFF">
       </path>
     </group>
   </group>

app/src/debug/res/drawable/ic_launcher_monochrome.xml

@@ -0,0 +1,13 @@
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:name="vector"
+    android:width="110dp"
+    android:height="110dp"
+    android:viewportWidth="110"
+    android:viewportHeight="110"
+>
+    <path
+        android:pathData="M 48.5 51.5 C 54.02 51.5 58.5 55.98 58.5 61.5 C 58.5 67.02 54.02 71.5 48.5 71.5 C 42.98 71.5 38.5 67.02 38.5 61.5 C 38.5 55.98 42.98 51.5 48.5 51.5 Z M 68.25 46 C 69.22 46 70 46.78 70 47.75 L 70 69.25 C 70 70.22 69.22 71 68.25 71 L 63.75 71 C 62.78 71 62 70.22 62 69.25 L 62 47.75 C 62 46.78 62.78 46 63.75 46 L 68.25 46 Z M 60.25 38 C 61.22 38 62 38.78 62 39.75 L 62 44.25 C 62 45.22 61.22 46 60.25 46 L 45.25 46 C 44.28 46 43.5 45.22 43.5 44.25 L 43.5 39.75 C 43.5 38.78 44.28 38 45.25 38 L 60.25 38 Z"
+        android:fillColor="#000000"
+    />
+</vector>

app/src/main/java/com/anytypeio/anytype/device/AnytypePushService.kt

@@ -7,6 +7,7 @@ import com.anytypeio.anytype.di.main.ConfigModule.DEFAULT_APP_COROUTINE_SCOPE
 import com.anytypeio.anytype.domain.auth.interactor.CheckAuthorizationStatus
 import com.anytypeio.anytype.domain.auth.model.AuthStatus
 import com.anytypeio.anytype.domain.base.AppCoroutineDispatchers
+import com.anytypeio.anytype.domain.base.fold
 import com.anytypeio.anytype.domain.device.DeviceTokenStoringService
 import com.google.firebase.messaging.FirebaseMessagingService
 import com.google.firebase.messaging.RemoteMessage
@@ -56,9 +57,9 @@ class AnytypePushService : FirebaseMessagingService() {
 
     private fun checkAuthorizationStatus(message: RemoteMessage) {
         scope.launch(dispatchers.io) {
-            checkAuthorizationStatus(Unit).process(
-                failure = { e -> Timber.e(e, "Error while checking auth status") },
-                success = { status ->
+            checkAuthorizationStatus.async(Unit).fold(
+                onFailure = { e -> Timber.e(e, "Error while checking auth status") },
+                onSuccess = { (status, account) ->
                     if (status == AuthStatus.UNAUTHORIZED) {
                         Timber.w("User is unauthorized, skipping push message processing")
                         // If the user is unauthorized, we do not process push messages

app/src/main/java/com/anytypeio/anytype/di/feature/MainEntryDI.kt

@@ -13,6 +13,7 @@ import com.anytypeio.anytype.domain.auth.interactor.ResumeAccount
 import com.anytypeio.anytype.domain.auth.repo.AuthRepository
 import com.anytypeio.anytype.domain.base.AppCoroutineDispatchers
 import com.anytypeio.anytype.domain.config.ConfigStorage
+import com.anytypeio.anytype.domain.config.ObserveShowSpacesIntroduction
 import com.anytypeio.anytype.domain.config.UserSettingsRepository
 import com.anytypeio.anytype.domain.deeplink.PendingIntentStore
 import com.anytypeio.anytype.domain.device.PathProvider
@@ -24,6 +25,7 @@ import com.anytypeio.anytype.domain.notifications.SystemNotificationService
 import com.anytypeio.anytype.domain.platform.InitialParamsProvider
 import com.anytypeio.anytype.domain.subscriptions.GlobalSubscriptionManager
 import com.anytypeio.anytype.domain.theme.GetTheme
+import com.anytypeio.anytype.domain.vault.SetSpacesIntroductionShown
 import com.anytypeio.anytype.domain.wallpaper.ObserveSpaceWallpaper
 import com.anytypeio.anytype.domain.workspace.SpaceManager
 import com.anytypeio.anytype.other.DefaultSpaceInviteResolver
@@ -88,7 +90,10 @@ object MainEntryModule {
         observeSpaceWallpaper: ObserveSpaceWallpaper,
         urlBuilder: UrlBuilder,
         appShutdown: AppShutdown,
-        scope: CoroutineScope
+        scope: CoroutineScope,
+        observeShowSpacesIntroduction: ObserveShowSpacesIntroduction,
+        setSpacesIntroductionShown: SetSpacesIntroductionShown,
+        appInfo: com.anytypeio.anytype.core_utils.tools.AppInfo
     ): MainViewModelFactory = MainViewModelFactory(
         resumeAccount = resumeAccount,
         analytics = analytics,
@@ -111,7 +116,10 @@ object MainEntryModule {
         observeSpaceWallpaper = observeSpaceWallpaper,
         urlBuilder = urlBuilder,
         appShutdown = appShutdown,
-        scope = scope
+        scope = scope,
+        observeShowSpacesIntroduction = observeShowSpacesIntroduction,
+        setSpacesIntroductionShown = setSpacesIntroductionShown,
+        appInfo = appInfo
     )
 
     @JvmStatic
@@ -181,8 +189,9 @@ object MainEntryModule {
     @PerScreen
     @Provides
     fun provideCheckAuthStatus(
-        repo: AuthRepository
-    ): CheckAuthorizationStatus = CheckAuthorizationStatus(repo)
+        repo: AuthRepository,
+        dispatchers: AppCoroutineDispatchers
+    ): CheckAuthorizationStatus = CheckAuthorizationStatus(repo, dispatchers)
 
     @JvmStatic
     @PerScreen

app/src/main/java/com/anytypeio/anytype/di/feature/spaces/CreateSpaceDI.kt

@@ -8,6 +8,8 @@ import com.anytypeio.anytype.domain.base.AppCoroutineDispatchers
 import com.anytypeio.anytype.domain.block.repo.BlockRepository
 import com.anytypeio.anytype.domain.config.UserSettingsRepository
 import com.anytypeio.anytype.domain.multiplayer.SpaceViewSubscriptionContainer
+import com.anytypeio.anytype.domain.multiplayer.UserPermissionProvider
+import com.anytypeio.anytype.domain.search.ProfileSubscriptionManager
 import com.anytypeio.anytype.domain.workspace.SpaceManager
 import com.anytypeio.anytype.presentation.analytics.AnalyticSpaceHelperDelegate
 import com.anytypeio.anytype.presentation.spaces.CreateSpaceViewModel
@@ -55,4 +57,6 @@ interface CreateSpaceDependencies : ComponentDependencies {
     fun analyticSpaceHelper(): AnalyticSpaceHelperDelegate
     fun spaceViews(): SpaceViewSubscriptionContainer
     fun userSettingsRepo(): UserSettingsRepository
+    fun permissions(): UserPermissionProvider
+    fun profileContainer(): ProfileSubscriptionManager
 }

app/src/main/java/com/anytypeio/anytype/di/feature/vault/VaultDI.kt

@@ -28,6 +28,7 @@ import com.anytypeio.anytype.domain.resources.StringResourceProvider
 import com.anytypeio.anytype.domain.search.ProfileSubscriptionManager
 import com.anytypeio.anytype.domain.wallpaper.GetSpaceWallpapers
 import com.anytypeio.anytype.domain.workspace.SpaceManager
+import com.anytypeio.anytype.core_utils.tools.AppInfo
 import com.anytypeio.anytype.other.DefaultSpaceInviteResolver
 import com.anytypeio.anytype.presentation.navigation.DeepLinkToObjectDelegate
 import com.anytypeio.anytype.presentation.notifications.NotificationPermissionManager
@@ -119,5 +120,6 @@ interface VaultComponentDependencies : ComponentDependencies {
     fun provideChatEventChannel(): ChatEventChannel
     fun provideStorelessSubscriptionContainer(): StorelessSubscriptionContainer
     fun provideVaultChatPreviewContainer(): ChatPreviewContainer
+    fun appInfo(): AppInfo
     @Named(DEFAULT_APP_COROUTINE_SCOPE) fun scope(): CoroutineScope
 }

app/src/main/java/com/anytypeio/anytype/ui/home/HomeScreen.kt

@@ -531,7 +531,6 @@ private fun WidgetList(
                         onDropDownMenuAction = { action ->
                             onWidgetMenuAction(item.id, action)
                         },
-                        mode = mode,
                         onWidgetSourceClicked = onWidgetSourceClicked,
                     )
                 }
@@ -613,6 +612,7 @@ private fun WidgetList(
 
                 WidgetView.Section.ObjectTypes -> {
                     SpaceObjectTypesSectionHeader(
+                        mode = mode,
                         onCreateNewTypeClicked = onCreateNewTypeClicked,
                         onSectionClicked = { onSectionClicked(SECTION_OBJECT_TYPE) }
                     )
@@ -658,6 +658,7 @@ fun WidgetEditModeButton(
 
 @Composable
 private fun SpaceObjectTypesSectionHeader(
+    mode: InteractionMode,
     onSectionClicked: () -> Unit,
     onCreateNewTypeClicked: () -> Unit
 ) {
@@ -675,16 +676,18 @@ private fun SpaceObjectTypesSectionHeader(
             style = Caption1Medium,
             color = colorResource(id = R.color.control_transparent_secondary)
         )
-        Image(
-            painter = painterResource(id = R.drawable.ic_default_plus),
-            contentDescription = "Create new type",
-            modifier = Modifier
-                .align(Alignment.BottomEnd)
-                .padding(end = 20.dp, bottom = 12.dp)
-                .size(18.dp)
-                .noRippleClickable { onCreateNewTypeClicked() },
-            contentScale = ContentScale.Inside
-        )
+        if (mode !is InteractionMode.ReadOnly) {
+            Image(
+                painter = painterResource(id = R.drawable.ic_default_plus),
+                contentDescription = "Create new type",
+                modifier = Modifier
+                    .align(Alignment.BottomEnd)
+                    .padding(end = 20.dp, bottom = 12.dp)
+                    .size(18.dp)
+                    .noRippleClickable { onCreateNewTypeClicked() },
+                contentScale = ContentScale.Inside
+            )
+        }
     }
 }
 

app/src/main/java/com/anytypeio/anytype/ui/main/MainActivity.kt

@@ -10,6 +10,8 @@ import androidx.activity.SystemBarStyle
 import androidx.activity.enableEdgeToEdge
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
 import androidx.core.os.bundleOf
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentContainerView
@@ -74,6 +76,9 @@ import javax.inject.Inject
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import timber.log.Timber
+import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.platform.ViewCompositionStrategy
+import com.anytypeio.anytype.ui.vault.SpacesIntroductionScreen
 
 class MainActivity : AppCompatActivity(R.layout.activity_main), AppNavigation.Provider {
 
@@ -116,6 +121,7 @@ class MainActivity : AppCompatActivity(R.layout.activity_main), AppNavigation.Pr
         )
         inject()
         setupTheme()
+        setupFeatureIntroductions()
 
         if (savedInstanceState != null) vm.onRestore()
 
@@ -777,6 +783,32 @@ class MainActivity : AppCompatActivity(R.layout.activity_main), AppNavigation.Pr
 
     override fun nav(): AppNavigation = navigator
 
+    /**
+     * Sets up feature introductions using Compose.
+     * Shows SpacesIntroductionScreen only after account starts and only to existing users.
+     */
+    private fun setupFeatureIntroductions() {
+        findViewById<ComposeView>(R.id.composeOverlay).apply {
+            setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
+            setContent {
+                val showSpacesIntroduction by vm.showSpacesIntroduction.collectAsState()
+                if (showSpacesIntroduction != null) {
+                    SpacesIntroductionScreen(
+                        onDismiss = {
+                            vm.onSpacesIntroductionDismissed()
+                        },
+                        onComplete = {
+                            vm.onSpacesIntroductionDismissed()
+                        },
+                        onPageChanged = { step ->
+                            vm.sendOnboardingTooltipEvent(step)
+                        }
+                    )
+                }
+            }
+        }
+    }
+
     fun inject() {
         componentManager().mainEntryComponent.get().inject(this)
     }

app/src/main/java/com/anytypeio/anytype/ui/onboarding/screens/signup/OnboardingEmailScreen.kt

@@ -192,13 +192,12 @@ private fun OnboardingEmailScreen(
                             isFocused = focusState.isFocused
                         },
                     placeholder = {
-                        if (innerValue.text.isEmpty() && !isFocused) {
-                            Text(
-                                text = stringResource(id = R.string.onboarding_enter_email),
-                                style = PreviewTitle1Regular,
-                                color = colorResource(id = R.color.text_tertiary)
-                            )
-                        }
+                        Text(
+                            modifier = Modifier.padding(start = 1.dp),
+                            text = stringResource(id = R.string.onboarding_enter_email),
+                            style = PreviewTitle1Regular,
+                            color = colorResource(id = R.color.text_tertiary)
+                        )
                     },
                     textStyle = PreviewTitle1Regular.copy(
                         color = colorResource(id = R.color.text_primary)

app/src/main/java/com/anytypeio/anytype/ui/spaces/CreateSpaceFragment.kt

@@ -25,6 +25,7 @@ import com.anytypeio.anytype.core_utils.ext.toast
 import com.anytypeio.anytype.core_utils.ui.BaseBottomSheetComposeFragment
 import com.anytypeio.anytype.di.common.componentManager
 import com.anytypeio.anytype.presentation.spaces.CreateSpaceViewModel
+import com.anytypeio.anytype.presentation.spaces.SpaceIconView
 import com.anytypeio.anytype.ui.chats.ChatFragment
 import com.anytypeio.anytype.ui.editor.EditorFragment
 import com.anytypeio.anytype.ui.home.HomeScreenFragment