mirror of
https://gitlab.linphone.org/BC/public/linphone-android.git
synced 2026-01-17 11:28:06 +00:00
Improved help UI when system display & text size is increased by user
This commit is contained in:
Sylvain Berfini
parent
247788c64c
commit
1ee5993624
2 changed files with 72 additions and 55 deletions
|
|
@ -50,13 +50,10 @@
|
|||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
style="@style/tertiary_button_label_style"
|
||||
android:onClick="@{() -> viewModel.cleanLogs()}"
|
||||
android:id="@+id/clean_logs"
|
||||
android:onClick="@{() -> viewModel.cleanLogs()}"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="16dp"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:layout_marginTop="20dp"
|
||||
android:background="@drawable/tertiary_button_background"
|
||||
android:paddingStart="12dp"
|
||||
android:paddingEnd="12dp"
|
||||
|
|
@ -66,18 +63,14 @@
|
|||
android:text="@string/help_troubleshooting_clean_logs"
|
||||
android:maxLines="1"
|
||||
android:ellipsize="end"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/title"/>
|
||||
bind:ignore="MissingConstraints"/>
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
style="@style/tertiary_button_label_style"
|
||||
android:onClick="@{() -> viewModel.shareLogs()}"
|
||||
android:id="@+id/send_logs"
|
||||
android:onClick="@{() -> viewModel.shareLogs()}"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="16dp"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:layout_marginTop="20dp"
|
||||
android:background="@drawable/tertiary_button_background"
|
||||
android:paddingStart="12dp"
|
||||
android:paddingEnd="12dp"
|
||||
|
|
@ -88,8 +81,22 @@
|
|||
android:maxLines="1"
|
||||
android:ellipsize="end"
|
||||
android:visibility="@{viewModel.uploadLogsAvailable ? View.VISIBLE : View.GONE}"
|
||||
app:layout_constraintStart_toEndOf="@id/clean_logs"
|
||||
app:layout_constraintTop_toBottomOf="@id/title"/>
|
||||
bind:ignore="MissingConstraints" />
|
||||
|
||||
<androidx.constraintlayout.helper.widget.Flow
|
||||
android:id="@+id/logs_flow"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="16dp"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:layout_marginTop="20dp"
|
||||
app:flow_wrapMode="chain"
|
||||
app:flow_horizontalGap="16dp"
|
||||
app:flow_verticalGap="10dp"
|
||||
app:flow_horizontalStyle="spread_inside"
|
||||
app:constraint_referenced_ids="clean_logs, send_logs"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/title" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/app_version_icon"
|
||||
|
|
@ -102,7 +109,7 @@
|
|||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toStartOf="@id/app_version_title"
|
||||
app:layout_constraintTop_toTopOf="@id/app_version_title"
|
||||
app:layout_constraintBottom_toBottomOf="@id/app_version_subtitle"/>
|
||||
app:layout_constraintBottom_toBottomOf="@id/app_version_title" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
style="@style/header_style"
|
||||
|
|
@ -113,7 +120,7 @@
|
|||
android:layout_marginEnd="16dp"
|
||||
android:layout_marginTop="24dp"
|
||||
android:text="@string/help_troubleshooting_app_version_title"
|
||||
app:layout_constraintTop_toBottomOf="@id/clean_logs"
|
||||
app:layout_constraintTop_toBottomOf="@id/logs_flow"
|
||||
app:layout_constraintStart_toEndOf="@id/app_version_icon"
|
||||
app:layout_constraintEnd_toEndOf="parent"/>
|
||||
|
||||
|
|
@ -142,7 +149,7 @@
|
|||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toStartOf="@id/sdk_version_title"
|
||||
app:layout_constraintTop_toTopOf="@id/sdk_version_title"
|
||||
app:layout_constraintBottom_toBottomOf="@id/sdk_version_subtitle"/>
|
||||
app:layout_constraintBottom_toBottomOf="@id/sdk_version_title" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
style="@style/header_style"
|
||||
|
|
@ -151,9 +158,9 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="16dp"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:layout_marginTop="24dp"
|
||||
android:layout_marginTop="20dp"
|
||||
android:text="@string/help_troubleshooting_sdk_version_title"
|
||||
app:layout_constraintTop_toBottomOf="@id/app_version_icon"
|
||||
app:layout_constraintTop_toBottomOf="@id/app_version_subtitle"
|
||||
app:layout_constraintStart_toEndOf="@id/sdk_version_icon"
|
||||
app:layout_constraintEnd_toEndOf="parent"/>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layout
|
||||
<layout xmlns:tools="http://schemas.android.com/tools"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
|
||||
|
|
@ -68,7 +68,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="16dp"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:layout_marginTop="32dp"
|
||||
android:layout_marginTop="20dp"
|
||||
android:text="@string/help_about_title"
|
||||
app:layout_constraintTop_toBottomOf="@id/title"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
|
|
@ -86,7 +86,7 @@
|
|||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toStartOf="@id/privacy_policy_title"
|
||||
app:layout_constraintTop_toTopOf="@id/privacy_policy_title"
|
||||
app:layout_constraintBottom_toBottomOf="@id/privacy_policy_subtitle" />
|
||||
app:layout_constraintBottom_toBottomOf="@id/privacy_policy_title"/>
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
style="@style/header_style"
|
||||
|
|
@ -122,48 +122,44 @@
|
|||
android:layout_width="32dp"
|
||||
android:layout_height="32dp"
|
||||
android:layout_marginStart="16dp"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:src="@drawable/info"
|
||||
android:contentDescription="@null"
|
||||
app:tint="?attr/color_main1_500"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toStartOf="@id/version_title"
|
||||
app:layout_constraintTop_toTopOf="@id/version_title"
|
||||
app:layout_constraintBottom_toBottomOf="@id/version_subtitle" />
|
||||
app:layout_constraintTop_toTopOf="@id/version"
|
||||
app:layout_constraintStart_toStartOf="parent"/>
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
style="@style/header_style"
|
||||
android:id="@+id/version_title"
|
||||
android:layout_width="0dp"
|
||||
<LinearLayout
|
||||
android:id="@+id/version"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="16dp"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:layout_marginTop="24dp"
|
||||
android:text="@string/help_about_version_title"
|
||||
app:layout_constraintTop_toBottomOf="@id/privacy_policy_subtitle"
|
||||
app:layout_constraintStart_toEndOf="@id/version_icon"
|
||||
app:layout_constraintEnd_toStartOf="@id/check_for_update"/>
|
||||
android:orientation="vertical"
|
||||
tools:ignore="MissingConstraints">
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
style="@style/default_text_style"
|
||||
android:id="@+id/version_subtitle"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="16dp"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:text="@{viewModel.version, default=`6.0.0`}"
|
||||
android:textSize="14sp"
|
||||
android:textColor="?attr/color_main2_600"
|
||||
app:layout_constraintTop_toBottomOf="@id/version_title"
|
||||
app:layout_constraintStart_toEndOf="@id/version_icon"
|
||||
app:layout_constraintEnd_toStartOf="@id/check_for_update" />
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
style="@style/header_style"
|
||||
android:id="@+id/version_title"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/help_about_version_title"/>
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
style="@style/default_text_style"
|
||||
android:id="@+id/version_subtitle"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@{viewModel.version, default=`6.0.0`}"
|
||||
android:textSize="14sp"
|
||||
android:textColor="?attr/color_main2_600" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
style="@style/tertiary_button_label_style"
|
||||
android:onClick="@{() -> viewModel.checkForUpdate()}"
|
||||
android:id="@+id/check_for_update"
|
||||
android:onClick="@{() -> viewModel.checkForUpdate()}"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:background="@drawable/tertiary_button_background"
|
||||
android:paddingStart="12dp"
|
||||
android:paddingEnd="12dp"
|
||||
|
|
@ -174,10 +170,24 @@
|
|||
android:maxLines="1"
|
||||
android:ellipsize="end"
|
||||
android:visibility="@{viewModel.checkUpdateAvailable ? View.VISIBLE : View.GONE}"
|
||||
app:layout_constraintStart_toEndOf="@id/version_title"
|
||||
tools:ignore="MissingConstraints" />
|
||||
|
||||
<androidx.constraintlayout.helper.widget.Flow
|
||||
android:id="@+id/version_flow"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="16dp"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:layout_marginTop="24dp"
|
||||
app:flow_wrapMode="chain"
|
||||
app:flow_horizontalGap="16dp"
|
||||
app:flow_verticalGap="10dp"
|
||||
app:flow_horizontalStyle="spread_inside"
|
||||
app:flow_horizontalBias="0"
|
||||
app:constraint_referenced_ids="version, check_for_update"
|
||||
app:layout_constraintStart_toEndOf="@id/version_icon"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="@id/version_title"
|
||||
app:layout_constraintBottom_toBottomOf="@id/version_subtitle"/>
|
||||
app:layout_constraintTop_toBottomOf="@id/privacy_policy_subtitle" />
|
||||
|
||||
<ImageView
|
||||
android:onClick="@{licensesClickListener}"
|
||||
|
|
@ -191,7 +201,7 @@
|
|||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toStartOf="@id/open_source_licenses_title"
|
||||
app:layout_constraintTop_toTopOf="@id/open_source_licenses_title"
|
||||
app:layout_constraintBottom_toBottomOf="@id/open_source_licenses_subtitle" />
|
||||
app:layout_constraintBottom_toBottomOf="@id/open_source_licenses_title" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
style="@style/header_style"
|
||||
|
|
@ -203,7 +213,7 @@
|
|||
android:layout_marginEnd="16dp"
|
||||
android:layout_marginTop="24dp"
|
||||
android:text="@string/help_about_open_source_licenses_title"
|
||||
app:layout_constraintTop_toBottomOf="@id/version_subtitle"
|
||||
app:layout_constraintTop_toBottomOf="@id/version_flow"
|
||||
app:layout_constraintStart_toEndOf="@id/open_source_licenses_icon"
|
||||
app:layout_constraintEnd_toEndOf="parent"/>
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue