Skip to content

Commit aceef97

Browse files
rafaelksrafaelks
authored
Merge pull request RocketChat#1732 from divyanshub024/visible-ktx
[IMPROVEMENT] Use isVisible Ktx function rather than extension function
2 parents 9b4af32 + 03b64eb commit aceef97

File tree

6 files changed

+22
-34
lines changed

6 files changed

+22
-34
lines changed

‎app/src/main/java/chat/rocket/android/authentication/registerusername/ui/RegisterUsernameFragment.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import android.view.View
88
import android.view.ViewGroup
99
import androidx.core.content.ContextCompat
1010
import androidx.core.view.ViewCompat
11+
import androidx.core.view.isVisible
1112
import androidx.fragment.app.Fragment
1213
import chat.rocket.android.R
1314
import chat.rocket.android.analytics.AnalyticsManager
@@ -16,7 +17,6 @@ import chat.rocket.android.authentication.registerusername.presentation.Register
1617
import chat.rocket.android.authentication.registerusername.presentation.RegisterUsernameView
1718
import chat.rocket.android.util.extension.asObservable
1819
import chat.rocket.android.util.extensions.inflate
19-
import chat.rocket.android.util.extensions.setVisible
2020
import chat.rocket.android.util.extensions.showKeyboard
2121
import chat.rocket.android.util.extensions.showToast
2222
import chat.rocket.android.util.extensions.textContent
@@ -113,13 +113,13 @@ class RegisterUsernameFragment : Fragment(), RegisterUsernameView {
113113
override fun showLoading() {
114114
ui {
115115
disableUserInput()
116-
view_loading.setVisible(true)
116+
view_loading.isVisible = true
117117
}
118118
}
119119

120120
override fun hideLoading() {
121121
ui {
122-
view_loading.setVisible(false)
122+
view_loading.isVisible = false
123123
enableUserInput()
124124
}
125125
}

‎app/src/main/java/chat/rocket/android/authentication/resetpassword/ui/ResetPasswordFragment.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import android.view.View
66
import android.view.ViewGroup
77
import androidx.core.content.ContextCompat
88
import androidx.core.view.ViewCompat
9+
import androidx.core.view.isVisible
910
import androidx.fragment.app.Fragment
1011
import chat.rocket.android.R
1112
import chat.rocket.android.analytics.AnalyticsManager
@@ -15,7 +16,6 @@ import chat.rocket.android.authentication.resetpassword.presentation.ResetPasswo
1516
import chat.rocket.android.util.extension.asObservable
1617
import chat.rocket.android.util.extensions.inflate
1718
import chat.rocket.android.util.extensions.isEmail
18-
import chat.rocket.android.util.extensions.setVisible
1919
import chat.rocket.android.util.extensions.showKeyboard
2020
import chat.rocket.android.util.extensions.showToast
2121
import chat.rocket.android.util.extensions.textContent
@@ -93,13 +93,13 @@ class ResetPasswordFragment : Fragment(), ResetPasswordView {
9393
override fun showLoading() {
9494
ui {
9595
disableUserInput()
96-
view_loading.setVisible(true)
96+
view_loading.isVisible = true
9797
}
9898
}
9999

100100
override fun hideLoading() {
101101
ui {
102-
view_loading.setVisible(false)
102+
view_loading.isVisible = false
103103
enableUserInput()
104104
}
105105
}

‎app/src/main/java/chat/rocket/android/chatinformation/ui/MessageInfoFragment.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import android.os.Bundle
44
import android.view.LayoutInflater
55
import android.view.View
66
import android.view.ViewGroup
7+
import androidx.core.view.isVisible
78
import androidx.fragment.app.Fragment
89
import androidx.recyclerview.widget.DefaultItemAnimator
910
import androidx.recyclerview.widget.LinearLayoutManager
@@ -15,7 +16,6 @@ import chat.rocket.android.chatinformation.adapter.ReadReceiptAdapter
1516
import chat.rocket.android.chatinformation.presentation.MessageInfoPresenter
1617
import chat.rocket.android.chatinformation.presentation.MessageInfoView
1718
import chat.rocket.android.chatinformation.viewmodel.ReadReceiptViewModel
18-
import chat.rocket.android.util.extensions.setVisible
1919
import chat.rocket.android.util.extensions.showToast
2020
import chat.rocket.android.util.extensions.ui
2121
import dagger.android.support.AndroidSupportInjection
@@ -86,15 +86,15 @@ class MessageInfoFragment : Fragment(), MessageInfoView {
8686

8787
override fun showLoading() {
8888
ui {
89-
view_loading.setVisible(true)
89+
view_loading.isVisible = true
9090
view_loading.show()
9191
}
9292
}
9393

9494
override fun hideLoading() {
9595
ui {
96+
view_loading.isVisible = false
9697
view_loading.hide()
97-
view_loading.setVisible(false)
9898
}
9999
}
100100

@@ -103,4 +103,4 @@ class MessageInfoFragment : Fragment(), MessageInfoView {
103103
adapter.addAll(messageReceipts)
104104
}
105105
}
106-
}
106+
}

