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

removing a redundant wrapper of the dialpad

Browse Source
This commit is contained in:
tibbi 2018-09-25 13:34:31 +02:00
parent b0c1f4e30d
commit dac59dabcf
2 changed files with 182 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/kotlin/com/simplemobiletools/contacts/activities/DialpadActivity.kt
View File

@ -46,7 +46,7 @@ class DialpadActivity : SimpleActivity() {
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
updateTextColors(dialpad_wrapper) updateTextColors(dialpad_holder)
dialpad_clear_char.applyColorFilter(config.textColor) dialpad_clear_char.applyColorFilter(config.textColor)
} }

368
app/src/main/res/layout/activity_dialpad.xml
View File

@ -1,212 +1,206 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout <android.support.constraint.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/dialpad_wrapper" android:id="@+id/dialpad_holder"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
android:layout_alignParentBottom="true"
android:layout_marginBottom="@dimen/activity_margin"
android:focusableInTouchMode="true">
<android.support.constraint.ConstraintLayout <com.simplemobiletools.commons.views.MyRecyclerView
android:id="@+id/dialpad_holder" android:id="@+id/dialpad_list"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="0dp"
android:layout_alignParentBottom="true" android:clipToPadding="false"
android:layout_marginBottom="@dimen/activity_margin" android:scrollbars="none"
android:focusableInTouchMode="true"> app:layoutManager="com.simplemobiletools.commons.views.MyLinearLayoutManager"
app:layout_constraintBottom_toTopOf="@+id/dialpad_input"
app:layout_constraintTop_toTopOf="parent"/>
<com.simplemobiletools.commons.views.MyRecyclerView <com.simplemobiletools.commons.views.FastScroller
android:id="@+id/dialpad_list" android:id="@+id/dialpad_fastscroller"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="0dp" android:layout_height="0dp"
android:clipToPadding="false" android:layout_alignParentEnd="true"
android:scrollbars="none" android:layout_alignParentRight="true"
app:layoutManager="com.simplemobiletools.commons.views.MyLinearLayoutManager" android:paddingStart="@dimen/normal_margin"
app:layout_constraintBottom_toTopOf="@+id/dialpad_input" android:paddingLeft="@dimen/normal_margin"
app:layout_constraintTop_toTopOf="parent"/> app:layout_constraintBottom_toBottomOf="@+id/dialpad_list"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="@+id/dialpad_list">
<com.simplemobiletools.commons.views.FastScroller <include layout="@layout/fastscroller_handle_vertical"/>
android:id="@+id/dialpad_fastscroller"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:paddingLeft="@dimen/normal_margin"
android:paddingStart="@dimen/normal_margin"
app:layout_constraintBottom_toBottomOf="@+id/dialpad_list"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="@+id/dialpad_list">
<include layout="@layout/fastscroller_handle_vertical"/> </com.simplemobiletools.commons.views.FastScroller>
</com.simplemobiletools.commons.views.FastScroller> <com.simplemobiletools.commons.views.MyEditText
android:id="@+id/dialpad_input"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/activity_margin"
android:gravity="center"
android:inputType="phone"
android:textCursorDrawable="@null"
android:textSize="@dimen/dialpad_input_text_size"
app:layout_constraintBottom_toTopOf="@+id/dialpad_2"
app:layout_constraintEnd_toStartOf="@+id/dialpad_clear_char"
app:layout_constraintStart_toStartOf="parent"/>
<com.simplemobiletools.commons.views.MyEditText <ImageView
android:id="@+id/dialpad_input" android:id="@+id/dialpad_clear_char"
android:layout_width="0dp" style="@style/MyBorderlessBackgroundStyle"
android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_marginLeft="@dimen/activity_margin" android:layout_height="0dp"
android:gravity="center" android:layout_marginRight="@dimen/activity_margin"
android:inputType="phone" android:paddingLeft="@dimen/activity_margin"
android:textCursorDrawable="@null" android:paddingRight="@dimen/activity_margin"
android:textSize="@dimen/dialpad_input_text_size" android:src="@drawable/ic_clear_char"
app:layout_constraintBottom_toTopOf="@+id/dialpad_2" app:layout_constraintBottom_toBottomOf="@+id/dialpad_input"
app:layout_constraintEnd_toStartOf="@+id/dialpad_clear_char" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"/> app:layout_constraintTop_toTopOf="@+id/dialpad_input"/>
<ImageView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/dialpad_clear_char" android:id="@+id/dialpad_1"
style="@style/MyBorderlessBackgroundStyle" style="@style/DialpadNumberStyle"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="wrap_content"
android:layout_marginRight="@dimen/activity_margin" android:layout_marginLeft="@dimen/activity_margin"
android:paddingLeft="@dimen/activity_margin" android:text="1"
android:paddingRight="@dimen/activity_margin" app:layout_constraintBottom_toTopOf="@+id/dialpad_4"
android:src="@drawable/ic_clear_char" app:layout_constraintEnd_toStartOf="@+id/dialpad_2"
app:layout_constraintBottom_toBottomOf="@+id/dialpad_input" app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent"/>
app:layout_constraintTop_toTopOf="@+id/dialpad_input"/>
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/dialpad_1" android:id="@+id/dialpad_2"
style="@style/DialpadNumberStyle" style="@style/DialpadNumberStyle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/activity_margin" android:text="2"
android:text="1" app:layout_constraintBottom_toTopOf="@+id/dialpad_5"
app:layout_constraintBottom_toTopOf="@+id/dialpad_4" app:layout_constraintEnd_toStartOf="@+id/dialpad_3"
app:layout_constraintEnd_toStartOf="@+id/dialpad_2" app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toEndOf="@+id/dialpad_1"/>
app:layout_constraintStart_toStartOf="parent"/>
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/dialpad_2" android:id="@+id/dialpad_3"
style="@style/DialpadNumberStyle" style="@style/DialpadNumberStyle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="2" android:layout_marginRight="@dimen/activity_margin"
app:layout_constraintBottom_toTopOf="@+id/dialpad_5" android:text="3"
app:layout_constraintEnd_toStartOf="@+id/dialpad_3" app:layout_constraintBottom_toTopOf="@+id/dialpad_6"
app:layout_constraintHorizontal_bias="0.5" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/dialpad_1"/> app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/dialpad_2"/>
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/dialpad_3" android:id="@+id/dialpad_4"
style="@style/DialpadNumberStyle" style="@style/DialpadNumberStyle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="@dimen/activity_margin" android:layout_marginLeft="@dimen/activity_margin"
android:text="3" android:text="4"
app:layout_constraintBottom_toTopOf="@+id/dialpad_6" app:layout_constraintBottom_toTopOf="@+id/dialpad_7"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toStartOf="@+id/dialpad_5"
app:layout_constraintHorizontal_bias="0.5" app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/dialpad_2"/> app:layout_constraintStart_toStartOf="parent"/>
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/dialpad_4" android:id="@+id/dialpad_5"
style="@style/DialpadNumberStyle" style="@style/DialpadNumberStyle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/activity_margin" android:text="5"
android:text="4" app:layout_constraintBottom_toTopOf="@+id/dialpad_8"
app:layout_constraintBottom_toTopOf="@+id/dialpad_7" app:layout_constraintEnd_toStartOf="@+id/dialpad_6"
app:layout_constraintEnd_toStartOf="@+id/dialpad_5" app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toEndOf="@+id/dialpad_4"/>
app:layout_constraintStart_toStartOf="parent"/>
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/dialpad_5" android:id="@+id/dialpad_6"
style="@style/DialpadNumberStyle" style="@style/DialpadNumberStyle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="5" android:layout_marginRight="@dimen/activity_margin"
app:layout_constraintBottom_toTopOf="@+id/dialpad_8" android:text="6"
app:layout_constraintEnd_toStartOf="@+id/dialpad_6" app:layout_constraintBottom_toTopOf="@+id/dialpad_9"
app:layout_constraintHorizontal_bias="0.5" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/dialpad_4"/> app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/dialpad_5"/>
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/dialpad_6" android:id="@+id/dialpad_7"
style="@style/DialpadNumberStyle" style="@style/DialpadNumberStyle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="@dimen/activity_margin" android:layout_marginLeft="@dimen/activity_margin"
android:text="6" android:text="7"
app:layout_constraintBottom_toTopOf="@+id/dialpad_9" app:layout_constraintBottom_toTopOf="@+id/dialpad_asterisk"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toStartOf="@+id/dialpad_8"
app:layout_constraintHorizontal_bias="0.5" app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/dialpad_5"/> app:layout_constraintStart_toStartOf="parent"/>
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/dialpad_7" android:id="@+id/dialpad_8"
style="@style/DialpadNumberStyle" style="@style/DialpadNumberStyle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/activity_margin" android:text="8"
android:text="7" app:layout_constraintBottom_toTopOf="@+id/dialpad_0"
app:layout_constraintBottom_toTopOf="@+id/dialpad_asterisk" app:layout_constraintEnd_toStartOf="@+id/dialpad_9"
app:layout_constraintEnd_toStartOf="@+id/dialpad_8" app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toEndOf="@+id/dialpad_7"/>
app:layout_constraintStart_toStartOf="parent"/>
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/dialpad_8" android:id="@+id/dialpad_9"
style="@style/DialpadNumberStyle" style="@style/DialpadNumberStyle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="8" android:layout_marginRight="@dimen/activity_margin"
app:layout_constraintBottom_toTopOf="@+id/dialpad_0" android:text="9"
app:layout_constraintEnd_toStartOf="@+id/dialpad_9" app:layout_constraintBottom_toTopOf="@+id/dialpad_hashtag"
app:layout_constraintHorizontal_bias="0.5" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/dialpad_7"/> app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/dialpad_8"/>
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/dialpad_9" android:id="@+id/dialpad_asterisk"
style="@style/DialpadNumberStyle" style="@style/DialpadNumberStyle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="@dimen/activity_margin" android:layout_marginLeft="@dimen/activity_margin"
android:text="9" android:text="*"
app:layout_constraintBottom_toTopOf="@+id/dialpad_hashtag" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toStartOf="@+id/dialpad_0"
app:layout_constraintHorizontal_bias="0.5" app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/dialpad_8"/> app:layout_constraintStart_toStartOf="parent"
tools:layout_editor_absoluteY="0dp"/>
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/dialpad_asterisk" android:id="@+id/dialpad_0"
style="@style/DialpadNumberStyle" style="@style/DialpadNumberStyle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/activity_margin" android:text="0"
android:text="*" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/dialpad_hashtag"
app:layout_constraintEnd_toStartOf="@+id/dialpad_0" app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toEndOf="@+id/dialpad_asterisk"/>
app:layout_constraintStart_toStartOf="parent"
tools:layout_editor_absoluteY="0dp"/>
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/dialpad_0" android:id="@+id/dialpad_hashtag"
style="@style/DialpadNumberStyle" style="@style/DialpadNumberStyle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="0" android:layout_marginRight="@dimen/activity_margin"
app:layout_constraintBottom_toBottomOf="parent" android:text="#"
app:layout_constraintEnd_toStartOf="@+id/dialpad_hashtag" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintHorizontal_bias="0.5" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/dialpad_asterisk"/> app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/dialpad_0"/>
<com.simplemobiletools.commons.views.MyTextView </android.support.constraint.ConstraintLayout>
android:id="@+id/dialpad_hashtag"
style="@style/DialpadNumberStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/activity_margin"
android:text="#"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/dialpad_0"/>
</android.support.constraint.ConstraintLayout>
</RelativeLayout>