fix codestyle

app/src/main/java/com/keylesspalace/tusky/MainActivity.kt

@@ -48,7 +48,12 @@ import com.bumptech.glide.request.transition.Transition
 import com.google.android.material.tabs.TabLayout
 import com.google.android.material.tabs.TabLayout.OnTabSelectedListener
 import com.google.android.material.tabs.TabLayoutMediator
-import com.keylesspalace.tusky.appstore.*
+import com.keylesspalace.tusky.appstore.AnnouncementReadEvent
+import com.keylesspalace.tusky.appstore.CacheUpdater
+import com.keylesspalace.tusky.appstore.Event
+import com.keylesspalace.tusky.appstore.EventHub
+import com.keylesspalace.tusky.appstore.MainTabsChangedEvent
+import com.keylesspalace.tusky.appstore.ProfileEditedEvent
 import com.keylesspalace.tusky.components.announcements.AnnouncementsActivity
 import com.keylesspalace.tusky.components.compose.ComposeActivity
 import com.keylesspalace.tusky.components.compose.ComposeActivity.Companion.canHandleMimeType
@@ -67,7 +72,14 @@ import com.keylesspalace.tusky.interfaces.ActionButtonActivity
 import com.keylesspalace.tusky.interfaces.ReselectableFragment
 import com.keylesspalace.tusky.pager.MainPagerAdapter
 import com.keylesspalace.tusky.settings.PrefKeys
-import com.keylesspalace.tusky.util.*
+import com.keylesspalace.tusky.util.ThemeUtils
+import com.keylesspalace.tusky.util.deleteStaleCachedMedia
+import com.keylesspalace.tusky.util.emojify
+import com.keylesspalace.tusky.util.hide
+import com.keylesspalace.tusky.util.removeShortcut
+import com.keylesspalace.tusky.util.updateShortcut
+import com.keylesspalace.tusky.util.viewBinding
+import com.keylesspalace.tusky.util.visible
 import com.mikepenz.iconics.IconicsDrawable
 import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial
 import com.mikepenz.iconics.utils.colorInt
@@ -76,9 +88,24 @@ import com.mikepenz.materialdrawer.holder.BadgeStyle
 import com.mikepenz.materialdrawer.holder.ColorHolder
 import com.mikepenz.materialdrawer.holder.StringHolder
 import com.mikepenz.materialdrawer.iconics.iconicsIcon
-import com.mikepenz.materialdrawer.model.*
+import com.mikepenz.materialdrawer.model.AbstractDrawerItem
-import com.mikepenz.materialdrawer.model.interfaces.*
+import com.mikepenz.materialdrawer.model.DividerDrawerItem
-import com.mikepenz.materialdrawer.util.*
+import com.mikepenz.materialdrawer.model.PrimaryDrawerItem
+import com.mikepenz.materialdrawer.model.ProfileDrawerItem
+import com.mikepenz.materialdrawer.model.ProfileSettingDrawerItem
+import com.mikepenz.materialdrawer.model.SecondaryDrawerItem
+import com.mikepenz.materialdrawer.model.interfaces.IProfile
+import com.mikepenz.materialdrawer.model.interfaces.descriptionRes
+import com.mikepenz.materialdrawer.model.interfaces.descriptionText
+import com.mikepenz.materialdrawer.model.interfaces.iconRes
+import com.mikepenz.materialdrawer.model.interfaces.iconUrl
+import com.mikepenz.materialdrawer.model.interfaces.nameRes
+import com.mikepenz.materialdrawer.model.interfaces.nameText
+import com.mikepenz.materialdrawer.util.AbstractDrawerImageLoader
+import com.mikepenz.materialdrawer.util.DrawerImageLoader
+import com.mikepenz.materialdrawer.util.addItems
+import com.mikepenz.materialdrawer.util.addItemsAtPosition
+import com.mikepenz.materialdrawer.util.updateBadge
 import com.mikepenz.materialdrawer.widget.AccountHeaderView
 import dagger.android.DispatchingAndroidInjector
 import dagger.android.HasAndroidInjector
