forked from dsutanto/bChot-android
refactoring to id.databisnis.bachot
This commit is contained in:
@@ -7,11 +7,11 @@
|
||||
*/
|
||||
|
||||
plugins {
|
||||
id("io.element.android-library")
|
||||
id("id.databisnis.android.bachot-library")
|
||||
}
|
||||
|
||||
android {
|
||||
namespace = "io.element.android.services.appnavstate.api"
|
||||
namespace = "id.databisnis.android.bachot.services.appnavstate.api"
|
||||
}
|
||||
|
||||
dependencies {
|
||||
|
||||
+4
-4
@@ -6,11 +6,11 @@
|
||||
* Please see LICENSE files in the repository root for full details.
|
||||
*/
|
||||
|
||||
package io.element.android.services.appnavstate.api
|
||||
package id.databisnis.android.bachot.services.appnavstate.api
|
||||
|
||||
import io.element.android.libraries.matrix.api.core.RoomId
|
||||
import io.element.android.libraries.matrix.api.core.SessionId
|
||||
import io.element.android.libraries.matrix.api.room.JoinedRoom
|
||||
import id.databisnis.android.bachot.libraries.matrix.api.core.RoomId
|
||||
import id.databisnis.android.bachot.libraries.matrix.api.core.SessionId
|
||||
import id.databisnis.android.bachot.libraries.matrix.api.room.JoinedRoom
|
||||
|
||||
/**
|
||||
* Holds the active rooms for a given session so they can be reused instead of instantiating new ones.
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
* Please see LICENSE files in the repository root for full details.
|
||||
*/
|
||||
|
||||
package io.element.android.services.appnavstate.api
|
||||
package id.databisnis.android.bachot.services.appnavstate.api
|
||||
|
||||
import kotlinx.coroutines.flow.StateFlow
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
* Please see LICENSE files in the repository root for full details.
|
||||
*/
|
||||
|
||||
package io.element.android.services.appnavstate.api
|
||||
package id.databisnis.android.bachot.services.appnavstate.api
|
||||
|
||||
/**
|
||||
* A wrapper for the current navigation state of the app, along with its foreground/background state.
|
||||
+5
-5
@@ -6,12 +6,12 @@
|
||||
* Please see LICENSE files in the repository root for full details.
|
||||
*/
|
||||
|
||||
package io.element.android.services.appnavstate.api
|
||||
package id.databisnis.android.bachot.services.appnavstate.api
|
||||
|
||||
import io.element.android.libraries.matrix.api.core.RoomId
|
||||
import io.element.android.libraries.matrix.api.core.SessionId
|
||||
import io.element.android.libraries.matrix.api.core.SpaceId
|
||||
import io.element.android.libraries.matrix.api.core.ThreadId
|
||||
import id.databisnis.android.bachot.libraries.matrix.api.core.RoomId
|
||||
import id.databisnis.android.bachot.libraries.matrix.api.core.SessionId
|
||||
import id.databisnis.android.bachot.libraries.matrix.api.core.SpaceId
|
||||
import id.databisnis.android.bachot.libraries.matrix.api.core.ThreadId
|
||||
import kotlinx.coroutines.flow.StateFlow
|
||||
|
||||
/**
|
||||
+1
-1
@@ -5,6 +5,6 @@
|
||||
* Please see LICENSE files in the repository root for full details.
|
||||
*/
|
||||
|
||||
package io.element.android.services.appnavstate.api
|
||||
package id.databisnis.android.bachot.services.appnavstate.api
|
||||
|
||||
const val ROOM_OPENED_FROM_NOTIFICATION = "opened_from_notification"
|
||||
+5
-5
@@ -6,12 +6,12 @@
|
||||
* Please see LICENSE files in the repository root for full details.
|
||||
*/
|
||||
|
||||
package io.element.android.services.appnavstate.api
|
||||
package id.databisnis.android.bachot.services.appnavstate.api
|
||||
|
||||
import io.element.android.libraries.matrix.api.core.RoomId
|
||||
import io.element.android.libraries.matrix.api.core.SessionId
|
||||
import io.element.android.libraries.matrix.api.core.SpaceId
|
||||
import io.element.android.libraries.matrix.api.core.ThreadId
|
||||
import id.databisnis.android.bachot.libraries.matrix.api.core.RoomId
|
||||
import id.databisnis.android.bachot.libraries.matrix.api.core.SessionId
|
||||
import id.databisnis.android.bachot.libraries.matrix.api.core.SpaceId
|
||||
import id.databisnis.android.bachot.libraries.matrix.api.core.ThreadId
|
||||
|
||||
/**
|
||||
* Can represent the current global app navigation state.
|
||||
+5
-5
@@ -6,12 +6,12 @@
|
||||
* Please see LICENSE files in the repository root for full details.
|
||||
*/
|
||||
|
||||
package io.element.android.services.appnavstate.api
|
||||
package id.databisnis.android.bachot.services.appnavstate.api
|
||||
|
||||
import io.element.android.libraries.matrix.api.core.RoomId
|
||||
import io.element.android.libraries.matrix.api.core.SessionId
|
||||
import io.element.android.libraries.matrix.api.core.SpaceId
|
||||
import io.element.android.libraries.matrix.api.core.ThreadId
|
||||
import id.databisnis.android.bachot.libraries.matrix.api.core.RoomId
|
||||
import id.databisnis.android.bachot.libraries.matrix.api.core.SessionId
|
||||
import id.databisnis.android.bachot.libraries.matrix.api.core.SpaceId
|
||||
import id.databisnis.android.bachot.libraries.matrix.api.core.ThreadId
|
||||
|
||||
fun NavigationState.currentSessionId(): SessionId? {
|
||||
return when (this) {
|
||||
@@ -10,13 +10,13 @@ import extension.testCommonDependencies
|
||||
*/
|
||||
|
||||
plugins {
|
||||
id("io.element.android-library")
|
||||
id("id.databisnis.android.bachot-library")
|
||||
}
|
||||
|
||||
setupDependencyInjection()
|
||||
|
||||
android {
|
||||
namespace = "io.element.android.services.appnavstate.impl"
|
||||
namespace = "id.databisnis.android.bachot.services.appnavstate.impl"
|
||||
}
|
||||
|
||||
dependencies {
|
||||
|
||||
+5
-5
@@ -6,15 +6,15 @@
|
||||
* Please see LICENSE files in the repository root for full details.
|
||||
*/
|
||||
|
||||
package io.element.android.services.appnavstate.impl
|
||||
package id.databisnis.android.bachot.services.appnavstate.impl
|
||||
|
||||
import dev.zacsweers.metro.AppScope
|
||||
import dev.zacsweers.metro.ContributesBinding
|
||||
import dev.zacsweers.metro.SingleIn
|
||||
import io.element.android.libraries.matrix.api.core.RoomId
|
||||
import io.element.android.libraries.matrix.api.core.SessionId
|
||||
import io.element.android.libraries.matrix.api.room.JoinedRoom
|
||||
import io.element.android.services.appnavstate.api.ActiveRoomsHolder
|
||||
import id.databisnis.android.bachot.libraries.matrix.api.core.RoomId
|
||||
import id.databisnis.android.bachot.libraries.matrix.api.core.SessionId
|
||||
import id.databisnis.android.bachot.libraries.matrix.api.room.JoinedRoom
|
||||
import id.databisnis.android.bachot.services.appnavstate.api.ActiveRoomsHolder
|
||||
import java.util.concurrent.ConcurrentHashMap
|
||||
|
||||
@SingleIn(AppScope::class)
|
||||
+2
-2
@@ -6,12 +6,12 @@
|
||||
* Please see LICENSE files in the repository root for full details.
|
||||
*/
|
||||
|
||||
package io.element.android.services.appnavstate.impl
|
||||
package id.databisnis.android.bachot.services.appnavstate.impl
|
||||
|
||||
import androidx.lifecycle.Lifecycle
|
||||
import androidx.lifecycle.LifecycleEventObserver
|
||||
import androidx.lifecycle.ProcessLifecycleOwner
|
||||
import io.element.android.services.appnavstate.api.AppForegroundStateService
|
||||
import id.databisnis.android.bachot.services.appnavstate.api.AppForegroundStateService
|
||||
import kotlinx.coroutines.flow.MutableStateFlow
|
||||
|
||||
class DefaultAppForegroundStateService : AppForegroundStateService {
|
||||
+11
-11
@@ -6,21 +6,21 @@
|
||||
* Please see LICENSE files in the repository root for full details.
|
||||
*/
|
||||
|
||||
package io.element.android.services.appnavstate.impl
|
||||
package id.databisnis.android.bachot.services.appnavstate.impl
|
||||
|
||||
import dev.zacsweers.metro.AppScope
|
||||
import dev.zacsweers.metro.ContributesBinding
|
||||
import dev.zacsweers.metro.SingleIn
|
||||
import io.element.android.libraries.core.log.logger.LoggerTag
|
||||
import io.element.android.libraries.di.annotations.AppCoroutineScope
|
||||
import io.element.android.libraries.matrix.api.core.RoomId
|
||||
import io.element.android.libraries.matrix.api.core.SessionId
|
||||
import io.element.android.libraries.matrix.api.core.SpaceId
|
||||
import io.element.android.libraries.matrix.api.core.ThreadId
|
||||
import io.element.android.services.appnavstate.api.AppForegroundStateService
|
||||
import io.element.android.services.appnavstate.api.AppNavigationState
|
||||
import io.element.android.services.appnavstate.api.AppNavigationStateService
|
||||
import io.element.android.services.appnavstate.api.NavigationState
|
||||
import id.databisnis.android.bachot.libraries.core.log.logger.LoggerTag
|
||||
import id.databisnis.android.bachot.libraries.di.annotations.AppCoroutineScope
|
||||
import id.databisnis.android.bachot.libraries.matrix.api.core.RoomId
|
||||
import id.databisnis.android.bachot.libraries.matrix.api.core.SessionId
|
||||
import id.databisnis.android.bachot.libraries.matrix.api.core.SpaceId
|
||||
import id.databisnis.android.bachot.libraries.matrix.api.core.ThreadId
|
||||
import id.databisnis.android.bachot.services.appnavstate.api.AppForegroundStateService
|
||||
import id.databisnis.android.bachot.services.appnavstate.api.AppNavigationState
|
||||
import id.databisnis.android.bachot.services.appnavstate.api.AppNavigationStateService
|
||||
import id.databisnis.android.bachot.services.appnavstate.api.NavigationState
|
||||
import kotlinx.coroutines.CoroutineScope
|
||||
import kotlinx.coroutines.flow.MutableStateFlow
|
||||
import kotlinx.coroutines.flow.StateFlow
|
||||
+4
-4
@@ -6,7 +6,7 @@
|
||||
* Please see LICENSE files in the repository root for full details.
|
||||
*/
|
||||
|
||||
package io.element.android.services.appnavstate.impl.di
|
||||
package id.databisnis.android.bachot.services.appnavstate.impl.di
|
||||
|
||||
import android.content.Context
|
||||
import androidx.startup.AppInitializer
|
||||
@@ -14,9 +14,9 @@ import dev.zacsweers.metro.AppScope
|
||||
import dev.zacsweers.metro.BindingContainer
|
||||
import dev.zacsweers.metro.ContributesTo
|
||||
import dev.zacsweers.metro.Provides
|
||||
import io.element.android.libraries.di.annotations.ApplicationContext
|
||||
import io.element.android.services.appnavstate.api.AppForegroundStateService
|
||||
import io.element.android.services.appnavstate.impl.initializer.AppForegroundStateServiceInitializer
|
||||
import id.databisnis.android.bachot.libraries.di.annotations.ApplicationContext
|
||||
import id.databisnis.android.bachot.services.appnavstate.api.AppForegroundStateService
|
||||
import id.databisnis.android.bachot.services.appnavstate.impl.initializer.AppForegroundStateServiceInitializer
|
||||
|
||||
@BindingContainer
|
||||
@ContributesTo(AppScope::class)
|
||||
+3
-3
@@ -6,13 +6,13 @@
|
||||
* Please see LICENSE files in the repository root for full details.
|
||||
*/
|
||||
|
||||
package io.element.android.services.appnavstate.impl.initializer
|
||||
package id.databisnis.android.bachot.services.appnavstate.impl.initializer
|
||||
|
||||
import android.content.Context
|
||||
import androidx.lifecycle.ProcessLifecycleInitializer
|
||||
import androidx.startup.Initializer
|
||||
import io.element.android.services.appnavstate.api.AppForegroundStateService
|
||||
import io.element.android.services.appnavstate.impl.DefaultAppForegroundStateService
|
||||
import id.databisnis.android.bachot.services.appnavstate.api.AppForegroundStateService
|
||||
import id.databisnis.android.bachot.services.appnavstate.impl.DefaultAppForegroundStateService
|
||||
|
||||
class AppForegroundStateServiceInitializer : Initializer<AppForegroundStateService> {
|
||||
override fun create(context: Context): AppForegroundStateService {
|
||||
+16
-16
@@ -6,24 +6,24 @@
|
||||
* Please see LICENSE files in the repository root for full details.
|
||||
*/
|
||||
|
||||
package io.element.android.services.appnavstate.impl
|
||||
package id.databisnis.android.bachot.services.appnavstate.impl
|
||||
|
||||
import com.google.common.truth.Truth.assertThat
|
||||
import io.element.android.libraries.matrix.test.A_ROOM_ID
|
||||
import io.element.android.libraries.matrix.test.A_ROOM_ID_2
|
||||
import io.element.android.libraries.matrix.test.A_SESSION_ID
|
||||
import io.element.android.libraries.matrix.test.A_SESSION_ID_2
|
||||
import io.element.android.libraries.matrix.test.A_SPACE_ID
|
||||
import io.element.android.libraries.matrix.test.A_SPACE_ID_2
|
||||
import io.element.android.libraries.matrix.test.A_THREAD_ID
|
||||
import io.element.android.libraries.matrix.test.A_THREAD_ID_2
|
||||
import io.element.android.services.appnavstate.api.AppNavigationStateService
|
||||
import io.element.android.services.appnavstate.api.NavigationState
|
||||
import io.element.android.services.appnavstate.test.A_ROOM_OWNER
|
||||
import io.element.android.services.appnavstate.test.A_SESSION_OWNER
|
||||
import io.element.android.services.appnavstate.test.A_SPACE_OWNER
|
||||
import io.element.android.services.appnavstate.test.A_THREAD_OWNER
|
||||
import io.element.android.services.appnavstate.test.FakeAppForegroundStateService
|
||||
import id.databisnis.android.bachot.libraries.matrix.test.A_ROOM_ID
|
||||
import id.databisnis.android.bachot.libraries.matrix.test.A_ROOM_ID_2
|
||||
import id.databisnis.android.bachot.libraries.matrix.test.A_SESSION_ID
|
||||
import id.databisnis.android.bachot.libraries.matrix.test.A_SESSION_ID_2
|
||||
import id.databisnis.android.bachot.libraries.matrix.test.A_SPACE_ID
|
||||
import id.databisnis.android.bachot.libraries.matrix.test.A_SPACE_ID_2
|
||||
import id.databisnis.android.bachot.libraries.matrix.test.A_THREAD_ID
|
||||
import id.databisnis.android.bachot.libraries.matrix.test.A_THREAD_ID_2
|
||||
import id.databisnis.android.bachot.services.appnavstate.api.AppNavigationStateService
|
||||
import id.databisnis.android.bachot.services.appnavstate.api.NavigationState
|
||||
import id.databisnis.android.bachot.services.appnavstate.test.A_ROOM_OWNER
|
||||
import id.databisnis.android.bachot.services.appnavstate.test.A_SESSION_OWNER
|
||||
import id.databisnis.android.bachot.services.appnavstate.test.A_SPACE_OWNER
|
||||
import id.databisnis.android.bachot.services.appnavstate.test.A_THREAD_OWNER
|
||||
import id.databisnis.android.bachot.services.appnavstate.test.FakeAppForegroundStateService
|
||||
import kotlinx.coroutines.flow.first
|
||||
import kotlinx.coroutines.test.TestScope
|
||||
import kotlinx.coroutines.test.runTest
|
||||
@@ -7,11 +7,11 @@
|
||||
*/
|
||||
|
||||
plugins {
|
||||
id("io.element.android-library")
|
||||
id("id.databisnis.android.bachot-library")
|
||||
}
|
||||
|
||||
android {
|
||||
namespace = "io.element.android.services.appnavstate.test"
|
||||
namespace = "id.databisnis.android.bachot.services.appnavstate.test"
|
||||
}
|
||||
|
||||
dependencies {
|
||||
|
||||
+7
-7
@@ -6,14 +6,14 @@
|
||||
* Please see LICENSE files in the repository root for full details.
|
||||
*/
|
||||
|
||||
package io.element.android.services.appnavstate.test
|
||||
package id.databisnis.android.bachot.services.appnavstate.test
|
||||
|
||||
import io.element.android.libraries.matrix.api.core.MAIN_SPACE
|
||||
import io.element.android.libraries.matrix.api.core.RoomId
|
||||
import io.element.android.libraries.matrix.api.core.SessionId
|
||||
import io.element.android.libraries.matrix.api.core.SpaceId
|
||||
import io.element.android.libraries.matrix.api.core.ThreadId
|
||||
import io.element.android.services.appnavstate.api.NavigationState
|
||||
import id.databisnis.android.bachot.libraries.matrix.api.core.MAIN_SPACE
|
||||
import id.databisnis.android.bachot.libraries.matrix.api.core.RoomId
|
||||
import id.databisnis.android.bachot.libraries.matrix.api.core.SessionId
|
||||
import id.databisnis.android.bachot.libraries.matrix.api.core.SpaceId
|
||||
import id.databisnis.android.bachot.libraries.matrix.api.core.ThreadId
|
||||
import id.databisnis.android.bachot.services.appnavstate.api.NavigationState
|
||||
|
||||
const val A_SESSION_OWNER = "aSessionOwner"
|
||||
const val A_SPACE_OWNER = "aSpaceOwner"
|
||||
+2
-2
@@ -6,9 +6,9 @@
|
||||
* Please see LICENSE files in the repository root for full details.
|
||||
*/
|
||||
|
||||
package io.element.android.services.appnavstate.test
|
||||
package id.databisnis.android.bachot.services.appnavstate.test
|
||||
|
||||
import io.element.android.services.appnavstate.api.AppForegroundStateService
|
||||
import id.databisnis.android.bachot.services.appnavstate.api.AppForegroundStateService
|
||||
import kotlinx.coroutines.flow.MutableStateFlow
|
||||
|
||||
class FakeAppForegroundStateService(
|
||||
+8
-8
@@ -6,15 +6,15 @@
|
||||
* Please see LICENSE files in the repository root for full details.
|
||||
*/
|
||||
|
||||
package io.element.android.services.appnavstate.test
|
||||
package id.databisnis.android.bachot.services.appnavstate.test
|
||||
|
||||
import io.element.android.libraries.matrix.api.core.RoomId
|
||||
import io.element.android.libraries.matrix.api.core.SessionId
|
||||
import io.element.android.libraries.matrix.api.core.SpaceId
|
||||
import io.element.android.libraries.matrix.api.core.ThreadId
|
||||
import io.element.android.services.appnavstate.api.AppNavigationState
|
||||
import io.element.android.services.appnavstate.api.AppNavigationStateService
|
||||
import io.element.android.services.appnavstate.api.NavigationState
|
||||
import id.databisnis.android.bachot.libraries.matrix.api.core.RoomId
|
||||
import id.databisnis.android.bachot.libraries.matrix.api.core.SessionId
|
||||
import id.databisnis.android.bachot.libraries.matrix.api.core.SpaceId
|
||||
import id.databisnis.android.bachot.libraries.matrix.api.core.ThreadId
|
||||
import id.databisnis.android.bachot.services.appnavstate.api.AppNavigationState
|
||||
import id.databisnis.android.bachot.services.appnavstate.api.AppNavigationStateService
|
||||
import id.databisnis.android.bachot.services.appnavstate.api.NavigationState
|
||||
import kotlinx.coroutines.flow.MutableStateFlow
|
||||
|
||||
class FakeAppNavigationStateService(
|
||||
Reference in New Issue
Block a user