diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/NewConversationActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/NewConversationActivity.kt index 1268b88f..33f8de21 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/NewConversationActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/NewConversationActivity.kt @@ -16,6 +16,7 @@ import com.simplemobiletools.smsmessenger.adapters.ContactsAdapter import com.simplemobiletools.smsmessenger.extensions.getSuggestedContacts import com.simplemobiletools.smsmessenger.extensions.getThreadId import com.simplemobiletools.smsmessenger.helpers.* +import kotlinx.android.synthetic.main.activity_main.* import kotlinx.android.synthetic.main.activity_new_conversation.* import kotlinx.android.synthetic.main.item_suggested_contact.view.* import java.net.URLDecoder @@ -26,11 +27,15 @@ class NewConversationActivity : SimpleActivity() { private var privateContacts = ArrayList() override fun onCreate(savedInstanceState: Bundle?) { + isMaterialActivity = true super.onCreate(savedInstanceState) setContentView(R.layout.activity_new_conversation) title = getString(R.string.new_conversation) updateTextColors(new_conversation_holder) + updateMaterialActivityViews(new_conversation_coordinator, contacts_list, true) + setupMaterialScrollListener(contacts_list, new_conversation_toolbar) + window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE) new_conversation_address.requestFocus() @@ -45,6 +50,7 @@ class NewConversationActivity : SimpleActivity() { setupToolbar(new_conversation_toolbar, NavigationIcon.Arrow) no_contacts_placeholder_2.setTextColor(getProperPrimaryColor()) no_contacts_placeholder_2.underlineText() + suggestions_label.setTextColor(getProperPrimaryColor()) } private fun initContacts() { diff --git a/app/src/main/res/layout/activity_new_conversation.xml b/app/src/main/res/layout/activity_new_conversation.xml index 170375c3..b7628b9b 100644 --- a/app/src/main/res/layout/activity_new_conversation.xml +++ b/app/src/main/res/layout/activity_new_conversation.xml @@ -5,151 +5,139 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - - - + android:layout_height="?attr/actionBarSize" + android:background="@color/color_primary" + app:title="@string/new_conversation" + app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" /> + android:layout_marginTop="?attr/actionBarSize"> - + android:layout_height="@dimen/normal_icon_size" + android:layout_marginStart="@dimen/activity_margin" + android:layout_marginEnd="@dimen/activity_margin" + android:layout_toStartOf="@+id/new_conversation_confirm" + android:background="@android:color/transparent" + android:gravity="center_vertical" + android:hint="@string/add_contact_or_number" + android:inputType="textCapWords" + android:textSize="@dimen/big_text_size" /> - + - + - + - + - + + + + + android:divider="@drawable/linear_layout_horizontal_divider" + android:orientation="horizontal" + android:showDividers="middle" /> - + - + - - + - + - - - - -