Fix build

4 years ago · 6e5f75d472
parent 9699126ac9
commit 6e5f75d472
3 changed files with 1 additions and 11 deletions
--- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/JoinPublicChatActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/JoinPublicChatActivity.kt
@ -212,7 +212,7 @@ class EnterChatURLFragment : Fragment() {
        chatURLEditText.imeOptions = chatURLEditText.imeOptions or 16777216 // Always use incognito keyboard
        joinPublicChatButton.setOnClickListener { joinPublicChatIfPossible() }
        viewModel.defaultRooms.observe(viewLifecycleOwner) { state ->
-            defaultRoomsParent.isVisible = state is State.Success
+            defaultRoomsContainer.isVisible = state is State.Success
            defaultRoomsLoader.isVisible = state is State.Loading
            when (state) {
                State.Loading -> {
--- a/app/src/main/res/layout-sw400dp/fragment_enter_chat_url.xml
+++ b/app/src/main/res/layout-sw400dp/fragment_enter_chat_url.xml
@ -33,12 +33,7 @@

    <LinearLayout
        android:visibility="gone"
-<<<<<<< HEAD
-        android:paddingHorizontal="24dp"
-        android:id="@+id/defaultRoomsParent"
-=======
        android:id="@+id/defaultRoomsContainer"
->>>>>>> 133bcac17 (Make chips look better)
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:orientation="vertical">
--- a/app/src/main/res/layout/fragment_enter_chat_url.xml
+++ b/app/src/main/res/layout/fragment_enter_chat_url.xml
@ -33,12 +33,7 @@

    <LinearLayout
        android:visibility="gone"
-<<<<<<< HEAD
-        android:paddingHorizontal="24dp"
-        android:id="@+id/defaultRoomsParent"
-=======
        android:id="@+id/defaultRoomsContainer"
->>>>>>> 133bcac17 (Make chips look better)
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:orientation="vertical">