filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re-prioritize login selection

Browse Source 
1. Matrix-ID
2. "Other" -> Custom server
3. Matrix

- Matrix-ID should be intuitive (compare: email address)
- Promoting Element Matrix Services for organisations makes not much
  sense here
    - if you have a server hosted this way, you can use the "other"
      selection or mxid as well (?)
    - if organisations feel like using SchildiChat instead of Element,
      they will probably find a way ;)
This commit is contained in:
SpiritCroc 2020-07-24 19:50:06 +02:00
parent e89d2df45e
commit 8d6c8b4a30
3 changed files with 106 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

134
vector/src/main/res/layout/fragment_login_server_selection.xml
View File

@ -44,6 +44,92 @@
app:layout_constraintTop_toBottomOf="@+id/loginServerTitle" /> app:layout_constraintTop_toBottomOf="@+id/loginServerTitle" />
<!-- Use a CheckableConstraintLayout to keep the pressed state when retrieving login flow --> <!-- Use a CheckableConstraintLayout to keep the pressed state when retrieving login flow -->
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/loginServerIKnowMyIdSubmit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:background="@drawable/bg_login_server_selector"
android:contentDescription="@string/login_a11y_connect_using_matrix_id_sc"
android:minHeight="80dp"
android:paddingStart="@dimen/layout_horizontal_margin"
android:paddingEnd="@dimen/layout_horizontal_margin"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/loginServerText">
<TextView
android:id="@+id/loginServerIKnowMyIdSubmitTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="start"
android:text="@string/login_connect_using_matrix_id_title_sc"
android:textAppearance="@style/TextAppearance.Vector.Login.Text"
android:textColor="?riotx_text_primary"
android:textSize="16sp"
app:layout_constraintBottom_toTopOf="@+id/loginServerIKnowMyIdSubmitText"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="packed" />
<TextView
android:id="@+id/loginServerIKnowMyIdSubmitText"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:gravity="start"
android:text="@string/login_connect_using_matrix_id_text_sc"
android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/loginServerIKnowMyIdSubmitTitle" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/loginServerChoiceOther"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:background="@drawable/bg_login_server_selector"
android:contentDescription="@string/login_a11y_choose_other_sc"
android:minHeight="80dp"
android:paddingStart="@dimen/layout_horizontal_margin"
android:paddingEnd="@dimen/layout_horizontal_margin"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/loginServerIKnowMyIdSubmit">
<TextView
android:id="@+id/loginServerChoiceOtherTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="start"
android:text="@string/login_server_other_title_sc"
android:textAppearance="@style/TextAppearance.Vector.Login.Text"
android:textColor="?riotx_text_primary"
android:textSize="16sp"
app:layout_constraintBottom_toTopOf="@+id/loginServerChoiceOtherText"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="packed" />
<TextView
android:id="@+id/loginServerChoiceOtherText"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:gravity="start"
android:text="@string/login_server_other_text_sc"
android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/loginServerChoiceOtherTitle" />
</androidx.constraintlayout.widget.ConstraintLayout>
<im.vector.riotx.core.platform.CheckableConstraintLayout <im.vector.riotx.core.platform.CheckableConstraintLayout
android:id="@+id/loginServerChoiceMatrixOrg" android:id="@+id/loginServerChoiceMatrixOrg"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -56,7 +142,7 @@
android:paddingEnd="@dimen/layout_horizontal_margin" android:paddingEnd="@dimen/layout_horizontal_margin"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/loginServerText"> app:layout_constraintTop_toBottomOf="@+id/loginServerChoiceOther">
<ImageView <ImageView
android:id="@+id/loginServerChoiceMatrixOrgIcon" android:id="@+id/loginServerChoiceMatrixOrgIcon"
@ -95,6 +181,7 @@
android:minHeight="80dp" android:minHeight="80dp"
android:paddingStart="@dimen/layout_horizontal_margin" android:paddingStart="@dimen/layout_horizontal_margin"
android:paddingEnd="0dp" android:paddingEnd="0dp"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/loginServerChoiceMatrixOrg"> app:layout_constraintTop_toBottomOf="@+id/loginServerChoiceMatrixOrg">
@ -138,49 +225,7 @@
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout <!--
android:id="@+id/loginServerChoiceOther"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:background="@drawable/bg_login_server_selector"
android:contentDescription="@string/login_a11y_choose_other"
android:minHeight="80dp"
android:paddingStart="@dimen/layout_horizontal_margin"
android:paddingEnd="@dimen/layout_horizontal_margin"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/loginServerChoiceModular">
<TextView
android:id="@+id/loginServerChoiceOtherTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="start"
android:text="@string/login_server_other_title"
android:textAppearance="@style/TextAppearance.Vector.Login.Text"
android:textColor="?riotx_text_primary"
android:textSize="16sp"
app:layout_constraintBottom_toTopOf="@+id/loginServerChoiceOtherText"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="packed" />
<TextView
android:id="@+id/loginServerChoiceOtherText"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:gravity="start"
android:text="@string/login_server_other_text"
android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/loginServerChoiceOtherTitle" />
</androidx.constraintlayout.widget.ConstraintLayout>
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/loginServerIKnowMyIdSubmit" android:id="@+id/loginServerIKnowMyIdSubmit"
style="@style/Style.Vector.Login.Button.Text" style="@style/Style.Vector.Login.Button.Text"
@ -193,6 +238,7 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/loginServerChoiceOther" /> app:layout_constraintTop_toBottomOf="@+id/loginServerChoiceOther" />
-->
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

8
vector/src/main/res/values-de/strings_sc.xml
View File

@ -18,4 +18,12 @@
<string name="all_list_rooms_empty_title">SchildiChat</string> <string name="all_list_rooms_empty_title">SchildiChat</string>
<string name="all_list_rooms_empty_body">Konversationen werden hier angezeigt</string> <string name="all_list_rooms_empty_body">Konversationen werden hier angezeigt</string>
<!-- Login screen -->
<string name="login_a11y_connect_using_matrix_id_sc">Mit Matrix-ID anmelden</string>
<string name="login_connect_using_matrix_id_title_sc">Mit Matrix-ID anmelden</string>
<string name="login_connect_using_matrix_id_text_sc">z. B. @user:domain.com</string>
<string name="login_a11y_choose_other_sc">@string/login_a11y_choose_other</string>
<string name="login_server_other_title_sc">Benutzerdefinierter Server</string>
<string name="login_server_other_text_sc">Erweiterte Server-Einstellungen</string>
</resources> </resources>

8
vector/src/main/res/values/strings_sc.xml
View File

@ -18,4 +18,12 @@
<string name="all_list_rooms_empty_title">SchildiChat</string> <string name="all_list_rooms_empty_title">SchildiChat</string>
<string name="all_list_rooms_empty_body">Chats will be displayed here</string> <string name="all_list_rooms_empty_body">Chats will be displayed here</string>
<!-- Login screen -->
<string name="login_a11y_connect_using_matrix_id_sc">@string/login_connect_using_matrix_id_submit</string>
<string name="login_connect_using_matrix_id_title_sc">@string/login_connect_using_matrix_id_submit</string>
<string name="login_connect_using_matrix_id_text_sc">e.g. @user:domain.com</string>
<string name="login_a11y_choose_other_sc">@string/login_a11y_choose_other</string>
<string name="login_server_other_title_sc">Custom server</string>
<string name="login_server_other_text_sc">Advanced server settings</string>
</resources> </resources>