Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 9 Projects Releases Packages Wiki Activity Actions

Finish removing x. from packages (keep it in app module for now)

Browse source
This commit is contained in:
ganfra 2023-01-20 18:52:59 +01:00
parent f800e22477
commit 718b37a4eb
17 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
anvilannotations/src/main/kotlin/io/element/android/x/anvilannotations/ContributesNode.kt → anvilannotations/src/main/kotlin/io/element/android/anvilannotations/ContributesNode.kt
View file

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package io.element.android.x.anvilannotations package io.element.android.anvilannotations
import kotlin.reflect.KClass import kotlin.reflect.KClass

4
anvilcodegen/src/main/kotlin/io/element/android/x/anvilcodegen/ContributesNodeCodeGenerator.kt → anvilcodegen/src/main/kotlin/io/element/android/anvilcodegen/ContributesNodeCodeGenerator.kt
View file

@ -16,7 +16,7 @@
@file:OptIn(ExperimentalAnvilApi::class) @file:OptIn(ExperimentalAnvilApi::class)
package io.element.android.x.anvilcodegen package io.element.android.anvilcodegen
import com.google.auto.service.AutoService import com.google.auto.service.AutoService
import com.squareup.anvil.annotations.ContributesTo import com.squareup.anvil.annotations.ContributesTo
@ -46,7 +46,7 @@ import dagger.assisted.Assisted
import dagger.assisted.AssistedFactory import dagger.assisted.AssistedFactory
import dagger.assisted.AssistedInject import dagger.assisted.AssistedInject
import dagger.multibindings.IntoMap import dagger.multibindings.IntoMap
import io.element.android.x.anvilannotations.ContributesNode import io.element.android.anvilannotations.ContributesNode
import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.descriptors.ModuleDescriptor
import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile

2
features/login/src/androidTest/kotlin/io/element/android/features/login/ExampleInstrumentedTest.kt
View file

@ -33,6 +33,6 @@ class ExampleInstrumentedTest {
fun useAppContext() { fun useAppContext() {
// Context of the app under test. // Context of the app under test.
val appContext = InstrumentationRegistry.getInstrumentation().targetContext val appContext = InstrumentationRegistry.getInstrumentation().targetContext
assertEquals("io.element.android.x.features.login.test", appContext.packageName) assertEquals("io.element.android.features.login.test", appContext.packageName)
} }
} }

2
features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerNode.kt
View file

@ -25,7 +25,7 @@ import com.bumble.appyx.core.node.Node
import com.bumble.appyx.core.plugin.Plugin import com.bumble.appyx.core.plugin.Plugin
import dagger.assisted.Assisted import dagger.assisted.Assisted
import dagger.assisted.AssistedInject import dagger.assisted.AssistedInject
import io.element.android.x.anvilannotations.ContributesNode import io.element.android.anvilannotations.ContributesNode
import io.element.android.libraries.architecture.presenterConnector import io.element.android.libraries.architecture.presenterConnector
import io.element.android.libraries.di.AppScope import io.element.android.libraries.di.AppScope

2
features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootNode.kt
View file

@ -27,7 +27,7 @@ import com.bumble.appyx.core.plugin.Plugin
import com.bumble.appyx.core.plugin.plugins import com.bumble.appyx.core.plugin.plugins
import dagger.assisted.Assisted import dagger.assisted.Assisted
import dagger.assisted.AssistedInject import dagger.assisted.AssistedInject
import io.element.android.x.anvilannotations.ContributesNode import io.element.android.anvilannotations.ContributesNode
import io.element.android.libraries.architecture.presenterConnector import io.element.android.libraries.architecture.presenterConnector
import io.element.android.libraries.core.compose.OnLifecycleEvent import io.element.android.libraries.core.compose.OnLifecycleEvent
import io.element.android.libraries.di.AppScope import io.element.android.libraries.di.AppScope

2
features/logout/src/androidTest/kotlin/io/element/android/features/logout/ExampleInstrumentedTest.kt
View file

