Unverified Commit 87cb9f1d authored by Lucio Maciel's avatar Lucio Maciel Committed by GitHub

Merge branch 'beta' into fix/text-being-cut-off

parents 4ed7220b aa5dda00
...@@ -11,7 +11,6 @@ import androidx.core.view.ViewCompat ...@@ -11,7 +11,6 @@ import androidx.core.view.ViewCompat
import androidx.core.view.isVisible import androidx.core.view.isVisible
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import chat.rocket.android.R import chat.rocket.android.R
import chat.rocket.android.R.string.message_credentials_saved_successfully
import chat.rocket.android.analytics.AnalyticsManager import chat.rocket.android.analytics.AnalyticsManager
import chat.rocket.android.analytics.event.ScreenViewEvent import chat.rocket.android.analytics.event.ScreenViewEvent
import chat.rocket.android.authentication.signup.presentation.SignupPresenter import chat.rocket.android.authentication.signup.presentation.SignupPresenter
...@@ -64,7 +63,7 @@ class SignupFragment : Fragment(), SignupView { ...@@ -64,7 +63,7 @@ class SignupFragment : Fragment(), SignupView {
if (resultCode == Activity.RESULT_OK) { if (resultCode == Activity.RESULT_OK) {
if (data != null) { if (data != null) {
if (requestCode == SAVE_CREDENTIALS) { if (requestCode == SAVE_CREDENTIALS) {
showMessage(getString(message_credentials_saved_successfully)) showMessage(getString(R.string.message_credentials_saved_successfully))
} }
} }
} }
......
...@@ -141,7 +141,7 @@ class ChatRoomPresenter @Inject constructor( ...@@ -141,7 +141,7 @@ class ChatRoomPresenter @Inject constructor(
broadcast broadcast
} ?: false } ?: false
view.onRoomUpdated(userCanPost, chatIsBroadcast, userCanMod) view.onRoomUpdated(userCanPost, chatIsBroadcast, userCanMod)
loadMessages(roomId, roomType) loadMessages(roomId, roomType, clearDataSet = true)
chatRoomMessage?.let { messageHelper.messageIdFromPermalink(it) } chatRoomMessage?.let { messageHelper.messageIdFromPermalink(it) }
?.let { messageId -> ?.let { messageId ->
val name = messageHelper.roomNameFromPermalink(chatRoomMessage) val name = messageHelper.roomNameFromPermalink(chatRoomMessage)
......
...@@ -25,25 +25,25 @@ abstract class MessageDao { ...@@ -25,25 +25,25 @@ abstract class MessageDao {
@Insert @Insert
abstract fun insert(message: MessageEntity) abstract fun insert(message: MessageEntity)
@Insert @Insert(onConflict = OnConflictStrategy.REPLACE)
abstract fun insert(relation: MessageFavoritesRelation) abstract fun insert(relation: MessageFavoritesRelation)
@Insert @Insert(onConflict = OnConflictStrategy.REPLACE)
abstract fun insert(relation: MessageMentionsRelation) abstract fun insert(relation: MessageMentionsRelation)
@Insert @Insert(onConflict = OnConflictStrategy.REPLACE)
abstract fun insert(relation: MessageChannels) abstract fun insert(relation: MessageChannels)
@Insert @Insert(onConflict = OnConflictStrategy.REPLACE)
abstract fun insert(attachment: AttachmentEntity) abstract fun insert(attachment: AttachmentEntity)
@Insert @Insert(onConflict = OnConflictStrategy.REPLACE)
abstract fun insert(field: AttachmentFieldEntity) abstract fun insert(field: AttachmentFieldEntity)
@Insert(onConflict = OnConflictStrategy.IGNORE) @Insert(onConflict = OnConflictStrategy.IGNORE)
abstract fun insert(reaction: ReactionEntity) abstract fun insert(reaction: ReactionEntity)
@Insert @Insert(onConflict = OnConflictStrategy.REPLACE)
abstract fun insert(url: UrlEntity) abstract fun insert(url: UrlEntity)
@Query("DELETE FROM messages WHERE id = :id") @Query("DELETE FROM messages WHERE id = :id")
......
...@@ -8,18 +8,18 @@ import android.view.ViewGroup ...@@ -8,18 +8,18 @@ import android.view.ViewGroup
import android.webkit.WebView import android.webkit.WebView
import android.webkit.WebViewClient import android.webkit.WebViewClient
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.fragment.app.Fragment
import chat.rocket.android.R import chat.rocket.android.R
import chat.rocket.android.analytics.AnalyticsManager import chat.rocket.android.analytics.AnalyticsManager
import chat.rocket.android.util.extensions.inflate import chat.rocket.android.util.extensions.inflate
import chat.rocket.android.util.extensions.ui import chat.rocket.android.util.extensions.ui
import dagger.android.support.DaggerFragment
import kotlinx.android.synthetic.main.fragment_admin_panel_web_view.* import kotlinx.android.synthetic.main.fragment_admin_panel_web_view.*
import javax.inject.Inject import javax.inject.Inject
private const val BUNDLE_WEB_PAGE_URL = "web_page_url" private const val BUNDLE_WEB_PAGE_URL = "web_page_url"
private const val BUNDLE_USER_TOKEN = "user_token" private const val BUNDLE_USER_TOKEN = "user_token"
class AdminPanelWebViewFragment : Fragment() { class AdminPanelWebViewFragment : DaggerFragment() {
private lateinit var webPageUrl: String private lateinit var webPageUrl: String
private lateinit var userToken: String private lateinit var userToken: String
@Inject @Inject
......
...@@ -9,12 +9,14 @@ ...@@ -9,12 +9,14 @@
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/accounts_container" android:id="@+id/accounts_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent"
android:visibility="gone" android:visibility="gone"
tools:visibility="visible"> tools:visibility="visible">
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
android:layout_marginStart="56dp" android:layout_marginStart="56dp"
android:layout_marginTop="2dp" android:layout_marginTop="2dp"
android:textDirection="locale" android:textDirection="locale"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
tools:text="This is a multiline chat message from Bertie that will take more than just one line of text. I have sure that everything is amazing!" /> tools:text="This is a multiline chat message from Bertie that will take more than just one line of text. I have sure that everything is amazing!" />
......
...@@ -26,7 +26,7 @@ ext { ...@@ -26,7 +26,7 @@ ext {
playServices : '16.0.0', playServices : '16.0.0',
exoPlayer : '2.8.2', exoPlayer : '2.8.2',
flexbox : '1.0.0', flexbox : '1.0.0',
material : '1.0.0', material : '1.0.0-beta01',
room : '2.0.0', room : '2.0.0',
lifecycle : '2.0.0', lifecycle : '2.0.0',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment