refactor: remove useless FontActivity.kt

musicbeeremote · Jan 1, 2025 · 51ba65b · 51ba65b
1 parent ba7559d
commit 51ba65b
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 18 deletions.
diff --git a/app/src/main/assets/fonts/roboto_light.ttf b/app/src/main/assets/fonts/roboto_light.ttf
diff --git a/app/src/main/assets/fonts/roboto_medium.ttf b/app/src/main/assets/fonts/roboto_medium.ttf
diff --git a/app/src/main/assets/fonts/roboto_regular.ttf b/app/src/main/assets/fonts/roboto_regular.ttf
diff --git a/app/src/main/java/com/kelsos/mbrc/BaseActivity.kt b/app/src/main/java/com/kelsos/mbrc/BaseActivity.kt
@@ -13,6 +13,7 @@ import androidx.activity.OnBackPressedCallback
 import androidx.annotation.ColorRes
 import androidx.annotation.StringRes
 import androidx.appcompat.app.ActionBarDrawerToggle
+import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.TaskStackBuilder
 import androidx.core.content.ContextCompat
 import androidx.core.view.GravityCompat
@@ -42,7 +43,7 @@ import timber.log.Timber
 import javax.inject.Inject
 
 abstract class BaseActivity :
-  FontActivity(),
+  AppCompatActivity(),
   NavigationView.OnNavigationItemSelectedListener {
   @Inject
   lateinit var bus: RxBus

diff --git a/app/src/main/java/com/kelsos/mbrc/FontActivity.kt b/app/src/main/java/com/kelsos/mbrc/FontActivity.kt
diff --git a/app/src/main/java/com/kelsos/mbrc/features/help/HelpFeedbackActivity.kt b/app/src/main/java/com/kelsos/mbrc/features/help/HelpFeedbackActivity.kt
@@ -1,14 +1,14 @@
 package com.kelsos.mbrc.features.help
 
 import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import androidx.viewpager2.widget.ViewPager2
 import com.google.android.material.appbar.MaterialToolbar
 import com.google.android.material.tabs.TabLayout
 import com.google.android.material.tabs.TabLayoutMediator
-import com.kelsos.mbrc.FontActivity
 import com.kelsos.mbrc.R
 
-class HelpFeedbackActivity : FontActivity() {
+class HelpFeedbackActivity : AppCompatActivity() {
   private lateinit var toolbar: MaterialToolbar
   private lateinit var tabLayout: TabLayout
   private lateinit var viewPager: ViewPager2

diff --git a/app/src/main/java/com/kelsos/mbrc/features/library/AlbumTracksActivity.kt b/app/src/main/java/com/kelsos/mbrc/features/library/AlbumTracksActivity.kt
@@ -7,11 +7,11 @@ import android.widget.Button
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.activity.OnBackPressedCallback
+import androidx.appcompat.app.AppCompatActivity
 import androidx.core.os.BundleCompat
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.snackbar.Snackbar
-import com.kelsos.mbrc.FontActivity
 import com.kelsos.mbrc.R
 import com.kelsos.mbrc.common.ui.EmptyRecyclerView
 import com.kelsos.mbrc.common.utilities.RemoteUtils.sha1
@@ -25,7 +25,7 @@ import java.io.File
 import javax.inject.Inject
 
 class AlbumTracksActivity :
-  FontActivity(),
+  AppCompatActivity(),
   AlbumTracksView,
   TrackEntryAdapter.MenuItemSelectedListener {
   @Inject

diff --git a/app/src/main/java/com/kelsos/mbrc/features/library/ArtistAlbumsActivity.kt b/app/src/main/java/com/kelsos/mbrc/features/library/ArtistAlbumsActivity.kt
@@ -3,11 +3,11 @@ package com.kelsos.mbrc.features.library
 import android.os.Bundle
 import android.view.MenuItem
 import androidx.activity.OnBackPressedCallback
+import androidx.appcompat.app.AppCompatActivity
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.appbar.MaterialToolbar
 import com.google.android.material.snackbar.Snackbar
-import com.kelsos.mbrc.FontActivity
 import com.kelsos.mbrc.R
 import com.kelsos.mbrc.annotations.Queue
 import com.kelsos.mbrc.common.ui.EmptyRecyclerView
@@ -19,7 +19,7 @@ import toothpick.smoothie.module.SmoothieActivityModule
 import javax.inject.Inject
 
 class ArtistAlbumsActivity :
-  FontActivity(),
+  AppCompatActivity(),
   ArtistAlbumsView,
   AlbumEntryAdapter.MenuItemSelectedListener {
   private lateinit var recyclerView: EmptyRecyclerView

diff --git a/app/src/main/java/com/kelsos/mbrc/features/library/GenreArtistsActivity.kt b/app/src/main/java/com/kelsos/mbrc/features/library/GenreArtistsActivity.kt
@@ -3,11 +3,11 @@ package com.kelsos.mbrc.features.library
 import android.os.Bundle
 import android.view.MenuItem
 import androidx.activity.OnBackPressedCallback
+import androidx.appcompat.app.AppCompatActivity
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.appbar.MaterialToolbar
 import com.google.android.material.snackbar.Snackbar
-import com.kelsos.mbrc.FontActivity
 import com.kelsos.mbrc.R
 import com.kelsos.mbrc.annotations.Queue
 import com.kelsos.mbrc.common.ui.EmptyRecyclerView
@@ -21,7 +21,7 @@ import toothpick.smoothie.module.SmoothieActivityModule
 import javax.inject.Inject
 
 class GenreArtistsActivity :
-  FontActivity(),
+  AppCompatActivity(),
   GenreArtistsView,
   MenuItemSelectedListener {
   private lateinit var recyclerView: EmptyRecyclerView

diff --git a/app/src/main/java/com/kelsos/mbrc/features/settings/ConnectionManagerActivity.kt b/app/src/main/java/com/kelsos/mbrc/features/settings/ConnectionManagerActivity.kt
@@ -3,13 +3,13 @@ package com.kelsos.mbrc.features.settings
 import android.os.Bundle
 import android.view.MenuItem
 import android.widget.Button
+import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.isGone
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.appbar.MaterialToolbar
 import com.google.android.material.progressindicator.LinearProgressIndicator
 import com.google.android.material.snackbar.Snackbar
-import com.kelsos.mbrc.FontActivity
 import com.kelsos.mbrc.R
 import com.kelsos.mbrc.constants.UserInputEventType
 import com.kelsos.mbrc.events.DefaultSettingsChangedEvent
@@ -25,7 +25,7 @@ import toothpick.smoothie.module.SmoothieActivityModule
 import javax.inject.Inject
 
 class ConnectionManagerActivity :
-  FontActivity(),
+  AppCompatActivity(),
   ConnectionManagerView,
   SettingsDialogFragment.SettingsSaveListener,
   ConnectionAdapter.ConnectionChangeListener {

diff --git a/app/src/main/java/com/kelsos/mbrc/features/settings/SettingsActivity.kt b/app/src/main/java/com/kelsos/mbrc/features/settings/SettingsActivity.kt
@@ -2,16 +2,16 @@ package com.kelsos.mbrc.features.settings
 
 import android.os.Bundle
 import android.view.MenuItem
+import androidx.appcompat.app.AppCompatActivity
 import com.google.android.material.appbar.MaterialToolbar
-import com.kelsos.mbrc.FontActivity
 import com.kelsos.mbrc.R
 import com.kelsos.mbrc.events.bus.RxBus
 import toothpick.Scope
 import toothpick.Toothpick
 import toothpick.smoothie.module.SmoothieActivityModule
 import javax.inject.Inject
 
-class SettingsActivity : FontActivity() {
+class SettingsActivity : AppCompatActivity() {
   @Inject
   lateinit var bus: RxBus
   private lateinit var scope: Scope