Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated the lockscreen 160 #164

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -82,4 +82,4 @@ crash.txt
/fastlane/
fastlane/
partner-keys.json
/.idea/appInsightsSettings.xml
/.idea/appInsightsSettings.xml
76 changes: 48 additions & 28 deletions app/src/main/res/layout/activity_pin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +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">

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/ltcPriceConstraintLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/litecoin_litewallet_blue_darker">

<TextView
android:id="@+id/version_text"
style="@style/BRTextStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginEnd="16dp"
android:text="@string/About.appVersion"
android:textColor="@color/white"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
android:background="@color/litecoin_litewallet_dark_blue">

<TextView
android:id="@+id/ltcPriceTextView"
Expand All @@ -51,11 +38,18 @@
android:fontFamily="@font/barlowsemicondensed_light"
tools:text="@string/Login.currentLtcPrice"
android:textColor="@color/white"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ltcPriceTextView" />

<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="#8DD6DAE1"
android:layout_marginTop="20dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ltcPriceDescTextView" />
</androidx.constraintlayout.widget.ConstraintLayout>

<ImageView
Expand All @@ -70,11 +64,12 @@
android:src="@drawable/litewallet_logotype_white"
app:layout_constraintBottom_toTopOf="@+id/brkeyboard"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.497"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ltcPriceConstraintLayout"
app:layout_constraintVertical_bias="0.0" />
app:layout_constraintVertical_bias="0.25" />

<ImageButton
android:id="@+id/scanQRCodeImgBut"
Expand Down Expand Up @@ -151,7 +146,9 @@
android:id="@+id/brkeyboard"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginBottom="20dp"
app:layout_constraintBottom_toTopOf="@+id/forgot_seed_phrase_or_pin_text"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:showAlphabet="true" />
Expand All @@ -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" />

<TextView
android:id="@+id/unlocked_text"
style="@style/BRTextStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="0dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="32dp"
android:layout_marginBottom="28dp"
android:alpha="0"
android:text="@string/UnlockScreen.unlocked"
android:textColor="@color/white"
android:textSize="18sp"
app:layout_constraintBottom_toTopOf="@+id/unlocked_image"
app:layout_constraintHorizontal_bias="0.461"
app:layout_constraintHorizontal_bias="0.492"
app:layout_constraintLeft_toLeftOf="@+id/unlocked_image"
app:layout_constraintRight_toRightOf="@+id/unlocked_image" />

Expand All @@ -213,4 +206,31 @@
app:layout_constraintBottom_toTopOf="@+id/brkeyboard"
app:layout_constraintRight_toRightOf="parent" />

<TextView
android:id="@+id/forgot_seed_phrase_or_pin_text"
style="@style/BRTextStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="20dp"
android:clickable="true"
android:text="@string/UnlockScreen.forgetSeedPhraseOrPIN"
android:textColor="#85FFFFFF"
android:textSize="18sp"
app:layout_constraintBottom_toTopOf="@+id/version_text"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" />

<TextView
android:id="@+id/version_text"
style="@style/BRTextStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:text="@string/About.appVersion"
android:textColor="@color/white"
android:textSize="14sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" />

