From 963d9f6401bf43e7f94a361397389f7745f5cf8e Mon Sep 17 00:00:00 2001 From: FongMi Date: Thu, 2 Nov 2023 10:25:28 +0800 Subject: [PATCH] Clean code --- .../java/com/fongmi/android/tv/ui/activity/CastActivity.java | 2 +- .../java/com/fongmi/android/tv/ui/activity/LiveActivity.java | 2 +- .../java/com/fongmi/android/tv/ui/activity/VideoActivity.java | 2 +- .../java/com/fongmi/android/tv/ui/dialog/PassDialog.java | 1 - .../fongmi/android/tv/ui/{custom => }/dialog/BaseDialog.java | 2 +- .../fongmi/android/tv/ui/{custom => }/dialog/TrackDialog.java | 2 +- .../java/com/fongmi/android/tv/ui/activity/LiveActivity.java | 2 +- .../java/com/fongmi/android/tv/ui/activity/VideoActivity.java | 2 +- .../mobile/java/com/fongmi/android/tv/ui/dialog/CastDialog.java | 1 - .../java/com/fongmi/android/tv/ui/dialog/ControlDialog.java | 1 - .../java/com/fongmi/android/tv/ui/dialog/EpisodeGridDialog.java | 1 - .../java/com/fongmi/android/tv/ui/dialog/FilterDialog.java | 1 - .../mobile/java/com/fongmi/android/tv/ui/dialog/PassDialog.java | 1 - .../java/com/fongmi/android/tv/ui/dialog/ReceiveDialog.java | 1 - .../mobile/java/com/fongmi/android/tv/ui/dialog/SyncDialog.java | 1 - 15 files changed, 7 insertions(+), 15 deletions(-) rename app/src/main/java/com/fongmi/android/tv/ui/{custom => }/dialog/BaseDialog.java (97%) rename app/src/main/java/com/fongmi/android/tv/ui/{custom => }/dialog/TrackDialog.java (98%) diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CastActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CastActivity.java index 5de42381b..f3629eb3c 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CastActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CastActivity.java @@ -38,7 +38,7 @@ import com.fongmi.android.tv.player.Players; import com.fongmi.android.tv.player.Source; import com.fongmi.android.tv.ui.base.BaseActivity; import com.fongmi.android.tv.ui.custom.CustomKeyDownCast; -import com.fongmi.android.tv.ui.custom.dialog.TrackDialog; +import com.fongmi.android.tv.ui.dialog.TrackDialog; import com.fongmi.android.tv.utils.Clock; import com.fongmi.android.tv.utils.KeyUtil; import com.fongmi.android.tv.utils.ResUtil; diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java index fee139567..b6c9ad308 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java @@ -53,7 +53,7 @@ import com.fongmi.android.tv.ui.custom.CustomLiveListView; import com.fongmi.android.tv.ui.dialog.LiveDialog; import com.fongmi.android.tv.ui.dialog.PassDialog; import com.fongmi.android.tv.ui.dialog.SubtitleDialog; -import com.fongmi.android.tv.ui.custom.dialog.TrackDialog; +import com.fongmi.android.tv.ui.dialog.TrackDialog; import com.fongmi.android.tv.ui.presenter.ChannelPresenter; import com.fongmi.android.tv.ui.presenter.GroupPresenter; import com.fongmi.android.tv.utils.Biometric; diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java index 9d439a6ec..6848335ad 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java @@ -66,7 +66,7 @@ import com.fongmi.android.tv.ui.base.BaseActivity; import com.fongmi.android.tv.ui.custom.CustomKeyDownVod; import com.fongmi.android.tv.ui.custom.CustomMovement; import com.fongmi.android.tv.ui.dialog.DescDialog; -import com.fongmi.android.tv.ui.custom.dialog.TrackDialog; +import com.fongmi.android.tv.ui.dialog.TrackDialog; import com.fongmi.android.tv.ui.presenter.ArrayPresenter; import com.fongmi.android.tv.ui.presenter.EpisodePresenter; import com.fongmi.android.tv.ui.presenter.FlagPresenter; diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/PassDialog.java b/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/PassDialog.java index 255988a52..0c7f8fb2c 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/PassDialog.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/PassDialog.java @@ -15,7 +15,6 @@ import androidx.viewbinding.ViewBinding; import com.fongmi.android.tv.databinding.DialogPassBinding; import com.fongmi.android.tv.impl.PassCallback; -import com.fongmi.android.tv.ui.custom.dialog.BaseDialog; import com.fongmi.android.tv.utils.ResUtil; import com.google.android.material.bottomsheet.BottomSheetDialogFragment; diff --git a/app/src/main/java/com/fongmi/android/tv/ui/custom/dialog/BaseDialog.java b/app/src/main/java/com/fongmi/android/tv/ui/dialog/BaseDialog.java similarity index 97% rename from app/src/main/java/com/fongmi/android/tv/ui/custom/dialog/BaseDialog.java rename to app/src/main/java/com/fongmi/android/tv/ui/dialog/BaseDialog.java index a9522bd24..71a4fa6ba 100644 --- a/app/src/main/java/com/fongmi/android/tv/ui/custom/dialog/BaseDialog.java +++ b/app/src/main/java/com/fongmi/android/tv/ui/dialog/BaseDialog.java @@ -1,4 +1,4 @@ -package com.fongmi.android.tv.ui.custom.dialog; +package com.fongmi.android.tv.ui.dialog; import android.app.Dialog; import android.content.DialogInterface; diff --git a/app/src/main/java/com/fongmi/android/tv/ui/custom/dialog/TrackDialog.java b/app/src/main/java/com/fongmi/android/tv/ui/dialog/TrackDialog.java similarity index 98% rename from app/src/main/java/com/fongmi/android/tv/ui/custom/dialog/TrackDialog.java rename to app/src/main/java/com/fongmi/android/tv/ui/dialog/TrackDialog.java index 656d6c7b2..cc1ef5d39 100644 --- a/app/src/main/java/com/fongmi/android/tv/ui/custom/dialog/TrackDialog.java +++ b/app/src/main/java/com/fongmi/android/tv/ui/dialog/TrackDialog.java @@ -1,4 +1,4 @@ -package com.fongmi.android.tv.ui.custom.dialog; +package com.fongmi.android.tv.ui.dialog; import android.view.LayoutInflater; import android.view.ViewGroup; diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java index 8c4e34371..92e7d4865 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java @@ -57,7 +57,7 @@ import com.fongmi.android.tv.ui.dialog.CastDialog; import com.fongmi.android.tv.ui.dialog.LiveDialog; import com.fongmi.android.tv.ui.dialog.PassDialog; import com.fongmi.android.tv.ui.dialog.SubtitleDialog; -import com.fongmi.android.tv.ui.custom.dialog.TrackDialog; +import com.fongmi.android.tv.ui.dialog.TrackDialog; import com.fongmi.android.tv.utils.Biometric; import com.fongmi.android.tv.utils.Clock; import com.fongmi.android.tv.utils.ImgUtil; diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java index 119bc8bc6..955615239 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java @@ -81,7 +81,7 @@ import com.fongmi.android.tv.ui.dialog.ControlDialog; import com.fongmi.android.tv.ui.dialog.EpisodeGridDialog; import com.fongmi.android.tv.ui.dialog.EpisodeListDialog; import com.fongmi.android.tv.ui.dialog.SubtitleDialog; -import com.fongmi.android.tv.ui.custom.dialog.TrackDialog; +import com.fongmi.android.tv.ui.dialog.TrackDialog; import com.fongmi.android.tv.utils.Clock; import com.fongmi.android.tv.utils.FileChooser; import com.fongmi.android.tv.utils.ImgUtil; diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/CastDialog.java b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/CastDialog.java index de85ce327..9c3156e34 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/CastDialog.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/CastDialog.java @@ -29,7 +29,6 @@ import com.fongmi.android.tv.databinding.DialogDeviceBinding; import com.fongmi.android.tv.server.Server; import com.fongmi.android.tv.ui.activity.ScanActivity; import com.fongmi.android.tv.ui.adapter.DeviceAdapter; -import com.fongmi.android.tv.ui.custom.dialog.BaseDialog; import com.fongmi.android.tv.utils.Notify; import com.github.catvod.net.OkHttp; import com.github.catvod.utils.Path; diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/ControlDialog.java b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/ControlDialog.java index 2c336a05c..96084cb77 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/ControlDialog.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/ControlDialog.java @@ -21,7 +21,6 @@ import com.fongmi.android.tv.player.Players; import com.fongmi.android.tv.ui.adapter.ParseAdapter; import com.fongmi.android.tv.ui.base.ViewType; import com.fongmi.android.tv.ui.custom.SpaceItemDecoration; -import com.fongmi.android.tv.ui.custom.dialog.BaseDialog; import com.fongmi.android.tv.utils.ResUtil; import com.google.android.material.bottomsheet.BottomSheetDialogFragment; import com.google.android.material.slider.Slider; diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/EpisodeGridDialog.java b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/EpisodeGridDialog.java index 0d1b36168..7a94d06e3 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/EpisodeGridDialog.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/EpisodeGridDialog.java @@ -12,7 +12,6 @@ import androidx.viewpager2.adapter.FragmentStateAdapter; import com.fongmi.android.tv.bean.Episode; import com.fongmi.android.tv.databinding.DialogEpisodeGridBinding; -import com.fongmi.android.tv.ui.custom.dialog.BaseDialog; import com.fongmi.android.tv.ui.fragment.EpisodeFragment; import com.fongmi.android.tv.utils.ResUtil; import com.google.android.material.bottomsheet.BottomSheetDialogFragment; diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/FilterDialog.java b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/FilterDialog.java index 0a7cf2aa9..553934ec4 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/FilterDialog.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/FilterDialog.java @@ -12,7 +12,6 @@ import com.fongmi.android.tv.bean.Filter; import com.fongmi.android.tv.databinding.DialogFilterBinding; import com.fongmi.android.tv.impl.FilterCallback; import com.fongmi.android.tv.ui.adapter.FilterAdapter; -import com.fongmi.android.tv.ui.custom.dialog.BaseDialog; import com.google.android.material.bottomsheet.BottomSheetDialogFragment; import java.util.List; diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/PassDialog.java b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/PassDialog.java index 4bccbf39d..5e1e724bd 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/PassDialog.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/PassDialog.java @@ -14,7 +14,6 @@ import androidx.viewbinding.ViewBinding; import com.fongmi.android.tv.databinding.DialogPassBinding; import com.fongmi.android.tv.impl.PassCallback; -import com.fongmi.android.tv.ui.custom.dialog.BaseDialog; import com.fongmi.android.tv.utils.ResUtil; import com.google.android.material.bottomsheet.BottomSheetDialogFragment; diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/ReceiveDialog.java b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/ReceiveDialog.java index 8f5af9d1b..9a0546b63 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/ReceiveDialog.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/ReceiveDialog.java @@ -16,7 +16,6 @@ import com.fongmi.android.tv.event.CastEvent; import com.fongmi.android.tv.event.RefreshEvent; import com.fongmi.android.tv.impl.Callback; import com.fongmi.android.tv.ui.activity.VideoActivity; -import com.fongmi.android.tv.ui.custom.dialog.BaseDialog; import com.fongmi.android.tv.utils.ImgUtil; import com.fongmi.android.tv.utils.Notify; import com.google.android.material.bottomsheet.BottomSheetDialogFragment; diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/SyncDialog.java b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/SyncDialog.java index 839634d89..d1ebb6029 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/SyncDialog.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/SyncDialog.java @@ -23,7 +23,6 @@ import com.fongmi.android.tv.databinding.DialogDeviceBinding; import com.fongmi.android.tv.impl.Callback; import com.fongmi.android.tv.ui.activity.ScanActivity; import com.fongmi.android.tv.ui.adapter.DeviceAdapter; -import com.fongmi.android.tv.ui.custom.dialog.BaseDialog; import com.fongmi.android.tv.utils.Notify; import com.github.catvod.net.OkHttp; import com.google.android.material.bottomsheet.BottomSheetDialogFragment;