refactor

2026-05-03 03:20:07 -05:00 · 2020-09-29 07:30:40 +03:00
parent f1103f2510
commit 85173a05b7
5 changed files with 17 additions and 17 deletions
@@ -7,7 +7,7 @@ import com.liskovsoft.smartyoutubetv2.common.app.models.playback.controller.Play
 import com.liskovsoft.smartyoutubetv2.common.app.models.playback.listener.PlayerHandlerEventListener;
 import com.liskovsoft.smartyoutubetv2.common.app.models.playback.managers.AutoFrameRateManager;
 import com.liskovsoft.smartyoutubetv2.common.app.models.playback.managers.HistoryUpdater;
-import com.liskovsoft.smartyoutubetv2.common.app.models.playback.managers.PlayerUiManager;
+import com.liskovsoft.smartyoutubetv2.common.app.models.playback.managers.HqDialogManager;
 import com.liskovsoft.smartyoutubetv2.common.app.models.playback.managers.StateUpdater;
 import com.liskovsoft.smartyoutubetv2.common.app.models.playback.managers.SuggestionsLoader;
 import com.liskovsoft.smartyoutubetv2.common.app.models.playback.managers.VideoLoader;
@@ -29,7 +29,7 @@ public class MainPlayerEventBridge implements PlayerEventListener {
    public MainPlayerEventBridge() {
        mEventListeners = new ArrayList<>();

-        PlayerUiManager uiManager = new PlayerUiManager();
+        HqDialogManager uiManager = new HqDialogManager();
        VideoLoader videoLoader = new VideoLoader();
        SuggestionsLoader suggestionsLoader = new SuggestionsLoader();
        suggestionsLoader.addListener(uiManager);
@@ -13,7 +13,7 @@ import java.util.ArrayList;
 import java.util.List;

 public class AutoFrameRateManager extends PlayerEventListenerHelper {
-    private final PlayerUiManager mUiManager;
+    private final HqDialogManager mUiManager;
    private AutoFrameRateHelper mAutoFrameRateHelper;
    private boolean mEnabled;
    private boolean mCorrectionEnabled;
@@ -23,7 +23,7 @@ public class AutoFrameRateManager extends PlayerEventListenerHelper {
    private AutoFrameRateHelper mParentAutoFrameRateHelper;
    private ModeSyncManager mModeSyncManager;

-    public AutoFrameRateManager(PlayerUiManager uiManager) {
+    public AutoFrameRateManager(HqDialogManager uiManager) {
        mUiManager = uiManager;
    }

@@ -27,8 +27,8 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;

-public class PlayerUiManager extends PlayerEventListenerHelper implements MetadataListener {
-    private static final String TAG = PlayerUiManager.class.getSimpleName();
+public class HqDialogManager extends PlayerEventListenerHelper implements MetadataListener {
+    private static final String TAG = HqDialogManager.class.getSimpleName();
    private final Handler mHandler;
    private static final long UI_HIDE_TIMEOUT_MS = 2_000;
    private static final long SUGGESTIONS_RESET_TIMEOUT_MS = 500;
@@ -41,7 +41,7 @@ public class PlayerUiManager extends PlayerEventListenerHelper implements Metada
    private boolean mBlockEngine;
    private boolean mEnablePIP;

-    public PlayerUiManager() {
+    public HqDialogManager() {
        mHandler = new Handler(Looper.getMainLooper());
    }

@@ -310,13 +310,13 @@ public class PlayerUiManager extends PlayerEventListenerHelper implements Metada

    private void createCheckedOptions() {
        for (String key : mCheckedCategories.keySet()) {
-            mSettingsPresenter.appendChecked(key, mCheckedCategories.get(key));
+            mSettingsPresenter.appendCheckedCategory(key, mCheckedCategories.get(key));
        }
    }

    private void createRadioOptions() {
        for (String key : mRadioCategories.keySet()) {
-            mSettingsPresenter.appendRadio(key, mRadioCategories.get(key));
+            mSettingsPresenter.appendRadioCategory(key, mRadioCategories.get(key));
        }
    }

@@ -109,21 +109,21 @@ public class VideoSettingsPresenter implements Presenter<VideoSettingsView> {
        showDialog(null, onClose);
    }

-    public void showDialog(String title, Runnable onClose) {
-        mTitle = title;
+    public void showDialog(String dialogTitle, Runnable onClose) {
+        mTitle = dialogTitle;
        mOnClose = onClose;
        ViewManager.instance(mContext).startView(VideoSettingsView.class);
    }

-    public void appendRadio(String categoryTitle, List<OptionItem> items) {
+    public void appendRadioCategory(String categoryTitle, List<OptionItem> items) {
        mCategories.add(SettingsCategory.radioList(categoryTitle, items));
    }

-    public void appendChecked(String categoryTitle, List<OptionItem> items) {
+    public void appendCheckedCategory(String categoryTitle, List<OptionItem> items) {
        mCategories.add(SettingsCategory.checkedList(categoryTitle, items));
    }

-    public void appendStrings(String categoryTitle, List<OptionItem> items) {
+    public void appendStringsCategory(String categoryTitle, List<OptionItem> items) {
        mCategories.add(SettingsCategory.stringList(categoryTitle, items));
    }

@@ -131,7 +131,7 @@ public class VideoSettingsPresenter implements Presenter<VideoSettingsView> {
        mCategories.add(SettingsCategory.singleSwitch(optionItem));
    }

-    public void appendButton(OptionItem optionItem) {
+    public void appendSingleButton(OptionItem optionItem) {
        mCategories.add(SettingsCategory.singleButton(optionItem));
    }
 }
@@ -52,8 +52,8 @@ public class AppUpdateManager implements AppUpdateCheckerListener {
    private void showUpdateDialog(String versionName, List<String> changelog, String apkPath) {
        mSettingsPresenter.clear();

-        mSettingsPresenter.appendStrings(mContext.getString(R.string.update_changelog), createChangelogOptions(changelog));
-        mSettingsPresenter.appendButton(
+        mSettingsPresenter.appendStringsCategory(mContext.getString(R.string.update_changelog), createChangelogOptions(changelog));
+        mSettingsPresenter.appendSingleButton(
                UiOptionItem.from(mContext.getString(R.string.install_update), optionItem -> {
                    mUpdateChecker.installUpdate();
                    mUpdateInstalled = true;