Skip to content

Commit

Permalink
fix: Improve layout on smaller screens
Browse files Browse the repository at this point in the history
  • Loading branch information
devinbileck committed Feb 10, 2024
1 parent ceda814 commit af62b21
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 8 deletions.
4 changes: 3 additions & 1 deletion app/src/main/res/layout/activity_pairing_send.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,14 @@
<TextView
android:id="@+id/pairing_send_pairing_token_instructions"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="0dp"
android:layout_marginStart="40dp"
android:layout_marginTop="40dp"
android:layout_marginEnd="40dp"
android:layout_marginBottom="80dp"
android:text="@string/send_pairing_instructions_text"
android:textSize="18sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,8 @@
<Button
android:id="@+id/skip_request_notification_permission_button"
style="@style/BorderlessPrimaryButton"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="5dp"
android:layout_marginEnd="5dp"
android:layout_marginBottom="20dp"
android:enabled="true"
android:text="@string/skip"
Expand Down
5 changes: 2 additions & 3 deletions app/src/main/res/layout/activity_welcome.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,11 @@
<Button
android:id="@+id/welcome_learn_more_button"
style="@style/BorderlessPrimaryButton"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="5dp"
android:layout_marginEnd="5dp"
android:layout_marginBottom="20dp"
android:enabled="true"
android:gravity="center_horizontal|center_vertical"
android:text="@string/button_learn_more"
android:textAllCaps="false"
android:textSize="16sp"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
<string name="send_pairing_token">Send Pairing Token</string>
<string name="scan_pairing_token">Scan Pairing Token</string>
<string name="send_pairing_subject">Bisq pairing token</string>
<string name="send_pairing_instructions_text">If you are unable to scan the QR code, you can instead send the pairing token to yourself (e.g. via email).\n\nMake sure to keep the pairing token private. It contains your encryption key (AES/CBC/NOPadding with initialization vector) which is used by the Bisq desktop application to encrypt notifications and a token from Google that identifies this device.\n\nOnce you have the token, open the Bisq desktop application and go to Account -&gt; Notifications. Then paste/enter the token into the pairing token field. Upon entering the token, this app should then be paired and progress to the next screen automatically.</string>
<string name="send_pairing_instructions_text">If you are unable to scan the QR code, you can instead send the pairing token to yourself (e.g. via email).\n\nMake sure to keep the pairing token private. It contains your encryption key which is used by the Bisq desktop application to encrypt notifications and a token from Google that identifies this device.\n\nOnce you have the token, open the Bisq desktop application and go to Account -&gt; Notifications. Then paste/enter the token into the pairing token field. Upon entering the token, this app should then be paired and progress to the next screen automatically.</string>
<string name="pairing_success_text">Success!\n\nThis app is now paired to your Bisq desktop application.</string>
<string name="pairing_request_notification_permission_text">Get notified!\n\nDon\'t miss an update by allowing the app to send you notifications.</string>

Expand Down

0 comments on commit af62b21

Please sign in to comment.