diff --git a/.gitignore b/.gitignore index 4cc00a7e1f..dd64e70b22 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,8 @@ local.properties # User-specific configurations .idea +!.idea/codeStyles +!.idea/inspectionProfiles # LayoutInspector files /captures @@ -26,4 +28,4 @@ local.properties **/fastlane/report.xml **/fastlane/Preview.html **/fastlane/screenshots -**/fastlane/test_output \ No newline at end of file +**/fastlane/test_output diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000000..ad9c1261c4 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,204 @@ + + + + \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000000..79ee123c2b --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000000..ba5af7a4ce --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,92 @@ + + + + \ No newline at end of file diff --git a/app/src/main/java/com/tangem/tap/common/feedback/FeedbackManager.kt b/app/src/main/java/com/tangem/tap/common/feedback/FeedbackManager.kt index dccb805723..4e551608e5 100644 --- a/app/src/main/java/com/tangem/tap/common/feedback/FeedbackManager.kt +++ b/app/src/main/java/com/tangem/tap/common/feedback/FeedbackManager.kt @@ -12,6 +12,7 @@ import java.io.FileWriter import java.io.StringWriter import timber.log.Timber import zendesk.configurations.Configuration +import zendesk.core.AnonymousIdentity import zendesk.core.Zendesk import zendesk.support.Support import zendesk.support.request.RequestConfiguration @@ -36,6 +37,7 @@ class FeedbackManager( /* oauthClientId = */ zendeskConfig.clientId, ) Support.INSTANCE.init(Zendesk.INSTANCE) + Zendesk.INSTANCE.setIdentity(AnonymousIdentity()) } fun sendEmail(feedbackData: FeedbackData, onFail: ((Exception) -> Unit)? = null) { diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletMiddleware.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletMiddleware.kt index 7a4ac13ea5..7c63b551f9 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletMiddleware.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletMiddleware.kt @@ -1,8 +1,5 @@ package com.tangem.tap.features.wallet.redux.middlewares -import android.content.Intent -import android.net.Uri -import androidx.core.content.ContextCompat import com.tangem.blockchain.blockchains.solana.RentProvider import com.tangem.blockchain.common.Amount import com.tangem.blockchain.common.AmountType @@ -15,12 +12,7 @@ import com.tangem.domain.common.extensions.withMainContext import com.tangem.operations.attestation.Attestation import com.tangem.operations.attestation.OnlineCardVerifier import com.tangem.tap.common.analytics.Analytics -import com.tangem.tap.common.extensions.copyToClipboard -import com.tangem.tap.common.extensions.dispatchDebugErrorNotification -import com.tangem.tap.common.extensions.dispatchOnMain -import com.tangem.tap.common.extensions.onCardScanned -import com.tangem.tap.common.extensions.shareText -import com.tangem.tap.common.extensions.stripZeroPlainString +import com.tangem.tap.common.extensions.* import com.tangem.tap.common.redux.AppState import com.tangem.tap.common.redux.global.GlobalAction import com.tangem.tap.common.redux.navigation.AppScreen @@ -233,9 +225,7 @@ class WalletMiddleware { action.context.shareText(action.address) } is WalletAction.ExploreAddress -> { - val uri = Uri.parse(action.exploreUrl) - val intent = Intent(Intent.ACTION_VIEW, uri) - ContextCompat.startActivity(action.context, intent, null) + store.dispatchOpenUrl(action.exploreUrl) } is WalletAction.Send -> { val newAction = prepareSendAction(action.amount, store.state.walletState) diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt index 176fa48a14..73f315e29b 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt @@ -13,6 +13,7 @@ import androidx.recyclerview.widget.RecyclerView import androidx.transition.TransitionInflater import by.kirich1409.viewbindingdelegate.viewBinding import coil.load +import coil.size.Scale import com.tangem.tap.MainActivity import com.tangem.tap.common.extensions.show import com.tangem.tap.common.recyclerView.SpaceItemDecoration @@ -166,6 +167,8 @@ class WalletFragment : Fragment(R.layout.fragment_wallet), StoreSubscriber diff --git a/app/src/main/res/layout/fragment_wallet.xml b/app/src/main/res/layout/fragment_wallet.xml index 1545257fc9..d9339cbb3a 100644 --- a/app/src/main/res/layout/fragment_wallet.xml +++ b/app/src/main/res/layout/fragment_wallet.xml @@ -46,24 +46,24 @@ android:id="@+id/cl_wallet" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingBottom="74dp"> + android:paddingBottom="74dp" + android:clipToPadding="false"> + android:id="@+id/iv_card" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:layout_marginTop="8dp" + android:layout_marginEnd="16dp" + android:layout_marginBottom="12dp" + android:scaleType="fitCenter" + android:adjustViewBounds="true" + android:elevation="3dp" + android:maxHeight="215dp" + android:contentDescription="@null" + app:layout_constraintTop_toTopOf="parent" + tools:src="@drawable/card_placeholder_black" /> @@ -185,29 +187,29 @@ android:layout_height="wrap_content" android:visibility="gone" android:layout_marginTop="30dp" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" app:layout_constraintTop_toBottomOf="@id/l_address" app:layout_constraintVertical_bias="1" app:layout_constraintBottom_toBottomOf="parent" /> + + - - - - - diff --git a/app/src/main/res/layout/item_currency_wallet.xml b/app/src/main/res/layout/item_currency_wallet.xml index de692cfa83..7f145c3e1d 100644 --- a/app/src/main/res/layout/item_currency_wallet.xml +++ b/app/src/main/res/layout/item_currency_wallet.xml @@ -18,11 +18,12 @@ + android:paddingTop="12dp" + android:paddingBottom="12dp" + android:paddingStart="16dp" + android:paddingEnd="16dp" + android:animateLayoutChanges="true" + android:clipToPadding="false"> + tools:src="@drawable/shape_circle" + tools:tint="@color/iconGray" /> + + + android:id="@+id/badge_custom_balance" + android:layout_width="10dp" + android:layout_height="10dp" + android:background="@drawable/shape_badge_custom_currency" + android:visibility="gone" + app:layout_constraintBottom_toBottomOf="@id/iv_currency" + app:layout_constraintEnd_toEndOf="@id/iv_currency" + tools:visibility="visible" /> Скрыть Вы скрываете токен с главного экрана, но в любой момент сможете добавить его обратно. Невозможно скрыть %s - Токен %s является основной валютой в сети %s и не может быть скрыт, до тех пор пока у вас в списке есть другие токены этой сети. + + Токен %s является основной валютой в сети %s и не может быть скрыт до тех пор, пока у вас в списке есть другие токены этой сети. Сеть %s не найдена. Пожалуйста, добавьте её и попробуйте заново. Сеть не поддерживается. Пожалуйста, выберите другую сеть. diff --git a/app/src/main/res/values/zendesk_styles.xml b/app/src/main/res/values/zendesk_styles.xml index ebb4fcab6b..0022b241b1 100644 --- a/app/src/main/res/values/zendesk_styles.xml +++ b/app/src/main/res/values/zendesk_styles.xml @@ -4,4 +4,15 @@ @color/darkGray6 @color/darkGray6 + + // Contact us FAB style +