From 0bf7e12ee895992cf5601692b787953ccc0438d9 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sat, 30 May 2020 17:29:00 +0200 Subject: [PATCH] renaming conversation to new_conversation layout --- .../smsmessenger/activities/NewConversationActivity.kt | 4 ++-- ...ctivity_conversation.xml => activity_new_conversation.xml} | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename app/src/main/res/layout/{activity_conversation.xml => activity_new_conversation.xml} (100%) 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 4f5b1fea..bca2f70b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/NewConversationActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/NewConversationActivity.kt @@ -18,7 +18,7 @@ import com.simplemobiletools.smsmessenger.extensions.config import com.simplemobiletools.smsmessenger.extensions.getSuggestedContacts import com.simplemobiletools.smsmessenger.extensions.getThreadId import com.simplemobiletools.smsmessenger.helpers.* -import kotlinx.android.synthetic.main.activity_conversation.* +import kotlinx.android.synthetic.main.activity_new_conversation.* import kotlinx.android.synthetic.main.item_suggested_contact.view.* import java.net.URLDecoder import java.util.* @@ -30,7 +30,7 @@ class NewConversationActivity : SimpleActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setContentView(R.layout.activity_conversation) + setContentView(R.layout.activity_new_conversation) title = getString(R.string.new_conversation) updateTextColors(new_conversation_holder) diff --git a/app/src/main/res/layout/activity_conversation.xml b/app/src/main/res/layout/activity_new_conversation.xml similarity index 100% rename from app/src/main/res/layout/activity_conversation.xml rename to app/src/main/res/layout/activity_new_conversation.xml index 79704e5d..f76e807f 100644 --- a/app/src/main/res/layout/activity_conversation.xml +++ b/app/src/main/res/layout/activity_new_conversation.xml @@ -42,12 +42,12 @@ android:id="@+id/no_contacts_placeholder" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_below="@+id/message_divider_two" android:layout_centerHorizontal="true" android:layout_marginTop="@dimen/bigger_margin" android:alpha="0.8" android:gravity="center" android:paddingLeft="@dimen/activity_margin" - android:layout_below="@+id/message_divider_two" android:paddingRight="@dimen/activity_margin" android:text="@string/no_access_to_contacts" android:textSize="@dimen/bigger_text_size"