TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-05-01 01:10:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix build

Browse Source
This commit is contained in:
Niels Andriesse 2021-05-14 13:53:41 +10:00
parent 9699126ac9
commit 6e5f75d472
3 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/loki/activities/JoinPublicChatActivity.kt
View File

@ -212,7 +212,7 @@ class EnterChatURLFragment : Fragment() {
chatURLEditText.imeOptions = chatURLEditText.imeOptions or 16777216 // Always use incognito keyboard chatURLEditText.imeOptions = chatURLEditText.imeOptions or 16777216 // Always use incognito keyboard
joinPublicChatButton.setOnClickListener { joinPublicChatIfPossible() } joinPublicChatButton.setOnClickListener { joinPublicChatIfPossible() }
viewModel.defaultRooms.observe(viewLifecycleOwner) { state -> viewModel.defaultRooms.observe(viewLifecycleOwner) { state ->
defaultRoomsParent.isVisible = state is State.Success defaultRoomsContainer.isVisible = state is State.Success
defaultRoomsLoader.isVisible = state is State.Loading defaultRoomsLoader.isVisible = state is State.Loading
when (state) { when (state) {
State.Loading -> { State.Loading -> {

5
app/src/main/res/layout-sw400dp/fragment_enter_chat_url.xml
View File

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

5
app/src/main/res/layout/fragment_enter_chat_url.xml
View File

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