@ -33,6 +33,6 @@ class ExampleInstrumentedTest {
fun useAppContext() { fun useAppContext() {
// Context of the app under test. // Context of the app under test.
val appContext = InstrumentationRegistry.getInstrumentation().targetContext val appContext = InstrumentationRegistry.getInstrumentation().targetContext
assertEquals("io.element.android.x.features.login.test", appContext.packageName) assertEquals("io.element.android.features.login.test", appContext.packageName)
} }
} }

2
features/messages/src/androidTest/kotlin/io/element/android/features/messages/ExampleInstrumentedTest.kt
View file

@ -33,6 +33,6 @@ class ExampleInstrumentedTest {
fun useAppContext() { fun useAppContext() {
// Context of the app under test. // Context of the app under test.
val appContext = InstrumentationRegistry.getInstrumentation().targetContext val appContext = InstrumentationRegistry.getInstrumentation().targetContext
assertEquals("io.element.android.x.features.messages.test", appContext.packageName) assertEquals("io.element.android.features.messages.test", appContext.packageName)
} }
} }

2
features/messages/src/main/kotlin/io/element/android/features/messages/MessagesNode.kt
View file

@ -25,7 +25,7 @@ import com.bumble.appyx.core.node.Node
import com.bumble.appyx.core.plugin.Plugin import com.bumble.appyx.core.plugin.Plugin
import dagger.assisted.Assisted import dagger.assisted.Assisted
import dagger.assisted.AssistedInject import dagger.assisted.AssistedInject
import io.element.android.x.anvilannotations.ContributesNode import io.element.android.anvilannotations.ContributesNode
import io.element.android.libraries.architecture.presenterConnector import io.element.android.libraries.architecture.presenterConnector
import io.element.android.libraries.di.RoomScope import io.element.android.libraries.di.RoomScope

2
features/onboarding/src/androidTest/kotlin/io/element/android/features/login/ExampleInstrumentedTest.kt
View file

@ -33,6 +33,6 @@ class ExampleInstrumentedTest {
fun useAppContext() { fun useAppContext() {
// Context of the app under test. // Context of the app under test.
val appContext = InstrumentationRegistry.getInstrumentation().targetContext val appContext = InstrumentationRegistry.getInstrumentation().targetContext
assertEquals("io.element.android.x.features.login.test", appContext.packageName) assertEquals("io.element.android.features.login.test", appContext.packageName)
} }
} }

2
features/preferences/src/androidTest/kotlin/io/element/android/features/preferences/ExampleInstrumentedTest.kt
View file

@ -33,6 +33,6 @@ class ExampleInstrumentedTest {
fun useAppContext() { fun useAppContext() {
// Context of the app under test. // Context of the app under test.
val appContext = InstrumentationRegistry.getInstrumentation().targetContext val appContext = InstrumentationRegistry.getInstrumentation().targetContext
assertEquals("io.element.android.x.features.preferences.test", appContext.packageName) assertEquals("io.element.android.features.preferences.test", appContext.packageName)
} }
} }

2
features/preferences/src/main/kotlin/io/element/android/features/preferences/root/PreferencesRootNode.kt
View file

@ -26,7 +26,7 @@ import com.bumble.appyx.core.plugin.Plugin
import com.bumble.appyx.core.plugin.plugins import com.bumble.appyx.core.plugin.plugins
import dagger.assisted.Assisted import dagger.assisted.Assisted
import dagger.assisted.AssistedInject import dagger.assisted.AssistedInject
import io.element.android.x.anvilannotations.ContributesNode import io.element.android.anvilannotations.ContributesNode
import io.element.android.libraries.architecture.presenterConnector import io.element.android.libraries.architecture.presenterConnector
import io.element.android.libraries.di.SessionScope import io.element.android.libraries.di.SessionScope

2
features/rageshake/src/main/kotlin/io/element/android/features/rageshake/bugreport/BugReportNode.kt
View file

