Browse Source

Fix after rebase

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
tobiasKaminsky 4 years ago
parent
commit
b4283b2654

+ 0 - 2
src/main/java/com/nextcloud/ui/ChooseAccountDialogFragment.kt

@@ -50,8 +50,6 @@ import com.owncloud.android.utils.DisplayUtils
 import com.owncloud.android.utils.DisplayUtils.AvatarGenerationListener
 import com.owncloud.android.utils.DisplayUtils.AvatarGenerationListener
 import com.owncloud.android.utils.theme.ThemeColorUtils
 import com.owncloud.android.utils.theme.ThemeColorUtils
 import com.owncloud.android.utils.theme.ThemeDrawableUtils
 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 java.util.ArrayList
 import javax.inject.Inject
 import javax.inject.Inject
 
 

+ 4 - 4
src/main/java/com/nextcloud/ui/SetStatusDialogFragment.kt

@@ -140,7 +140,7 @@ class SetStatusDialogFragment :
 
 
         currentStatus?.let {
         currentStatus?.let {
             binding.emoji.setText(it.icon)
             binding.emoji.setText(it.icon)
-            binding.customStatusInput.text.clear()
+            binding.customStatusInput.text?.clear()
             binding.customStatusInput.setText(it.message)
             binding.customStatusInput.setText(it.message)
             visualizeStatus(it.status)
             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(
         ThemeTextInputUtils.colorTextInput(
             binding.customStatusInputContainer,
             binding.customStatusInputContainer,
             binding.customStatusInput,
             binding.customStatusInput,
@@ -408,7 +408,7 @@ class SetStatusDialogFragment :
     override fun onClick(predefinedStatus: PredefinedStatus) {
     override fun onClick(predefinedStatus: PredefinedStatus) {
         selectedPredefinedMessageId = predefinedStatus.id
         selectedPredefinedMessageId = predefinedStatus.id
         clearAt = clearAtToUnixTime(predefinedStatus.clearAt)
         clearAt = clearAtToUnixTime(predefinedStatus.clearAt)
-        emoji.setText(predefinedStatus.icon)
+        binding.emoji.setText(predefinedStatus.icon)
         binding.customStatusInput.text?.clear()
         binding.customStatusInput.text?.clear()
         binding.customStatusInput.text?.append(predefinedStatus.message)
         binding.customStatusInput.text?.append(predefinedStatus.message)