rei-forks
/
element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1467 from vector-im/feature/modular_link 

Update link to Modular url from "https://modular.im/" to "https://modular.im/services/matrix-hosting-riot" and open it using ChromeCustomTab
This commit is contained in:
Benoit Marty 2020-06-10 10:12:48 +02:00 committed by GitHub
parent 0a7f77ea16 c35c94b7b7
commit ed27c35bb4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.md
View File

@ -33,6 +33,7 @@ Build 🧱:
Other changes: Other changes:
- Send plain text in the body of events containing formatted body, as per https://matrix.org/docs/spec/client_server/latest#m-room-message-msgtypes - Send plain text in the body of events containing formatted body, as per https://matrix.org/docs/spec/client_server/latest#m-room-message-msgtypes
- Update link to Modular url from "https://modular.im/" to "https://modular.im/services/matrix-hosting-riot" and open it using ChromeCustomTab
Changes in RiotX 0.21.0 (2020-05-28) Changes in RiotX 0.21.0 (2020-05-28)
=================================================== ===================================================

5
vector/src/main/java/im/vector/riotx/features/login/Config.kt
View File

@ -16,4 +16,7 @@
package im.vector.riotx.features.login package im.vector.riotx.features.login
const val MODULAR_LINK = "https://modular.im/?utm_source=riot-x-android&utm_medium=native&utm_campaign=riot-x-android-authentication" const val MODULAR_LINK = "https://modular.im/services/matrix-hosting-riot" +
"?utm_source=riot-x-android" +
"&utm_medium=native" +
"&utm_campaign=riot-x-android-authentication"

4
vector/src/main/java/im/vector/riotx/features/login/LoginServerSelectionFragment.kt
View File

@ -21,7 +21,7 @@ import android.view.View
import butterknife.OnClick import butterknife.OnClick
import com.airbnb.mvrx.withState import com.airbnb.mvrx.withState
import im.vector.riotx.R import im.vector.riotx.R
import im.vector.riotx.core.utils.openUrlInExternalBrowser import im.vector.riotx.core.utils.openUrlInChromeCustomTab
import kotlinx.android.synthetic.main.fragment_login_server_selection.* import kotlinx.android.synthetic.main.fragment_login_server_selection.*
import me.gujun.android.span.span import me.gujun.android.span.span
import javax.inject.Inject import javax.inject.Inject
@ -56,7 +56,7 @@ class LoginServerSelectionFragment @Inject constructor() : AbstractLoginFragment
@OnClick(R.id.loginServerChoiceModularLearnMore) @OnClick(R.id.loginServerChoiceModularLearnMore)
fun learnMore() { fun learnMore() {
openUrlInExternalBrowser(requireActivity(), MODULAR_LINK) openUrlInChromeCustomTab(requireActivity(), null, MODULAR_LINK)
} }
@OnClick(R.id.loginServerChoiceMatrixOrg) @OnClick(R.id.loginServerChoiceMatrixOrg)

4
vector/src/main/java/im/vector/riotx/features/login/LoginServerUrlFormFragment.kt
View File

@ -26,7 +26,7 @@ import com.jakewharton.rxbinding3.widget.textChanges
import im.vector.riotx.R import im.vector.riotx.R
import im.vector.riotx.core.extensions.hideKeyboard import im.vector.riotx.core.extensions.hideKeyboard
import im.vector.riotx.core.utils.ensureProtocol import im.vector.riotx.core.utils.ensureProtocol
import im.vector.riotx.core.utils.openUrlInExternalBrowser import im.vector.riotx.core.utils.openUrlInChromeCustomTab
import kotlinx.android.synthetic.main.fragment_login_server_url_form.* import kotlinx.android.synthetic.main.fragment_login_server_url_form.*
import javax.inject.Inject import javax.inject.Inject
@ -84,7 +84,7 @@ class LoginServerUrlFormFragment @Inject constructor() : AbstractLoginFragment()
@OnClick(R.id.loginServerUrlFormLearnMore) @OnClick(R.id.loginServerUrlFormLearnMore)
fun learnMore() { fun learnMore() {
openUrlInExternalBrowser(requireActivity(), MODULAR_LINK) openUrlInChromeCustomTab(requireActivity(), null, MODULAR_LINK)
} }
override fun resetViewModel() { override fun resetViewModel() {