opensourcemirror
/
nextcloud-android
mirror of https://github.com/nextcloud/android.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix after rebase 

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
This commit is contained in:
tobiasKaminsky 2021-02-23 08:25:39 +01:00
parent 5073e04b0b
commit b4283b2654
No known key found for this signature in database
GPG Key ID: 0E00D4D47D0C5AF7
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nextcloud/ui/ChooseAccountDialogFragment.kt
View File

@ -50,8 +50,6 @@ import com.owncloud.android.utils.DisplayUtils
import com.owncloud.android.utils.DisplayUtils.AvatarGenerationListener
import com.owncloud.android.utils.theme.ThemeColorUtils
import com.owncloud.android.utils.theme.ThemeDrawableUtils
import kotlinx.android.synthetic.main.account_item.*
import kotlinx.android.synthetic.main.dialog_choose_account.*
import java.util.ArrayList
import javax.inject.Inject

8
src/main/java/com/nextcloud/ui/SetStatusDialogFragment.kt
View File

@ -140,7 +140,7 @@ class SetStatusDialogFragment :
currentStatus?.let {
binding.emoji.setText(it.icon)
binding.customStatusInput.text.clear()
binding.customStatusInput.text?.clear()
binding.customStatusInput.setText(it.message)
visualizeStatus(it.status)
@ -212,8 +212,8 @@ class SetStatusDialogFragment :
}
}
clearStatus.setTextColor(ThemeColorUtils.primaryColor(context, true))
ThemeButtonUtils.colorPrimaryButton(setStatus, context)
binding.clearStatus.setTextColor(ThemeColorUtils.primaryColor(context, true))
ThemeButtonUtils.colorPrimaryButton(binding.setStatus, context)
ThemeTextInputUtils.colorTextInput(
binding.customStatusInputContainer,
binding.customStatusInput,
@ -408,7 +408,7 @@ class SetStatusDialogFragment :
override fun onClick(predefinedStatus: PredefinedStatus) {
selectedPredefinedMessageId = predefinedStatus.id
clearAt = clearAtToUnixTime(predefinedStatus.clearAt)
emoji.setText(predefinedStatus.icon)
binding.emoji.setText(predefinedStatus.icon)
binding.customStatusInput.text?.clear()
binding.customStatusInput.text?.append(predefinedStatus.message)