mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-03-25 23:39:00 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix / post merge issues

Browse source
This commit is contained in:
Valere 2020-01-17 15:17:16 +01:00
parent 188cd6beff
commit e45c1e6c2a
6 changed files with 18 additions and 11 deletions
.idea/codeStyles
codeStyleConfig.xml
vector/src/main/java/im/vector/riotx/features
crypto/verification
choose
VerificationChooseMethodController.kt
conclusion
VerificationConclusionController.kt
emoji
VerificationEmojiCodeController.kt
request
VerificationRequestController.kt
home/room/detail
RoomDetailFragment.kt

1
.idea/codeStyles/codeStyleConfig.xml generated
View file

@ -1,5 +1,6 @@
<component name="ProjectCodeStyleConfiguration"> <component name="ProjectCodeStyleConfiguration">
<state> <state>
<option name="USE_PER_PROJECT_SETTINGS" value="true" /> <option name="USE_PER_PROJECT_SETTINGS" value="true" />
<option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
</state> </state>
</component> </component>

6
vector/src/main/java/im/vector/riotx/features/crypto/verification/choose/VerificationChooseMethodController.kt
View file

@ -18,7 +18,7 @@ package im.vector.riotx.features.crypto.verification.choose
import com.airbnb.epoxy.EpoxyController import com.airbnb.epoxy.EpoxyController
import im.vector.riotx.R import im.vector.riotx.R
import im.vector.riotx.core.epoxy.bottomsheet.bottomSheetSeparatorItem import im.vector.riotx.core.epoxy.dividerItem
import im.vector.riotx.core.resources.ColorProvider import im.vector.riotx.core.resources.ColorProvider
import im.vector.riotx.core.resources.StringProvider import im.vector.riotx.core.resources.StringProvider
import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationActionItem import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationActionItem
@ -55,7 +55,7 @@ class VerificationChooseMethodController @Inject constructor(
imageRes(R.drawable.riotx_logo) imageRes(R.drawable.riotx_logo)
} }
bottomSheetSeparatorItem { dividerItem {
id("sep0") id("sep0")
} }
@ -68,7 +68,7 @@ class VerificationChooseMethodController @Inject constructor(
listener { listener?.openCamera() } listener { listener?.openCamera() }
} }
bottomSheetSeparatorItem { dividerItem {
id("sep1") id("sep1")
} }

4
vector/src/main/java/im/vector/riotx/features/crypto/verification/conclusion/VerificationConclusionController.kt
View file

@ -18,7 +18,7 @@ package im.vector.riotx.features.crypto.verification.conclusion
import com.airbnb.epoxy.EpoxyController import com.airbnb.epoxy.EpoxyController
import im.vector.riotx.R import im.vector.riotx.R
import im.vector.riotx.core.epoxy.bottomsheet.bottomSheetSeparatorItem import im.vector.riotx.core.epoxy.dividerItem
import im.vector.riotx.core.resources.ColorProvider import im.vector.riotx.core.resources.ColorProvider
import im.vector.riotx.core.resources.StringProvider import im.vector.riotx.core.resources.StringProvider
import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationActionItem import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationActionItem
@ -76,7 +76,7 @@ class VerificationConclusionController @Inject constructor(
else -> Unit else -> Unit
} }
bottomSheetSeparatorItem { dividerItem {
id("sep0") id("sep0")
} }

12
vector/src/main/java/im/vector/riotx/features/crypto/verification/emoji/VerificationEmojiCodeController.kt
View file

