Updated gradle plugin version + improved UI
This commit is contained in:
parent
153ccab4ae
commit
9802d0a8d8
4 changed files with 57 additions and 65 deletions
|
@ -162,13 +162,18 @@
|
|||
android:queryBackground="@color/transparent_color"
|
||||
android:queryHint="@string/contact_filter_hint"/>
|
||||
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp"
|
||||
android:layout_below="@id/searchBar"
|
||||
android:background="?attr/dividerColor" />
|
||||
|
||||
<HorizontalScrollView
|
||||
android:visibility="@{viewModel.createGroupChat ? View.VISIBLE : View.GONE}"
|
||||
android:id="@+id/layoutContactsSelected"
|
||||
android:layout_below="@id/searchBar"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="50dp"
|
||||
android:layout_marginTop="5dp"
|
||||
android:background="?attr/lightToolbarBackgroundColor"
|
||||
android:fadeScrollbars="false"
|
||||
android:lines="1">
|
||||
|
|
|
@ -95,70 +95,54 @@
|
|||
|
||||
</FrameLayout>
|
||||
|
||||
<TextView
|
||||
style="@style/contact_edit_form_label_font"
|
||||
<com.google.android.material.textfield.TextInputLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingTop="10dp"
|
||||
android:text="@string/contact_last_name"
|
||||
android:textAllCaps="true" />
|
||||
android:hint="@string/contact_last_name">
|
||||
|
||||
<EditText
|
||||
style="@style/contact_edit_form_font"
|
||||
android:text="@={viewModel.lastName}"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="40dp"
|
||||
android:background="@drawable/resizable_text_field"
|
||||
android:textColor="@color/black_color"
|
||||
android:gravity="left"
|
||||
android:inputType="textPersonName|textCapWords"
|
||||
android:paddingRight="5dp"
|
||||
android:hint="@string/contact_last_name"
|
||||
android:textCursorDrawable="@null" />
|
||||
<com.google.android.material.textfield.TextInputEditText
|
||||
android:text="@={viewModel.lastName}"
|
||||
android:imeOptions="actionDone"
|
||||
android:singleLine="true"
|
||||
android:inputType="textPersonName|textCapWords"
|
||||
android:background="@color/transparent_color"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"/>
|
||||
|
||||
<TextView
|
||||
style="@style/contact_edit_form_label_font"
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
|
||||
<com.google.android.material.textfield.TextInputLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingTop="10dp"
|
||||
android:text="@string/contact_first_name"
|
||||
android:textAllCaps="true" />
|
||||
android:hint="@string/contact_first_name">
|
||||
|
||||
<EditText
|
||||
style="@style/contact_edit_form_font"
|
||||
android:text="@={viewModel.firstName}"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="40dp"
|
||||
android:background="@drawable/resizable_text_field"
|
||||
android:textColor="@color/black_color"
|
||||
android:gravity="left"
|
||||
android:inputType="textPersonName|textCapWords"
|
||||
android:paddingRight="5dp"
|
||||
android:hint="@string/contact_first_name"
|
||||
android:textCursorDrawable="@null" />
|
||||
<com.google.android.material.textfield.TextInputEditText
|
||||
android:text="@={viewModel.firstName}"
|
||||
android:imeOptions="actionDone"
|
||||
android:singleLine="true"
|
||||
android:inputType="textPersonName|textCapWords"
|
||||
android:background="@color/transparent_color"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"/>
|
||||
|
||||
<TextView
|
||||
style="@style/contact_edit_form_label_font"
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
|
||||
<com.google.android.material.textfield.TextInputLayout
|
||||
android:visibility="@{viewModel.displayOrganization ? View.VISIBLE : View.GONE}"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingTop="10dp"
|
||||
android:text="@string/contact_organization"
|
||||
android:textAllCaps="true" />
|
||||
android:hint="@string/contact_organization">
|
||||
|
||||
<EditText
|
||||
style="@style/contact_edit_form_font"
|
||||
android:visibility="@{viewModel.displayOrganization ? View.VISIBLE : View.GONE}"
|
||||
android:text="@={viewModel.organization}"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="40dp"
|
||||
android:background="@drawable/resizable_text_field"
|
||||
android:textColor="@color/black_color"
|
||||
android:gravity="left"
|
||||
android:inputType="textPersonName|textCapWords"
|
||||
android:paddingRight="5dp"
|
||||
android:hint="@string/contact_organization"
|
||||
android:textCursorDrawable="@null" />
|
||||
<com.google.android.material.textfield.TextInputEditText
|
||||
android:text="@={viewModel.organization}"
|
||||
android:imeOptions="actionDone"
|
||||
android:singleLine="true"
|
||||
android:inputType="textPersonName|textCapWords"
|
||||
android:background="@color/transparent_color"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"/>
|
||||
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="match_parent"
|
||||
|
|
|
@ -14,20 +14,23 @@
|
|||
android:visibility="@{data.toRemove ? View.GONE : View.VISIBLE, default=visible}"
|
||||
android:paddingBottom="5dp">
|
||||
|
||||
<EditText
|
||||
style="@style/contact_edit_form_font"
|
||||
android:text="@={data.newValue}"
|
||||
android:inputType="@{data.sipAddress ? InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS : InputType.TYPE_CLASS_PHONE}"
|
||||
<com.google.android.material.textfield.TextInputLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="40dp"
|
||||
android:background="@drawable/resizable_text_field"
|
||||
android:textColor="@color/black_color"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_toLeftOf="@id/delete"
|
||||
android:layout_centerVertical="true"
|
||||
android:gravity="left"
|
||||
android:paddingRight="5dp"
|
||||
android:hint="@{data.sipAddress ? @string/sip_address : @string/phone_number, default=@string/sip_address}"
|
||||
android:textCursorDrawable="@null" />
|
||||
android:hint="@{data.sipAddress ? @string/sip_address : @string/phone_number, default=@string/sip_address}">
|
||||
|
||||
<com.google.android.material.textfield.TextInputEditText
|
||||
android:text="@={data.newValue}"
|
||||
android:imeOptions="actionDone"
|
||||
android:singleLine="true"
|
||||
android:inputType="@{data.sipAddress ? InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS : InputType.TYPE_CLASS_PHONE}"
|
||||
android:background="@color/transparent_color"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"/>
|
||||
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/delete"
|
||||
|
|
|
@ -12,7 +12,7 @@ buildscript {
|
|||
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:4.0.0'
|
||||
classpath 'com.android.tools.build:gradle:4.0.1'
|
||||
classpath 'com.google.gms:google-services:4.3.3'
|
||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
||||
classpath "org.jlleitschuh.gradle:ktlint-gradle:9.1.1"
|
||||
|
|
Loading…
Reference in a new issue