</com.breadwallet.presenter.customviews.BRLockScreenConstraintLayout>
2 changes: 2 additions & 0 deletions app/src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -635,6 +635,8 @@
<string name="UnlockScreen.touchIdTitle.android">Authentifizierung erforderlich</string>
<!-- Wallet unlocked message -->
<string name="UnlockScreen.unlocked">Wallet entsperrt</string>
<!-- Forget Seed Phrase or PIN -->
<string name="UnlockScreen.forgetSeedPhraseOrPIN">Haben Sie Ihre Seed Phrase oder PIN vergessen?</string>
<!-- Update PIN caption text -->
<string name="UpdatePin.caption">Merke dir diese PIN. Falls du sie vergisst, kannst du nicht mehr auf deine Litecoins zugreifen.</string>
<!-- PIN creation info. -->
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values-es/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -634,6 +634,8 @@
<string name="UnlockScreen.touchIdTitle.android">Se requiere autenticación</string>
<!-- Wallet unlocked message -->
<string name="UnlockScreen.unlocked">Cartera desbloqueada</string>
<!-- Forget Seed Phrase or PIN -->
<string name="UnlockScreen.forgetSeedPhraseOrPIN">¿Olvidó su frase inicial o PIN?</string>
<!-- Update PIN caption text -->
<string name="UpdatePin.caption">Recuerda este PIN. Si lo olvidas, no podrás acceder a tu Litecoin.</string>
<!-- PIN creation info. -->
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -633,6 +633,8 @@
<!-- Device authentication title -->
<string name="ViewOnBlockchain">Voir sur la blockchain</string>
<string name="UnlockScreen.touchIdTitle.android">Identification nécessaire</string>
<!-- Forget Seed Phrase or PIN -->
<string name="UnlockScreen.forgetSeedPhraseOrPIN">Vous avez oublié votre phrase de départ ou votre code PIN?</string>
<!-- Wallet unlocked message -->
<string name="UnlockScreen.unlocked">Portefeuille déverrouillé</string>
<!-- Update PIN caption text -->
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values-in/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -633,6 +633,8 @@
<!-- Device authentication title -->
<string name="ViewOnBlockchain">Lihat di blockchain</string>
<string name="UnlockScreen.touchIdTitle.android">Otentikasi diperlukan</string>
<!-- Forget Seed Phrase or PIN -->
<string name="UnlockScreen.forgetSeedPhraseOrPIN">Lupa seed phrase atau PIN Anda?</string>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have started using Google Drive to store the localizations and its much than the old way. Here is a sample:
https://docs.google.com/spreadsheets/d/1sgoSChAEaelmT-AxtCoH2OT1IHMzWUT8mSHOEgG1RnY/edit#gid=0

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll put all of them unlockscreen.forgetSeedPhraseOrPIN on the google docs

