diff --git a/app/src/main/res/layout-land/voip_numpad.xml b/app/src/main/res/layout-land/voip_numpad.xml new file mode 100644 index 000000000..3b9fc7d1c --- /dev/null +++ b/app/src/main/res/layout-land/voip_numpad.xml @@ -0,0 +1,223 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/voip_numpad.xml b/app/src/main/res/layout/voip_numpad.xml index c2438a6fa..d8448f34a 100644 --- a/app/src/main/res/layout/voip_numpad.xml +++ b/app/src/main/res/layout/voip_numpad.xml @@ -49,7 +49,9 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_margin="10dp" + android:ellipsize="start" android:gravity="center_horizontal" + android:maxLines="1" android:text="@{controlsViewModel.dtmfHistory, default=`0123456`}" app:layout_constraintEnd_toEndOf="@id/background" app:layout_constraintStart_toStartOf="@id/background" @@ -62,11 +64,13 @@ android:onClick="@{() -> controlsViewModel.handleDtmfClick('1')}" android:src="@drawable/voip_numpad_1" app:layout_constraintBottom_toTopOf="@id/dtmf_4" + app:layout_constraintDimensionRatio="1:1" app:layout_constraintEnd_toStartOf="@id/dtmf_2" app:layout_constraintHorizontal_chainStyle="spread" app:layout_constraintStart_toStartOf="@id/background" app:layout_constraintTop_toBottomOf="@id/entered_dtmfs" - app:layout_constraintVertical_chainStyle="spread" /> + app:layout_constraintVertical_chainStyle="spread" + app:layout_constraintWidth_max="@dimen/voip_numpad_button_max_size" /> + app:layout_constraintVertical_chainStyle="spread" + app:layout_constraintWidth_max="@dimen/voip_numpad_button_max_size" /> + app:layout_constraintVertical_chainStyle="spread" + app:layout_constraintWidth_max="@dimen/voip_numpad_button_max_size" /> + app:layout_constraintTop_toBottomOf="@id/dtmf_1" + app:layout_constraintWidth_max="@dimen/voip_numpad_button_max_size" /> + app:layout_constraintTop_toBottomOf="@id/dtmf_2" + app:layout_constraintWidth_max="@dimen/voip_numpad_button_max_size" /> + app:layout_constraintTop_toBottomOf="@id/dtmf_3" + app:layout_constraintWidth_max="@dimen/voip_numpad_button_max_size" /> + app:layout_constraintTop_toBottomOf="@id/dtmf_4" + app:layout_constraintWidth_max="@dimen/voip_numpad_button_max_size" /> + app:layout_constraintTop_toBottomOf="@id/dtmf_5" + app:layout_constraintWidth_max="@dimen/voip_numpad_button_max_size" /> + app:layout_constraintTop_toBottomOf="@id/dtmf_6" + app:layout_constraintWidth_max="@dimen/voip_numpad_button_max_size" /> + app:layout_constraintTop_toBottomOf="@id/dtmf_7" + app:layout_constraintWidth_max="@dimen/voip_numpad_button_max_size" /> + app:layout_constraintTop_toBottomOf="@id/dtmf_8" + app:layout_constraintWidth_max="@dimen/voip_numpad_button_max_size" /> + app:layout_constraintTop_toBottomOf="@id/dtmf_9" + app:layout_constraintWidth_max="@dimen/voip_numpad_button_max_size" /> diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml index c1cb719fe..7735bcbea 100644 --- a/app/src/main/res/values/dimen.xml +++ b/app/src/main/res/values/dimen.xml @@ -59,4 +59,5 @@ 30dp 137dp 200dp + 60dp \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 7d36f423f..25736aaa0 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -82,8 +82,9 @@