From fc52074dcd8e92b2f9ee81a5ab4caf817d176e5f Mon Sep 17 00:00:00 2001 From: Konrad Pozniak Date: Thu, 28 Nov 2024 19:15:54 +0100 Subject: [PATCH] remove some unused code (#4776) --- .../main/java/com/keylesspalace/tusky/MainActivity.kt | 2 +- .../tusky/components/account/AccountActivity.kt | 11 ----------- .../components/announcements/AnnouncementsActivity.kt | 11 ----------- .../announcements/AnnouncementsViewModel.kt | 2 +- .../com/keylesspalace/tusky/network/MastodonApi.kt | 4 +--- .../java/com/keylesspalace/tusky/MainActivityTest.kt | 2 +- 6 files changed, 4 insertions(+), 28 deletions(-) diff --git a/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt b/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt index af2ba7ac3..cc2b0b1c4 100644 --- a/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt @@ -1160,7 +1160,7 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, MenuProvider { private fun fetchAnnouncements() { lifecycleScope.launch { - mastodonApi.listAnnouncements(false) + mastodonApi.announcements() .fold( { announcements -> unreadAnnouncementsCount = announcements.count { !it.read } diff --git a/app/src/main/java/com/keylesspalace/tusky/components/account/AccountActivity.kt b/app/src/main/java/com/keylesspalace/tusky/components/account/AccountActivity.kt index ee2bd0e4c..0acfceff1 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/account/AccountActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/account/AccountActivity.kt @@ -94,10 +94,6 @@ import com.keylesspalace.tusky.util.startActivityWithSlideInAnimation import com.keylesspalace.tusky.util.viewBinding import com.keylesspalace.tusky.util.visible import com.keylesspalace.tusky.view.showMuteAccountDialog -import com.mikepenz.iconics.IconicsDrawable -import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial -import com.mikepenz.iconics.utils.colorInt -import com.mikepenz.iconics.utils.sizeDp import dagger.hilt.android.AndroidEntryPoint import java.text.NumberFormat import java.text.ParseException @@ -854,13 +850,6 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, MenuProvide if (!viewModel.isSelf && followState != FollowState.FOLLOWING) { menu.removeItem(R.id.action_add_or_remove_from_list) } - - menu.findItem(R.id.action_search)?.apply { - icon = IconicsDrawable(this@AccountActivity, GoogleMaterial.Icon.gmd_search).apply { - sizeDp = 20 - colorInt = MaterialColors.getColor(binding.collapsingToolbar, android.R.attr.textColorPrimary) - } - } } private fun showFollowRequestPendingDialog() { diff --git a/app/src/main/java/com/keylesspalace/tusky/components/announcements/AnnouncementsActivity.kt b/app/src/main/java/com/keylesspalace/tusky/components/announcements/AnnouncementsActivity.kt index f777dbaf6..fdab56ee3 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/announcements/AnnouncementsActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/announcements/AnnouncementsActivity.kt @@ -28,7 +28,6 @@ import androidx.core.view.MenuProvider import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.DividerItemDecoration import androidx.recyclerview.widget.LinearLayoutManager -import com.google.android.material.color.MaterialColors import com.keylesspalace.tusky.BottomSheetActivity import com.keylesspalace.tusky.R import com.keylesspalace.tusky.StatusListActivity @@ -45,10 +44,6 @@ import com.keylesspalace.tusky.util.startActivityWithSlideInAnimation import com.keylesspalace.tusky.util.unsafeLazy import com.keylesspalace.tusky.util.viewBinding import com.keylesspalace.tusky.view.EmojiPicker -import com.mikepenz.iconics.IconicsDrawable -import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial -import com.mikepenz.iconics.utils.colorInt -import com.mikepenz.iconics.utils.sizeDp import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.launch @@ -152,12 +147,6 @@ class AnnouncementsActivity : override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) { menuInflater.inflate(R.menu.activity_announcements, menu) - menu.findItem(R.id.action_search)?.apply { - icon = IconicsDrawable(this@AnnouncementsActivity, GoogleMaterial.Icon.gmd_search).apply { - sizeDp = 20 - colorInt = MaterialColors.getColor(binding.includedToolbar.toolbar, android.R.attr.textColorPrimary) - } - } } override fun onMenuItemSelected(menuItem: MenuItem): Boolean { diff --git a/app/src/main/java/com/keylesspalace/tusky/components/announcements/AnnouncementsViewModel.kt b/app/src/main/java/com/keylesspalace/tusky/components/announcements/AnnouncementsViewModel.kt index 3834c5d97..665ee3ce6 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/announcements/AnnouncementsViewModel.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/announcements/AnnouncementsViewModel.kt @@ -58,7 +58,7 @@ class AnnouncementsViewModel @Inject constructor( fun load() { viewModelScope.launch { _announcements.value = Loading() - mastodonApi.listAnnouncements() + mastodonApi.announcements() .fold( { _announcements.value = Success(it) diff --git a/app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.kt b/app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.kt index 1611697ce..39cbd5008 100644 --- a/app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.kt +++ b/app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.kt @@ -609,9 +609,7 @@ interface MastodonApi { ): NetworkResult @GET("api/v1/announcements") - suspend fun listAnnouncements( - @Query("with_dismissed") withDismissed: Boolean = true - ): NetworkResult> + suspend fun announcements(): NetworkResult> @POST("api/v1/announcements/{id}/dismiss") suspend fun dismissAnnouncement(@Path("id") announcementId: String): NetworkResult diff --git a/app/src/test/java/com/keylesspalace/tusky/MainActivityTest.kt b/app/src/test/java/com/keylesspalace/tusky/MainActivityTest.kt index 35ccb3c25..94247c2f5 100644 --- a/app/src/test/java/com/keylesspalace/tusky/MainActivityTest.kt +++ b/app/src/test/java/com/keylesspalace/tusky/MainActivityTest.kt @@ -138,7 +138,7 @@ class MainActivityTest { activity.externalScope = TestScope() activity.mastodonApi = mock { onBlocking { accountVerifyCredentials() } doReturn NetworkResult.success(account) - onBlocking { listAnnouncements(false) } doReturn NetworkResult.success(emptyList()) + onBlocking { announcements() } doReturn NetworkResult.success(emptyList()) } activity.preferences = mock(defaultAnswer = { when (it.method.returnType) {