@@ -156,7 +183,9 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
                     forwardShare(intent)
                 } else {
                     // No account was provided, show the chooser
-                    showAccountChooserDialog(getString(R.string.action_share_as), true, object : AccountSelectionListener {
+                    showAccountChooserDialog(
+                        getString(R.string.action_share_as), true,
+                        object : AccountSelectionListener {
                             override fun onAccountSelected(account: AccountEntity) {
                                 val requestedId = account.id
                                 if (requestedId == activeAccount.id) {
@@ -168,7 +197,8 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
                                     changeAccount(requestedId, intent)
                                 }
                             }
-                    })
+                        }
+                    )
                 }
             } else if (accountRequested && savedInstanceState == null) {
                 // user clicked a notification, show notification tab
@@ -323,12 +353,15 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
             headerBackgroundScaleType = ImageView.ScaleType.CENTER_CROP
             currentHiddenInList = true
             onAccountHeaderListener = { _: View?, profile: IProfile, current: Boolean -> handleProfileClick(profile, current) }
-            addProfile(ProfileSettingDrawerItem().apply {
+            addProfile(
+                ProfileSettingDrawerItem().apply {
                     identifier = DRAWER_ITEM_ADD_ACCOUNT
                     nameRes = R.string.add_account_name
                     descriptionRes = R.string.add_account_description
                     iconicsIcon = GoogleMaterial.Icon.gmd_add
-            }, 0)
+                },
+                0
+            )
             attachToSliderView(binding.mainDrawer)
             dividerBelowHeader = false
             closeDrawerOnProfileListClick = true
@@ -468,14 +501,16 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
             )
 
             if (addSearchButton) {
-                binding.mainDrawer.addItemsAtPosition(4,
+                binding.mainDrawer.addItemsAtPosition(
+                    4,
                     primaryDrawerItem {
                         nameRes = R.string.action_search
                         iconicsIcon = GoogleMaterial.Icon.gmd_search
                         onClick = {
                             startActivityWithSlideInAnimation(SearchActivity.getIntent(context))
                         }
-                    })
+                    }
+                )
             }
 
             setSavedInstance(savedInstanceState)
@@ -572,7 +607,6 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
         binding.mainToolbar.setOnClickListener {
             (adapter.getFragment(activeTabLayout.selectedTabPosition) as? ReselectableFragment)?.onReselect()
         }