<!-- Wallet unlocked message -->
<string name="UnlockScreen.unlocked">Dompet Tidak Terkunci</string>
<!-- Update PIN caption text -->
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values-it/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -633,6 +633,8 @@
<!-- Device authentication title -->
<string name="ViewOnBlockchain">Visualizza su blockchain</string>
<string name="UnlockScreen.touchIdTitle.android">Autenticazione richiesta</string>
<!-- Forget Seed Phrase or PIN -->
<string name="UnlockScreen.forgetSeedPhraseOrPIN">Hai dimenticato la frase seed o il PIN?</string>
<!-- Wallet unlocked message -->
<string name="UnlockScreen.unlocked">Portafoglio Sbloccato</string>
<!-- Update PIN caption text -->
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values-ja/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -635,6 +635,8 @@
<string name="UnlockScreen.touchIdTitle.android">認証が必要です</string>
<!-- Wallet unlocked message -->
<string name="UnlockScreen.unlocked">ウォレットのロックが解除されました</string>
<!-- Forget Seed Phrase or PIN -->
<string name="UnlockScreen.forgetSeedPhraseOrPIN">シードフレーズまたはPINをお忘れですか?</string>
<!-- Update PIN caption text -->
<string name="UpdatePin.caption">このPINコードは覚えておいてください。忘れた場合、ご自身のライトコインへアクセスできなくなります。</string>
<!-- PIN creation info. -->
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values-ko/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -635,6 +635,8 @@
<string name="UnlockScreen.touchIdTitle.android">본인확인 필요</string>
<!-- Wallet unlocked message -->
<string name="UnlockScreen.unlocked">월렛의 잠금이 해제됨</string>
<!-- Forget Seed Phrase or PIN -->
<string name="UnlockScreen.forgetSeedPhraseOrPIN">시드 문구나 PIN을 잊으셨나요?</string>
<!-- Update PIN caption text -->
<string name="UpdatePin.caption">이 PIN 코드를 기억하세요. PIN 코드를 잊어버리면 자신의 라이트코인을 사용할 수 없게 됩니다.</string>
<!-- PIN creation info. -->
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values-pt/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -635,6 +635,8 @@
<string name="UnlockScreen.touchIdTitle.android">Autenticação necessária</string>
<!-- Wallet unlocked message -->
<string name="UnlockScreen.unlocked">Carteira Desbloqueada</string>
<!-- Forget Seed Phrase or PIN -->
<string name="UnlockScreen.forgetSeedPhraseOrPIN">Esqueceu-se da sua frase-semente ou PIN?</string>
<!-- Update PIN caption text -->
<string name="UpdatePin.caption">Lembre-se deste PIN. Se o esquecer, não será capaz de aceder às suas Litecoins.</string>
<!-- PIN creation info. -->
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values-ru/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -633,6 +633,8 @@
<!-- Device authentication title -->
<string name="ViewOnBlockchain">Посмотреть на блокчейне</string>
<string name="UnlockScreen.touchIdTitle.android">Требуется аутентификация</string>
<!-- Forget Seed Phrase or PIN -->
<string name="UnlockScreen.forgetSeedPhraseOrPIN">Забыли начальную фразу или PIN-код?</string>
<!-- Wallet unlocked message -->
<string name="UnlockScreen.unlocked">Кошелек разблокирован</string>
<!-- Update PIN caption text -->
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values-tr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -636,6 +636,8 @@
<string name="UnlockScreen.subheader">PIN girin</string>
<!-- Instruction to touch the sensor for fingerprint authentication -->
<string name="UnlockScreen.touchIdInstructions.android">Dokunma Sensörü</string>
<!-- Forget Seed Phrase or PIN -->
<string name="UnlockScreen.forgetSeedPhraseOrPIN">Tohum cümlenizi veya PIN kodunuzu mu unuttunuz?</string>
<!-- TouchID prompt text -->
<string name="UnlockScreen.touchIdPrompt">Litewallet\'ınızın kilidini açın.</string>
<!-- Device authentication body -->
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values-uk/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -620,6 +620,8 @@
<string name="ViewOnBlockchain">Перегляд на блокчейні</string>
<!-- Device authentication title -->
<!-- Wallet unlocked message -->
<!-- Forget Seed Phrase or PIN -->
<string name="UnlockScreen.forgetSeedPhraseOrPIN">Забули пароль або PIN-код?</string>
<string name="UnlockScreen.unlocked">Гаманець розблоковано</string>
<!-- Update PIN caption text -->
<string name="UpdatePin.caption">Запам’ятайте цей PIN-код. Якщо ви забудете його, ви не зможете отримати доступ до свого Litecoin.</string>
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values-zh-rCN/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -635,6 +635,8 @@
<string name="UnlockScreen.touchIdTitle.android">需要身份认证</string>
<!-- Wallet unlocked message -->
<string name="UnlockScreen.unlocked">钱包已解锁</string>
<!-- Forget Seed Phrase or PIN -->
<string name="UnlockScreen.forgetSeedPhraseOrPIN">忘记密码或 PIN 码?</string>
<!-- Update PIN caption text -->
<string name="UpdatePin.caption">请牢记此 PIN 码。如果您忘记,您将无法访问您的莱特币。</string>
<!-- PIN creation info. -->
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values-zh-rTW/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -635,6 +635,8 @@
<string name="UnlockScreen.touchIdTitle.android">需要驗證</string>
<!-- Wallet unlocked message -->
<string name="UnlockScreen.unlocked">錢包已解鎖</string>
<!-- Forget Seed Phrase or PIN -->
<string name="UnlockScreen.forgetSeedPhraseOrPIN">忘了助記詞或 PIN 碼?</string>
<!-- Update PIN caption text -->
<string name="UpdatePin.caption">請記住此 PIN 碼。如果忘記,會無法存取您的比特幣。</string>
<!-- PIN creation info. -->
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/colors.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
<item name="litecoin_litewallet_orange" type="color">#FE5F55</item>
<item name="litecoin_litewallet_green" type="color">#179E27</item>
<color name="white_30_alpha">#b3ffffff</color>
<item name="litecoin_litewallet_dark_blue" type="color">#0C3475</item>

<color name="blue_grey">#7c98c7</color>
<color name="white_two">#f5f5f5</color>
Expand Down
4 changes: 3 additions & 1 deletion app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -632,7 +632,9 @@
<string name="UnlockScreen.touchIdTitle.android">Authentication required</string>
<!-- Wallet unlocked message -->
<string name="UnlockScreen.unlocked">Wallet Unlocked</string>
<!-- Update PIN caption text -->
<!-- Forget Seed Phrase or PIN -->
<string name="UnlockScreen.forgetSeedPhraseOrPIN">Forget your seed Phrase or PIN?</string>
<!-- Update PIN caption text -->
<string name="UpdatePin.caption">Remember this PIN. If you forget it, you won\'t be able to access your Litecoin.</string>
<!-- PIN creation info. -->
<string name="UpdatePin.createInstruction">Your PIN will be used to unlock your Litewallet and send money.</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<item name="windowNoTitle">true</item>
<item name="windowActionBar">true</item>
<item name="android:windowBackground">@color/white</item>
<item name="android:statusBarColor">@android:color/darker_gray</item>
<item name="android:statusBarColor">@color/litecoin_litewallet_dark_blue</item>
<item name="android:actionBarStyle">@style/BreadActionBar</item>
<item name="android:textViewStyle">@style/RobotoTextViewStyle</item>
<item name="android:buttonStyle">@style/RobotoButtonStyle</item>
Expand Down