From 5f240bbc7faad997bb493bffdb2b338e9d0b7227 Mon Sep 17 00:00:00 2001 From: josikie Date: Mon, 29 Jan 2024 20:22:56 +0700 Subject: [PATCH 1/3] Update Gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 9b2449184..c517bddcf 100644 --- a/.gitignore +++ b/.gitignore @@ -82,4 +82,4 @@ crash.txt /fastlane/ fastlane/ partner-keys.json -/.idea/appInsightsSettings.xml +/.idea/appInsightsSettings.xml \ No newline at end of file From 6c632846fe0ca9bc003dfd9eaf0cc454f977512b Mon Sep 17 00:00:00 2001 From: josikie Date: Sun, 4 Feb 2024 22:37:04 +0700 Subject: [PATCH 2/3] Updated lockscreen --- app/src/main/res/layout/activity_pin.xml | 76 ++++++++++++++-------- app/src/main/res/values-de/strings.xml | 2 + app/src/main/res/values-es/strings.xml | 2 + app/src/main/res/values-fr/strings.xml | 2 + app/src/main/res/values-in/strings.xml | 2 + app/src/main/res/values-it/strings.xml | 2 + app/src/main/res/values-ja/strings.xml | 2 + app/src/main/res/values-ko/strings.xml | 2 + app/src/main/res/values-pt/strings.xml | 2 + app/src/main/res/values-ru/strings.xml | 2 + app/src/main/res/values-tr/strings.xml | 2 + app/src/main/res/values-uk/strings.xml | 2 + app/src/main/res/values-zh-rCN/strings.xml | 2 + app/src/main/res/values-zh-rTW/strings.xml | 2 + app/src/main/res/values/colors.xml | 2 +- app/src/main/res/values/strings.xml | 4 +- app/src/main/res/values/styles.xml | 2 +- 17 files changed, 79 insertions(+), 31 deletions(-) diff --git a/app/src/main/res/layout/activity_pin.xml b/app/src/main/res/layout/activity_pin.xml index 3aacd0a48..12cce4f1a 100644 --- a/app/src/main/res/layout/activity_pin.xml +++ b/app/src/main/res/layout/activity_pin.xml @@ -12,20 +12,7 @@ android:id="@+id/ltcPriceConstraintLayout" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/litecoin_litewallet_blue_darker"> - - + android:background="@color/litecoin_litewallet_blue"> + + app:layout_constraintVertical_bias="0.25" /> @@ -163,7 +160,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:text="@string/UnlockScreen.subheader" - android:textColor="@color/white" + android:textColor="#FFF5F5" android:textSize="@dimen/sub_header" app:layout_constraintBottom_toTopOf="@+id/pinLayout" app:layout_constraintLeft_toLeftOf="@+id/pinLayout" @@ -173,32 +170,28 @@ android:id="@+id/unlocked_image" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="0dp" - android:layout_marginTop="0dp" - android:layout_marginRight="0dp" - android:layout_marginBottom="0dp" + android:layout_marginTop="100dp" android:alpha="0" android:src="@drawable/ic_unlocked" app:layout_constraintBottom_toBottomOf="@+id/brkeyboard" + app:layout_constraintHorizontal_bias="0.498" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.529" /> @@ -213,4 +206,31 @@ app:layout_constraintBottom_toTopOf="@+id/brkeyboard" app:layout_constraintRight_toRightOf="parent" /> + + + + \ No newline at end of file diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 525b99bfb..faf381c58 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -635,6 +635,8 @@ Authentifizierung erforderlich Wallet entsperrt + + Haben Sie Ihre Seed Phrase oder PIN vergessen? Merke dir diese PIN. Falls du sie vergisst, kannst du nicht mehr auf deine Litecoins zugreifen. diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 2d595d010..53878a7b3 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -634,6 +634,8 @@ Se requiere autenticación Cartera desbloqueada + + ¿Olvidó su frase inicial o PIN? Recuerda este PIN. Si lo olvidas, no podrás acceder a tu Litecoin. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index d76251113..c9acc191e 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -633,6 +633,8 @@ Voir sur la blockchain Identification nécessaire + + Vous avez oublié votre phrase de départ ou votre code PIN? Portefeuille déverrouillé diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index a7284514a..9ad1ee9a1 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -633,6 +633,8 @@ Lihat di blockchain Otentikasi diperlukan + + Lupa seed phrase atau PIN Anda? Dompet Tidak Terkunci diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index dbb615898..7bf55389c 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -633,6 +633,8 @@ Visualizza su blockchain Autenticazione richiesta + + Hai dimenticato la frase seed o il PIN? Portafoglio Sbloccato diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 6dead709b..b7ff0af8b 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -635,6 +635,8 @@ 認証が必要です ウォレットのロックが解除されました + + シードフレーズまたはPINをお忘れですか? このPINコードは覚えておいてください。忘れた場合、ご自身のライトコインへアクセスできなくなります。 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 6dd4b8aba..840c255d8 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -635,6 +635,8 @@ 본인확인 필요 월렛의 잠금이 해제됨 + + 시드 문구나 PIN을 잊으셨나요? 이 PIN 코드를 기억하세요. PIN 코드를 잊어버리면 자신의 라이트코인을 사용할 수 없게 됩니다. diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index ecddffabd..986009549 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -635,6 +635,8 @@ Autenticação necessária Carteira Desbloqueada + + Esqueceu-se da sua frase-semente ou PIN? Lembre-se deste PIN. Se o esquecer, não será capaz de aceder às suas Litecoins. diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 4bc95076a..7654d3af6 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -633,6 +633,8 @@ Посмотреть на блокчейне Требуется аутентификация + + Забыли начальную фразу или PIN-код? Кошелек разблокирован diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index c6f53fc6c..75bac9dca 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -636,6 +636,8 @@ PIN girin Dokunma Sensörü + + Tohum cümlenizi veya PIN kodunuzu mu unuttunuz? Litewallet\'ınızın kilidini açın. diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index ba0dffc58..33b7caf28 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -620,6 +620,8 @@ Перегляд на блокчейні + + Забули пароль або PIN-код? Гаманець розблоковано Запам’ятайте цей PIN-код. Якщо ви забудете його, ви не зможете отримати доступ до свого Litecoin. diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 053e885e4..ead0f5f98 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -635,6 +635,8 @@ 需要身份认证 钱包已解锁 + + 忘记密码或 PIN 码? 请牢记此 PIN 码。如果您忘记,您将无法访问您的莱特币。 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 66b115c1f..6ded51457 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -635,6 +635,8 @@ 需要驗證 錢包已解鎖 + + 忘了助記詞或 PIN 碼? 請記住此 PIN 碼。如果忘記,會無法存取您的比特幣。 diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 543419e3b..090c77e6a 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -71,7 +71,7 @@ #F1F1F1 #A6A9AA #4D4D4E - #345D9D + #0C3475 #FE5F55 #179E27 #b3ffffff diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b5f18e293..34e6f29f3 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -632,7 +632,9 @@ Authentication required Wallet Unlocked - + + Forget your seed Phrase or PIN? + Remember this PIN. If you forget it, you won\'t be able to access your Litecoin. Your PIN will be used to unlock your Litewallet and send money. diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 2b224159f..e12ce374b 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -11,7 +11,7 @@ true true @color/white - @android:color/darker_gray + @color/litecoin_litewallet_blue @style/BreadActionBar @style/RobotoTextViewStyle @style/RobotoButtonStyle From b6b5e6bb831c7230d0ab5c2ef4113733486443cf Mon Sep 17 00:00:00 2001 From: josikie Date: Thu, 22 Feb 2024 21:39:33 +0700 Subject: [PATCH 3/3] Changed color to white, Added litewallet dark blue color --- app/src/main/res/layout/activity_pin.xml | 6 +++--- app/src/main/res/values/colors.xml | 3 ++- app/src/main/res/values/styles.xml | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/src/main/res/layout/activity_pin.xml b/app/src/main/res/layout/activity_pin.xml index 12cce4f1a..86d9f71aa 100644 --- a/app/src/main/res/layout/activity_pin.xml +++ b/app/src/main/res/layout/activity_pin.xml @@ -5,14 +5,14 @@ android:id="@+id/activity_pit" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/litecoin_litewallet_blue" + android:background="@color/litecoin_litewallet_dark_blue" tools:context="com.breadwallet.presenter.activities.LoginActivity"> + android:background="@color/litecoin_litewallet_dark_blue"> #F1F1F1 #A6A9AA #4D4D4E - #0C3475 + #345D9D #FE5F55 #179E27 #b3ffffff + #0C3475 #7c98c7 #f5f5f5 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index e12ce374b..e05158021 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -11,7 +11,7 @@ true true @color/white - @color/litecoin_litewallet_blue + @color/litecoin_litewallet_dark_blue @style/BreadActionBar @style/RobotoTextViewStyle @style/RobotoButtonStyle