-
     }
 
     private fun handleProfileClick(profile: IProfile, current: Boolean): Boolean {

app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeViewModel.kt

@@ -28,17 +28,27 @@ import com.keylesspalace.tusky.components.search.SearchType
 import com.keylesspalace.tusky.db.AccountManager
 import com.keylesspalace.tusky.db.AppDatabase
 import com.keylesspalace.tusky.db.InstanceEntity
-import com.keylesspalace.tusky.entity.*
+import com.keylesspalace.tusky.entity.Attachment
+import com.keylesspalace.tusky.entity.Emoji
+import com.keylesspalace.tusky.entity.NewPoll
 import com.keylesspalace.tusky.entity.Status
 import com.keylesspalace.tusky.network.MastodonApi
 import com.keylesspalace.tusky.service.ServiceClient
 import com.keylesspalace.tusky.service.TootToSend
-import com.keylesspalace.tusky.util.*
+import com.keylesspalace.tusky.util.Either
+import com.keylesspalace.tusky.util.RxAwareViewModel
+import com.keylesspalace.tusky.util.VersionUtils
+import com.keylesspalace.tusky.util.combineLiveData
+import com.keylesspalace.tusky.util.filter
+import com.keylesspalace.tusky.util.map
+import com.keylesspalace.tusky.util.randomAlphanumericString
+import com.keylesspalace.tusky.util.toLiveData
+import com.keylesspalace.tusky.util.withoutFirstWhich
 import io.reactivex.rxjava3.core.Observable
 import io.reactivex.rxjava3.core.Single
 import io.reactivex.rxjava3.disposables.Disposable
 import kotlinx.coroutines.launch
-import java.util.*
+import java.util.Locale
 import javax.inject.Inject
 
 class ComposeViewModel @Inject constructor(
@@ -91,7 +101,9 @@ class ComposeViewModel @Inject constructor(
 
     init {
 
-        Single.zip(api.getCustomEmojis(), api.getInstance(), { emojis, instance ->
+        Single.zip(
+            api.getCustomEmojis(), api.getInstance(),
+            { emojis, instance ->
                 InstanceEntity(
                     instance = accountManager.activeAccount?.domain!!,
                     emojiList = emojis,
@@ -100,20 +112,24 @@ class ComposeViewModel @Inject constructor(
                     maxPollOptionLength = instance.pollLimits?.maxOptionChars,
                     version = instance.version
                 )
-        })
+            }
+        )
             .doOnSuccess {
                 db.instanceDao().insertOrReplace(it)
             }
             .onErrorResumeNext {
                 db.instanceDao().loadMetadataForInstance(accountManager.activeAccount?.domain!!)
             }
-                .subscribe({ instanceEntity ->
+            .subscribe(
+                { instanceEntity ->
                     emoji.postValue(instanceEntity.emojiList)
                     instance.postValue(instanceEntity)
-                }, { throwable ->
+                },
+                { throwable ->
                     // this can happen on network error when no cached data is available
                     Log.w(TAG, "error loading instance data", throwable)
-                })
+                }
+            )
             .autoDispose()
     }
 
@@ -124,19 +140,23 @@ class ComposeViewModel @Inject constructor(
         mediaUploader.prepareMedia(uri)
             .map { (type, uri, size) ->
                 val mediaItems = media.value!!
-                    if (type != QueuedMedia.Type.IMAGE
+                if (type != QueuedMedia.Type.IMAGE &&
-                            && mediaItems.isNotEmpty()
+                    mediaItems.isNotEmpty() &&
-                            && mediaItems[0].type == QueuedMedia.Type.IMAGE) {
+                    mediaItems[0].type == QueuedMedia.Type.IMAGE
+                ) {
                     throw VideoOrImageException()
                 } else {
                     addMediaToQueue(type, uri, size, description)
                 }
             }
-                .subscribe({ queuedMedia ->
+            .subscribe(
+                { queuedMedia ->
                     liveData.postValue(Either.Right(queuedMedia))
-                }, { error ->
+                },
+                { error ->
                     liveData.postValue(Either.Left(error))
-                })
+                }
+            )
             .autoDispose()
         return liveData
     }
@@ -157,7 +177,8 @@ class ComposeViewModel @Inject constructor(
         media.value = media.value!! + mediaItem
         mediaToDisposable[mediaItem.localId] = mediaUploader
             .uploadMedia(mediaItem)
-                .subscribe({ event ->
+            .subscribe(
+                { event ->
                     val item = media.value?.find { it.localId == mediaItem.localId }
                         ?: return@subscribe
                     val newMediaItem = when (event) {
@@ -169,16 +190,20 @@ class ComposeViewModel @Inject constructor(
                     synchronized(media) {
                         val mediaValue = media.value!!
                         val index = mediaValue.indexOfFirst { it.localId == newMediaItem.localId }
-                        media.postValue(if (index == -1) {
+                        media.postValue(
+                            if (index == -1) {
                                 mediaValue + newMediaItem
                             } else {
                                 mediaValue.toMutableList().also { it[index] = newMediaItem }
-                        })
                             }
-                }, { error ->
+                        )
+                    }
+                },
+                { error ->
                     media.postValue(media.value?.filter { it.localId != mediaItem.localId } ?: emptyList())
                     uploadError.postValue(error)
-                })
+                }
+            )
         return mediaItem
     }
 
@@ -198,12 +223,14 @@ class ComposeViewModel @Inject constructor(
 
     fun didChange(content: String?, contentWarning: String?): Boolean {
 
-        val textChanged = !(content.isNullOrEmpty()
+        val textChanged = !(
-                || startingText?.startsWith(content.toString()) ?: false)
+            content.isNullOrEmpty() ||
+                startingText?.startsWith(content.toString()) ?: false
+            )
 
-        val contentWarningChanged = showContentWarning.value!!
+        val contentWarningChanged = showContentWarning.value!! &&
-                && !contentWarning.isNullOrEmpty()
+            !contentWarning.isNullOrEmpty() &&
-                && !startingContentWarning.startsWith(contentWarning.toString())
+            !startingContentWarning.startsWith(contentWarning.toString())
         val mediaChanged = !media.value.isNullOrEmpty()
         val pollChanged = poll.value != null
 
@@ -316,11 +343,14 @@ class ComposeViewModel @Inject constructor(
                     media.removeObserver(this)
                 } else if (updatedItem.id != null) {
                     api.updateMedia(updatedItem.id, description)
-                            .subscribe({
+                        .subscribe(
+                            {
                                 completedCaptioningLiveData.postValue(true)
-                            }, {
+                            },
+                            {
                                 completedCaptioningLiveData.postValue(false)
-                            })
+                            }
+                        )
                         .autoDispose()
                     media.removeObserver(this)
                 }
@@ -389,7 +419,8 @@ class ComposeViewModel @Inject constructor(
 
         val replyVisibility = composeOptions?.replyVisibility ?: Status.Visibility.UNKNOWN
         startingVisibility = Status.Visibility.byNum(
-                preferredVisibility.num.coerceAtLeast(replyVisibility.num))
+            preferredVisibility.num.coerceAtLeast(replyVisibility.num)
+        )
 
         inReplyToId = composeOptions?.inReplyToId
 
@@ -468,7 +499,6 @@ class ComposeViewModel @Inject constructor(
     private companion object {
         const val TAG = "ComposeViewModel"
     }
-
 }
 
 fun <T> mutableLiveData(default: T) = MutableLiveData<T>().apply { value = default }

app/src/main/java/com/keylesspalace/tusky/components/drafts/DraftHelper.kt

@@ -162,5 +162,4 @@ class DraftHelper @Inject constructor(
         IOUtils.copyToFile(contentResolver, this, file)
         return FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID + ".fileprovider", file)
     }
-
 }

app/src/main/java/com/keylesspalace/tusky/components/scheduled/ScheduledTootActivity.kt

@@ -117,7 +117,9 @@ class ScheduledTootActivity : BaseActivity(), ScheduledTootActionListener, Injec
     }
 
     override fun edit(item: ScheduledStatus) {
-        val intent = ComposeActivity.startIntent(this, ComposeActivity.ComposeOptions(
+        val intent = ComposeActivity.startIntent(
+            this,
+            ComposeActivity.ComposeOptions(
                 scheduledTootId = item.id,
                 tootText = item.params.text,
                 contentWarning = item.params.spoilerText,
@@ -126,7 +128,8 @@ class ScheduledTootActivity : BaseActivity(), ScheduledTootActionListener, Injec
                 visibility = item.params.visibility,
                 scheduledAt = item.scheduledAt,
                 sensitive = item.params.sensitive
-        ))
+            )
+        )
         startActivity(intent)
     }
 

app/src/main/java/com/keylesspalace/tusky/components/scheduled/ScheduledTootAdapter.kt

@@ -40,7 +40,6 @@ class ScheduledTootAdapter(
         override fun areContentsTheSame(oldItem: ScheduledStatus, newItem: ScheduledStatus): Boolean {
             return oldItem == newItem
         }
-
     }
 ) {