From 1d9252c1a7c8b96fb24ff7df4e230a329160d9f5 Mon Sep 17 00:00:00 2001 From: FongMi Date: Thu, 2 Nov 2023 10:23:16 +0800 Subject: [PATCH] Clean code --- .../fongmi/android/tv/ui/activity/CollectActivity.java | 2 +- .../fongmi/android/tv/ui/activity/HistoryActivity.java | 2 +- .../fongmi/android/tv/ui/activity/KeepActivity.java | 2 +- .../fongmi/android/tv/ui/activity/LiveActivity.java | 8 ++++---- .../fongmi/android/tv/ui/activity/VideoActivity.java | 10 +++++----- .../tv/ui/{custom => }/dialog/BufferDialog.java | 2 +- .../android/tv/ui/{custom => }/dialog/CastDialog.java | 3 ++- .../tv/ui/{custom => }/dialog/ConfigDialog.java | 2 +- .../tv/ui/{custom => }/dialog/ControlDialog.java | 3 ++- .../tv/ui/{custom => }/dialog/EpisodeGridDialog.java | 3 ++- .../tv/ui/{custom => }/dialog/EpisodeListDialog.java | 2 +- .../tv/ui/{custom => }/dialog/FilterDialog.java | 3 ++- .../tv/ui/{custom => }/dialog/HistoryDialog.java | 2 +- .../android/tv/ui/{custom => }/dialog/LinkDialog.java | 2 +- .../android/tv/ui/{custom => }/dialog/LiveDialog.java | 2 +- .../android/tv/ui/{custom => }/dialog/PassDialog.java | 3 ++- .../android/tv/ui/{custom => }/dialog/ProxyDialog.java | 2 +- .../tv/ui/{custom => }/dialog/ReceiveDialog.java | 3 ++- .../android/tv/ui/{custom => }/dialog/SiteDialog.java | 2 +- .../tv/ui/{custom => }/dialog/SubtitleDialog.java | 2 +- .../android/tv/ui/{custom => }/dialog/SyncDialog.java | 3 ++- .../android/tv/ui/{custom => }/dialog/UaDialog.java | 2 +- .../fongmi/android/tv/ui/fragment/SettingFragment.java | 10 +++++----- .../android/tv/ui/fragment/SettingPlayerFragment.java | 6 +++--- .../com/fongmi/android/tv/ui/fragment/VodFragment.java | 8 ++++---- 25 files changed, 48 insertions(+), 41 deletions(-) rename app/src/mobile/java/com/fongmi/android/tv/ui/{custom => }/dialog/BufferDialog.java (97%) rename app/src/mobile/java/com/fongmi/android/tv/ui/{custom => }/dialog/CastDialog.java (98%) rename app/src/mobile/java/com/fongmi/android/tv/ui/{custom => }/dialog/ConfigDialog.java (98%) rename app/src/mobile/java/com/fongmi/android/tv/ui/{custom => }/dialog/ControlDialog.java (98%) rename app/src/mobile/java/com/fongmi/android/tv/ui/{custom => }/dialog/EpisodeGridDialog.java (97%) rename app/src/mobile/java/com/fongmi/android/tv/ui/{custom => }/dialog/EpisodeListDialog.java (98%) rename app/src/mobile/java/com/fongmi/android/tv/ui/{custom => }/dialog/FilterDialog.java (94%) rename app/src/mobile/java/com/fongmi/android/tv/ui/{custom => }/dialog/HistoryDialog.java (97%) rename app/src/mobile/java/com/fongmi/android/tv/ui/{custom => }/dialog/LinkDialog.java (98%) rename app/src/mobile/java/com/fongmi/android/tv/ui/{custom => }/dialog/LiveDialog.java (97%) rename app/src/mobile/java/com/fongmi/android/tv/ui/{custom => }/dialog/PassDialog.java (95%) rename app/src/mobile/java/com/fongmi/android/tv/ui/{custom => }/dialog/ProxyDialog.java (98%) rename app/src/mobile/java/com/fongmi/android/tv/ui/{custom => }/dialog/ReceiveDialog.java (96%) rename app/src/mobile/java/com/fongmi/android/tv/ui/{custom => }/dialog/SiteDialog.java (98%) rename app/src/mobile/java/com/fongmi/android/tv/ui/{custom => }/dialog/SubtitleDialog.java (98%) rename app/src/mobile/java/com/fongmi/android/tv/ui/{custom => }/dialog/SyncDialog.java (98%) rename app/src/mobile/java/com/fongmi/android/tv/ui/{custom => }/dialog/UaDialog.java (98%) diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/CollectActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/CollectActivity.java index 3a9900b9b..6df3f75fd 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/CollectActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/CollectActivity.java @@ -38,7 +38,7 @@ import com.fongmi.android.tv.ui.base.BaseActivity; import com.fongmi.android.tv.ui.base.ViewType; import com.fongmi.android.tv.ui.custom.CustomScroller; import com.fongmi.android.tv.ui.custom.CustomTextListener; -import com.fongmi.android.tv.ui.custom.dialog.SiteDialog; +import com.fongmi.android.tv.ui.dialog.SiteDialog; import com.fongmi.android.tv.utils.PauseExecutor; import com.fongmi.android.tv.utils.ResUtil; import com.fongmi.android.tv.utils.Util; diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/HistoryActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/HistoryActivity.java index 87eefcd1e..6d79e2476 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/HistoryActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/HistoryActivity.java @@ -15,7 +15,7 @@ import com.fongmi.android.tv.databinding.ActivityHistoryBinding; import com.fongmi.android.tv.event.RefreshEvent; import com.fongmi.android.tv.ui.adapter.HistoryAdapter; import com.fongmi.android.tv.ui.base.BaseActivity; -import com.fongmi.android.tv.ui.custom.dialog.SyncDialog; +import com.fongmi.android.tv.ui.dialog.SyncDialog; import com.google.android.material.dialog.MaterialAlertDialogBuilder; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/KeepActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/KeepActivity.java index d9c899c47..803588703 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/KeepActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/KeepActivity.java @@ -18,7 +18,7 @@ import com.fongmi.android.tv.event.RefreshEvent; import com.fongmi.android.tv.impl.Callback; import com.fongmi.android.tv.ui.adapter.KeepAdapter; import com.fongmi.android.tv.ui.base.BaseActivity; -import com.fongmi.android.tv.ui.custom.dialog.SyncDialog; +import com.fongmi.android.tv.ui.dialog.SyncDialog; import com.fongmi.android.tv.utils.Notify; import com.google.android.material.dialog.MaterialAlertDialogBuilder; 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 3ecf863a6..8c4e34371 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 @@ -53,10 +53,10 @@ import com.fongmi.android.tv.ui.adapter.ChannelAdapter; import com.fongmi.android.tv.ui.adapter.GroupAdapter; import com.fongmi.android.tv.ui.base.BaseActivity; import com.fongmi.android.tv.ui.custom.CustomKeyDownLive; -import com.fongmi.android.tv.ui.custom.dialog.CastDialog; -import com.fongmi.android.tv.ui.custom.dialog.LiveDialog; -import com.fongmi.android.tv.ui.custom.dialog.PassDialog; -import com.fongmi.android.tv.ui.custom.dialog.SubtitleDialog; +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.utils.Biometric; import com.fongmi.android.tv.utils.Clock; 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 749eae134..119bc8bc6 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 @@ -76,11 +76,11 @@ import com.fongmi.android.tv.ui.base.ViewType; import com.fongmi.android.tv.ui.custom.CustomKeyDownVod; import com.fongmi.android.tv.ui.custom.CustomMovement; import com.fongmi.android.tv.ui.custom.SpaceItemDecoration; -import com.fongmi.android.tv.ui.custom.dialog.CastDialog; -import com.fongmi.android.tv.ui.custom.dialog.ControlDialog; -import com.fongmi.android.tv.ui.custom.dialog.EpisodeGridDialog; -import com.fongmi.android.tv.ui.custom.dialog.EpisodeListDialog; -import com.fongmi.android.tv.ui.custom.dialog.SubtitleDialog; +import com.fongmi.android.tv.ui.dialog.CastDialog; +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.utils.Clock; import com.fongmi.android.tv.utils.FileChooser; diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/BufferDialog.java b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/BufferDialog.java similarity index 97% rename from app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/BufferDialog.java rename to app/src/mobile/java/com/fongmi/android/tv/ui/dialog/BufferDialog.java index 225fa5335..efb4d9218 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/BufferDialog.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/BufferDialog.java @@ -1,4 +1,4 @@ -package com.fongmi.android.tv.ui.custom.dialog; +package com.fongmi.android.tv.ui.dialog; import android.content.DialogInterface; import android.view.LayoutInflater; diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/CastDialog.java b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/CastDialog.java similarity index 98% rename from app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/CastDialog.java rename to app/src/mobile/java/com/fongmi/android/tv/ui/dialog/CastDialog.java index a72dbb975..de85ce327 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/CastDialog.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/CastDialog.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.View; @@ -29,6 +29,7 @@ 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/custom/dialog/ConfigDialog.java b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/ConfigDialog.java similarity index 98% rename from app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/ConfigDialog.java rename to app/src/mobile/java/com/fongmi/android/tv/ui/dialog/ConfigDialog.java index 9acd2ff95..56e98539d 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/ConfigDialog.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/ConfigDialog.java @@ -1,4 +1,4 @@ -package com.fongmi.android.tv.ui.custom.dialog; +package com.fongmi.android.tv.ui.dialog; import android.content.DialogInterface; import android.text.TextUtils; diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/ControlDialog.java b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/ControlDialog.java similarity index 98% rename from app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/ControlDialog.java rename to app/src/mobile/java/com/fongmi/android/tv/ui/dialog/ControlDialog.java index adfd4fc37..2c336a05c 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/ControlDialog.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/ControlDialog.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.View; @@ -21,6 +21,7 @@ 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/custom/dialog/EpisodeGridDialog.java b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/EpisodeGridDialog.java similarity index 97% rename from app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/EpisodeGridDialog.java rename to app/src/mobile/java/com/fongmi/android/tv/ui/dialog/EpisodeGridDialog.java index 72eb5d97c..0d1b36168 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/EpisodeGridDialog.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/EpisodeGridDialog.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; @@ -12,6 +12,7 @@ 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/custom/dialog/EpisodeListDialog.java b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/EpisodeListDialog.java similarity index 98% rename from app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/EpisodeListDialog.java rename to app/src/mobile/java/com/fongmi/android/tv/ui/dialog/EpisodeListDialog.java index da00d6bc8..e766a7a89 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/EpisodeListDialog.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/EpisodeListDialog.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.WindowManager; diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/FilterDialog.java b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/FilterDialog.java similarity index 94% rename from app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/FilterDialog.java rename to app/src/mobile/java/com/fongmi/android/tv/ui/dialog/FilterDialog.java index 25df90793..0a7cf2aa9 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/FilterDialog.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/FilterDialog.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; @@ -12,6 +12,7 @@ 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/custom/dialog/HistoryDialog.java b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/HistoryDialog.java similarity index 97% rename from app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/HistoryDialog.java rename to app/src/mobile/java/com/fongmi/android/tv/ui/dialog/HistoryDialog.java index dcb51d4c7..7200e7ee7 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/HistoryDialog.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/HistoryDialog.java @@ -1,4 +1,4 @@ -package com.fongmi.android.tv.ui.custom.dialog; +package com.fongmi.android.tv.ui.dialog; import android.view.LayoutInflater; diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/LinkDialog.java b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/LinkDialog.java similarity index 98% rename from app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/LinkDialog.java rename to app/src/mobile/java/com/fongmi/android/tv/ui/dialog/LinkDialog.java index bb37e88c9..6488acb43 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/LinkDialog.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/LinkDialog.java @@ -1,4 +1,4 @@ -package com.fongmi.android.tv.ui.custom.dialog; +package com.fongmi.android.tv.ui.dialog; import android.content.DialogInterface; import android.net.Uri; diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/LiveDialog.java b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/LiveDialog.java similarity index 97% rename from app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/LiveDialog.java rename to app/src/mobile/java/com/fongmi/android/tv/ui/dialog/LiveDialog.java index 6812af805..f14ca01c5 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/LiveDialog.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/LiveDialog.java @@ -1,4 +1,4 @@ -package com.fongmi.android.tv.ui.custom.dialog; +package com.fongmi.android.tv.ui.dialog; import android.app.Activity; import android.view.LayoutInflater; diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/PassDialog.java b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/PassDialog.java similarity index 95% rename from app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/PassDialog.java rename to app/src/mobile/java/com/fongmi/android/tv/ui/dialog/PassDialog.java index a78d7db83..4bccbf39d 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/PassDialog.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/PassDialog.java @@ -1,4 +1,4 @@ -package com.fongmi.android.tv.ui.custom.dialog; +package com.fongmi.android.tv.ui.dialog; import android.view.KeyEvent; import android.view.LayoutInflater; @@ -14,6 +14,7 @@ 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/custom/dialog/ProxyDialog.java b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/ProxyDialog.java similarity index 98% rename from app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/ProxyDialog.java rename to app/src/mobile/java/com/fongmi/android/tv/ui/dialog/ProxyDialog.java index 526d781af..acbf53279 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/ProxyDialog.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/ProxyDialog.java @@ -1,4 +1,4 @@ -package com.fongmi.android.tv.ui.custom.dialog; +package com.fongmi.android.tv.ui.dialog; import android.content.DialogInterface; import android.text.TextUtils; diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/ReceiveDialog.java b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/ReceiveDialog.java similarity index 96% rename from app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/ReceiveDialog.java rename to app/src/mobile/java/com/fongmi/android/tv/ui/dialog/ReceiveDialog.java index 4a7f59b42..8f5af9d1b 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/ReceiveDialog.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/ReceiveDialog.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.View; @@ -16,6 +16,7 @@ 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/custom/dialog/SiteDialog.java b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/SiteDialog.java similarity index 98% rename from app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/SiteDialog.java rename to app/src/mobile/java/com/fongmi/android/tv/ui/dialog/SiteDialog.java index b0360d458..6458d086a 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/SiteDialog.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/SiteDialog.java @@ -1,4 +1,4 @@ -package com.fongmi.android.tv.ui.custom.dialog; +package com.fongmi.android.tv.ui.dialog; import android.app.Activity; import android.view.LayoutInflater; diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/SubtitleDialog.java b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/SubtitleDialog.java similarity index 98% rename from app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/SubtitleDialog.java rename to app/src/mobile/java/com/fongmi/android/tv/ui/dialog/SubtitleDialog.java index ec70eda15..a1b398a92 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/SubtitleDialog.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/SubtitleDialog.java @@ -1,4 +1,4 @@ -package com.fongmi.android.tv.ui.custom.dialog; +package com.fongmi.android.tv.ui.dialog; import android.content.Context; import android.content.DialogInterface; diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/SyncDialog.java b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/SyncDialog.java similarity index 98% rename from app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/SyncDialog.java rename to app/src/mobile/java/com/fongmi/android/tv/ui/dialog/SyncDialog.java index 841c05459..839634d89 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/SyncDialog.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/SyncDialog.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; @@ -23,6 +23,7 @@ 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; diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/UaDialog.java b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/UaDialog.java similarity index 98% rename from app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/UaDialog.java rename to app/src/mobile/java/com/fongmi/android/tv/ui/dialog/UaDialog.java index b9615099a..78b798323 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/UaDialog.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/UaDialog.java @@ -1,4 +1,4 @@ -package com.fongmi.android.tv.ui.custom.dialog; +package com.fongmi.android.tv.ui.dialog; import android.content.DialogInterface; import android.text.TextUtils; diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java index af8606a8d..8cb9c013a 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java @@ -31,11 +31,11 @@ import com.fongmi.android.tv.impl.SiteCallback; import com.fongmi.android.tv.player.ExoUtil; import com.fongmi.android.tv.ui.activity.MainActivity; import com.fongmi.android.tv.ui.base.BaseFragment; -import com.fongmi.android.tv.ui.custom.dialog.ConfigDialog; -import com.fongmi.android.tv.ui.custom.dialog.HistoryDialog; -import com.fongmi.android.tv.ui.custom.dialog.LiveDialog; -import com.fongmi.android.tv.ui.custom.dialog.ProxyDialog; -import com.fongmi.android.tv.ui.custom.dialog.SiteDialog; +import com.fongmi.android.tv.ui.dialog.ConfigDialog; +import com.fongmi.android.tv.ui.dialog.HistoryDialog; +import com.fongmi.android.tv.ui.dialog.LiveDialog; +import com.fongmi.android.tv.ui.dialog.ProxyDialog; +import com.fongmi.android.tv.ui.dialog.SiteDialog; import com.fongmi.android.tv.utils.FileChooser; import com.fongmi.android.tv.utils.FileUtil; import com.fongmi.android.tv.utils.Notify; diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingPlayerFragment.java b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingPlayerFragment.java index 1d38fd424..8427bd9ce 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingPlayerFragment.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingPlayerFragment.java @@ -17,9 +17,9 @@ import com.fongmi.android.tv.impl.UaCallback; import com.fongmi.android.tv.player.ExoUtil; import com.fongmi.android.tv.player.Players; import com.fongmi.android.tv.ui.base.BaseFragment; -import com.fongmi.android.tv.ui.custom.dialog.BufferDialog; -import com.fongmi.android.tv.ui.custom.dialog.SubtitleDialog; -import com.fongmi.android.tv.ui.custom.dialog.UaDialog; +import com.fongmi.android.tv.ui.dialog.BufferDialog; +import com.fongmi.android.tv.ui.dialog.SubtitleDialog; +import com.fongmi.android.tv.ui.dialog.UaDialog; import com.fongmi.android.tv.utils.ResUtil; import com.google.android.material.dialog.MaterialAlertDialogBuilder; diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/VodFragment.java b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/VodFragment.java index cc285aec2..de32a9b5a 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/VodFragment.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/VodFragment.java @@ -36,10 +36,10 @@ import com.fongmi.android.tv.ui.activity.KeepActivity; import com.fongmi.android.tv.ui.activity.VideoActivity; import com.fongmi.android.tv.ui.adapter.TypeAdapter; import com.fongmi.android.tv.ui.base.BaseFragment; -import com.fongmi.android.tv.ui.custom.dialog.FilterDialog; -import com.fongmi.android.tv.ui.custom.dialog.LinkDialog; -import com.fongmi.android.tv.ui.custom.dialog.ReceiveDialog; -import com.fongmi.android.tv.ui.custom.dialog.SiteDialog; +import com.fongmi.android.tv.ui.dialog.FilterDialog; +import com.fongmi.android.tv.ui.dialog.LinkDialog; +import com.fongmi.android.tv.ui.dialog.ReceiveDialog; +import com.fongmi.android.tv.ui.dialog.SiteDialog; import com.fongmi.android.tv.utils.FileChooser; import com.github.catvod.net.OkHttp; import com.github.catvod.utils.Trans;