@ -20,12 +20,16 @@ import com.airbnb.epoxy.EpoxyController
import com.airbnb.mvrx.Fail import com.airbnb.mvrx.Fail
import com.airbnb.mvrx.Success import com.airbnb.mvrx.Success
import im.vector.riotx.R import im.vector.riotx.R
import im.vector.riotx.core.epoxy.bottomsheet.bottomSheetSeparatorItem import im.vector.riotx.core.epoxy.dividerItem
import im.vector.riotx.core.epoxy.errorWithRetryItem import im.vector.riotx.core.epoxy.errorWithRetryItem
import im.vector.riotx.core.error.ErrorFormatter import im.vector.riotx.core.error.ErrorFormatter
import im.vector.riotx.core.resources.ColorProvider import im.vector.riotx.core.resources.ColorProvider
import im.vector.riotx.core.resources.StringProvider import im.vector.riotx.core.resources.StringProvider
import im.vector.riotx.features.crypto.verification.epoxy.* import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationActionItem
import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationDecimalCodeItem
import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationEmojisItem
import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationNoticeItem
import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationWaitingItem
import javax.inject.Inject import javax.inject.Inject
class VerificationEmojiCodeController @Inject constructor( class VerificationEmojiCodeController @Inject constructor(
@ -120,7 +124,7 @@ class VerificationEmojiCodeController @Inject constructor(
} }
private fun buildActions(state: VerificationEmojiCodeViewState) { private fun buildActions(state: VerificationEmojiCodeViewState) {
bottomSheetSeparatorItem { dividerItem {
id("sep0") id("sep0")
} }
@ -138,7 +142,7 @@ class VerificationEmojiCodeController @Inject constructor(
iconColor(colorProvider.getColor(R.color.vector_error_color)) iconColor(colorProvider.getColor(R.color.vector_error_color))
listener { listener?.onDoNotMatchButtonTapped() } listener { listener?.onDoNotMatchButtonTapped() }
} }
bottomSheetSeparatorItem { dividerItem {
id("sep1") id("sep1")
} }
bottomSheetVerificationActionItem { bottomSheetVerificationActionItem {

4
vector/src/main/java/im/vector/riotx/features/crypto/verification/request/VerificationRequestController.kt
View file

@ -20,7 +20,7 @@ import androidx.core.text.toSpannable
import com.airbnb.epoxy.EpoxyController import com.airbnb.epoxy.EpoxyController
import com.airbnb.mvrx.Loading import com.airbnb.mvrx.Loading
import im.vector.riotx.R import im.vector.riotx.R
import im.vector.riotx.core.epoxy.bottomsheet.bottomSheetSeparatorItem import im.vector.riotx.core.epoxy.dividerItem
import im.vector.riotx.core.resources.ColorProvider import im.vector.riotx.core.resources.ColorProvider
import im.vector.riotx.core.resources.StringProvider import im.vector.riotx.core.resources.StringProvider
import im.vector.riotx.core.utils.colorizeMatchingText import im.vector.riotx.core.utils.colorizeMatchingText
@ -57,7 +57,7 @@ class VerificationRequestController @Inject constructor(
notice(styledText) notice(styledText)
} }
bottomSheetSeparatorItem { dividerItem {
id("sep") id("sep")
} }

2
vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt
View file

@ -54,6 +54,7 @@ import com.airbnb.epoxy.OnModelBuildFinishedListener
import com.airbnb.mvrx.Async import com.airbnb.mvrx.Async
import com.airbnb.mvrx.Fail import com.airbnb.mvrx.Fail
import com.airbnb.mvrx.Loading import com.airbnb.mvrx.Loading
import com.airbnb.mvrx.MvRx
import com.airbnb.mvrx.Success import com.airbnb.mvrx.Success
import com.airbnb.mvrx.args import com.airbnb.mvrx.args
import com.airbnb.mvrx.fragmentViewModel import com.airbnb.mvrx.fragmentViewModel
@ -74,6 +75,7 @@ import im.vector.matrix.android.api.session.room.model.message.MessageFileConten
import im.vector.matrix.android.api.session.room.model.message.MessageImageInfoContent import im.vector.matrix.android.api.session.room.model.message.MessageImageInfoContent
import im.vector.matrix.android.api.session.room.model.message.MessageTextContent import im.vector.matrix.android.api.session.room.model.message.MessageTextContent
import im.vector.matrix.android.api.session.room.model.message.MessageType import im.vector.matrix.android.api.session.room.model.message.MessageType
import im.vector.matrix.android.api.session.room.model.message.MessageVerificationRequestContent
import im.vector.matrix.android.api.session.room.model.message.MessageVideoContent import im.vector.matrix.android.api.session.room.model.message.MessageVideoContent
import im.vector.matrix.android.api.session.room.send.SendState import im.vector.matrix.android.api.session.room.send.SendState
import im.vector.matrix.android.api.session.room.timeline.Timeline import im.vector.matrix.android.api.session.room.timeline.Timeline