- With your secret recovery phrase in place, you are almost ready to get started with Concordium. -
-- The only thing you need before you can create your first account, is to get a Concordium - Identity from one of the identity providers. -
- - diff --git a/app/src/main/assets/identity_intro_flow_en_2.html b/app/src/main/assets/identity_intro_flow_en_2.html deleted file mode 100644 index 8e691849..00000000 --- a/app/src/main/assets/identity_intro_flow_en_2.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - -- All accounts on the Concordium blockchain are tied to an identity. So, you need to verify your - identity before you can begin transacting on the blockchain. -
-- Due to the decentralised nature of the Concordium blockchain, identity verification is done by - third parties and not by Concordium. -
-- This means that Concordium doesn't know your identity. The identity only exists in your wallet - and as an encrypted copy with the identity provider. -
- - diff --git a/app/src/main/assets/identity_intro_flow_en_3.html b/app/src/main/assets/identity_intro_flow_en_3.html deleted file mode 100644 index 87a7b6e3..00000000 --- a/app/src/main/assets/identity_intro_flow_en_3.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - -- You can choose which identity provider you want to use yourself. -
-- Once one of the identity providers has verified your real life identity, they will return the - Concordium Identity to your wallet. -
-- To become verified, you will have to supply one or more photos of an official ID document, for - example a passport or a drivers license. You will also need to supply a photo of yourself. -
- - diff --git a/app/src/main/assets/identity_intro_flow_en_4.html b/app/src/main/assets/identity_intro_flow_en_4.html deleted file mode 100644 index f1efad8f..00000000 --- a/app/src/main/assets/identity_intro_flow_en_4.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - -- Identities and accounts are not same on Concordium. -
-- Once you get your Concordium identity from the identity provider, you can use it to open your - first account on the blockchain. -
-- Now, let’s get you set up with an identity, so you can get started using Concordium! -
- - diff --git a/app/src/main/java/com/concordium/wallet/ui/MainActivity.kt b/app/src/main/java/com/concordium/wallet/ui/MainActivity.kt index 5b81c025..3fa80fd5 100644 --- a/app/src/main/java/com/concordium/wallet/ui/MainActivity.kt +++ b/app/src/main/java/com/concordium/wallet/ui/MainActivity.kt @@ -19,7 +19,6 @@ import com.concordium.wallet.ui.common.delegates.AuthDelegate import com.concordium.wallet.ui.common.delegates.AuthDelegateImpl import com.concordium.wallet.ui.common.delegates.IdentityStatusDelegate import com.concordium.wallet.ui.common.delegates.IdentityStatusDelegateImpl -import com.concordium.wallet.ui.identity.identityproviderlist.IdentityProviderListActivity import com.concordium.wallet.ui.more.import.ImportActivity import com.concordium.wallet.ui.more.moreoverview.MoreOverviewFragment import com.concordium.wallet.ui.news.NewsOverviewFragment @@ -36,7 +35,6 @@ class MainActivity : BaseActivity(R.layout.activity_main, R.string.accounts_over IdentityStatusDelegate by IdentityStatusDelegateImpl() { companion object { - const val EXTRA_CREATE_FIRST_IDENTITY = "EXTRA_CREATE_FIRST_IDENTITY" const val EXTRA_WALLET_CONNECT_URI = "wc_uri" } @@ -75,10 +73,6 @@ class MainActivity : BaseActivity(R.layout.activity_main, R.string.accounts_over } handlePossibleWalletConnectUri(intent) - - if (intent.getBooleanExtra(EXTRA_CREATE_FIRST_IDENTITY, false)) { - goToFirstIdentityCreation() - } } override fun onResume() { @@ -282,11 +276,5 @@ class MainActivity : BaseActivity(R.layout.activity_main, R.string.accounts_over walletConnectViewModel.handleWcUri(walletConnectUri) } } - - private fun goToFirstIdentityCreation() { - val intent = Intent(this, IdentityProviderListActivity::class.java) - intent.putExtra(IdentityProviderListActivity.SHOW_FOR_FIRST_IDENTITY, true) - startActivity(intent) - } //endregion } diff --git a/app/src/main/java/com/concordium/wallet/ui/identity/identitycreate/IdentityIntroFlow.kt b/app/src/main/java/com/concordium/wallet/ui/identity/identitycreate/IdentityIntroFlow.kt deleted file mode 100644 index 05b53704..00000000 --- a/app/src/main/java/com/concordium/wallet/ui/identity/identitycreate/IdentityIntroFlow.kt +++ /dev/null @@ -1,52 +0,0 @@ -package com.concordium.wallet.ui.identity.identitycreate - -import android.content.Intent -import android.os.Bundle -import com.concordium.wallet.R -import com.concordium.wallet.ui.MainActivity -import com.concordium.wallet.ui.common.GenericFlowActivity - -class IdentityIntroFlow : GenericFlowActivity(R.string.identity_intro_flow_title) { - companion object { - val TITLES = intArrayOf( - R.string.identity_intro_flow_subtitle1, - R.string.identity_intro_flow_subtitle2, - R.string.identity_intro_flow_subtitle3, - R.string.identity_intro_flow_subtitle4 - ) - const val MAX_PAGES = 4 - } - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - hideActionBarBack(isVisible = false) - - showProgressLine = true - progressLineFilledDots = 3 - progressLineTotalDots = 5 - updateViews() - } - - override fun onBackPressed() { - } - - override fun gotoContinue() { - finishAffinity() - val intent = Intent(this, MainActivity::class.java) - intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP) - intent.putExtra(MainActivity.EXTRA_CREATE_FIRST_IDENTITY, true) - startActivity(intent) - } - - override fun getMaxPages(): Int { - return MAX_PAGES - } - - override fun getPageTitle(position: Int): Int { - return TITLES[position] - } - - override fun getLink(position: Int): String { - return "file:///android_asset/identity_intro_flow_en_" + (position + 1) + ".html" - } -} diff --git a/app/src/main/java/com/concordium/wallet/ui/identity/identityproviderlist/IdentityProviderAdapter.kt b/app/src/main/java/com/concordium/wallet/ui/identity/identityproviderlist/IdentityProviderAdapter.kt index 956df9a9..93552688 100644 --- a/app/src/main/java/com/concordium/wallet/ui/identity/identityproviderlist/IdentityProviderAdapter.kt +++ b/app/src/main/java/com/concordium/wallet/ui/identity/identityproviderlist/IdentityProviderAdapter.kt @@ -56,9 +56,8 @@ class IdentityProviderAdapter( //region OnItemClickListener //************************************************************ - interface OnItemClickListener { + fun interface OnItemClickListener { fun onItemClicked(item: IdentityProvider) - fun onItemActionClicked(item: IdentityProvider) } fun setOnItemClickListener(onItemClickListener: OnItemClickListener) { diff --git a/app/src/main/java/com/concordium/wallet/ui/identity/identityproviderlist/IdentityProviderListActivity.kt b/app/src/main/java/com/concordium/wallet/ui/identity/identityproviderlist/IdentityProviderListActivity.kt index fd8c2aa0..51f392c0 100644 --- a/app/src/main/java/com/concordium/wallet/ui/identity/identityproviderlist/IdentityProviderListActivity.kt +++ b/app/src/main/java/com/concordium/wallet/ui/identity/identityproviderlist/IdentityProviderListActivity.kt @@ -11,7 +11,6 @@ import com.concordium.wallet.databinding.ActivityIdentityProviderListBinding import com.concordium.wallet.ui.base.BaseActivity import com.concordium.wallet.ui.common.delegates.AuthDelegate import com.concordium.wallet.ui.common.delegates.AuthDelegateImpl -import com.concordium.wallet.ui.identity.identityproviderpolicywebview.IdentityProviderPolicyWebViewActivity import com.concordium.wallet.ui.identity.identityproviderwebview.IdentityProviderWebviewActivity class IdentityProviderListActivity : BaseActivity( @@ -93,16 +92,9 @@ class IdentityProviderListActivity : BaseActivity( } private fun initializeList() { - identityProviderAdapter.setOnItemClickListener(object : - IdentityProviderAdapter.OnItemClickListener { - override fun onItemClicked(item: IdentityProvider) { - viewModel.selectedIdentityVerificationItem(item) - } - - override fun onItemActionClicked(item: IdentityProvider) { - gotoIdentityProviderPolicyWebView(item) - } - }) + identityProviderAdapter.setOnItemClickListener { item: IdentityProvider -> + viewModel.selectedIdentityVerificationItem(item) + } binding.recyclerview.adapter = identityProviderAdapter viewModel.identityProviderList.observe(this, identityProviderAdapter::setData) @@ -122,13 +114,6 @@ class IdentityProviderListActivity : BaseActivity( } } - private fun gotoIdentityProviderPolicyWebView(identityProvider: IdentityProvider) { - identityProvider.metadata - val intent = Intent(this, IdentityProviderPolicyWebViewActivity::class.java) - intent.putExtra(IdentityProviderPolicyWebViewActivity.EXTRA_URL, "https://google.com") - startActivity(intent) - } - private fun showWaiting(waiting: Boolean) { if (waiting) { binding.progress.progressLayout.visibility = View.VISIBLE diff --git a/app/src/main/java/com/concordium/wallet/ui/identity/identityproviderpolicywebview/IdentityProviderPolicyWebViewActivity.kt b/app/src/main/java/com/concordium/wallet/ui/identity/identityproviderpolicywebview/IdentityProviderPolicyWebViewActivity.kt deleted file mode 100644 index 1e9bd4fd..00000000 --- a/app/src/main/java/com/concordium/wallet/ui/identity/identityproviderpolicywebview/IdentityProviderPolicyWebViewActivity.kt +++ /dev/null @@ -1,66 +0,0 @@ -package com.concordium.wallet.ui.identity.identityproviderpolicywebview - -import android.os.Bundle -import android.webkit.WebResourceRequest -import android.webkit.WebView -import android.webkit.WebViewClient -import androidx.lifecycle.ViewModelProvider -import com.concordium.wallet.R -import com.concordium.wallet.databinding.ActivityIdentityProviderPolicyWebviewBinding -import com.concordium.wallet.ui.base.BaseActivity - -class IdentityProviderPolicyWebViewActivity : BaseActivity( - R.layout.activity_identity_provider_policy_webview, - R.string.identity_provider_webview_title -) { - - companion object { - const val EXTRA_URL = "EXTRA_URL" - } - - private lateinit var viewModel: IdentityProviderPolicyWebViewViewModel - private val binding by lazy { - ActivityIdentityProviderPolicyWebviewBinding.bind(findViewById(R.id.root_layout)) - } - - //region Lifecycle - //************************************************************ - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - - val url = intent.extras!!.getString(EXTRA_URL) as String - - initializeViewModel() - viewModel.initialize(url) - initViews() - } - - //endregion - - //region Initialize - //************************************************************ - - private fun initializeViewModel() { - viewModel = ViewModelProvider( - this, - ViewModelProvider.AndroidViewModelFactory.getInstance(application) - )[IdentityProviderPolicyWebViewViewModel::class.java] - } - - fun initViews() { - binding.webview.webViewClient = object : WebViewClient() { - override fun shouldOverrideUrlLoading( - view: WebView?, - request: WebResourceRequest? - ): Boolean { - view?.loadUrl(request?.url.toString()) - return false - } - } - - binding.webview.loadUrl(viewModel.url) - } - - //endregion -} diff --git a/app/src/main/java/com/concordium/wallet/ui/identity/identityproviderpolicywebview/IdentityProviderPolicyWebViewViewModel.kt b/app/src/main/java/com/concordium/wallet/ui/identity/identityproviderpolicywebview/IdentityProviderPolicyWebViewViewModel.kt deleted file mode 100644 index 389b47dc..00000000 --- a/app/src/main/java/com/concordium/wallet/ui/identity/identityproviderpolicywebview/IdentityProviderPolicyWebViewViewModel.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.concordium.wallet.ui.identity.identityproviderpolicywebview - -import android.app.Application -import androidx.lifecycle.AndroidViewModel - -class IdentityProviderPolicyWebViewViewModel(application: Application) : - AndroidViewModel(application) { - lateinit var url: String - - fun initialize(url: String) { - this.url = url - } -} diff --git a/app/src/main/java/com/concordium/wallet/ui/identity/identityproviderwebview/IdentityProviderWebviewActivity.kt b/app/src/main/java/com/concordium/wallet/ui/identity/identityproviderwebview/IdentityProviderWebviewActivity.kt index ef352fe2..4e8d7149 100644 --- a/app/src/main/java/com/concordium/wallet/ui/identity/identityproviderwebview/IdentityProviderWebviewActivity.kt +++ b/app/src/main/java/com/concordium/wallet/ui/identity/identityproviderwebview/IdentityProviderWebviewActivity.kt @@ -258,7 +258,9 @@ class IdentityProviderWebviewActivity : BaseActivity( private fun gotoIdentityConfirmed(identity: Identity) { finish() if (showForFirstIdentity) { + finishAffinity() val intent = Intent(this, MainActivity::class.java) + intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP) startActivity(intent) } else { val intent = Intent(this, IdentityConfirmedActivity::class.java) diff --git a/app/src/main/java/com/concordium/wallet/ui/onboarding/OnboardingFragment.kt b/app/src/main/java/com/concordium/wallet/ui/onboarding/OnboardingFragment.kt index 28a7b229..2372df6a 100644 --- a/app/src/main/java/com/concordium/wallet/ui/onboarding/OnboardingFragment.kt +++ b/app/src/main/java/com/concordium/wallet/ui/onboarding/OnboardingFragment.kt @@ -296,4 +296,4 @@ class OnboardingFragment @JvmOverloads constructor( newAccountViewModel.createAccount() } } -} \ No newline at end of file +} diff --git a/app/src/main/res/drawable/ccx_ai_assistant_card_background.xml b/app/src/main/res/drawable/ccx_ai_assistant_card_background.xml deleted file mode 100644 index f021b630..00000000 --- a/app/src/main/res/drawable/ccx_ai_assistant_card_background.xml +++ /dev/null @@ -1,30 +0,0 @@ - -