‎app/src/main/java/chat/rocket/android/chatroom/adapter/PeopleSuggestionsAdapter.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import android.view.View
77
import android.view.ViewGroup
88
import android.widget.ImageView
99
import android.widget.TextView
10+
import androidx.core.view.isVisible
1011
import chat.rocket.android.R
1112
import chat.rocket.android.chatroom.adapter.PeopleSuggestionsAdapter.PeopleSuggestionViewHolder
1213
import chat.rocket.android.chatroom.uimodel.suggestion.PeopleSuggestionUiModel
13-
import chat.rocket.android.util.extensions.setVisible
1414
import chat.rocket.android.suggestions.model.SuggestionModel
1515
import chat.rocket.android.suggestions.ui.BaseSuggestionViewHolder
1616
import chat.rocket.android.suggestions.ui.SuggestionsAdapter
@@ -58,17 +58,17 @@ class PeopleSuggestionsAdapter(context: Context) : SuggestionsAdapter<PeopleSugg
5858
username.text = item.username
5959
name.text = item.name
6060
if (item.imageUri?.isEmpty() != false) {
61-
avatar.setVisible(false)
61+
avatar.isVisible = false
6262
} else {
63-
avatar.setVisible(true)
63+
avatar.isVisible = true
6464
avatar.setImageURI(item.imageUri)
6565
}
6666
val status = item.status
6767
if (status != null) {
6868
val statusDrawable = DrawableHelper.getUserStatusDrawable(status, itemView.context)
6969
statusView.setImageDrawable(statusDrawable)
7070
} else {
71-
statusView.setVisible(false)
71+
statusView.isVisible = false
7272
}
7373
setOnClickListener {
7474
itemClickListener?.onClick(item)

‎app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsAdapter.kt

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import android.view.View
1212
import android.view.ViewGroup
1313
import android.widget.ImageView
1414
import android.widget.TextView
15+
import androidx.core.view.isVisible
1516
import chat.rocket.android.R
1617
import chat.rocket.android.infrastructure.LocalRepository
1718
import chat.rocket.android.infrastructure.checkIfMyself
@@ -53,13 +54,13 @@ class ChatRoomsAdapter(
5354
bindName(chatRoom, text_chat_name)
5455
bindIcon(chatRoom, image_chat_icon)
5556
if (settings.showLastMessage()) {
56-
text_last_message.setVisible(true)
57-
text_last_message_date_time.setVisible(true)
57+
text_last_message.isVisible = true
58+
text_last_message_date_time.isVisible = true
5859
bindLastMessageDateTime(chatRoom, text_last_message_date_time)
5960
bindLastMessage(chatRoom, text_last_message)
6061
} else {
61-
text_last_message.setVisible(false)
62-
text_last_message_date_time.setVisible(false)
62+
text_last_message.isVisible = false
63+
text_last_message_date_time.isVisible = false
6364
}
6465
bindUnreadMessages(chatRoom, text_total_unread_messages)
6566

@@ -178,13 +179,13 @@ class ChatRoomsAdapter(
178179
when {
179180
totalUnreadMessage in 1..99 -> {
180181
textView.textContent = totalUnreadMessage.toString()
181-
textView.setVisible(true)
182+
textView.isVisible = true
182183
}
183184
totalUnreadMessage > 99 -> {
184185
textView.textContent = context.getString(R.string.msg_more_than_ninety_nine_unread_messages)
185-
textView.setVisible(true)
186+
textView.isVisible = true
186187
}
187-
else -> textView.setVisible(false)
188+
else -> textView.isVisible = false
188189
}
189190
}
190191
}

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,19 +37,6 @@ fun FragmentActivity.clearLightStatusBar() {
3737
}
3838
}
3939

40-
// TODO: Remove. Use KTX instead.
41-
fun View.setVisible(visible: Boolean) {
42-
visibility = if (visible) {
43-
View.VISIBLE
44-
} else {
45-
View.GONE
46-
}
47-
}
48-
49-
fun View.isVisible(): Boolean {
50-
return visibility == View.VISIBLE
51-
}
52-
5340
fun ViewGroup.inflate(@LayoutRes resource: Int, attachToRoot: Boolean = false): View =
5441
LayoutInflater.from(context).inflate(resource, this, attachToRoot)
5542

0 commit comments

Comments
 (0)