Skip to content
This repository was archived by the owner on Jun 7, 2020. It is now read-only.

Commit d5a5a9b

Browse files
committed
fix wildcard imports
fix indentation handle nullable in PushManager parcelable methods move textview extension in widget file
1 parent 0685f5f commit d5a5a9b

6 files changed

Lines changed: 28 additions & 26 deletions

File tree

app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomViewHolder.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import androidx.core.view.isInvisible
88
import androidx.core.view.isVisible
99
import chat.rocket.android.R
1010
import chat.rocket.android.chatrooms.adapter.model.RoomUiModel
11-
import chat.rocket.android.util.extensions.setTextViewAppearance
11+
import chat.rocket.android.util.extension.setTextViewAppearance
1212
import chat.rocket.common.model.RoomType
1313
import chat.rocket.common.model.UserStatus
1414
import kotlinx.android.synthetic.main.item_chat.view.*

app/src/main/java/chat/rocket/android/createchannel/ui/CreateChannelFragment.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
package chat.rocket.android.createchannel.ui
22

33
import android.os.Bundle
4-
import android.view.*
4+
import android.view.LayoutInflater
5+
import android.view.Menu
6+
import android.view.MenuItem
7+
import android.view.View
8+
import android.view.ViewGroup
59
import androidx.appcompat.app.AppCompatActivity
610
import androidx.appcompat.view.ActionMode
711
import androidx.core.view.isVisible

app/src/main/java/chat/rocket/android/members/adapter/MembersAdapter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import kotlinx.android.synthetic.main.avatar.view.*
1111
import kotlinx.android.synthetic.main.item_member.view.*
1212

1313
class MembersAdapter(
14-
private val listener: (MemberUiModel) -> Unit
14+
private val listener: (MemberUiModel) -> Unit
1515
) : RecyclerView.Adapter<MembersAdapter.ViewHolder>() {
1616
private var dataSet: List<MemberUiModel> = ArrayList()
1717

app/src/main/java/chat/rocket/android/push/PushManager.kt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -231,8 +231,8 @@ class PushManager @Inject constructor(
231231

232232
@RequiresApi(Build.VERSION_CODES.O)
233233
private fun createBaseNotificationBuilder(
234-
pushMessage: PushMessage,
235-
grouped: Boolean = false
234+
pushMessage: PushMessage,
235+
grouped: Boolean = false
236236
): NotificationCompat.Builder {
237237
return with(pushMessage) {
238238
val id = notificationId.toInt()
@@ -299,10 +299,10 @@ class PushManager @Inject constructor(
299299
}
300300

301301
private fun getContentIntent(
302-
context: Context,
303-
notificationId: Int,
304-
pushMessage: PushMessage,
305-
grouped: Boolean = false
302+
context: Context,
303+
notificationId: Int,
304+
pushMessage: PushMessage,
305+
grouped: Boolean = false
306306
): PendingIntent {
307307
val roomId = if (!grouped) pushMessage.info.roomId else null
308308
val notificationIntent = context.changeServerIntent(pushMessage.info.host, chatRoomId = roomId)
@@ -395,12 +395,12 @@ data class PushMessage(
395395
) : Parcelable {
396396

397397
constructor(parcel: Parcel) : this(
398-
parcel.readString()!!,
399-
parcel.readString()!!,
400-
parcel.readParcelable(PushMessage::class.java.classLoader)!!,
398+
parcel.readString() ?: "",
399+
parcel.readString() ?: "",
400+
parcel.readParcelable(PushMessage::class.java.classLoader) ?: PushInfo.EMPTY,
401401
parcel.readString(),
402402
parcel.readString(),
403-
parcel.readString()!!,
403+
parcel.readString()?: "",
404404
parcel.readString(),
405405
parcel.readString())
406406

app/src/main/java/chat/rocket/android/util/extensions/TextView.kt

Lines changed: 0 additions & 13 deletions
This file was deleted.

util/src/main/java/chat/rocket/android/util/extension/Widget.kt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
package chat.rocket.android.util.extension
22

3+
import android.content.Context
4+
import android.os.Build
5+
import android.widget.TextView
36
import androidx.appcompat.widget.SearchView
47

58
fun SearchView.onQueryTextListener(queryListener: (String) -> Unit) {
@@ -14,4 +17,12 @@ fun SearchView.onQueryTextListener(queryListener: (String) -> Unit) {
1417
return true
1518
}
1619
})
20+
}
21+
22+
fun TextView.setTextViewAppearance(context: Context, style: Int) {
23+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
24+
setTextAppearance(style)
25+
} else {
26+
setTextAppearance(context, style)
27+
}
1728
}

0 commit comments

Comments
 (0)