mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-11-28 13:38:49 +03:00
Code Issues Projects Releases Packages Wiki Activity

Upgrade to new design input

Browse source
This commit is contained in:
Valere 2020-11-20 13:42:40 +01:00
parent fd92d6559c
commit e2320cd3b2
3 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
vector/src/main/java/im/vector/app/features/usercode/ShowUserCodeFragment.kt
View file

@ -57,7 +57,7 @@ class ShowUserCodeFragment @Inject constructor(
doOpenQRCodeScanner()
}
}
shareByText.debouncedClicks {
showUserCodeShareButton.debouncedClicks {
sharedViewModel.handle(UserCodeActions.ShareByText)
}

35
vector/src/main/res/layout/fragment_user_code_show.xml
View file

@ -49,19 +49,6 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toEndOf="@+id/showUserCodeClose"
app:layout_constraintEnd_toStartOf="@id/shareByText"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/shareByText"
android:layout_width="@dimen/layout_touch_size"
android:layout_height="@dimen/layout_touch_size"
android:scaleType="center"
android:src="@drawable/ic_share"
app:tint="@color/riotx_accent"
android:layout_marginEnd="@dimen/layout_horizontal_margin"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
@ -178,18 +165,34 @@
app:layout_constraintTop_toBottomOf="@id/showUserCodeCard" />
<com.google.android.material.button.MaterialButton
android:id="@+id/showUserCodeScanButton"
android:id="@+id/showUserCodeShareButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:minWidth="130dp"
android:text="@string/user_code_scan"
app:layout_constraintBottom_toBottomOf="parent"
android:text="@string/user_code_share"
app:icon="@drawable/ic_share"
app:iconTint="@color/white"
app:layout_constraintBottom_toTopOf="@id/showUserCodeScanButton"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/showUserCodeInfoText"
app:layout_constraintVertical_bias="0" />
<com.google.android.material.button.MaterialButton
android:id="@+id/showUserCodeScanButton"
style="@style/Widget.MaterialComponents.Button.TextButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:minWidth="130dp"
android:text="@string/user_code_scan"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/showUserCodeShareButton"
app:layout_constraintVertical_bias="0" />
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>

5
vector/src/main/res/values/strings.xml
View file

@ -2561,9 +2561,10 @@
</plurals>
<string name="invite_users_to_room_failure">We could not invite users. Please check the users you want to invite and try again.</string>
<string name="user_code_scan">SCAN A QR CODE</string>
<string name="user_code_scan">Scan a QR code</string>
<string name="user_code_share">Share my code</string>
<string name="user_code_my_code">My code</string>
<string name="user_code_info_text">This is your QR code. Share it with people so they can scan it to add you and start chatting.</string>
<string name="user_code_info_text">Share this code with people so they can scan it to add you and start chatting.</string>
<string name="choose_locale_current_locale_title">Current language</string>
<string name="choose_locale_other_locales_title">Other available languages</string>