Refactoring

Author: Tsisar

app/src/main/java/cc/calliope/mini/Aggregator.kt app/src/main/java/cc/calliope/mini/core/bluetooth/Aggregator.kt

@@ -1,7 +1,5 @@
-package cc.calliope.mini
+package cc.calliope.mini.core.bluetooth
 
-import android.util.Log
-import cc.calliope.mini.utils.Utils
 import no.nordicsemi.android.kotlin.ble.core.ServerDevice
 import no.nordicsemi.android.kotlin.ble.core.scanner.BleScanResult
 import no.nordicsemi.android.kotlin.ble.core.scanner.BleScanResultData

app/src/main/java/cc/calliope/mini/CurrentDevice.kt app/src/main/java/cc/calliope/mini/core/bluetooth/CurrentDevice.kt

@@ -1,4 +1,4 @@
-package cc.calliope.mini
+package cc.calliope.mini.core.bluetooth
 
 import android.os.Parcel
 import android.os.Parcelable

app/src/main/java/cc/calliope/mini/DeviceKt.kt app/src/main/java/cc/calliope/mini/core/bluetooth/DeviceKt.kt

@@ -1,4 +1,4 @@
-package cc.calliope.mini
+package cc.calliope.mini.core.bluetooth
 
 import android.os.Build
 import android.os.SystemClock

app/src/main/java/cc/calliope/mini/ScanViewModelKt.kt app/src/main/java/cc/calliope/mini/core/bluetooth/ScanViewModelKt.kt

@@ -1,4 +1,4 @@
-package cc.calliope.mini
+package cc.calliope.mini.core.bluetooth
 
 import android.app.Application
 import android.util.Log
@@ -18,7 +18,6 @@ import no.nordicsemi.android.kotlin.ble.core.scanner.BleScannerCallbackType
 import no.nordicsemi.android.kotlin.ble.core.scanner.BleScannerMatchMode
 import no.nordicsemi.android.kotlin.ble.core.scanner.BleScannerSettings
 import no.nordicsemi.android.kotlin.ble.scanner.BleScanner
-import no.nordicsemi.android.kotlin.ble.scanner.aggregator.BleScanResultAggregator
 
 
 class ScanViewModelKt(application: Application) : AndroidViewModel(application) {

app/src/main/java/cc/calliope/mini/core/service/FlashingService.java

@@ -2,7 +2,6 @@
 
 import static cc.calliope.mini.core.state.Notification.ERROR;
 import static cc.calliope.mini.core.state.Notification.INFO;
-import static cc.calliope.mini.core.state.State.STATE_IDLE;
 import static cc.calliope.mini.utils.Constants.MINI_V1;
 import static cc.calliope.mini.utils.Constants.MINI_V2;
 import static cc.calliope.mini.utils.Constants.UNIDENTIFIED;

app/src/main/java/cc/calliope/mini/dialog/pattern/PatternDialogFragment.java

@@ -31,10 +31,10 @@
 import androidx.fragment.app.DialogFragment;
 import androidx.lifecycle.ViewModelProvider;
 
-import cc.calliope.mini.DeviceKt;
+import cc.calliope.mini.core.bluetooth.DeviceKt;
 import cc.calliope.mini.core.service.BondingService;
 import cc.calliope.mini.views.PatternMatrixView;
-import cc.calliope.mini.ScanViewModelKt;
+import cc.calliope.mini.core.bluetooth.ScanViewModelKt;
 import cc.calliope.mini.core.state.Notification;
 import cc.calliope.mini.core.state.State;
 import cc.calliope.mini.core.state.ApplicationStateHandler;

app/src/main/java/cc/calliope/mini/dialog/scripts/ScriptsFragment.java

@@ -219,7 +219,7 @@ private void renameFile(FileWrapper file) {
     }
 
     private void removeFile(FileWrapper file) {
-        String title = getResources().getString(R.string.title_dialog_rename);
+        String title = getResources().getString(R.string.title_dialog_delete);
         String message = String.format(getString(R.string.info_dialog_delete), FilenameUtils.removeExtension(file.getName()));
 
         DialogUtils.showWarningDialog(activity, title, message, () -> {

app/src/main/java/cc/calliope/mini/WebInfoFragment.kt app/src/main/java/cc/calliope/mini/fragment/WebInfoFragment.kt

@@ -1,14 +1,12 @@
-package cc.calliope.mini
+package cc.calliope.mini.fragment
 
-import android.app.UiModeManager
-import android.content.Context
-import android.content.res.Configuration
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.webkit.WebView
 import androidx.fragment.app.Fragment
+import cc.calliope.mini.R
 import java.util.Locale
 
 class WebInfoFragment : Fragment() {

app/src/main/java/cc/calliope/mini/fragment/home/HomeAdapter.java

@@ -4,7 +4,7 @@
 import androidx.fragment.app.Fragment;
 import androidx.viewpager2.adapter.FragmentStateAdapter;
 
-import cc.calliope.mini.WebInfoFragment;
+import cc.calliope.mini.fragment.WebInfoFragment;
 import cc.calliope.mini.fragment.help.HelpFragment;
 import cc.calliope.mini.utils.Utils;
 

app/src/main/java/cc/calliope/mini/views/PatternMatrixView.java

@@ -4,7 +4,6 @@
 import android.graphics.Canvas;
 import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 
@@ -90,7 +89,6 @@ public boolean onTouchEvent(MotionEvent event) {
         int number = (int) (event.getY() / cellSize);
 
         if (action == MotionEvent.ACTION_DOWN) {
-            Log.i("MAIN", "column: " + column + "; Y: " + number);
             if (column < SIZE && number < SIZE) {
                 if (cell[column][number] && number < SIZE - 1 && (number == 0 || !cell[column][number - 1])) {
                     number++;