@ -26,7 +26,7 @@ import com.bumble.appyx.core.plugin.Plugin
import com.bumble.appyx.core.plugin.plugins import com.bumble.appyx.core.plugin.plugins
import dagger.assisted.Assisted import dagger.assisted.Assisted
import dagger.assisted.AssistedInject import dagger.assisted.AssistedInject
import io.element.android.x.anvilannotations.ContributesNode import io.element.android.anvilannotations.ContributesNode
import io.element.android.libraries.architecture.presenterConnector import io.element.android.libraries.architecture.presenterConnector
import io.element.android.libraries.di.AppScope import io.element.android.libraries.di.AppScope

2
features/roomlist/src/androidTest/kotlin/io/element/android/features/roomlist/ExampleInstrumentedTest.kt
View file

@ -33,6 +33,6 @@ class ExampleInstrumentedTest {
fun useAppContext() { fun useAppContext() {
// Context of the app under test. // Context of the app under test.
val appContext = InstrumentationRegistry.getInstrumentation().targetContext val appContext = InstrumentationRegistry.getInstrumentation().targetContext
assertEquals("io.element.android.x.features.roomlist.test", appContext.packageName) assertEquals("io.element.android.features.roomlist.test", appContext.packageName)
} }
} }

2
features/roomlist/src/main/kotlin/io/element/android/features/roomlist/RoomListNode.kt
View file

@ -26,7 +26,7 @@ import com.bumble.appyx.core.plugin.Plugin
import com.bumble.appyx.core.plugin.plugins import com.bumble.appyx.core.plugin.plugins
import dagger.assisted.Assisted import dagger.assisted.Assisted
import dagger.assisted.AssistedInject import dagger.assisted.AssistedInject
import io.element.android.x.anvilannotations.ContributesNode import io.element.android.anvilannotations.ContributesNode
import io.element.android.libraries.architecture.presenterConnector import io.element.android.libraries.architecture.presenterConnector
import io.element.android.libraries.di.SessionScope import io.element.android.libraries.di.SessionScope
import io.element.android.libraries.matrix.core.RoomId import io.element.android.libraries.matrix.core.RoomId

2
features/template/src/main/kotlin/io/element/android/features/template/TemplateNode.kt
View file

@ -26,7 +26,7 @@ import com.bumble.appyx.core.plugin.Plugin
import dagger.assisted.Assisted import dagger.assisted.Assisted
import dagger.assisted.AssistedInject import dagger.assisted.AssistedInject
import io.element.android.libraries.architecture.presenterConnector import io.element.android.libraries.architecture.presenterConnector
import io.element.android.x.anvilannotations.ContributesNode import io.element.android.anvilannotations.ContributesNode
import io.element.android.libraries.di.AppScope import io.element.android.libraries.di.AppScope
// TODO Change to use the right Scope for your feature. For now it can be AppScope, SessionScope or RoomScope // TODO Change to use the right Scope for your feature. For now it can be AppScope, SessionScope or RoomScope

2
libraries/elementresources/build.gradle.kts
View file

@ -19,7 +19,7 @@ plugins {
} }
android { android {
namespace = "io.element.android.x.element.resources" namespace = "io.element.android.element.resources"
} }
dependencies { dependencies {

2
libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/RichTextComposerLayout.kt
View file

@ -50,7 +50,7 @@ import io.element.android.libraries.textcomposer.databinding.ViewRichTextMenuBut
import io.element.android.libraries.textcomposer.tools.setTextIfDifferent import io.element.android.libraries.textcomposer.tools.setTextIfDifferent
import uniffi.wysiwyg_composer.ActionState import uniffi.wysiwyg_composer.ActionState
import uniffi.wysiwyg_composer.ComposerAction import uniffi.wysiwyg_composer.ComposerAction
import io.element.android.x.element.resources.R as ElementR import io.element.android.element.resources.R as ElementR
import io.element.android.libraries.ui.strings.R as StringR import io.element.android.libraries.ui.strings.R as StringR
// Imported from Element Android // Imported from Element Android