fenix/Simple-Dialer
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Dialer.git synced 2025-06-05 21:49:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #488 from Naveen3Singh/dimension_fixes

Browse Source 
Fix overlapping views
This commit is contained in:
Tibor Kaputa
2022-11-20 10:02:07 +01:00
committed by GitHub
parent b8bbb6e9bc 9ee6f3d4a2
commit e0dbba3c6a
4 changed files with 127 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/kotlin/com/simplemobiletools/dialer/adapters/RecentCallsAdapter.kt
View File

@@ -274,7 +274,7 @@ class RecentCallsAdapter(
private fun setupView(view: View, call: RecentCall) {
view.apply {
item_recents_frame.isSelected = selectedKeys.contains(call.id)
item_recents_holder.isSelected = selectedKeys.contains(call.id)
var nameToShow = SpannableString(call.name)
if (call.specificType.isNotEmpty()) {
nameToShow = SpannableString("${call.name} - ${call.specificType}")

18
app/src/main/res/layout/activity_call.xml
View File

@@ -15,7 +15,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.05"
app:layout_constraintVertical_bias="0.08"
tools:src="@drawable/ic_call_accept" />
<com.simplemobiletools.commons.views.MyTextView
@@ -171,7 +171,7 @@
app:layout_constraintEnd_toStartOf="@+id/call_toggle_speaker"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.6" />
app:layout_constraintVertical_bias="0.63" />
<ImageView
android:id="@+id/call_toggle_speaker"
@@ -185,7 +185,7 @@
app:layout_constraintEnd_toStartOf="@+id/call_dialpad"
app:layout_constraintStart_toEndOf="@+id/call_toggle_microphone"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.6" />
app:layout_constraintVertical_bias="0.63" />
<ImageView
android:id="@+id/call_dialpad"
@@ -199,7 +199,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/call_toggle_speaker"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.6" />
app:layout_constraintVertical_bias="0.63" />
<ImageView
android:id="@+id/call_toggle_hold"
@@ -270,6 +270,13 @@
app:layout_constraintStart_toStartOf="@+id/call_toggle_speaker"
app:layout_constraintTop_toBottomOf="@+id/call_toggle_speaker" />
<androidx.constraintlayout.widget.Barrier
android:id="@+id/call_control_grid_barrier"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:barrierDirection="bottom"
app:constraint_referenced_ids="call_toggle_microphone,call_toggle_speaker,call_dialpad,call_toggle_hold,call_add,call_swap,call_merge,call_manage" />
<ImageView
android:id="@+id/call_end"
android:layout_width="@dimen/dialpad_button_size"
@@ -279,8 +286,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.9" />
app:layout_constraintTop_toBottomOf="@id/call_control_grid_barrier" />
<androidx.constraintlayout.widget.Group
android:id="@+id/controls_single_call"

227
app/src/main/res/layout/item_recent_call.xml
View File

@@ -1,132 +1,131 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/item_recents_frame"
android:id="@+id/item_recents_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:foreground="@drawable/selector">
android:foreground="@drawable/selector"
android:paddingTop="@dimen/medium_margin"
android:paddingBottom="@dimen/medium_margin">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/item_recents_holder"
android:layout_width="match_parent"
<ImageView
android:id="@+id/item_recents_image"
android:layout_width="@dimen/normal_icon_size"
android:layout_height="@dimen/normal_icon_size"
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/small_margin"
android:layout_marginEnd="@dimen/small_margin"
android:padding="@dimen/small_margin"
android:src="@drawable/ic_person_vector"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/item_recents_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:paddingTop="@dimen/medium_margin"
android:paddingBottom="@dimen/medium_margin">
android:layout_marginStart="@dimen/small_margin"
android:layout_marginEnd="@dimen/small_margin"
android:ellipsize="end"
android:maxLines="1"
android:textSize="@dimen/bigger_text_size"
app:layout_constraintBottom_toTopOf="@id/item_recents_date_time"
app:layout_constraintEnd_toStartOf="@+id/overflow_menu_icon"
app:layout_constraintStart_toEndOf="@+id/item_recents_image"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="spread_inside"
tools:text="John Doe" />
<ImageView
android:id="@+id/item_recents_image"
android:layout_width="@dimen/normal_icon_size"
android:layout_height="@dimen/normal_icon_size"
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/small_margin"
android:layout_marginEnd="@dimen/small_margin"
android:padding="@dimen/small_margin"
android:src="@drawable/ic_person_vector"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/item_recents_sim_image"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="@dimen/tiny_margin"
android:alpha="0.6"
android:padding="@dimen/tiny_margin"
android:src="@drawable/ic_sim_vector"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/item_recents_date_time"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintStart_toEndOf="@+id/item_recents_image"
app:layout_constraintTop_toTopOf="@id/item_recents_date_time"
tools:visibility="visible" />
<TextView
android:id="@+id/item_recents_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/small_margin"
android:layout_marginEnd="@dimen/small_margin"
android:ellipsize="end"
android:maxLines="1"
android:textSize="@dimen/bigger_text_size"
app:layout_constraintEnd_toStartOf="@+id/overflow_menu_icon"
app:layout_constraintStart_toEndOf="@+id/item_recents_image"
app:layout_constraintTop_toTopOf="parent"
tools:text="John Doe" />
<TextView
android:id="@+id/item_recents_sim_id"
android:layout_width="0dp"
android:layout_height="0dp"
android:gravity="center"
android:textColor="@color/md_grey_black"
android:textSize="@dimen/small_text_size"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/item_recents_sim_image"
app:layout_constraintEnd_toEndOf="@+id/item_recents_sim_image"
app:layout_constraintStart_toStartOf="@+id/item_recents_sim_image"
app:layout_constraintTop_toTopOf="@+id/item_recents_sim_image"
tools:text="1"
tools:visibility="visible" />
<ImageView
android:id="@+id/item_recents_sim_image"
android:layout_width="@dimen/activity_margin"
android:layout_height="@dimen/activity_margin"
android:layout_marginStart="@dimen/small_margin"
android:alpha="0.6"
android:paddingTop="@dimen/tiny_margin"
android:paddingBottom="@dimen/tiny_margin"
android:src="@drawable/ic_sim_vector"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/item_recents_date_time"
app:layout_constraintStart_toEndOf="@+id/item_recents_image"
app:layout_constraintTop_toTopOf="@+id/item_recents_date_time"
tools:visibility="visible" />
<ImageView
android:id="@+id/item_recents_type"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="@dimen/tiny_margin"
android:alpha="0.6"
android:padding="@dimen/tiny_margin"
android:src="@drawable/ic_incoming_call_vector"
app:layout_constraintBottom_toBottomOf="@+id/item_recents_date_time"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintEnd_toStartOf="@id/item_recents_date_time"
app:layout_constraintStart_toEndOf="@+id/item_recents_sim_image"
app:layout_constraintTop_toTopOf="@+id/item_recents_date_time" />
<TextView
android:id="@+id/item_recents_sim_id"
android:layout_width="0dp"
android:layout_height="0dp"
android:gravity="center"
android:textColor="@color/md_grey_black"
android:textSize="@dimen/small_text_size"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/item_recents_sim_image"
app:layout_constraintEnd_toEndOf="@+id/item_recents_sim_image"
app:layout_constraintStart_toStartOf="@+id/item_recents_sim_image"
app:layout_constraintTop_toTopOf="@+id/item_recents_sim_image"
tools:text="1" />
<TextView
android:id="@+id/item_recents_date_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/tiny_margin"
android:alpha="0.6"
android:maxLines="1"
android:textSize="@dimen/normal_text_size"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/item_recents_type"
app:layout_constraintTop_toBottomOf="@id/item_recents_name"
tools:text="18.11.2022" />
<ImageView
android:id="@+id/item_recents_type"
android:layout_width="@dimen/activity_margin"
android:layout_height="@dimen/activity_margin"
android:layout_marginStart="@dimen/small_margin"
android:alpha="0.6"
android:scaleType="fitStart"
android:src="@drawable/ic_incoming_call_vector"
app:layout_constraintBottom_toBottomOf="@+id/item_recents_date_time"
app:layout_constraintStart_toEndOf="@+id/item_recents_sim_image"
app:layout_constraintTop_toTopOf="@+id/item_recents_date_time" />
<TextView
android:id="@+id/item_recents_duration"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/item_recents_name"
android:layout_marginEnd="@dimen/small_margin"
android:alpha="0.6"
android:gravity="end"
android:textSize="@dimen/normal_text_size"
app:layout_constraintBottom_toBottomOf="@id/item_recents_date_time"
app:layout_constraintEnd_toStartOf="@+id/overflow_menu_icon"
app:layout_constraintTop_toTopOf="@id/item_recents_date_time"
tools:text="00:10" />
<TextView
android:id="@+id/item_recents_date_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/small_margin"
android:alpha="0.6"
android:maxLines="1"
android:textSize="@dimen/normal_text_size"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/item_recents_duration"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintStart_toEndOf="@+id/item_recents_type"
tools:text="0123 456 789" />
<ImageView
android:id="@+id/overflow_menu_icon"
style="@style/OverflowMenuIconStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/item_recents_duration"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/item_recents_name"
android:layout_marginEnd="@dimen/small_margin"
android:alpha="0.6"
android:gravity="end"
android:textSize="@dimen/normal_text_size"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/overflow_menu_icon"
tools:text="00:10" />
<View
android:id="@+id/overflow_menu_anchor"
style="@style/OverflowMenuAnchorStyle"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/overflow_menu_icon"
style="@style/OverflowMenuIconStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<View
android:id="@+id/overflow_menu_anchor"
style="@style/OverflowMenuAnchorStyle"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</FrameLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

2
app/src/main/res/values/dimens.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="dialpad_button_size">72dp</dimen>
<dimen name="dialpad_button_size">60dp</dimen>
<dimen name="dialpad_button_size_small">50dp</dimen>
<dimen name="incoming_call_arrow_size">50dp</dimen>
<dimen name="incoming_call_button_size">72dp</dimen>