mirror of
https://gitlab.linphone.org/BC/public/linphone-android.git
synced 2026-01-17 03:18:06 +00:00
Small UI changes to improve look & feel
This commit is contained in:
parent
b574bf420c
commit
50c922b581
9 changed files with 49 additions and 35 deletions
9
app/src/main/res/color/main_top_bar_icon_color.xml
Normal file
9
app/src/main/res/color/main_top_bar_icon_color.xml
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:state_pressed="true"
|
||||
android:color="?attr/color_main2_600" />
|
||||
<item android:state_hovered="true"
|
||||
android:color="?attr/color_main2_600" />
|
||||
<item
|
||||
android:color="?attr/color_on_main"/>
|
||||
</selector>
|
||||
|
|
@ -156,7 +156,7 @@
|
|||
app:layout_constraintStart_toEndOf="@id/back"
|
||||
app:layout_constraintEnd_toStartOf="@id/separator"
|
||||
app:layout_constraintTop_toTopOf="@id/back"
|
||||
app:layout_constraintBottom_toBottomOf="@id/back"/>
|
||||
app:layout_constraintBottom_toTopOf="@id/call_media_encryption_info"/>
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
style="@style/call_header_style"
|
||||
|
|
@ -254,6 +254,7 @@
|
|||
bind:viewModel="@{viewModel}"
|
||||
bind:callMediaEncryptionStatisticsClickListener="@{callMediaEncryptionStatisticsClickListener}"
|
||||
app:layout_constraintTop_toBottomOf="@id/name"
|
||||
app:layout_constraintBottom_toBottomOf="@id/back"
|
||||
app:layout_constraintStart_toStartOf="@id/name"
|
||||
app:layout_constraintEnd_toEndOf="parent"/>
|
||||
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@
|
|||
app:barrierDirection="bottom" />
|
||||
|
||||
<ImageView
|
||||
style="@style/icon_top_bar_button_style"
|
||||
style="@style/icon_main_top_bar_button_style"
|
||||
android:id="@+id/drawer_menu"
|
||||
android:onClick="@{() -> viewModel.openDrawerMenu()}"
|
||||
android:layout_width="wrap_content"
|
||||
|
|
@ -56,8 +56,7 @@
|
|||
android:contentDescription="@string/content_description_open_filter"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:tint="?attr/color_on_main" />
|
||||
app:layout_constraintBottom_toBottomOf="parent" />
|
||||
|
||||
<include
|
||||
android:id="@+id/avatar"
|
||||
|
|
@ -89,7 +88,7 @@
|
|||
app:layout_constraintBottom_toBottomOf="@id/avatar"/>
|
||||
|
||||
<ImageView
|
||||
style="@style/icon_top_bar_button_style"
|
||||
style="@style/icon_main_top_bar_button_style"
|
||||
android:id="@+id/search_toggle"
|
||||
android:onClick="@{() -> viewModel.openSearchBar()}"
|
||||
android:layout_width="wrap_content"
|
||||
|
|
@ -98,11 +97,10 @@
|
|||
android:contentDescription="@string/content_description_open_filter"
|
||||
app:layout_constraintEnd_toStartOf="@id/extra_action"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:tint="?attr/color_on_main" />
|
||||
app:layout_constraintBottom_toBottomOf="parent" />
|
||||
|
||||
<ImageView
|
||||
style="@style/icon_top_bar_button_style"
|
||||
style="@style/icon_main_top_bar_button_style"
|
||||
android:id="@+id/extra_action"
|
||||
android:onClick="@{extraActionClickListener}"
|
||||
android:layout_width="wrap_content"
|
||||
|
|
@ -112,11 +110,10 @@
|
|||
android:visibility="@{!viewModel.searchBarVisible && enableExtraAction ? View.VISIBLE : View.GONE, default=gone}"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:tint="?attr/color_on_main" />
|
||||
app:layout_constraintBottom_toBottomOf="parent" />
|
||||
|
||||
<ImageView
|
||||
style="@style/icon_top_bar_button_style"
|
||||
style="@style/icon_main_top_bar_button_style"
|
||||
android:id="@+id/cancel_search"
|
||||
android:onClick="@{() -> viewModel.closeSearchBar()}"
|
||||
android:layout_width="wrap_content"
|
||||
|
|
@ -125,8 +122,7 @@
|
|||
android:contentDescription="@string/content_description_cancel_filter"
|
||||
app:layout_constraintBottom_toBottomOf="@id/search"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="@id/search"
|
||||
app:tint="?attr/color_on_main" />
|
||||
app:layout_constraintTop_toTopOf="@id/search" />
|
||||
|
||||
<com.google.android.material.textfield.TextInputLayout
|
||||
style="?attr/textInputFilledStyle"
|
||||
|
|
@ -161,7 +157,7 @@
|
|||
</com.google.android.material.textfield.TextInputLayout>
|
||||
|
||||
<ImageView
|
||||
style="@style/icon_top_bar_button_style"
|
||||
style="@style/icon_main_top_bar_button_style"
|
||||
android:id="@+id/clear_field"
|
||||
android:onClick="@{() -> viewModel.clearFilter()}"
|
||||
android:layout_width="wrap_content"
|
||||
|
|
@ -170,8 +166,7 @@
|
|||
android:contentDescription="@string/content_description_clear_filter"
|
||||
app:layout_constraintBottom_toBottomOf="@id/search"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="@id/search"
|
||||
app:tint="?attr/color_on_main" />
|
||||
app:layout_constraintTop_toTopOf="@id/search" />
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
|
|
|
|||
|
|
@ -423,6 +423,8 @@
|
|||
android:text="@string/account_settings_update_password_title"
|
||||
android:maxLines="1"
|
||||
android:ellipsize="end"
|
||||
android:drawableEnd="@drawable/pencil_simple"
|
||||
android:background="@drawable/squircle_transparent_button_background"
|
||||
app:layout_constraintHorizontal_bias="1"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@
|
|||
app:layout_constraintStart_toEndOf="@id/back"
|
||||
app:layout_constraintEnd_toStartOf="@id/separator"
|
||||
app:layout_constraintTop_toTopOf="@id/back"
|
||||
app:layout_constraintBottom_toBottomOf="@id/back"/>
|
||||
app:layout_constraintBottom_toTopOf="@id/call_media_encryption_info"/>
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
style="@style/call_header_style"
|
||||
|
|
@ -194,6 +194,7 @@
|
|||
bind:viewModel="@{viewModel}"
|
||||
bind:callMediaEncryptionStatisticsClickListener="@{callMediaEncryptionStatisticsClickListener}"
|
||||
app:layout_constraintTop_toBottomOf="@id/conference_subject"
|
||||
app:layout_constraintBottom_toBottomOf="@id/back"
|
||||
app:layout_constraintStart_toStartOf="@id/conference_subject"
|
||||
app:layout_constraintEnd_toEndOf="parent"/>
|
||||
|
||||
|
|
|
|||
|
|
@ -153,7 +153,7 @@
|
|||
app:layout_constraintStart_toEndOf="@id/back"
|
||||
app:layout_constraintEnd_toStartOf="@id/separator"
|
||||
app:layout_constraintTop_toTopOf="@id/back"
|
||||
app:layout_constraintBottom_toBottomOf="@id/back"/>
|
||||
app:layout_constraintBottom_toTopOf="@id/call_media_encryption_info"/>
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
style="@style/call_header_style"
|
||||
|
|
@ -251,6 +251,7 @@
|
|||
bind:viewModel="@{viewModel}"
|
||||
bind:callMediaEncryptionStatisticsClickListener="@{callMediaEncryptionStatisticsClickListener}"
|
||||
app:layout_constraintTop_toBottomOf="@id/name"
|
||||
app:layout_constraintBottom_toBottomOf="@id/back"
|
||||
app:layout_constraintStart_toStartOf="@id/name"
|
||||
app:layout_constraintEnd_toEndOf="parent"/>
|
||||
|
||||
|
|
|
|||
|
|
@ -147,9 +147,9 @@
|
|||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="24dp"
|
||||
android:layout_marginTop="16dp"
|
||||
android:layout_marginTop="12dp"
|
||||
android:layout_marginEnd="5dp"
|
||||
android:layout_marginBottom="16dp"
|
||||
android:layout_marginBottom="12dp"
|
||||
android:background="@color/transparent_color"
|
||||
android:hint="@string/conversation_text_field_hint"
|
||||
android:imeOptions="flagNoPersonalizedLearning"
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@
|
|||
app:barrierDirection="bottom" />
|
||||
|
||||
<ImageView
|
||||
style="@style/icon_top_bar_button_style"
|
||||
style="@style/icon_main_top_bar_button_style"
|
||||
android:id="@+id/drawer_menu"
|
||||
android:onClick="@{() -> viewModel.openDrawerMenu()}"
|
||||
android:layout_width="wrap_content"
|
||||
|
|
@ -56,8 +56,7 @@
|
|||
android:contentDescription="@string/content_description_open_filter"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:tint="?attr/color_on_main" />
|
||||
app:layout_constraintBottom_toBottomOf="parent" />
|
||||
|
||||
<include
|
||||
android:id="@+id/avatar"
|
||||
|
|
@ -89,7 +88,7 @@
|
|||
app:layout_constraintBottom_toBottomOf="@id/avatar"/>
|
||||
|
||||
<ImageView
|
||||
style="@style/icon_top_bar_button_style"
|
||||
style="@style/icon_main_top_bar_button_style"
|
||||
android:id="@+id/search_toggle"
|
||||
android:onClick="@{() -> viewModel.openSearchBar()}"
|
||||
android:layout_width="wrap_content"
|
||||
|
|
@ -98,11 +97,10 @@
|
|||
android:contentDescription="@string/content_description_open_filter"
|
||||
app:layout_constraintEnd_toStartOf="@id/extra_action"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:tint="?attr/color_on_main" />
|
||||
app:layout_constraintBottom_toBottomOf="parent" />
|
||||
|
||||
<ImageView
|
||||
style="@style/icon_top_bar_button_style"
|
||||
style="@style/icon_main_top_bar_button_style"
|
||||
android:id="@+id/extra_action"
|
||||
android:onClick="@{extraActionClickListener}"
|
||||
android:layout_width="wrap_content"
|
||||
|
|
@ -112,11 +110,10 @@
|
|||
android:visibility="@{!viewModel.searchBarVisible && enableExtraAction ? View.VISIBLE : View.GONE, default=gone}"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:tint="?attr/color_on_main" />
|
||||
app:layout_constraintBottom_toBottomOf="parent" />
|
||||
|
||||
<ImageView
|
||||
style="@style/icon_top_bar_button_style"
|
||||
style="@style/icon_main_top_bar_button_style"
|
||||
android:id="@+id/cancel_search"
|
||||
android:onClick="@{() -> viewModel.closeSearchBar()}"
|
||||
android:layout_width="wrap_content"
|
||||
|
|
@ -125,8 +122,7 @@
|
|||
android:contentDescription="@string/content_description_cancel_filter"
|
||||
app:layout_constraintBottom_toBottomOf="@id/search"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="@id/search"
|
||||
app:tint="?attr/color_on_main" />
|
||||
app:layout_constraintTop_toTopOf="@id/search" />
|
||||
|
||||
<com.google.android.material.textfield.TextInputLayout
|
||||
style="?attr/textInputFilledStyle"
|
||||
|
|
@ -161,7 +157,7 @@
|
|||
</com.google.android.material.textfield.TextInputLayout>
|
||||
|
||||
<ImageView
|
||||
style="@style/icon_top_bar_button_style"
|
||||
style="@style/icon_main_top_bar_button_style"
|
||||
android:id="@+id/clear_field"
|
||||
android:onClick="@{() -> viewModel.clearFilter()}"
|
||||
android:layout_width="wrap_content"
|
||||
|
|
@ -170,8 +166,7 @@
|
|||
android:contentDescription="@string/content_description_clear_filter"
|
||||
app:layout_constraintBottom_toBottomOf="@id/search"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="@id/search"
|
||||
app:tint="?attr/color_on_main" />
|
||||
app:layout_constraintTop_toTopOf="@id/search" />
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
|
|
|
|||
|
|
@ -133,6 +133,16 @@
|
|||
<item name="android:maxLines">1</item>
|
||||
<item name="android:ellipsize">end</item>
|
||||
</style>
|
||||
<style name="icon_main_top_bar_button_style">
|
||||
<item name="android:layout_marginTop">2dp</item>
|
||||
<item name="android:layout_marginBottom">2dp</item>
|
||||
<item name="android:layout_marginStart">2dp</item>
|
||||
<item name="android:layout_marginEnd">2dp</item>
|
||||
<item name="android:padding">15dp</item>
|
||||
<item name="android:adjustViewBounds">true</item>
|
||||
<item name="android:background">@drawable/circle_transparent_button_background</item>
|
||||
<item name="tint">@color/main_top_bar_icon_color</item>
|
||||
</style>
|
||||
<style name="icon_top_bar_button_style">
|
||||
<item name="android:layout_marginTop">2dp</item>
|
||||
<item name="android:layout_marginBottom">2dp</item>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue