filippodb/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-01-27 09:31:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5104 from noantiq/develop

Browse Source 
Make Space creation screens more consistent
This commit is contained in:
Benoit Marty 2022-02-21 16:53:56 +01:00 committed by GitHub
commit a89e8d0434
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/5104.misc Normal file
View File

@ -0,0 +1 @@
Make Space creation screens more consistent

15
vector/src/main/res/layout/fragment_space_create_choose_private_model.xml
View File

@ -13,7 +13,7 @@
<TextView
android:id="@+id/headerText"
style="@style/Widget.Vector.TextView.HeadlineMedium"
style="@style/Widget.Vector.TextView.Title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
@ -53,12 +53,23 @@
android:layout_marginBottom="16dp"
app:icon="@drawable/ic_member_small"
app:iconTint="?vctr_content_secondary"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintBottom_toTopOf="@id/changeLaterText"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:subTitle="@string/create_spaces_private_teammates"
app:title="@string/create_spaces_me_and_teammates" />
<TextView
android:id="@+id/changeLaterText"
style="@style/Widget.Vector.TextView.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="24dp"
android:gravity="center"
android:text="@string/create_spaces_you_can_change_later"
android:textColor="?vctr_content_secondary"
app:layout_constraintBottom_toBottomOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>

16
vector/src/main/res/layout/fragment_space_create_choose_type.xml
View File

@ -12,26 +12,14 @@
<TextView
android:id="@+id/headerText"
style="@style/Widget.Vector.TextView.Subtitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/create_spaces_type_header"
android:textColor="?vctr_content_secondary"
app:layout_constraintTop_toTopOf="parent" />
<TextView
style="@style/Widget.Vector.TextView.Title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:gravity="center"
android:text="@string/create_spaces_choose_type_label"
android:textColor="?vctr_content_primary"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@id/joinInfoHelpText"
app:layout_constraintTop_toBottomOf="@id/headerText"
app:layout_constraintVertical_bias="1" />
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/joinInfoHelpText"
@ -42,7 +30,7 @@
android:gravity="center"
android:text="@string/create_spaces_join_info_help"
android:textColor="?vctr_content_secondary"
app:layout_constraintBottom_toTopOf="@id/publicButton" />
app:layout_constraintTop_toBottomOf="@id/headerText" />
<im.vector.app.features.spaces.create.WizardButtonView
android:id="@+id/publicButton"

3
vector/src/main/res/values/strings.xml
View File

@ -3524,12 +3524,13 @@
<string name="add_space">Add Space</string>
<string name="your_public_space">Your public space</string>
<string name="your_private_space">Your private space</string>
<!-- TODO TO BE REMOVED -->
<string name="create_spaces_type_header">Spaces are a new way to group rooms and people</string>
<string name="create_spaces_choose_type_label">What type of space do you want to create?</string>
<string name="create_spaces_you_can_change_later">You can change this later</string>
<string name="create_spaces_join_info_help">To join an existing space, you need an invite.</string>
<string name="create_spaces_who_are_you_working_with">Who are you working with?</string>
<string name="create_spaces_make_sure_access">Make sure the right people have access to %s. You can change this later.</string>
<string name="create_spaces_make_sure_access">Make sure the right people have access to %s.</string>
<string name="create_spaces_just_me">Just me</string>
<string name="create_spaces_organise_rooms">A private space to organise your rooms</string>
<string name="create_spaces_me_and_teammates">Me and teammates</string>