diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index 9d58732..fee77c8 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -8,7 +8,7 @@ include(CheckLibraryExists) include(GenerateExportHeader) include(CheckCSourceCompiles) -project(SliceBeam) +project(Santoku) cmake_minimum_required(VERSION 3.4.1) set(CMAKE_CXX_STANDARD 17) @@ -1241,9 +1241,9 @@ add_library(slic3r src/main/jni/bbl/Orient.cpp - src/main/jni/slicebeam/beam_native.cpp - src/main/jni/slicebeam/GLModel.cpp - src/main/jni/slicebeam/GLShader.cpp + src/main/jni/santoku/beam_native.cpp + src/main/jni/santoku/GLModel.cpp + src/main/jni/santoku/GLShader.cpp # $ ) diff --git a/app/build.gradle b/app/build.gradle index 741f793..9cb0891 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,11 +8,11 @@ plugins { def commit = getGitCommitHash(file('.')) android { - namespace 'ru.ytkab0bp.slicebeam' + namespace 'com.dark98.santoku' compileSdk 35 defaultConfig { - applicationId "ru.ytkab0bp.slicebeam" + applicationId "com.dark98.santoku" minSdk 21 targetSdk 35 versionCode 8 @@ -74,7 +74,7 @@ android { applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "SliceBeam_" + commit + ".apk" + outputFileName = "Santoku_" + commit + ".apk" } } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index aae03d8..fa5fa2e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -22,8 +22,8 @@ android:icon="@mipmap/icon" android:label="@string/AppName" android:supportsRtl="true" - android:theme="@style/Theme.SliceBeam" - android:name=".SliceBeam" + android:theme="@style/Theme.Santoku" + android:name=".Santoku" android:usesCleartextTraffic="true" android:largeHeap="true" android:isGame="false" @@ -35,7 +35,7 @@ android:windowSoftInputMode="adjustPan" android:configChanges="uiMode" android:exported="true" - android:theme="@style/Theme.SliceBeam"> + android:theme="@style/Theme.Santoku"> @@ -55,7 +55,7 @@ diff --git a/app/src/main/assets/js_loader/k3d_la.js b/app/src/main/assets/js_loader/k3d_la.js index 3ea63a3..ef3a224 100644 --- a/app/src/main/assets/js_loader/k3d_la.js +++ b/app/src/main/assets/js_loader/k3d_la.js @@ -47,13 +47,13 @@ var dark = $['is_dark_theme']; document.getElementsByClassName('md-option')[dark ? 1 : 0].click(); beginSaveFile = function(filename) { - SliceBeam.beginDownload(filename); + Santoku.beginDownload(filename); } writeToFile = function(data) { - SliceBeam.writeData(btoa(unescape(encodeURIComponent(data)))); + Santoku.writeData(btoa(unescape(encodeURIComponent(data)))); } finishFile = function() { - SliceBeam.finishDownload(); + Santoku.finishDownload(); } \ No newline at end of file diff --git a/app/src/main/assets/js_loader/k3d_rct.js b/app/src/main/assets/js_loader/k3d_rct.js index a933db6..6fe5a11 100644 --- a/app/src/main/assets/js_loader/k3d_rct.js +++ b/app/src/main/assets/js_loader/k3d_rct.js @@ -47,7 +47,7 @@ var dark = $['is_dark_theme']; document.getElementsByClassName('md-option')[dark ? 1 : 0].click(); saveTextAsFile = function(filename, text) { - SliceBeam.beginDownload(filename); - SliceBeam.writeData(btoa(unescape(encodeURIComponent(text)))); - SliceBeam.finishDownload(); + Santoku.beginDownload(filename); + Santoku.writeData(btoa(unescape(encodeURIComponent(text)))); + Santoku.finishDownload(); } \ No newline at end of file diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/BeamServerData.java b/app/src/main/java/com/dark98/santoku/BeamServerData.java similarity index 84% rename from app/src/main/java/ru/ytkab0bp/slicebeam/BeamServerData.java rename to app/src/main/java/com/dark98/santoku/BeamServerData.java index da6457e..7e0cb99 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/BeamServerData.java +++ b/app/src/main/java/com/dark98/santoku/BeamServerData.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam; +package com.dark98.santoku; import android.util.Log; @@ -15,9 +15,9 @@ import java.util.List; import java.util.Locale; import cz.msebera.android.httpclient.Header; -import ru.ytkab0bp.slicebeam.cloud.CloudController; -import ru.ytkab0bp.slicebeam.events.BeamServerDataUpdatedEvent; -import ru.ytkab0bp.slicebeam.utils.Prefs; +import com.dark98.santoku.cloud.CloudController; +import com.dark98.santoku.events.BeamServerDataUpdatedEvent; +import com.dark98.santoku.utils.Prefs; public class BeamServerData { private final static String TAG = "BeamServerData"; @@ -26,7 +26,7 @@ public class BeamServerData { private static AsyncHttpClient client = new AsyncHttpClient(); static { - client.setUserAgent(String.format(Locale.ROOT, "SliceBeam/%s-%d", BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE)); + client.setUserAgent(String.format(Locale.ROOT, "Santoku/%s-%d", BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE)); client.setEnableRedirects(true); client.setLoggingEnabled(false); } @@ -59,7 +59,7 @@ public class BeamServerData { Prefs.setLastCheckedInfo(); try { - SliceBeam.SERVER_DATA = new BeamServerData(new JSONObject(str)); + Santoku.SERVER_DATA = new BeamServerData(new JSONObject(str)); } catch (JSONException e) { throw new RuntimeException(e); } @@ -81,11 +81,11 @@ public class BeamServerData { private void setIsRussia(boolean v) { Prefs.setRussianIP(v); - SliceBeam.EVENT_BUS.fireEvent(new BeamServerDataUpdatedEvent()); + Santoku.EVENT_BUS.fireEvent(new BeamServerDataUpdatedEvent()); } }); } else { - SliceBeam.EVENT_BUS.fireEvent(new BeamServerDataUpdatedEvent()); + Santoku.EVENT_BUS.fireEvent(new BeamServerDataUpdatedEvent()); } } diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/MainActivity.java b/app/src/main/java/com/dark98/santoku/MainActivity.java similarity index 87% rename from app/src/main/java/ru/ytkab0bp/slicebeam/MainActivity.java rename to app/src/main/java/com/dark98/santoku/MainActivity.java index d1f90bb..857bb1d 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/MainActivity.java +++ b/app/src/main/java/com/dark98/santoku/MainActivity.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam; +package com.dark98.santoku; import android.app.Activity; import android.content.ContentResolver; @@ -49,28 +49,28 @@ import java.util.UUID; import java.util.zip.ZipFile; import ru.ytkab0bp.sapil.APICallback; -import ru.ytkab0bp.slicebeam.cloud.CloudAPI; -import ru.ytkab0bp.slicebeam.cloud.CloudController; -import ru.ytkab0bp.slicebeam.components.BeamAlertDialogBuilder; -import ru.ytkab0bp.slicebeam.components.ChangeLogBottomSheet; -import ru.ytkab0bp.slicebeam.components.UnfoldMenu; -import ru.ytkab0bp.slicebeam.config.ConfigObject; -import ru.ytkab0bp.slicebeam.events.NeedDismissAIGeneratorMenu; -import ru.ytkab0bp.slicebeam.events.NeedDismissSnackbarEvent; -import ru.ytkab0bp.slicebeam.events.NeedSnackbarEvent; -import ru.ytkab0bp.slicebeam.events.ObjectsListChangedEvent; -import ru.ytkab0bp.slicebeam.fragment.BedFragment; -import ru.ytkab0bp.slicebeam.navigation.Fragment; -import ru.ytkab0bp.slicebeam.navigation.MobileNavigationDelegate; -import ru.ytkab0bp.slicebeam.navigation.NavigationDelegate; -import ru.ytkab0bp.slicebeam.slic3r.Model; -import ru.ytkab0bp.slicebeam.slic3r.Slic3rConfigWrapper; -import ru.ytkab0bp.slicebeam.slic3r.Slic3rRuntimeError; -import ru.ytkab0bp.slicebeam.theme.ThemesRepo; -import ru.ytkab0bp.slicebeam.utils.IOUtils; -import ru.ytkab0bp.slicebeam.utils.Prefs; -import ru.ytkab0bp.slicebeam.utils.ViewUtils; -import ru.ytkab0bp.slicebeam.view.SnackbarsLayout; +import com.dark98.santoku.cloud.CloudAPI; +import com.dark98.santoku.cloud.CloudController; +import com.dark98.santoku.components.BeamAlertDialogBuilder; +import com.dark98.santoku.components.ChangeLogBottomSheet; +import com.dark98.santoku.components.UnfoldMenu; +import com.dark98.santoku.config.ConfigObject; +import com.dark98.santoku.events.NeedDismissAIGeneratorMenu; +import com.dark98.santoku.events.NeedDismissSnackbarEvent; +import com.dark98.santoku.events.NeedSnackbarEvent; +import com.dark98.santoku.events.ObjectsListChangedEvent; +import com.dark98.santoku.fragment.BedFragment; +import com.dark98.santoku.navigation.Fragment; +import com.dark98.santoku.navigation.MobileNavigationDelegate; +import com.dark98.santoku.navigation.NavigationDelegate; +import com.dark98.santoku.slic3r.Model; +import com.dark98.santoku.slic3r.Slic3rConfigWrapper; +import com.dark98.santoku.slic3r.Slic3rRuntimeError; +import com.dark98.santoku.theme.ThemesRepo; +import com.dark98.santoku.utils.IOUtils; +import com.dark98.santoku.utils.Prefs; +import com.dark98.santoku.utils.ViewUtils; +import com.dark98.santoku.view.SnackbarsLayout; public class MainActivity extends AppCompatActivity { // Activity result @@ -105,7 +105,7 @@ public class MainActivity extends AppCompatActivity { finish(); return; } - if (SliceBeam.CONFIG == null) { + if (Santoku.CONFIG == null) { Prefs.setLastCommit(); startActivity(new Intent(this, SetupActivity.class)); finish(); @@ -194,7 +194,7 @@ public class MainActivity extends AppCompatActivity { } } - if (!Objects.equals(Prefs.getLastCommit(), BuildConfig.COMMIT) && SliceBeam.hasUpdateInfo) { + if (!Objects.equals(Prefs.getLastCommit(), BuildConfig.COMMIT) && Santoku.hasUpdateInfo) { Prefs.setLastCommit(); BeamServerData.load(); new ChangeLogBottomSheet(this).show(); @@ -226,8 +226,8 @@ public class MainActivity extends AppCompatActivity { OutputStream out = getContentResolver().openOutputStream(data.getData()); Model model = ((BedFragment) fragment).getGlView().getRenderer().getModel(); File tempFile = File.createTempFile("temp_project", ".3mf"); - SliceBeam.genCurrentConfig(); - File cfg = SliceBeam.getCurrentConfigFile(); + Santoku.genCurrentConfig(); + File cfg = Santoku.getCurrentConfigFile(); model.export3mf(cfg.getAbsolutePath(), tempFile.getAbsolutePath()); InputStream in = new FileInputStream(tempFile); @@ -240,7 +240,7 @@ public class MainActivity extends AppCompatActivity { out.close(); tempFile.delete(); - SliceBeam.EVENT_BUS.fireEvent(new NeedSnackbarEvent(R.string.MenuFileExport3mfSuccess)); + Santoku.EVENT_BUS.fireEvent(new NeedSnackbarEvent(R.string.MenuFileExport3mfSuccess)); } catch (IOException | Slic3rRuntimeError e) { throw new RuntimeException(e); } @@ -273,21 +273,21 @@ public class MainActivity extends AppCompatActivity { EXPORTING_PRINTERS = null; w.presets = new ConfigObject(); - if (w.findPrint(SliceBeam.CONFIG.presets.get("print")) != null) { - w.presets.put("print", SliceBeam.CONFIG.presets.get("print")); + if (w.findPrint(Santoku.CONFIG.presets.get("print")) != null) { + w.presets.put("print", Santoku.CONFIG.presets.get("print")); } - if (w.findFilament(SliceBeam.CONFIG.presets.get("filament")) != null) { - w.presets.put("filament", SliceBeam.CONFIG.presets.get("filament")); + if (w.findFilament(Santoku.CONFIG.presets.get("filament")) != null) { + w.presets.put("filament", Santoku.CONFIG.presets.get("filament")); } - if (w.findPrinter(SliceBeam.CONFIG.presets.get("printer")) != null) { - w.presets.put("printer", SliceBeam.CONFIG.presets.get("printer")); + if (w.findPrinter(Santoku.CONFIG.presets.get("printer")) != null) { + w.presets.put("printer", Santoku.CONFIG.presets.get("printer")); } OutputStream out = getContentResolver().openOutputStream(data.getData()); out.write(w.serialize().getBytes(StandardCharsets.UTF_8)); out.close(); - SliceBeam.EVENT_BUS.fireEvent(new NeedSnackbarEvent(R.string.MenuFileExportProfilesSuccess)); + Santoku.EVENT_BUS.fireEvent(new NeedSnackbarEvent(R.string.MenuFileExportProfilesSuccess)); } catch (IOException e) { throw new RuntimeException(e); } @@ -328,14 +328,14 @@ public class MainActivity extends AppCompatActivity { .show(); } } else if (requestCode == REQUEST_CODE_AI_GENERATOR_TAKE_PHOTO) { - SliceBeam.EVENT_BUS.fireEvent(new NeedDismissAIGeneratorMenu()); + Santoku.EVENT_BUS.fireEvent(new NeedDismissAIGeneratorMenu()); Bitmap bm = BitmapFactory.decodeFile(aiTempFile.getAbsolutePath()); generateAiModel(bm); aiTempFile.delete(); aiTempFile = null; } else if (requestCode == REQUEST_CODE_AI_GENERATOR_CHOOSE_PHOTO) { - SliceBeam.EVENT_BUS.fireEvent(new NeedDismissAIGeneratorMenu()); + Santoku.EVENT_BUS.fireEvent(new NeedDismissAIGeneratorMenu()); try { InputStream in = getContentResolver().openInputStream(data.getData()); @@ -350,8 +350,8 @@ public class MainActivity extends AppCompatActivity { private void loadConvertedProfile(Uri uri) { String tag = UUID.randomUUID().toString(); - SliceBeam.EVENT_BUS.fireEvent(new NeedSnackbarEvent(SnackbarsLayout.Type.LOADING, R.string.OrcaConversionPleaseWait).tag(tag)); - File f = new File(SliceBeam.getModelCacheDir(), "orca_conv.zip"); + Santoku.EVENT_BUS.fireEvent(new NeedSnackbarEvent(SnackbarsLayout.Type.LOADING, R.string.OrcaConversionPleaseWait).tag(tag)); + File f = new File(Santoku.getModelCacheDir(), "orca_conv.zip"); IOUtils.IO_POOL.submit(()->{ try { InputStream in = getContentResolver().openInputStream(uri); @@ -369,7 +369,7 @@ public class MainActivity extends AppCompatActivity { if (!bundle.get("bundle_type").equals("printer config bundle")) { zf.close(); - SliceBeam.EVENT_BUS.fireEvent(new NeedDismissSnackbarEvent(tag)); + Santoku.EVENT_BUS.fireEvent(new NeedDismissSnackbarEvent(tag)); ViewUtils.postOnMainThread(() -> new BeamAlertDialogBuilder(this) .setTitle(R.string.MenuFileImportProfilesFailed) .setMessage(R.string.OrcaConversionNotAConfigBundle) @@ -470,17 +470,17 @@ public class MainActivity extends AppCompatActivity { zf.close(); - SliceBeam.EVENT_BUS.fireEvent(new NeedDismissSnackbarEvent(tag)); + Santoku.EVENT_BUS.fireEvent(new NeedDismissSnackbarEvent(tag)); loadIniForImport(new ByteArrayInputStream(w.serialize().getBytes(StandardCharsets.UTF_8))); } catch (IOUtils.MissingProfileException ep) { - SliceBeam.EVENT_BUS.fireEvent(new NeedDismissSnackbarEvent(tag)); + Santoku.EVENT_BUS.fireEvent(new NeedDismissSnackbarEvent(tag)); ViewUtils.postOnMainThread(() -> new BeamAlertDialogBuilder(this) .setTitle(R.string.MenuFileImportProfilesFailed) .setMessage(getString(R.string.MenuFileImportProfilesFailedBaseProfileNotFound, ep.profile)) .setPositiveButton(android.R.string.ok, null) .show()); } catch (Exception e) { - SliceBeam.EVENT_BUS.fireEvent(new NeedDismissSnackbarEvent(tag)); + Santoku.EVENT_BUS.fireEvent(new NeedDismissSnackbarEvent(tag)); ViewUtils.postOnMainThread(() -> new BeamAlertDialogBuilder(this) .setTitle(R.string.MenuFileImportProfilesFailed) .setMessage(e.toString()) @@ -493,7 +493,7 @@ public class MainActivity extends AppCompatActivity { private void generateAiModel(Bitmap bm) { IS_GENERATING_AI_MODEL = true; String uploadTag = UUID.randomUUID().toString(); - SliceBeam.EVENT_BUS.fireEvent(new NeedSnackbarEvent(SnackbarsLayout.Type.LOADING, R.string.MenuFileAIGeneratorUploading).tag(uploadTag)); + Santoku.EVENT_BUS.fireEvent(new NeedSnackbarEvent(SnackbarsLayout.Type.LOADING, R.string.MenuFileAIGeneratorUploading).tag(uploadTag)); IOUtils.IO_POOL.submit(()->{ Bitmap scaled; if (bm.getWidth() > 1024 || bm.getHeight() > 1024) { @@ -519,13 +519,13 @@ public class MainActivity extends AppCompatActivity { CloudAPI.INSTANCE.modelsGenerate(Base64.encodeToString(out.toByteArray(), Base64.NO_WRAP), "image/png", new APICallback() { @Override public void onResponse(InputStream in) { - SliceBeam.EVENT_BUS.fireEvent(new NeedDismissSnackbarEvent(processTag)); + Santoku.EVENT_BUS.fireEvent(new NeedDismissSnackbarEvent(processTag)); String downloadTag = UUID.randomUUID().toString(); - SliceBeam.EVENT_BUS.fireEvent(new NeedSnackbarEvent(SnackbarsLayout.Type.LOADING, R.string.MenuFileAIGeneratorDownloading).tag(downloadTag)); + Santoku.EVENT_BUS.fireEvent(new NeedSnackbarEvent(SnackbarsLayout.Type.LOADING, R.string.MenuFileAIGeneratorDownloading).tag(downloadTag)); String fileName = "generated_" + UUID.randomUUID() + ".stl"; - File f = new File(SliceBeam.getModelCacheDir(), fileName); + File f = new File(Santoku.getModelCacheDir(), fileName); try { FileOutputStream fos = new FileOutputStream(f); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { @@ -571,8 +571,8 @@ public class MainActivity extends AppCompatActivity { } catch (Exception e) { Log.e("ai_generator", "Failed to write to downloads", e); } - SliceBeam.EVENT_BUS.fireEvent(new NeedDismissSnackbarEvent(downloadTag)); - SliceBeam.EVENT_BUS.fireEvent(new NeedSnackbarEvent(R.string.MenuFileAIGeneratorSavedAs, fileName)); + Santoku.EVENT_BUS.fireEvent(new NeedDismissSnackbarEvent(downloadTag)); + Santoku.EVENT_BUS.fireEvent(new NeedSnackbarEvent(R.string.MenuFileAIGeneratorSavedAs, fileName)); loadFile(f, true); CloudController.checkGeneratorRemaining(); IS_GENERATING_AI_MODEL = false; @@ -580,7 +580,7 @@ public class MainActivity extends AppCompatActivity { @Override public void onException(Exception e) { - SliceBeam.EVENT_BUS.fireEvent(new NeedDismissSnackbarEvent(processTag)); + Santoku.EVENT_BUS.fireEvent(new NeedDismissSnackbarEvent(processTag)); ViewUtils.postOnMainThread(() -> new BeamAlertDialogBuilder(MainActivity.this) .setTitle(R.string.MenuFileAIGeneratorError) .setMessage(e.toString()) @@ -589,8 +589,8 @@ public class MainActivity extends AppCompatActivity { IS_GENERATING_AI_MODEL = false; } }); - SliceBeam.EVENT_BUS.fireEvent(new NeedDismissSnackbarEvent(uploadTag)); - SliceBeam.EVENT_BUS.fireEvent(new NeedSnackbarEvent(SnackbarsLayout.Type.LOADING, R.string.MenuFileAIGeneratorProcessing).tag(processTag)); + Santoku.EVENT_BUS.fireEvent(new NeedDismissSnackbarEvent(uploadTag)); + Santoku.EVENT_BUS.fireEvent(new NeedSnackbarEvent(SnackbarsLayout.Type.LOADING, R.string.MenuFileAIGeneratorProcessing).tag(processTag)); }); } @@ -633,20 +633,20 @@ public class MainActivity extends AppCompatActivity { Runnable finish = () -> { for (int i = 0; i < enabledPrints.length; i++) { if (enabledPrints[i]) { - SliceBeam.CONFIG.importPrint(w.printConfigs.get(i)); + Santoku.CONFIG.importPrint(w.printConfigs.get(i)); } } for (int i = 0; i < enabledFilaments.length; i++) { if (enabledFilaments[i]) { - SliceBeam.CONFIG.importFilament(w.filamentConfigs.get(i)); + Santoku.CONFIG.importFilament(w.filamentConfigs.get(i)); } } for (int i = 0; i < enabledPrinters.length; i++) { if (enabledPrinters[i]) { - SliceBeam.CONFIG.importPrinter(w.printerConfigs.get(i)); + Santoku.CONFIG.importPrinter(w.printerConfigs.get(i)); } } - SliceBeam.saveConfig(); + Santoku.saveConfig(); }; Runnable printersRun = () -> { if (printers.length == 0) { @@ -698,7 +698,7 @@ public class MainActivity extends AppCompatActivity { private void loadFile(File f, boolean autoorient) { String tag = UUID.randomUUID().toString(); - SliceBeam.EVENT_BUS.fireEvent(new NeedSnackbarEvent(SnackbarsLayout.Type.LOADING, R.string.MenuFileOpenFileLoading).tag(tag)); + Santoku.EVENT_BUS.fireEvent(new NeedSnackbarEvent(SnackbarsLayout.Type.LOADING, R.string.MenuFileOpenFileLoading).tag(tag)); IOUtils.IO_POOL.submit(() -> { Process.setThreadPriority(-20); if (delegate.getCurrentFragment() instanceof BedFragment) { @@ -720,7 +720,7 @@ public class MainActivity extends AppCompatActivity { } if (!gcode) { - SliceBeam.EVENT_BUS.fireEvent(new ObjectsListChangedEvent()); + Santoku.EVENT_BUS.fireEvent(new ObjectsListChangedEvent()); } int i = model.getObjectsCount() - 1; if (autoorient) { @@ -728,10 +728,10 @@ public class MainActivity extends AppCompatActivity { fragment.getGlView().getRenderer().invalidateGlModel(i); fragment.getGlView().requestRender(); } - SliceBeam.EVENT_BUS.fireEvent(new NeedDismissSnackbarEvent(tag)); - SliceBeam.EVENT_BUS.fireEvent(new NeedSnackbarEvent(R.string.MenuFileOpenFileLoaded)); + Santoku.EVENT_BUS.fireEvent(new NeedDismissSnackbarEvent(tag)); + Santoku.EVENT_BUS.fireEvent(new NeedSnackbarEvent(R.string.MenuFileOpenFileLoaded)); if (model.isBigObject(i)) { - SliceBeam.EVENT_BUS.fireEvent(new NeedSnackbarEvent(SnackbarsLayout.Type.WARNING, R.string.MenuFileOpenFileBigObject)); + Santoku.EVENT_BUS.fireEvent(new NeedSnackbarEvent(SnackbarsLayout.Type.WARNING, R.string.MenuFileOpenFileBigObject)); } } }); @@ -739,7 +739,7 @@ public class MainActivity extends AppCompatActivity { Log.e("MainActivity", "Failed to load model", e); f.delete(); - SliceBeam.EVENT_BUS.fireEvent(new NeedDismissSnackbarEvent(tag)); + Santoku.EVENT_BUS.fireEvent(new NeedDismissSnackbarEvent(tag)); ViewUtils.postOnMainThread(() -> new BeamAlertDialogBuilder(this) .setTitle(R.string.MenuFileOpenFileFailed) .setMessage(e.toString()) @@ -780,7 +780,7 @@ public class MainActivity extends AppCompatActivity { return; } - File f = new File(SliceBeam.getModelCacheDir(), fileName); + File f = new File(Santoku.getModelCacheDir(), fileName); // TODO: Check if file already exists IOUtils.IO_POOL.submit(()->{ try { diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/SafeStartActivity.java b/app/src/main/java/com/dark98/santoku/SafeStartActivity.java similarity index 94% rename from app/src/main/java/ru/ytkab0bp/slicebeam/SafeStartActivity.java rename to app/src/main/java/com/dark98/santoku/SafeStartActivity.java index 40684f1..65489a5 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/SafeStartActivity.java +++ b/app/src/main/java/com/dark98/santoku/SafeStartActivity.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam; +package com.dark98.santoku; import android.app.Activity; import android.content.Intent; @@ -17,10 +17,10 @@ import android.widget.TextView; import androidx.annotation.Nullable; import androidx.core.graphics.ColorUtils; -import ru.ytkab0bp.slicebeam.theme.ThemesRepo; -import ru.ytkab0bp.slicebeam.utils.Prefs; -import ru.ytkab0bp.slicebeam.utils.ViewUtils; -import ru.ytkab0bp.slicebeam.view.BeamButton; +import com.dark98.santoku.theme.ThemesRepo; +import com.dark98.santoku.utils.Prefs; +import com.dark98.santoku.utils.ViewUtils; +import com.dark98.santoku.view.BeamButton; public class SafeStartActivity extends Activity { @Override diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/SliceBeam.java b/app/src/main/java/com/dark98/santoku/Santoku.java similarity index 76% rename from app/src/main/java/ru/ytkab0bp/slicebeam/SliceBeam.java rename to app/src/main/java/com/dark98/santoku/Santoku.java index 5c28bc0..7f90a89 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/SliceBeam.java +++ b/app/src/main/java/com/dark98/santoku/Santoku.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam; +package com.dark98.santoku; import android.annotation.SuppressLint; import android.app.Application; @@ -17,26 +17,26 @@ import java.util.Arrays; import java.util.Map; import ru.ytkab0bp.eventbus.EventBus; -import ru.ytkab0bp.slicebeam.boot.AppBoot; -import ru.ytkab0bp.slicebeam.boot.BeamServerDataTask; -import ru.ytkab0bp.slicebeam.boot.CheckUpdateJsonTask; -import ru.ytkab0bp.slicebeam.boot.ClearModelCacheTask; -import ru.ytkab0bp.slicebeam.boot.CloudInitTask; -import ru.ytkab0bp.slicebeam.boot.EventBusTask; -import ru.ytkab0bp.slicebeam.boot.LoadSlic3rConfigTask; -import ru.ytkab0bp.slicebeam.boot.PrefsTask; -import ru.ytkab0bp.slicebeam.boot.PrintConfigWarmupTask; -import ru.ytkab0bp.slicebeam.boot.TrueTimeTask; -import ru.ytkab0bp.slicebeam.boot.VibrationUtilsTask; -import ru.ytkab0bp.slicebeam.cloud.CloudController; -import ru.ytkab0bp.slicebeam.config.ConfigObject; -import ru.ytkab0bp.slicebeam.slic3r.ConfigOptionDef; -import ru.ytkab0bp.slicebeam.slic3r.PrintConfigDef; -import ru.ytkab0bp.slicebeam.slic3r.Slic3rConfigWrapper; -import ru.ytkab0bp.slicebeam.utils.Prefs; +import com.dark98.santoku.boot.AppBoot; +import com.dark98.santoku.boot.BeamServerDataTask; +import com.dark98.santoku.boot.CheckUpdateJsonTask; +import com.dark98.santoku.boot.ClearModelCacheTask; +import com.dark98.santoku.boot.CloudInitTask; +import com.dark98.santoku.boot.EventBusTask; +import com.dark98.santoku.boot.LoadSlic3rConfigTask; +import com.dark98.santoku.boot.PrefsTask; +import com.dark98.santoku.boot.PrintConfigWarmupTask; +import com.dark98.santoku.boot.TrueTimeTask; +import com.dark98.santoku.boot.VibrationUtilsTask; +import com.dark98.santoku.cloud.CloudController; +import com.dark98.santoku.config.ConfigObject; +import com.dark98.santoku.slic3r.ConfigOptionDef; +import com.dark98.santoku.slic3r.PrintConfigDef; +import com.dark98.santoku.slic3r.Slic3rConfigWrapper; +import com.dark98.santoku.utils.Prefs; -public class SliceBeam extends Application { - public static SliceBeam INSTANCE; +public class Santoku extends Application { + public static Santoku INSTANCE; public static EventBus EVENT_BUS = EventBus.newBus("main"); public static TrueTimeImpl TRUE_TIME; public static Slic3rConfigWrapper CONFIG; @@ -75,7 +75,7 @@ public class SliceBeam extends Application { } public static void saveConfig() { - SliceBeam.CONFIG_UID++; + Santoku.CONFIG_UID++; File f = getConfigFile(); try { FileOutputStream fos = new FileOutputStream(f); @@ -101,11 +101,11 @@ public class SliceBeam extends Application { public static ConfigObject buildCurrentConfigObject() { ConfigObject singleObject = new ConfigObject(); - ConfigObject printerConfig = SliceBeam.CONFIG.findPrinter(SliceBeam.CONFIG.presets.get("printer")); + ConfigObject printerConfig = Santoku.CONFIG.findPrinter(Santoku.CONFIG.presets.get("printer")); if (printerConfig != null) { singleObject.values.putAll(printerConfig.values); } - ConfigObject printConfig = SliceBeam.CONFIG.findPrint(SliceBeam.CONFIG.presets.get("print")); + ConfigObject printConfig = Santoku.CONFIG.findPrint(Santoku.CONFIG.presets.get("print")); if (printConfig != null) { for (Map.Entry en : printConfig.values.entrySet()) { if (!Slic3rConfigWrapper.PRINTER_CONFIG_KEYS.contains(en.getKey())) { @@ -114,7 +114,7 @@ public class SliceBeam extends Application { } } // TODO: MMU. Detect by printerConfig#getExtruderCount() - ConfigObject filamentConfig = SliceBeam.CONFIG.findFilament(SliceBeam.CONFIG.presets.get("filament")); + ConfigObject filamentConfig = Santoku.CONFIG.findFilament(Santoku.CONFIG.presets.get("filament")); if (filamentConfig != null) { for (Map.Entry en : filamentConfig.values.entrySet()) { if (!Slic3rConfigWrapper.PRINTER_CONFIG_KEYS.contains(en.getKey())) { diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/SetupActivity.java b/app/src/main/java/com/dark98/santoku/SetupActivity.java similarity index 97% rename from app/src/main/java/ru/ytkab0bp/slicebeam/SetupActivity.java rename to app/src/main/java/com/dark98/santoku/SetupActivity.java index e089ccd..8b8298c 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/SetupActivity.java +++ b/app/src/main/java/com/dark98/santoku/SetupActivity.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam; +package com.dark98.santoku; import static android.opengl.GLES30.GL_COLOR_BUFFER_BIT; import static android.opengl.GLES30.GL_DEPTH_BUFFER_BIT; @@ -89,35 +89,35 @@ import javax.microedition.khronos.opengles.GL10; import cz.msebera.android.httpclient.Header; import ru.ytkab0bp.eventbus.EventHandler; -import ru.ytkab0bp.slicebeam.cloud.CloudAPI; -import ru.ytkab0bp.slicebeam.cloud.CloudController; -import ru.ytkab0bp.slicebeam.components.BeamAlertDialogBuilder; -import ru.ytkab0bp.slicebeam.components.CloudManageBottomSheet; -import ru.ytkab0bp.slicebeam.config.ConfigObject; -import ru.ytkab0bp.slicebeam.events.BeamServerDataUpdatedEvent; -import ru.ytkab0bp.slicebeam.events.CloudFeaturesUpdatedEvent; -import ru.ytkab0bp.slicebeam.events.CloudLoginStateUpdatedEvent; -import ru.ytkab0bp.slicebeam.events.CloudSyncFinishedEvent; -import ru.ytkab0bp.slicebeam.recycler.BigHeaderItem; -import ru.ytkab0bp.slicebeam.recycler.PreferenceItem; -import ru.ytkab0bp.slicebeam.recycler.SimpleRecyclerAdapter; -import ru.ytkab0bp.slicebeam.recycler.SimpleRecyclerItem; -import ru.ytkab0bp.slicebeam.recycler.TextHintRecyclerItem; -import ru.ytkab0bp.slicebeam.slic3r.GLModel; -import ru.ytkab0bp.slicebeam.slic3r.GLShaderProgram; -import ru.ytkab0bp.slicebeam.slic3r.GLShadersManager; -import ru.ytkab0bp.slicebeam.slic3r.Slic3rConfigWrapper; -import ru.ytkab0bp.slicebeam.slic3r.Slic3rUtils; -import ru.ytkab0bp.slicebeam.theme.BeamTheme; -import ru.ytkab0bp.slicebeam.theme.IThemeView; -import ru.ytkab0bp.slicebeam.theme.ThemesRepo; -import ru.ytkab0bp.slicebeam.utils.Prefs; -import ru.ytkab0bp.slicebeam.utils.ViewUtils; -import ru.ytkab0bp.slicebeam.view.BeamSwitch; -import ru.ytkab0bp.slicebeam.view.BoostySubsView; -import ru.ytkab0bp.slicebeam.view.FadeRecyclerView; -import ru.ytkab0bp.slicebeam.view.MiniColorView; -import ru.ytkab0bp.slicebeam.view.TextColorImageSpan; +import com.dark98.santoku.cloud.CloudAPI; +import com.dark98.santoku.cloud.CloudController; +import com.dark98.santoku.components.BeamAlertDialogBuilder; +import com.dark98.santoku.components.CloudManageBottomSheet; +import com.dark98.santoku.config.ConfigObject; +import com.dark98.santoku.events.BeamServerDataUpdatedEvent; +import com.dark98.santoku.events.CloudFeaturesUpdatedEvent; +import com.dark98.santoku.events.CloudLoginStateUpdatedEvent; +import com.dark98.santoku.events.CloudSyncFinishedEvent; +import com.dark98.santoku.recycler.BigHeaderItem; +import com.dark98.santoku.recycler.PreferenceItem; +import com.dark98.santoku.recycler.SimpleRecyclerAdapter; +import com.dark98.santoku.recycler.SimpleRecyclerItem; +import com.dark98.santoku.recycler.TextHintRecyclerItem; +import com.dark98.santoku.slic3r.GLModel; +import com.dark98.santoku.slic3r.GLShaderProgram; +import com.dark98.santoku.slic3r.GLShadersManager; +import com.dark98.santoku.slic3r.Slic3rConfigWrapper; +import com.dark98.santoku.slic3r.Slic3rUtils; +import com.dark98.santoku.theme.BeamTheme; +import com.dark98.santoku.theme.IThemeView; +import com.dark98.santoku.theme.ThemesRepo; +import com.dark98.santoku.utils.Prefs; +import com.dark98.santoku.utils.ViewUtils; +import com.dark98.santoku.view.BeamSwitch; +import com.dark98.santoku.view.BoostySubsView; +import com.dark98.santoku.view.FadeRecyclerView; +import com.dark98.santoku.view.MiniColorView; +import com.dark98.santoku.view.TextColorImageSpan; public class SetupActivity extends AppCompatActivity { public final static String EXTRA_ABOUT = "about"; @@ -173,7 +173,7 @@ public class SetupActivity extends AppCompatActivity { private List enabledPrinters = new ArrayList<>(); { - client.setUserAgent(String.format(Locale.ROOT, "SliceBeam/%s-%d", BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE)); + client.setUserAgent(String.format(Locale.ROOT, "Santoku/%s-%d", BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE)); client.setEnableRedirects(true); client.setLoggingEnabled(false); } @@ -182,7 +182,7 @@ public class SetupActivity extends AppCompatActivity { protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); EdgeToEdge.enable(this); - SliceBeam.EVENT_BUS.registerListener(this); + Santoku.EVENT_BUS.registerListener(this); about = getIntent().getBooleanExtra(EXTRA_ABOUT, false); boostyOnly = getIntent().getBooleanExtra(EXTRA_BOOSTY_ONLY, false); @@ -334,7 +334,7 @@ public class SetupActivity extends AppCompatActivity { Log.e(TAG, "Failed to load vendor file " + iniUrl, error); isLoading = false; ViewUtils.postOnMainThread(() -> { - Toast.makeText(SliceBeam.INSTANCE, R.string.IntroFailedToLoadRepos, Toast.LENGTH_SHORT).show(); + Toast.makeText(Santoku.INSTANCE, R.string.IntroFailedToLoadRepos, Toast.LENGTH_SHORT).show(); fakeScroll(-1); pager.setUserInputEnabled(true); }); @@ -361,7 +361,7 @@ public class SetupActivity extends AppCompatActivity { isLoading = false; Log.e(TAG, "Failed to load repo", error); ViewUtils.postOnMainThread(() -> { - Toast.makeText(SliceBeam.INSTANCE, R.string.IntroFailedToLoadRepos, Toast.LENGTH_SHORT).show(); + Toast.makeText(Santoku.INSTANCE, R.string.IntroFailedToLoadRepos, Toast.LENGTH_SHORT).show(); fakeScroll(-1); pager.setUserInputEnabled(true); }); @@ -498,7 +498,7 @@ public class SetupActivity extends AppCompatActivity { protected void onDestroy() { super.onDestroy(); - SliceBeam.EVENT_BUS.unregisterListener(this); + Santoku.EVENT_BUS.unregisterListener(this); } @EventHandler(runOnMainThread = true) @@ -634,7 +634,7 @@ public class SetupActivity extends AppCompatActivity { Log.e(TAG, "Failed to load repos", error); if (fromPage) { ViewUtils.postOnMainThread(() -> { - Toast.makeText(SliceBeam.INSTANCE, R.string.IntroFailedToLoadRepos, Toast.LENGTH_SHORT).show(); + Toast.makeText(Santoku.INSTANCE, R.string.IntroFailedToLoadRepos, Toast.LENGTH_SHORT).show(); fakeScroll(-1); pager.setUserInputEnabled(true); }); @@ -1244,7 +1244,7 @@ public class SetupActivity extends AppCompatActivity { if (adapter.getItemCount() == 0 && isReposLoaded) { List items = new ArrayList<>(repos); - items.add(new TextHintRecyclerItem(SliceBeam.INSTANCE.getString(R.string.IntroSelectRepos))); + items.add(new TextHintRecyclerItem(Santoku.INSTANCE.getString(R.string.IntroSelectRepos))); adapter.setItems(items); } else { adapter.notifyDataSetChanged(); @@ -1271,7 +1271,7 @@ public class SetupActivity extends AppCompatActivity { public void onReposLoaded() { List items = new ArrayList<>(repos); - items.add(new TextHintRecyclerItem(SliceBeam.INSTANCE.getString(R.string.IntroSelectRepos))); + items.add(new TextHintRecyclerItem(Santoku.INSTANCE.getString(R.string.IntroSelectRepos))); adapter.setItems(items); new SpringAnimation(new FloatValueHolder(0)) .setMinimumVisibleChange(1 / 256f) @@ -1443,8 +1443,8 @@ public class SetupActivity extends AppCompatActivity { ll.addView(title); BoostySubsView subsView = new BoostySubsView(ctx); - if (SliceBeam.SERVER_DATA != null) { - List list = new ArrayList<>(SliceBeam.SERVER_DATA.boostySubscribers); + if (Santoku.SERVER_DATA != null) { + List list = new ArrayList<>(Santoku.SERVER_DATA.boostySubscribers); Collections.shuffle(list); subsView.setStrings(list); } @@ -1629,10 +1629,10 @@ public class SetupActivity extends AppCompatActivity { } } try { - if (Prefs.getCloudAPIToken() == null || SliceBeam.CONFIG == null) { - SliceBeam.getCurrentConfigFile().delete(); - SliceBeam.CONFIG = cfg; - FileOutputStream fos = new FileOutputStream(SliceBeam.getConfigFile()); + if (Prefs.getCloudAPIToken() == null || Santoku.CONFIG == null) { + Santoku.getCurrentConfigFile().delete(); + Santoku.CONFIG = cfg; + FileOutputStream fos = new FileOutputStream(Santoku.getConfigFile()); fos.write(cfg.serialize().getBytes(StandardCharsets.UTF_8)); fos.close(); } diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/boot/AppBoot.java b/app/src/main/java/com/dark98/santoku/boot/AppBoot.java similarity index 98% rename from app/src/main/java/ru/ytkab0bp/slicebeam/boot/AppBoot.java rename to app/src/main/java/com/dark98/santoku/boot/AppBoot.java index 39951e4..584078c 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/boot/AppBoot.java +++ b/app/src/main/java/com/dark98/santoku/boot/AppBoot.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.boot; +package com.dark98.santoku.boot; import android.util.Log; import android.util.SparseBooleanArray; @@ -11,7 +11,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import ru.ytkab0bp.slicebeam.BuildConfig; +import com.dark98.santoku.BuildConfig; public class AppBoot { private final static String TAG = "boot"; diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/boot/BeamServerDataTask.java b/app/src/main/java/com/dark98/santoku/boot/BeamServerDataTask.java similarity index 61% rename from app/src/main/java/ru/ytkab0bp/slicebeam/boot/BeamServerDataTask.java rename to app/src/main/java/com/dark98/santoku/boot/BeamServerDataTask.java index a7019b4..a4008d9 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/boot/BeamServerDataTask.java +++ b/app/src/main/java/com/dark98/santoku/boot/BeamServerDataTask.java @@ -1,18 +1,18 @@ -package ru.ytkab0bp.slicebeam.boot; +package com.dark98.santoku.boot; import org.json.JSONException; import org.json.JSONObject; -import ru.ytkab0bp.slicebeam.BeamServerData; -import ru.ytkab0bp.slicebeam.SliceBeam; -import ru.ytkab0bp.slicebeam.utils.Prefs; -import ru.ytkab0bp.slicebeam.utils.ViewUtils; +import com.dark98.santoku.BeamServerData; +import com.dark98.santoku.Santoku; +import com.dark98.santoku.utils.Prefs; +import com.dark98.santoku.utils.ViewUtils; public class BeamServerDataTask extends BootTask { public BeamServerDataTask() { super(() -> { try { - SliceBeam.SERVER_DATA = new BeamServerData(new JSONObject(Prefs.getBeamServerData())); + Santoku.SERVER_DATA = new BeamServerData(new JSONObject(Prefs.getBeamServerData())); } catch (JSONException e) { throw new RuntimeException(e); } diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/boot/BootTask.java b/app/src/main/java/com/dark98/santoku/boot/BootTask.java similarity index 95% rename from app/src/main/java/ru/ytkab0bp/slicebeam/boot/BootTask.java rename to app/src/main/java/com/dark98/santoku/boot/BootTask.java index 662853e..66f2890 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/boot/BootTask.java +++ b/app/src/main/java/com/dark98/santoku/boot/BootTask.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.boot; +package com.dark98.santoku.boot; import java.util.Collections; import java.util.List; diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/boot/CheckUpdateJsonTask.java b/app/src/main/java/com/dark98/santoku/boot/CheckUpdateJsonTask.java similarity index 50% rename from app/src/main/java/ru/ytkab0bp/slicebeam/boot/CheckUpdateJsonTask.java rename to app/src/main/java/com/dark98/santoku/boot/CheckUpdateJsonTask.java index e1ab18d..8ad2b62 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/boot/CheckUpdateJsonTask.java +++ b/app/src/main/java/com/dark98/santoku/boot/CheckUpdateJsonTask.java @@ -1,17 +1,17 @@ -package ru.ytkab0bp.slicebeam.boot; +package com.dark98.santoku.boot; import java.io.IOException; -import ru.ytkab0bp.slicebeam.SliceBeam; +import com.dark98.santoku.Santoku; public class CheckUpdateJsonTask extends BootTask { public CheckUpdateJsonTask() { super(() -> { try { - SliceBeam.INSTANCE.getAssets().open("update.json").close(); - SliceBeam.hasUpdateInfo = true; + Santoku.INSTANCE.getAssets().open("update.json").close(); + Santoku.hasUpdateInfo = true; } catch (IOException e) { - SliceBeam.hasUpdateInfo = false; + Santoku.hasUpdateInfo = false; } }); onWorker(); diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/boot/ClearModelCacheTask.java b/app/src/main/java/com/dark98/santoku/boot/ClearModelCacheTask.java similarity index 75% rename from app/src/main/java/ru/ytkab0bp/slicebeam/boot/ClearModelCacheTask.java rename to app/src/main/java/com/dark98/santoku/boot/ClearModelCacheTask.java index 40ace98..fb6f085 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/boot/ClearModelCacheTask.java +++ b/app/src/main/java/com/dark98/santoku/boot/ClearModelCacheTask.java @@ -1,14 +1,14 @@ -package ru.ytkab0bp.slicebeam.boot; +package com.dark98.santoku.boot; import java.io.File; -import ru.ytkab0bp.slicebeam.SliceBeam; +import com.dark98.santoku.Santoku; public class ClearModelCacheTask extends BootTask { @SuppressWarnings("ResultOfMethodCallIgnored") public ClearModelCacheTask() { super(()->{ - File cache = SliceBeam.getModelCacheDir(); + File cache = Santoku.getModelCacheDir(); if (cache.exists()) { for (File f : cache.listFiles()) { f.delete(); diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/boot/CloudCachedInitTask.java b/app/src/main/java/com/dark98/santoku/boot/CloudCachedInitTask.java similarity index 72% rename from app/src/main/java/ru/ytkab0bp/slicebeam/boot/CloudCachedInitTask.java rename to app/src/main/java/com/dark98/santoku/boot/CloudCachedInitTask.java index a5c6e52..609eefc 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/boot/CloudCachedInitTask.java +++ b/app/src/main/java/com/dark98/santoku/boot/CloudCachedInitTask.java @@ -1,8 +1,8 @@ -package ru.ytkab0bp.slicebeam.boot; +package com.dark98.santoku.boot; import java.util.Collections; -import ru.ytkab0bp.slicebeam.cloud.CloudController; +import com.dark98.santoku.cloud.CloudController; public class CloudCachedInitTask extends BootTask { public CloudCachedInitTask() { diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/boot/CloudInitTask.java b/app/src/main/java/com/dark98/santoku/boot/CloudInitTask.java similarity index 77% rename from app/src/main/java/ru/ytkab0bp/slicebeam/boot/CloudInitTask.java rename to app/src/main/java/com/dark98/santoku/boot/CloudInitTask.java index 66e8417..79eb875 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/boot/CloudInitTask.java +++ b/app/src/main/java/com/dark98/santoku/boot/CloudInitTask.java @@ -1,8 +1,8 @@ -package ru.ytkab0bp.slicebeam.boot; +package com.dark98.santoku.boot; import java.util.Arrays; -import ru.ytkab0bp.slicebeam.cloud.CloudController; +import com.dark98.santoku.cloud.CloudController; public class CloudInitTask extends BootTask { public CloudInitTask() { diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/boot/EventBusTask.java b/app/src/main/java/com/dark98/santoku/boot/EventBusTask.java similarity index 73% rename from app/src/main/java/ru/ytkab0bp/slicebeam/boot/EventBusTask.java rename to app/src/main/java/com/dark98/santoku/boot/EventBusTask.java index 6c757c3..3dae4bc 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/boot/EventBusTask.java +++ b/app/src/main/java/com/dark98/santoku/boot/EventBusTask.java @@ -1,7 +1,7 @@ -package ru.ytkab0bp.slicebeam.boot; +package com.dark98.santoku.boot; import ru.ytkab0bp.eventbus.EventBus; -import ru.ytkab0bp.slicebeam.BuildConfig; +import com.dark98.santoku.BuildConfig; public class EventBusTask extends BootTask { diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/boot/LoadSlic3rConfigTask.java b/app/src/main/java/com/dark98/santoku/boot/LoadSlic3rConfigTask.java similarity index 57% rename from app/src/main/java/ru/ytkab0bp/slicebeam/boot/LoadSlic3rConfigTask.java rename to app/src/main/java/com/dark98/santoku/boot/LoadSlic3rConfigTask.java index 6cb952a..b2c9580 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/boot/LoadSlic3rConfigTask.java +++ b/app/src/main/java/com/dark98/santoku/boot/LoadSlic3rConfigTask.java @@ -1,20 +1,20 @@ -package ru.ytkab0bp.slicebeam.boot; +package com.dark98.santoku.boot; import java.io.File; import java.io.IOException; -import ru.ytkab0bp.slicebeam.SliceBeam; -import ru.ytkab0bp.slicebeam.slic3r.Slic3rConfigWrapper; +import com.dark98.santoku.Santoku; +import com.dark98.santoku.slic3r.Slic3rConfigWrapper; @SuppressWarnings("ResultOfMethodCallIgnored") public class LoadSlic3rConfigTask extends BootTask { public LoadSlic3rConfigTask() { super(() -> { - File cfgFile = SliceBeam.getConfigFile(); - SliceBeam.getCurrentConfigFile().delete(); + File cfgFile = Santoku.getConfigFile(); + Santoku.getCurrentConfigFile().delete(); if (cfgFile.exists()) { try { - SliceBeam.CONFIG = new Slic3rConfigWrapper(cfgFile); + Santoku.CONFIG = new Slic3rConfigWrapper(cfgFile); } catch (IOException e) { throw new RuntimeException(e); } diff --git a/app/src/main/java/com/dark98/santoku/boot/PrefsTask.java b/app/src/main/java/com/dark98/santoku/boot/PrefsTask.java new file mode 100644 index 0000000..d44fa26 --- /dev/null +++ b/app/src/main/java/com/dark98/santoku/boot/PrefsTask.java @@ -0,0 +1,10 @@ +package com.dark98.santoku.boot; + +import com.dark98.santoku.Santoku; +import com.dark98.santoku.utils.Prefs; + +public class PrefsTask extends BootTask { + public PrefsTask() { + super(()->Prefs.init(Santoku.INSTANCE)); + } +} diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/boot/PrintConfigWarmupTask.java b/app/src/main/java/com/dark98/santoku/boot/PrintConfigWarmupTask.java similarity index 65% rename from app/src/main/java/ru/ytkab0bp/slicebeam/boot/PrintConfigWarmupTask.java rename to app/src/main/java/com/dark98/santoku/boot/PrintConfigWarmupTask.java index f7b672f..abe6987 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/boot/PrintConfigWarmupTask.java +++ b/app/src/main/java/com/dark98/santoku/boot/PrintConfigWarmupTask.java @@ -1,6 +1,6 @@ -package ru.ytkab0bp.slicebeam.boot; +package com.dark98.santoku.boot; -import ru.ytkab0bp.slicebeam.slic3r.PrintConfigDef; +import com.dark98.santoku.slic3r.PrintConfigDef; public class PrintConfigWarmupTask extends BootTask { public PrintConfigWarmupTask() { diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/boot/TrueTimeTask.java b/app/src/main/java/com/dark98/santoku/boot/TrueTimeTask.java similarity index 89% rename from app/src/main/java/ru/ytkab0bp/slicebeam/boot/TrueTimeTask.java rename to app/src/main/java/com/dark98/santoku/boot/TrueTimeTask.java index e9ec701..f944755 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/boot/TrueTimeTask.java +++ b/app/src/main/java/com/dark98/santoku/boot/TrueTimeTask.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.boot; +package com.dark98.santoku.boot; import androidx.annotation.NonNull; @@ -13,13 +13,13 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import kotlinx.coroutines.Dispatchers; -import ru.ytkab0bp.slicebeam.SliceBeam; +import com.dark98.santoku.Santoku; public class TrueTimeTask extends BootTask { public TrueTimeTask() { super(() -> { CountDownLatch latch = new CountDownLatch(1); - SliceBeam.TRUE_TIME = new TrueTimeImpl(new TrueTimeParameters.Builder().buildParams(), Dispatchers.getIO(), new TrueTimeEventListener() { + Santoku.TRUE_TIME = new TrueTimeImpl(new TrueTimeParameters.Builder().buildParams(), Dispatchers.getIO(), new TrueTimeEventListener() { @Override public void initialize(@NonNull TrueTimeParameters trueTimeParameters) {} @@ -64,7 +64,7 @@ public class TrueTimeTask extends BootTask { @Override public void returningDeviceTime() {} }); - SliceBeam.TRUE_TIME.sync(); + Santoku.TRUE_TIME.sync(); try { latch.await(300, TimeUnit.MILLISECONDS); } catch (InterruptedException ignored) {} diff --git a/app/src/main/java/com/dark98/santoku/boot/VibrationUtilsTask.java b/app/src/main/java/com/dark98/santoku/boot/VibrationUtilsTask.java new file mode 100644 index 0000000..f127418 --- /dev/null +++ b/app/src/main/java/com/dark98/santoku/boot/VibrationUtilsTask.java @@ -0,0 +1,12 @@ +package com.dark98.santoku.boot; + +import com.dark98.santoku.Santoku; +import com.dark98.santoku.utils.VibrationUtils; + +public class VibrationUtilsTask extends BootTask { + + public VibrationUtilsTask() { + super(() -> VibrationUtils.init(Santoku.INSTANCE)); + onWorker(); + } +} diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/cloud/CloudAPI.java b/app/src/main/java/com/dark98/santoku/cloud/CloudAPI.java similarity index 96% rename from app/src/main/java/ru/ytkab0bp/slicebeam/cloud/CloudAPI.java rename to app/src/main/java/com/dark98/santoku/cloud/CloudAPI.java index 2ae1f1d..26494bc 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/cloud/CloudAPI.java +++ b/app/src/main/java/com/dark98/santoku/cloud/CloudAPI.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.cloud; +package com.dark98.santoku.cloud; import androidx.annotation.Nullable; @@ -18,8 +18,8 @@ import ru.ytkab0bp.sapil.Arg; import ru.ytkab0bp.sapil.Header; import ru.ytkab0bp.sapil.Method; import ru.ytkab0bp.sapil.RequestType; -import ru.ytkab0bp.slicebeam.BuildConfig; -import ru.ytkab0bp.slicebeam.utils.Prefs; +import com.dark98.santoku.BuildConfig; +import com.dark98.santoku.utils.Prefs; public interface CloudAPI extends APIRunner { CloudAPI INSTANCE = APILibrary.newRunner(CloudAPI.class, new RunnerConfig() { @@ -32,7 +32,7 @@ public interface CloudAPI extends APIRunner { @Override public String getDefaultUserAgent() { - return "SliceBeam v" + BuildConfig.VERSION_NAME + "/" + BuildConfig.VERSION_CODE; + return "Santoku v" + BuildConfig.VERSION_NAME + "/" + BuildConfig.VERSION_CODE; } @Override diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/cloud/CloudController.java b/app/src/main/java/com/dark98/santoku/cloud/CloudController.java similarity index 71% rename from app/src/main/java/ru/ytkab0bp/slicebeam/cloud/CloudController.java rename to app/src/main/java/com/dark98/santoku/cloud/CloudController.java index d10ea4e..f62f2ca 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/cloud/CloudController.java +++ b/app/src/main/java/com/dark98/santoku/cloud/CloudController.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.cloud; +package com.dark98.santoku.cloud; import android.content.Intent; import android.net.Uri; @@ -18,21 +18,21 @@ import java.util.Locale; import ru.ytkab0bp.sapil.APICallback; import ru.ytkab0bp.sapil.APIRequestHandle; -import ru.ytkab0bp.slicebeam.R; -import ru.ytkab0bp.slicebeam.SliceBeam; -import ru.ytkab0bp.slicebeam.components.BeamAlertDialogBuilder; -import ru.ytkab0bp.slicebeam.events.CloudFeaturesUpdatedEvent; -import ru.ytkab0bp.slicebeam.events.CloudLoginStateUpdatedEvent; -import ru.ytkab0bp.slicebeam.events.CloudModelsRemainingCountUpdatedEvent; -import ru.ytkab0bp.slicebeam.events.CloudSyncFinishedEvent; -import ru.ytkab0bp.slicebeam.events.CloudUserInfoUpdatedEvent; -import ru.ytkab0bp.slicebeam.events.NeedDismissSnackbarEvent; -import ru.ytkab0bp.slicebeam.events.NeedSnackbarEvent; -import ru.ytkab0bp.slicebeam.slic3r.Slic3rConfigWrapper; -import ru.ytkab0bp.slicebeam.utils.IOUtils; -import ru.ytkab0bp.slicebeam.utils.Prefs; -import ru.ytkab0bp.slicebeam.utils.ViewUtils; -import ru.ytkab0bp.slicebeam.view.SnackbarsLayout; +import com.dark98.santoku.R; +import com.dark98.santoku.Santoku; +import com.dark98.santoku.components.BeamAlertDialogBuilder; +import com.dark98.santoku.events.CloudFeaturesUpdatedEvent; +import com.dark98.santoku.events.CloudLoginStateUpdatedEvent; +import com.dark98.santoku.events.CloudModelsRemainingCountUpdatedEvent; +import com.dark98.santoku.events.CloudSyncFinishedEvent; +import com.dark98.santoku.events.CloudUserInfoUpdatedEvent; +import com.dark98.santoku.events.NeedDismissSnackbarEvent; +import com.dark98.santoku.events.NeedSnackbarEvent; +import com.dark98.santoku.slic3r.Slic3rConfigWrapper; +import com.dark98.santoku.utils.IOUtils; +import com.dark98.santoku.utils.Prefs; +import com.dark98.santoku.utils.ViewUtils; +import com.dark98.santoku.view.SnackbarsLayout; public class CloudController { public final static String USER_INFO_AI_GEN_TAG = "ai_gen_user_info"; @@ -54,7 +54,7 @@ public class CloudController { private static Runnable loginAutoCancel = () -> { loginSessionId = null; isLoggingIn = false; - SliceBeam.EVENT_BUS.fireEvent(new CloudLoginStateUpdatedEvent()); + Santoku.EVENT_BUS.fireEvent(new CloudLoginStateUpdatedEvent()); }; private static Runnable loginCheck = new Runnable() { @Override @@ -99,7 +99,7 @@ public class CloudController { } public static void init() { - long now = SliceBeam.TRUE_TIME.now().getTime(); + long now = Santoku.TRUE_TIME.now().getTime(); boolean needSyncInfo = userFeatures == null || now - Prefs.getCloudLastFeaturesSync() > MIN_SYNC_FEATURES_DELTA; if (needSyncInfo) { checkUserFeatures(); @@ -128,21 +128,21 @@ public class CloudController { userInfo = null; Prefs.setCloudAPIToken(null); Prefs.setCloudCachedUserInfo(null); - SliceBeam.EVENT_BUS.fireEvent(new CloudUserInfoUpdatedEvent()); + Santoku.EVENT_BUS.fireEvent(new CloudUserInfoUpdatedEvent()); if (isLoggingIn) { isLoggingIn = false; - SliceBeam.EVENT_BUS.fireEvent(new CloudLoginStateUpdatedEvent()); + Santoku.EVENT_BUS.fireEvent(new CloudLoginStateUpdatedEvent()); } } else { Prefs.setCloudCachedUserInfo(gson.toJson(userInfo)); - SliceBeam.EVENT_BUS.fireEvent(new NeedDismissSnackbarEvent(USER_INFO_AI_GEN_TAG)); - SliceBeam.EVENT_BUS.fireEvent(new CloudUserInfoUpdatedEvent()); + Santoku.EVENT_BUS.fireEvent(new NeedDismissSnackbarEvent(USER_INFO_AI_GEN_TAG)); + Santoku.EVENT_BUS.fireEvent(new CloudUserInfoUpdatedEvent()); if (isLoggingIn) { isLoggingIn = false; - SliceBeam.EVENT_BUS.fireEvent(new CloudLoginStateUpdatedEvent()); + Santoku.EVENT_BUS.fireEvent(new CloudLoginStateUpdatedEvent()); } if (isSyncAvailable() && Prefs.isCloudProfileSyncEnabled()) { @@ -150,7 +150,7 @@ public class CloudController { } checkGeneratorRemaining(); } - Prefs.setCloudLastFeaturesSync(SliceBeam.TRUE_TIME.now().getTime()); + Prefs.setCloudLastFeaturesSync(Santoku.TRUE_TIME.now().getTime()); } @Override @@ -171,9 +171,9 @@ public class CloudController { public void onResponse(CloudAPI.LoginData response) { loginSessionId = response.sessionId; - ViewUtils.postOnMainThread(loginAutoCancel, response.expiresAt * 1000L - SliceBeam.TRUE_TIME.now().getTime()); + ViewUtils.postOnMainThread(loginAutoCancel, response.expiresAt * 1000L - Santoku.TRUE_TIME.now().getTime()); ViewUtils.postOnMainThread(loginCheck, 5000); - ViewUtils.postOnMainThread(() -> SliceBeam.INSTANCE.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(response.url)).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK))); + ViewUtils.postOnMainThread(() -> Santoku.INSTANCE.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(response.url)).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK))); } @Override @@ -185,13 +185,13 @@ public class CloudController { public static void beginLogin() { isLoggingIn = true; - SliceBeam.EVENT_BUS.fireEvent(new CloudLoginStateUpdatedEvent()); + Santoku.EVENT_BUS.fireEvent(new CloudLoginStateUpdatedEvent()); beginLogin0(); } public static void cancelLogin() { isLoggingIn = false; - SliceBeam.EVENT_BUS.fireEvent(new CloudLoginStateUpdatedEvent()); + Santoku.EVENT_BUS.fireEvent(new CloudLoginStateUpdatedEvent()); if (loginSessionId != null) { CloudAPI.INSTANCE.loginCancel(loginSessionId, response -> {}); } @@ -207,8 +207,8 @@ public class CloudController { public static void logout() { Prefs.setCloudAPIToken(null); userInfo = null; - SliceBeam.EVENT_BUS.fireEvent(new CloudLoginStateUpdatedEvent()); - SliceBeam.EVENT_BUS.fireEvent(new CloudUserInfoUpdatedEvent()); + Santoku.EVENT_BUS.fireEvent(new CloudLoginStateUpdatedEvent()); + Santoku.EVENT_BUS.fireEvent(new CloudUserInfoUpdatedEvent()); CloudAPI.INSTANCE.logout(response -> {}); } @@ -219,7 +219,7 @@ public class CloudController { modelsUsed = response.used; modelsMaxGenerations = response.max; Prefs.setCloudCachedUsedMaxModels(modelsUsed, modelsMaxGenerations); - SliceBeam.EVENT_BUS.fireEvent(new CloudModelsRemainingCountUpdatedEvent()); + Santoku.EVENT_BUS.fireEvent(new CloudModelsRemainingCountUpdatedEvent()); } @Override @@ -237,9 +237,9 @@ public class CloudController { userFeatures = response; Prefs.setCloudCachedUserFeatures(gson.toJson(userFeatures)); if (Prefs.getCloudAPIToken() == null) { - Prefs.setCloudLastFeaturesSync(SliceBeam.TRUE_TIME.now().getTime()); + Prefs.setCloudLastFeaturesSync(Santoku.TRUE_TIME.now().getTime()); } - SliceBeam.EVENT_BUS.fireEvent(new CloudFeaturesUpdatedEvent()); + Santoku.EVENT_BUS.fireEvent(new CloudFeaturesUpdatedEvent()); } @Override @@ -284,28 +284,28 @@ public class CloudController { public void onResponse(String response) { IOUtils.IO_POOL.submit(() -> { try { - File f = SliceBeam.getConfigFile(); + File f = Santoku.getConfigFile(); byte[] data = Base64.decode(response, 0); FileOutputStream fos = new FileOutputStream(f); fos.write(data); fos.close(); - SliceBeam.CONFIG = new Slic3rConfigWrapper(f); + Santoku.CONFIG = new Slic3rConfigWrapper(f); Prefs.setCloudLocalLastModified(lastModified); Prefs.setCloudLocalLastSentModified(lastModified); Prefs.setCloudRemoteLastModified(lastModified); - Prefs.setCloudLastSync(SliceBeam.TRUE_TIME.now().getTime()); - SliceBeam.EVENT_BUS.fireEvent(new NeedDismissSnackbarEvent(CLOUD_SYNC_TAG)); - SliceBeam.EVENT_BUS.fireEvent(new NeedSnackbarEvent(R.string.CloudSyncSuccess)); - SliceBeam.EVENT_BUS.fireEvent(new CloudSyncFinishedEvent()); + Prefs.setCloudLastSync(Santoku.TRUE_TIME.now().getTime()); + Santoku.EVENT_BUS.fireEvent(new NeedDismissSnackbarEvent(CLOUD_SYNC_TAG)); + Santoku.EVENT_BUS.fireEvent(new NeedSnackbarEvent(R.string.CloudSyncSuccess)); + Santoku.EVENT_BUS.fireEvent(new CloudSyncFinishedEvent()); } catch (IOException e) { Log.e(TAG, "Failed to write data", e); isSyncInProgress = false; - SliceBeam.EVENT_BUS.fireEvent(new NeedDismissSnackbarEvent(CLOUD_SYNC_TAG)); - SliceBeam.EVENT_BUS.fireEvent(new NeedSnackbarEvent(SnackbarsLayout.Type.ERROR, R.string.CloudSyncError)); - SliceBeam.EVENT_BUS.fireEvent(new CloudSyncFinishedEvent()); + Santoku.EVENT_BUS.fireEvent(new NeedDismissSnackbarEvent(CLOUD_SYNC_TAG)); + Santoku.EVENT_BUS.fireEvent(new NeedSnackbarEvent(SnackbarsLayout.Type.ERROR, R.string.CloudSyncError)); + Santoku.EVENT_BUS.fireEvent(new CloudSyncFinishedEvent()); } }); } @@ -315,9 +315,9 @@ public class CloudController { Log.e(TAG, "Failed to download data", e); isSyncInProgress = false; - SliceBeam.EVENT_BUS.fireEvent(new NeedDismissSnackbarEvent(CLOUD_SYNC_TAG)); - SliceBeam.EVENT_BUS.fireEvent(new NeedSnackbarEvent(SnackbarsLayout.Type.ERROR, R.string.CloudSyncError)); - SliceBeam.EVENT_BUS.fireEvent(new CloudSyncFinishedEvent()); + Santoku.EVENT_BUS.fireEvent(new NeedDismissSnackbarEvent(CLOUD_SYNC_TAG)); + Santoku.EVENT_BUS.fireEvent(new NeedSnackbarEvent(SnackbarsLayout.Type.ERROR, R.string.CloudSyncError)); + Santoku.EVENT_BUS.fireEvent(new CloudSyncFinishedEvent()); } }); } @@ -328,18 +328,18 @@ public class CloudController { } long modified = Prefs.getCloudLocalLastModified(); isSyncInProgress = true; - SliceBeam.EVENT_BUS.fireEvent(new NeedSnackbarEvent(SnackbarsLayout.Type.LOADING, R.string.CloudSyncInProgress).tag(CLOUD_SYNC_TAG)); + Santoku.EVENT_BUS.fireEvent(new NeedSnackbarEvent(SnackbarsLayout.Type.LOADING, R.string.CloudSyncInProgress).tag(CLOUD_SYNC_TAG)); CloudAPI.INSTANCE.syncGetState(new APICallback() { @Override public void onResponse(CloudAPI.SyncState response) { - if (SliceBeam.CONFIG == null && response.usedSize != 0) { + if (Santoku.CONFIG == null && response.usedSize != 0) { // Setup screen, no config yet downloadData(response.lastUpdatedDate); } else if (response.usedSize == 0) { - if (SliceBeam.CONFIG == null) { - SliceBeam.EVENT_BUS.fireEvent(new NeedDismissSnackbarEvent(CLOUD_SYNC_TAG)); - SliceBeam.EVENT_BUS.fireEvent(new CloudSyncFinishedEvent()); + if (Santoku.CONFIG == null) { + Santoku.EVENT_BUS.fireEvent(new NeedDismissSnackbarEvent(CLOUD_SYNC_TAG)); + Santoku.EVENT_BUS.fireEvent(new CloudSyncFinishedEvent()); return; } @@ -351,8 +351,8 @@ public class CloudController { downloadData(response.lastUpdatedDate); } else { // Modified on client and on server - SliceBeam.EVENT_BUS.fireEvent(new NeedDismissSnackbarEvent(CLOUD_SYNC_TAG)); - SliceBeam.EVENT_BUS.fireEvent(new NeedSnackbarEvent(SnackbarsLayout.Type.WARNING, R.string.CloudSyncConflict).button(R.string.CloudSyncConflictResolve, v -> { + Santoku.EVENT_BUS.fireEvent(new NeedDismissSnackbarEvent(CLOUD_SYNC_TAG)); + Santoku.EVENT_BUS.fireEvent(new NeedSnackbarEvent(SnackbarsLayout.Type.WARNING, R.string.CloudSyncConflict).button(R.string.CloudSyncConflictResolve, v -> { SimpleDateFormat format = new SimpleDateFormat("dd.MM.yyyy HH:mm", Locale.getDefault()); new BeamAlertDialogBuilder(v.getContext()) .setTitle(R.string.CloudSyncConflict) @@ -368,8 +368,8 @@ public class CloudController { uploadData(modified); } else { // Not modified on server and on client - SliceBeam.EVENT_BUS.fireEvent(new NeedDismissSnackbarEvent(CLOUD_SYNC_TAG)); - SliceBeam.EVENT_BUS.fireEvent(new CloudSyncFinishedEvent()); + Santoku.EVENT_BUS.fireEvent(new NeedDismissSnackbarEvent(CLOUD_SYNC_TAG)); + Santoku.EVENT_BUS.fireEvent(new CloudSyncFinishedEvent()); } } } @@ -379,8 +379,8 @@ public class CloudController { Log.e(TAG, "Failed to get sync state", e); isSyncInProgress = false; - SliceBeam.EVENT_BUS.fireEvent(new NeedDismissSnackbarEvent(CLOUD_SYNC_TAG)); - SliceBeam.EVENT_BUS.fireEvent(new NeedSnackbarEvent(SnackbarsLayout.Type.ERROR, R.string.CloudSyncError)); + Santoku.EVENT_BUS.fireEvent(new NeedDismissSnackbarEvent(CLOUD_SYNC_TAG)); + Santoku.EVENT_BUS.fireEvent(new NeedSnackbarEvent(SnackbarsLayout.Type.ERROR, R.string.CloudSyncError)); } }); } @@ -388,7 +388,7 @@ public class CloudController { private static void uploadData(long modified) { IOUtils.IO_POOL.submit(() -> { try { - File f = SliceBeam.getConfigFile(); + File f = Santoku.getConfigFile(); FileInputStream fis = new FileInputStream(f); ByteArrayOutputStream bos = new ByteArrayOutputStream(); byte[] buffer = new byte[10240]; @@ -409,10 +409,10 @@ public class CloudController { } Prefs.setCloudRemoteLastModified(response.lastUpdatedDate); Prefs.setCloudLocalLastSentModified(modified); - Prefs.setCloudLastSync(SliceBeam.TRUE_TIME.now().getTime()); - SliceBeam.EVENT_BUS.fireEvent(new NeedDismissSnackbarEvent(CLOUD_SYNC_TAG)); - SliceBeam.EVENT_BUS.fireEvent(new NeedSnackbarEvent(R.string.CloudSyncSuccess)); - SliceBeam.EVENT_BUS.fireEvent(new CloudSyncFinishedEvent()); + Prefs.setCloudLastSync(Santoku.TRUE_TIME.now().getTime()); + Santoku.EVENT_BUS.fireEvent(new NeedDismissSnackbarEvent(CLOUD_SYNC_TAG)); + Santoku.EVENT_BUS.fireEvent(new NeedSnackbarEvent(R.string.CloudSyncSuccess)); + Santoku.EVENT_BUS.fireEvent(new CloudSyncFinishedEvent()); } @Override @@ -420,24 +420,24 @@ public class CloudController { Log.e(TAG, "Failed to upload sync data", e); isSyncInProgress = false; - SliceBeam.EVENT_BUS.fireEvent(new NeedDismissSnackbarEvent(CLOUD_SYNC_TAG)); - SliceBeam.EVENT_BUS.fireEvent(new NeedSnackbarEvent(SnackbarsLayout.Type.ERROR, R.string.CloudSyncError)); - SliceBeam.EVENT_BUS.fireEvent(new CloudSyncFinishedEvent()); + Santoku.EVENT_BUS.fireEvent(new NeedDismissSnackbarEvent(CLOUD_SYNC_TAG)); + Santoku.EVENT_BUS.fireEvent(new NeedSnackbarEvent(SnackbarsLayout.Type.ERROR, R.string.CloudSyncError)); + Santoku.EVENT_BUS.fireEvent(new CloudSyncFinishedEvent()); } }); } catch (IOException e) { Log.e(TAG, "Failed to read sync data", e); isSyncInProgress = false; - SliceBeam.EVENT_BUS.fireEvent(new NeedDismissSnackbarEvent(CLOUD_SYNC_TAG)); - SliceBeam.EVENT_BUS.fireEvent(new NeedSnackbarEvent(SnackbarsLayout.Type.ERROR, R.string.CloudSyncError)); - SliceBeam.EVENT_BUS.fireEvent(new CloudSyncFinishedEvent()); + Santoku.EVENT_BUS.fireEvent(new NeedDismissSnackbarEvent(CLOUD_SYNC_TAG)); + Santoku.EVENT_BUS.fireEvent(new NeedSnackbarEvent(SnackbarsLayout.Type.ERROR, R.string.CloudSyncError)); + Santoku.EVENT_BUS.fireEvent(new CloudSyncFinishedEvent()); } }); } public static void notifyDataChanged() { - long now = SliceBeam.TRUE_TIME.now().getTime(); + long now = Santoku.TRUE_TIME.now().getTime(); Prefs.setCloudLocalLastModified(now); if (!isSyncAvailable() || !Prefs.isCloudProfileSyncEnabled()) { return; diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/components/BeamAlertDialogBuilder.java b/app/src/main/java/com/dark98/santoku/components/BeamAlertDialogBuilder.java similarity index 97% rename from app/src/main/java/ru/ytkab0bp/slicebeam/components/BeamAlertDialogBuilder.java rename to app/src/main/java/com/dark98/santoku/components/BeamAlertDialogBuilder.java index 1a6e7b8..f2308c9 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/components/BeamAlertDialogBuilder.java +++ b/app/src/main/java/com/dark98/santoku/components/BeamAlertDialogBuilder.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.components; +package com.dark98.santoku.components; import android.annotation.SuppressLint; import android.content.Context; @@ -21,9 +21,9 @@ import androidx.appcompat.widget.AppCompatCheckedTextView; import com.google.android.material.dialog.MaterialAlertDialogBuilder; -import ru.ytkab0bp.slicebeam.R; -import ru.ytkab0bp.slicebeam.theme.ThemesRepo; -import ru.ytkab0bp.slicebeam.utils.ViewUtils; +import com.dark98.santoku.R; +import com.dark98.santoku.theme.ThemesRepo; +import com.dark98.santoku.utils.ViewUtils; public class BeamAlertDialogBuilder extends MaterialAlertDialogBuilder { public BeamAlertDialogBuilder(@NonNull Context context) { diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/components/BeamColorPickerPopUp.java b/app/src/main/java/com/dark98/santoku/components/BeamColorPickerPopUp.java similarity index 90% rename from app/src/main/java/ru/ytkab0bp/slicebeam/components/BeamColorPickerPopUp.java rename to app/src/main/java/com/dark98/santoku/components/BeamColorPickerPopUp.java index 933e365..4beec12 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/components/BeamColorPickerPopUp.java +++ b/app/src/main/java/com/dark98/santoku/components/BeamColorPickerPopUp.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.components; +package com.dark98.santoku.components; import android.app.Dialog; import android.content.Context; @@ -8,9 +8,9 @@ import android.widget.TextView; import com.mrudultora.colorpicker.ColorPickerPopUp; -import ru.ytkab0bp.slicebeam.R; -import ru.ytkab0bp.slicebeam.theme.ThemesRepo; -import ru.ytkab0bp.slicebeam.utils.ViewUtils; +import com.dark98.santoku.R; +import com.dark98.santoku.theme.ThemesRepo; +import com.dark98.santoku.utils.ViewUtils; public class BeamColorPickerPopUp extends ColorPickerPopUp { public BeamColorPickerPopUp(Context context) { diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/components/ChangeLogBottomSheet.java b/app/src/main/java/com/dark98/santoku/components/ChangeLogBottomSheet.java similarity index 92% rename from app/src/main/java/ru/ytkab0bp/slicebeam/components/ChangeLogBottomSheet.java rename to app/src/main/java/com/dark98/santoku/components/ChangeLogBottomSheet.java index 67fb868..a8f2d00 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/components/ChangeLogBottomSheet.java +++ b/app/src/main/java/com/dark98/santoku/components/ChangeLogBottomSheet.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.components; +package com.dark98.santoku.components; import android.content.Context; import android.content.Intent; @@ -35,14 +35,14 @@ import java.util.List; import java.util.Locale; import ru.ytkab0bp.eventbus.EventHandler; -import ru.ytkab0bp.slicebeam.BeamServerData; -import ru.ytkab0bp.slicebeam.R; -import ru.ytkab0bp.slicebeam.SliceBeam; -import ru.ytkab0bp.slicebeam.events.BeamServerDataUpdatedEvent; -import ru.ytkab0bp.slicebeam.theme.ThemesRepo; -import ru.ytkab0bp.slicebeam.utils.ViewUtils; -import ru.ytkab0bp.slicebeam.view.BeamButton; -import ru.ytkab0bp.slicebeam.view.BoostySubsView; +import com.dark98.santoku.BeamServerData; +import com.dark98.santoku.R; +import com.dark98.santoku.Santoku; +import com.dark98.santoku.events.BeamServerDataUpdatedEvent; +import com.dark98.santoku.theme.ThemesRepo; +import com.dark98.santoku.utils.ViewUtils; +import com.dark98.santoku.view.BeamButton; +import com.dark98.santoku.view.BoostySubsView; public class ChangeLogBottomSheet extends BottomSheetDialog { private BoostySubsView subsView; @@ -156,8 +156,8 @@ public class ChangeLogBottomSheet extends BottomSheetDialog { ll.addView(subtitle); subsView = new BoostySubsView(context); - if (SliceBeam.SERVER_DATA != null) { - List list = new ArrayList<>(SliceBeam.SERVER_DATA.boostySubscribers); + if (Santoku.SERVER_DATA != null) { + List list = new ArrayList<>(Santoku.SERVER_DATA.boostySubscribers); Collections.shuffle(list); subsView.setStrings(list); } @@ -233,14 +233,14 @@ public class ChangeLogBottomSheet extends BottomSheetDialog { ll.setFitsSystemWindows(true); setContentView(ll); - SliceBeam.EVENT_BUS.registerListener(this); - setOnDismissListener(dialog -> SliceBeam.EVENT_BUS.unregisterListener(this)); + Santoku.EVENT_BUS.registerListener(this); + setOnDismissListener(dialog -> Santoku.EVENT_BUS.unregisterListener(this)); } @EventHandler(runOnMainThread = true) public void onDataUpdated(BeamServerDataUpdatedEvent e) { - if (SliceBeam.SERVER_DATA != null) { - List list = new ArrayList<>(SliceBeam.SERVER_DATA.boostySubscribers); + if (Santoku.SERVER_DATA != null) { + List list = new ArrayList<>(Santoku.SERVER_DATA.boostySubscribers); Collections.shuffle(list); subsView.setStrings(list); } diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/components/CloudManageBottomSheet.java b/app/src/main/java/com/dark98/santoku/components/CloudManageBottomSheet.java similarity index 90% rename from app/src/main/java/ru/ytkab0bp/slicebeam/components/CloudManageBottomSheet.java rename to app/src/main/java/com/dark98/santoku/components/CloudManageBottomSheet.java index 7c540b1..3918b67 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/components/CloudManageBottomSheet.java +++ b/app/src/main/java/com/dark98/santoku/components/CloudManageBottomSheet.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.components; +package com.dark98.santoku.components; import android.content.Context; import android.content.Intent; @@ -24,18 +24,18 @@ import com.google.android.material.bottomsheet.BottomSheetDialog; import java.util.ArrayList; import java.util.List; -import ru.ytkab0bp.slicebeam.R; -import ru.ytkab0bp.slicebeam.SliceBeam; -import ru.ytkab0bp.slicebeam.cloud.CloudAPI; -import ru.ytkab0bp.slicebeam.cloud.CloudController; -import ru.ytkab0bp.slicebeam.events.NeedDismissSnackbarEvent; -import ru.ytkab0bp.slicebeam.recycler.PreferenceSwitchItem; -import ru.ytkab0bp.slicebeam.recycler.SimpleRecyclerAdapter; -import ru.ytkab0bp.slicebeam.recycler.SimpleRecyclerItem; -import ru.ytkab0bp.slicebeam.theme.ThemesRepo; -import ru.ytkab0bp.slicebeam.utils.Prefs; -import ru.ytkab0bp.slicebeam.utils.ViewUtils; -import ru.ytkab0bp.slicebeam.view.TextColorImageSpan; +import com.dark98.santoku.R; +import com.dark98.santoku.Santoku; +import com.dark98.santoku.cloud.CloudAPI; +import com.dark98.santoku.cloud.CloudController; +import com.dark98.santoku.events.NeedDismissSnackbarEvent; +import com.dark98.santoku.recycler.PreferenceSwitchItem; +import com.dark98.santoku.recycler.SimpleRecyclerAdapter; +import com.dark98.santoku.recycler.SimpleRecyclerItem; +import com.dark98.santoku.theme.ThemesRepo; +import com.dark98.santoku.utils.Prefs; +import com.dark98.santoku.utils.ViewUtils; +import com.dark98.santoku.view.TextColorImageSpan; public class CloudManageBottomSheet extends BottomSheetDialog { public CloudManageBottomSheet(@NonNull Context context) { @@ -97,7 +97,7 @@ public class CloudManageBottomSheet extends BottomSheetDialog { if (isChecked) { CloudController.notifyDataChanged(); } else { - SliceBeam.EVENT_BUS.fireEvent(new NeedDismissSnackbarEvent(CloudController.CLOUD_SYNC_TAG)); + Santoku.EVENT_BUS.fireEvent(new NeedDismissSnackbarEvent(CloudController.CLOUD_SYNC_TAG)); } })); } diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/components/SliceProgressBottomSheet.java b/app/src/main/java/com/dark98/santoku/components/SliceProgressBottomSheet.java similarity index 92% rename from app/src/main/java/ru/ytkab0bp/slicebeam/components/SliceProgressBottomSheet.java rename to app/src/main/java/com/dark98/santoku/components/SliceProgressBottomSheet.java index 38ba209..8de521e 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/components/SliceProgressBottomSheet.java +++ b/app/src/main/java/com/dark98/santoku/components/SliceProgressBottomSheet.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.components; +package com.dark98.santoku.components; import android.content.Context; import android.content.res.ColorStateList; @@ -21,12 +21,12 @@ import java.util.ArrayList; import java.util.List; import ru.ytkab0bp.eventbus.EventHandler; -import ru.ytkab0bp.slicebeam.R; -import ru.ytkab0bp.slicebeam.SliceBeam; -import ru.ytkab0bp.slicebeam.events.SlicingProgressEvent; -import ru.ytkab0bp.slicebeam.slic3r.Slic3rLocalization; -import ru.ytkab0bp.slicebeam.theme.ThemesRepo; -import ru.ytkab0bp.slicebeam.utils.ViewUtils; +import com.dark98.santoku.R; +import com.dark98.santoku.Santoku; +import com.dark98.santoku.events.SlicingProgressEvent; +import com.dark98.santoku.slic3r.Slic3rLocalization; +import com.dark98.santoku.theme.ThemesRepo; +import com.dark98.santoku.utils.ViewUtils; public class SliceProgressBottomSheet extends BottomSheetDialog { private RecyclerView recyclerView; @@ -122,12 +122,12 @@ public class SliceProgressBottomSheet extends BottomSheetDialog { @Override public void onAttachedToWindow() { super.onAttachedToWindow(); - SliceBeam.EVENT_BUS.registerListener(this); + Santoku.EVENT_BUS.registerListener(this); } @Override public void onDetachedFromWindow() { super.onDetachedFromWindow(); - SliceBeam.EVENT_BUS.unregisterListener(this); + Santoku.EVENT_BUS.unregisterListener(this); } } diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/components/UnfoldMenu.java b/app/src/main/java/com/dark98/santoku/components/UnfoldMenu.java similarity index 97% rename from app/src/main/java/ru/ytkab0bp/slicebeam/components/UnfoldMenu.java rename to app/src/main/java/com/dark98/santoku/components/UnfoldMenu.java index 8059b99..11b9db5 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/components/UnfoldMenu.java +++ b/app/src/main/java/com/dark98/santoku/components/UnfoldMenu.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.components; +package com.dark98.santoku.components; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -18,10 +18,10 @@ import androidx.dynamicanimation.animation.FloatValueHolder; import androidx.dynamicanimation.animation.SpringAnimation; import androidx.dynamicanimation.animation.SpringForce; -import ru.ytkab0bp.slicebeam.fragment.BedFragment; -import ru.ytkab0bp.slicebeam.theme.ThemesRepo; -import ru.ytkab0bp.slicebeam.utils.ViewUtils; -import ru.ytkab0bp.slicebeam.view.MirrorView; +import com.dark98.santoku.fragment.BedFragment; +import com.dark98.santoku.theme.ThemesRepo; +import com.dark98.santoku.utils.ViewUtils; +import com.dark98.santoku.view.MirrorView; public abstract class UnfoldMenu { protected BedFragment fragment; diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/components/WebViewMenu.java b/app/src/main/java/com/dark98/santoku/components/WebViewMenu.java similarity index 88% rename from app/src/main/java/ru/ytkab0bp/slicebeam/components/WebViewMenu.java rename to app/src/main/java/com/dark98/santoku/components/WebViewMenu.java index 415d71a..dd0167c 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/components/WebViewMenu.java +++ b/app/src/main/java/com/dark98/santoku/components/WebViewMenu.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.components; +package com.dark98.santoku.components; import android.annotation.SuppressLint; import android.content.Context; @@ -23,14 +23,14 @@ import java.io.File; import java.io.FileOutputStream; import java.util.Locale; -import ru.ytkab0bp.slicebeam.BuildConfig; -import ru.ytkab0bp.slicebeam.R; -import ru.ytkab0bp.slicebeam.SliceBeam; -import ru.ytkab0bp.slicebeam.events.NeedDismissCalibrationsMenu; -import ru.ytkab0bp.slicebeam.fragment.BedFragment; -import ru.ytkab0bp.slicebeam.theme.ThemesRepo; -import ru.ytkab0bp.slicebeam.utils.ViewUtils; -import ru.ytkab0bp.slicebeam.view.DividerView; +import com.dark98.santoku.BuildConfig; +import com.dark98.santoku.R; +import com.dark98.santoku.Santoku; +import com.dark98.santoku.events.NeedDismissCalibrationsMenu; +import com.dark98.santoku.fragment.BedFragment; +import com.dark98.santoku.theme.ThemesRepo; +import com.dark98.santoku.utils.ViewUtils; +import com.dark98.santoku.view.DividerView; public class WebViewMenu extends UnfoldMenu { private final Uri uri; @@ -93,10 +93,10 @@ public class WebViewMenu extends UnfoldMenu { return super.dispatchTouchEvent(ev); } }; - webView.addJavascriptInterface(new Bridge(), "SliceBeam"); + webView.addJavascriptInterface(new Bridge(), "Santoku"); WebSettings settings = webView.getSettings(); - settings.setUserAgentString(String.format(Locale.ROOT, "SliceBeam/%s-%d", BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE)); + settings.setUserAgentString(String.format(Locale.ROOT, "Santoku/%s-%d", BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE)); settings.setJavaScriptEnabled(true); settings.setDomStorageEnabled(true); settings.setDatabaseEnabled(true); @@ -131,7 +131,7 @@ public class WebViewMenu extends UnfoldMenu { @JavascriptInterface public void beginDownload(String filename) { - cacheFile = new File(SliceBeam.getModelCacheDir(), filename); + cacheFile = new File(Santoku.getModelCacheDir(), filename); try { fileStream = new FileOutputStream(cacheFile); } catch (Exception e) { @@ -155,7 +155,7 @@ public class WebViewMenu extends UnfoldMenu { ViewUtils.postOnMainThread(() -> { dismiss(true); - SliceBeam.EVENT_BUS.fireEvent(new NeedDismissCalibrationsMenu()); + Santoku.EVENT_BUS.fireEvent(new NeedDismissCalibrationsMenu()); ViewUtils.postOnMainThread(() -> fragment.loadGCode(cacheFile), 200); }); } catch (Exception e) { diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/components/bed_menu/BedMenu.java b/app/src/main/java/com/dark98/santoku/components/bed_menu/BedMenu.java similarity index 77% rename from app/src/main/java/ru/ytkab0bp/slicebeam/components/bed_menu/BedMenu.java rename to app/src/main/java/com/dark98/santoku/components/bed_menu/BedMenu.java index 1c0c424..c7886ba 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/components/bed_menu/BedMenu.java +++ b/app/src/main/java/com/dark98/santoku/components/bed_menu/BedMenu.java @@ -1,12 +1,12 @@ -package ru.ytkab0bp.slicebeam.components.bed_menu; +package com.dark98.santoku.components.bed_menu; import android.content.Context; import android.view.View; import androidx.annotation.CallSuper; -import ru.ytkab0bp.slicebeam.fragment.BedFragment; -import ru.ytkab0bp.slicebeam.slic3r.Bed3D; +import com.dark98.santoku.fragment.BedFragment; +import com.dark98.santoku.slic3r.Bed3D; public abstract class BedMenu { private View view; diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/components/bed_menu/BedMenuItem.java b/app/src/main/java/com/dark98/santoku/components/bed_menu/BedMenuItem.java similarity index 96% rename from app/src/main/java/ru/ytkab0bp/slicebeam/components/bed_menu/BedMenuItem.java rename to app/src/main/java/com/dark98/santoku/components/bed_menu/BedMenuItem.java index 63ad83f..bfb900c 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/components/bed_menu/BedMenuItem.java +++ b/app/src/main/java/com/dark98/santoku/components/bed_menu/BedMenuItem.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.components.bed_menu; +package com.dark98.santoku.components.bed_menu; import android.content.Context; import android.content.res.ColorStateList; @@ -31,13 +31,13 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import ru.ytkab0bp.slicebeam.R; -import ru.ytkab0bp.slicebeam.SliceBeam; -import ru.ytkab0bp.slicebeam.recycler.SimpleRecyclerItem; -import ru.ytkab0bp.slicebeam.theme.IThemeView; -import ru.ytkab0bp.slicebeam.theme.ThemesRepo; -import ru.ytkab0bp.slicebeam.utils.RandomUtils; -import ru.ytkab0bp.slicebeam.utils.ViewUtils; +import com.dark98.santoku.R; +import com.dark98.santoku.Santoku; +import com.dark98.santoku.recycler.SimpleRecyclerItem; +import com.dark98.santoku.theme.IThemeView; +import com.dark98.santoku.theme.ThemesRepo; +import com.dark98.santoku.utils.RandomUtils; +import com.dark98.santoku.utils.ViewUtils; public class BedMenuItem extends SimpleRecyclerItem { public final int titleRes; @@ -169,7 +169,7 @@ public class BedMenuItem extends SimpleRecyclerItem(); if (sparkleDrawable == null) { - sparkleDrawable = ContextCompat.getDrawable(SliceBeam.INSTANCE, R.drawable.sparkle_28); + sparkleDrawable = ContextCompat.getDrawable(Santoku.INSTANCE, R.drawable.sparkle_28); sparkleDrawable.setColorFilter(new PorterDuffColorFilter(ThemesRepo.getColor(android.R.attr.colorAccent), PorterDuff.Mode.SRC_IN)); } diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/components/bed_menu/CameraMenu.java b/app/src/main/java/com/dark98/santoku/components/bed_menu/CameraMenu.java similarity index 94% rename from app/src/main/java/ru/ytkab0bp/slicebeam/components/bed_menu/CameraMenu.java rename to app/src/main/java/com/dark98/santoku/components/bed_menu/CameraMenu.java index 5d9573d..cf8f15c 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/components/bed_menu/CameraMenu.java +++ b/app/src/main/java/com/dark98/santoku/components/bed_menu/CameraMenu.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.components.bed_menu; +package com.dark98.santoku.components.bed_menu; import android.content.Context; import android.widget.Toast; @@ -10,16 +10,16 @@ import androidx.dynamicanimation.animation.SpringForce; import java.util.Arrays; import java.util.List; -import ru.ytkab0bp.slicebeam.R; -import ru.ytkab0bp.slicebeam.components.BeamAlertDialogBuilder; -import ru.ytkab0bp.slicebeam.recycler.SimpleRecyclerItem; -import ru.ytkab0bp.slicebeam.recycler.SpaceItem; -import ru.ytkab0bp.slicebeam.render.Camera; -import ru.ytkab0bp.slicebeam.slic3r.Bed3D; -import ru.ytkab0bp.slicebeam.utils.Prefs; -import ru.ytkab0bp.slicebeam.utils.Vec3d; -import ru.ytkab0bp.slicebeam.utils.ViewUtils; -import ru.ytkab0bp.slicebeam.view.GLView; +import com.dark98.santoku.R; +import com.dark98.santoku.components.BeamAlertDialogBuilder; +import com.dark98.santoku.recycler.SimpleRecyclerItem; +import com.dark98.santoku.recycler.SpaceItem; +import com.dark98.santoku.render.Camera; +import com.dark98.santoku.slic3r.Bed3D; +import com.dark98.santoku.utils.Prefs; +import com.dark98.santoku.utils.Vec3d; +import com.dark98.santoku.utils.ViewUtils; +import com.dark98.santoku.view.GLView; public class CameraMenu extends ListBedMenu { private boolean checkInvalidBed() { diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/components/bed_menu/FileMenu.java b/app/src/main/java/com/dark98/santoku/components/bed_menu/FileMenu.java similarity index 88% rename from app/src/main/java/ru/ytkab0bp/slicebeam/components/bed_menu/FileMenu.java rename to app/src/main/java/com/dark98/santoku/components/bed_menu/FileMenu.java index d651819..71bfd2c 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/components/bed_menu/FileMenu.java +++ b/app/src/main/java/com/dark98/santoku/components/bed_menu/FileMenu.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.components.bed_menu; +package com.dark98.santoku.components.bed_menu; import android.app.Activity; import android.content.Context; @@ -33,40 +33,40 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import ru.ytkab0bp.eventbus.EventHandler; -import ru.ytkab0bp.slicebeam.BeamServerData; -import ru.ytkab0bp.slicebeam.BuildConfig; -import ru.ytkab0bp.slicebeam.MainActivity; -import ru.ytkab0bp.slicebeam.R; -import ru.ytkab0bp.slicebeam.SetupActivity; -import ru.ytkab0bp.slicebeam.SliceBeam; -import ru.ytkab0bp.slicebeam.cloud.CloudController; -import ru.ytkab0bp.slicebeam.components.BeamAlertDialogBuilder; -import ru.ytkab0bp.slicebeam.components.UnfoldMenu; -import ru.ytkab0bp.slicebeam.components.WebViewMenu; -import ru.ytkab0bp.slicebeam.config.ConfigObject; -import ru.ytkab0bp.slicebeam.events.CloudFeaturesUpdatedEvent; -import ru.ytkab0bp.slicebeam.events.CloudModelsRemainingCountUpdatedEvent; -import ru.ytkab0bp.slicebeam.events.NeedDismissAIGeneratorMenu; -import ru.ytkab0bp.slicebeam.events.NeedDismissCalibrationsMenu; -import ru.ytkab0bp.slicebeam.events.NeedDismissSnackbarEvent; -import ru.ytkab0bp.slicebeam.events.NeedSnackbarEvent; -import ru.ytkab0bp.slicebeam.events.ObjectsListChangedEvent; -import ru.ytkab0bp.slicebeam.events.SelectedObjectChangedEvent; -import ru.ytkab0bp.slicebeam.fragment.BedFragment; -import ru.ytkab0bp.slicebeam.recycler.PreferenceItem; -import ru.ytkab0bp.slicebeam.recycler.SimpleRecyclerAdapter; -import ru.ytkab0bp.slicebeam.recycler.SimpleRecyclerItem; -import ru.ytkab0bp.slicebeam.recycler.SpaceItem; -import ru.ytkab0bp.slicebeam.slic3r.Bed3D; -import ru.ytkab0bp.slicebeam.slic3r.Slic3rRuntimeError; -import ru.ytkab0bp.slicebeam.theme.BeamTheme; -import ru.ytkab0bp.slicebeam.theme.ThemesRepo; -import ru.ytkab0bp.slicebeam.utils.Prefs; -import ru.ytkab0bp.slicebeam.utils.ViewUtils; -import ru.ytkab0bp.slicebeam.view.DividerView; -import ru.ytkab0bp.slicebeam.view.FadeRecyclerView; -import ru.ytkab0bp.slicebeam.view.SegmentsView; -import ru.ytkab0bp.slicebeam.view.SnackbarsLayout; +import com.dark98.santoku.BeamServerData; +import com.dark98.santoku.BuildConfig; +import com.dark98.santoku.MainActivity; +import com.dark98.santoku.R; +import com.dark98.santoku.SetupActivity; +import com.dark98.santoku.Santoku; +import com.dark98.santoku.cloud.CloudController; +import com.dark98.santoku.components.BeamAlertDialogBuilder; +import com.dark98.santoku.components.UnfoldMenu; +import com.dark98.santoku.components.WebViewMenu; +import com.dark98.santoku.config.ConfigObject; +import com.dark98.santoku.events.CloudFeaturesUpdatedEvent; +import com.dark98.santoku.events.CloudModelsRemainingCountUpdatedEvent; +import com.dark98.santoku.events.NeedDismissAIGeneratorMenu; +import com.dark98.santoku.events.NeedDismissCalibrationsMenu; +import com.dark98.santoku.events.NeedDismissSnackbarEvent; +import com.dark98.santoku.events.NeedSnackbarEvent; +import com.dark98.santoku.events.ObjectsListChangedEvent; +import com.dark98.santoku.events.SelectedObjectChangedEvent; +import com.dark98.santoku.fragment.BedFragment; +import com.dark98.santoku.recycler.PreferenceItem; +import com.dark98.santoku.recycler.SimpleRecyclerAdapter; +import com.dark98.santoku.recycler.SimpleRecyclerItem; +import com.dark98.santoku.recycler.SpaceItem; +import com.dark98.santoku.slic3r.Bed3D; +import com.dark98.santoku.slic3r.Slic3rRuntimeError; +import com.dark98.santoku.theme.BeamTheme; +import com.dark98.santoku.theme.ThemesRepo; +import com.dark98.santoku.utils.Prefs; +import com.dark98.santoku.utils.ViewUtils; +import com.dark98.santoku.view.DividerView; +import com.dark98.santoku.view.FadeRecyclerView; +import com.dark98.santoku.view.SegmentsView; +import com.dark98.santoku.view.SnackbarsLayout; public class FileMenu extends ListBedMenu { private final static List K3D_SUPPORTED_LANGUAGES = Arrays.asList("en", "ru"); @@ -134,11 +134,11 @@ public class FileMenu extends ListBedMenu { return; } if (CloudController.getUserInfo() == null) { - SliceBeam.EVENT_BUS.fireEvent(new NeedSnackbarEvent(SnackbarsLayout.Type.LOADING, R.string.MenuFileAIGeneratorPleaseWaitSetup).tag(CloudController.USER_INFO_AI_GEN_TAG)); + Santoku.EVENT_BUS.fireEvent(new NeedSnackbarEvent(SnackbarsLayout.Type.LOADING, R.string.MenuFileAIGeneratorPleaseWaitSetup).tag(CloudController.USER_INFO_AI_GEN_TAG)); ViewUtils.postOnMainThread(() -> { if (CloudController.getUserInfo() == null) { - SliceBeam.EVENT_BUS.fireEvent(new NeedDismissSnackbarEvent(CloudController.USER_INFO_AI_GEN_TAG)); - SliceBeam.EVENT_BUS.fireEvent(new NeedSnackbarEvent(SnackbarsLayout.Type.ERROR, R.string.MenuFileAIGeneratorErrorNotLoadedUserAccount)); + Santoku.EVENT_BUS.fireEvent(new NeedDismissSnackbarEvent(CloudController.USER_INFO_AI_GEN_TAG)); + Santoku.EVENT_BUS.fireEvent(new NeedSnackbarEvent(SnackbarsLayout.Type.ERROR, R.string.MenuFileAIGeneratorErrorNotLoadedUserAccount)); } else { fragment.showUnfoldMenu(new AIGeneratorMenu(), view); } @@ -169,24 +169,24 @@ public class FileMenu extends ListBedMenu { } }), new BedMenuItem(R.string.MenuFileExportProfiles, R.drawable.folder_simple_arrow_right_outline_28).onClick(v -> { - CharSequence[] prints = new CharSequence[SliceBeam.CONFIG.printConfigs.size()]; + CharSequence[] prints = new CharSequence[Santoku.CONFIG.printConfigs.size()]; boolean[] enabledPrints = new boolean[prints.length]; for (int i = 0; i < prints.length; i++) { - prints[i] = SliceBeam.CONFIG.printConfigs.get(i).getTitle(); + prints[i] = Santoku.CONFIG.printConfigs.get(i).getTitle(); enabledPrints[i] = true; } - CharSequence[] filaments = new CharSequence[SliceBeam.CONFIG.filamentConfigs.size()]; + CharSequence[] filaments = new CharSequence[Santoku.CONFIG.filamentConfigs.size()]; boolean[] enabledFilaments = new boolean[filaments.length]; for (int i = 0; i < filaments.length; i++) { - filaments[i] = SliceBeam.CONFIG.filamentConfigs.get(i).getTitle(); + filaments[i] = Santoku.CONFIG.filamentConfigs.get(i).getTitle(); enabledFilaments[i] = true; } - CharSequence[] printers = new CharSequence[SliceBeam.CONFIG.printerConfigs.size()]; + CharSequence[] printers = new CharSequence[Santoku.CONFIG.printerConfigs.size()]; boolean[] enabledPrinters = new boolean[printers.length]; for (int i = 0; i < printers.length; i++) { - printers[i] = SliceBeam.CONFIG.printerConfigs.get(i).getTitle(); + printers[i] = Santoku.CONFIG.printerConfigs.get(i).getTitle(); enabledPrinters[i] = true; } @@ -205,21 +205,21 @@ public class FileMenu extends ListBedMenu { for (int i = 0; i < enabledPrints.length; i++) { if (enabledPrints[i]) { hasEnabled = true; - MainActivity.EXPORTING_PRINTS.add(SliceBeam.CONFIG.printConfigs.get(i)); + MainActivity.EXPORTING_PRINTS.add(Santoku.CONFIG.printConfigs.get(i)); } } MainActivity.EXPORTING_FILAMENTS = new ArrayList<>(); for (int i = 0; i < enabledFilaments.length; i++) { if (enabledFilaments[i]) { hasEnabled = true; - MainActivity.EXPORTING_FILAMENTS.add(SliceBeam.CONFIG.filamentConfigs.get(i)); + MainActivity.EXPORTING_FILAMENTS.add(Santoku.CONFIG.filamentConfigs.get(i)); } } MainActivity.EXPORTING_PRINTERS = new ArrayList<>(); for (int i = 0; i < enabledPrinters.length; i++) { if (enabledPrinters[i]) { hasEnabled = true; - MainActivity.EXPORTING_PRINTERS.add(SliceBeam.CONFIG.printerConfigs.get(i)); + MainActivity.EXPORTING_PRINTERS.add(Santoku.CONFIG.printerConfigs.get(i)); } } if (!hasEnabled) { @@ -300,11 +300,11 @@ public class FileMenu extends ListBedMenu { adapter.setItems(Arrays.asList( new PreferenceItem().setIcon(R.drawable.camera_outline_28).setTitle(ctx.getString(R.string.MenuFileAIGeneratorFromCamera)).setOnClickListener(v -> { if (CloudController.getGeneratedModels() >= CloudController.getMaxGeneratedModels()) { - SliceBeam.EVENT_BUS.fireEvent(new NeedSnackbarEvent(SnackbarsLayout.Type.ERROR, R.string.MenuFileAIGeneratorNoGenerationsLeft)); + Santoku.EVENT_BUS.fireEvent(new NeedSnackbarEvent(SnackbarsLayout.Type.ERROR, R.string.MenuFileAIGeneratorNoGenerationsLeft)); return; } if (MainActivity.IS_GENERATING_AI_MODEL) { - SliceBeam.EVENT_BUS.fireEvent(new NeedSnackbarEvent(SnackbarsLayout.Type.WARNING, R.string.MenuFileAIGeneratorAlreadyGenerating)); + Santoku.EVENT_BUS.fireEvent(new NeedSnackbarEvent(SnackbarsLayout.Type.WARNING, R.string.MenuFileAIGeneratorAlreadyGenerating)); return; } if (ctx instanceof MainActivity) { @@ -321,11 +321,11 @@ public class FileMenu extends ListBedMenu { }), new PreferenceItem().setIcon(R.drawable.picture_outline_28).setTitle(ctx.getString(R.string.MenuFileAIGeneratorFromGallery)).setOnClickListener(v -> { if (CloudController.getGeneratedModels() >= CloudController.getMaxGeneratedModels()) { - SliceBeam.EVENT_BUS.fireEvent(new NeedSnackbarEvent(SnackbarsLayout.Type.ERROR, R.string.MenuFileAIGeneratorNoGenerationsLeft)); + Santoku.EVENT_BUS.fireEvent(new NeedSnackbarEvent(SnackbarsLayout.Type.ERROR, R.string.MenuFileAIGeneratorNoGenerationsLeft)); return; } if (MainActivity.IS_GENERATING_AI_MODEL) { - SliceBeam.EVENT_BUS.fireEvent(new NeedSnackbarEvent(SnackbarsLayout.Type.WARNING, R.string.MenuFileAIGeneratorAlreadyGenerating)); + Santoku.EVENT_BUS.fireEvent(new NeedSnackbarEvent(SnackbarsLayout.Type.WARNING, R.string.MenuFileAIGeneratorAlreadyGenerating)); return; } if (ctx instanceof MainActivity) { @@ -391,7 +391,7 @@ public class FileMenu extends ListBedMenu { protected void onCreate() { super.onCreate(); - SliceBeam.EVENT_BUS.registerListener(this); + Santoku.EVENT_BUS.registerListener(this); ViewUtils.postOnMainThread(() -> segmentsView.startAnimation(), 50); } @@ -409,12 +409,12 @@ public class FileMenu extends ListBedMenu { protected void onDestroy() { super.onDestroy(); - SliceBeam.EVENT_BUS.unregisterListener(this); + Santoku.EVENT_BUS.unregisterListener(this); } private void updateRemaining() { int rev = CloudController.getMaxGeneratedModels() - CloudController.getGeneratedModels(); - remainingView.setText(SliceBeam.INSTANCE.getString(R.string.MenuFileAIGeneratorRemaining, rev, CloudController.getMaxGeneratedModels())); + remainingView.setText(Santoku.INSTANCE.getString(R.string.MenuFileAIGeneratorRemaining, rev, CloudController.getMaxGeneratedModels())); segmentsView.setValues(new float[]{0, rev / (float) CloudController.getMaxGeneratedModels(), 1}); } } @@ -427,7 +427,7 @@ public class FileMenu extends ListBedMenu { private String loadJSLoader(String key) { try { - InputStream in = SliceBeam.INSTANCE.getAssets().open("js_loader/" + key + ".js"); + InputStream in = Santoku.INSTANCE.getAssets().open("js_loader/" + key + ".js"); ByteArrayOutputStream bos = new ByteArrayOutputStream(); byte[] buffer = new byte[10240]; int c; while ((c = in.read(buffer)) != -1) { @@ -436,7 +436,7 @@ public class FileMenu extends ListBedMenu { bos.close(); in.close(); - ConfigObject cfg = SliceBeam.buildCurrentConfigObject(); + ConfigObject cfg = Santoku.buildCurrentConfigObject(); Bed3D bed = FileMenu.this.fragment.getGlView().getRenderer().getBed(); double bedX = bed.getVolumeMax().x - bed.getVolumeMin().x; double bedY = bed.getVolumeMax().y - bed.getVolumeMin().y; @@ -562,14 +562,14 @@ public class FileMenu extends ListBedMenu { protected void onCreate() { super.onCreate(); - SliceBeam.EVENT_BUS.registerListener(this); + Santoku.EVENT_BUS.registerListener(this); } @Override protected void onDestroy() { super.onDestroy(); - SliceBeam.EVENT_BUS.unregisterListener(this); + Santoku.EVENT_BUS.unregisterListener(this); } } @@ -577,10 +577,10 @@ public class FileMenu extends ListBedMenu { private void loadModel(String key) { BedFragment fragment = this.fragment; ViewUtils.postOnMainThread(() -> { - File f = new File(SliceBeam.getModelCacheDir(), "calibration_" + key + ".stl"); + File f = new File(Santoku.getModelCacheDir(), "calibration_" + key + ".stl"); new Thread(()->{ try { - InputStream in = SliceBeam.INSTANCE.getAssets().open("models/" + key + ".stl"); + InputStream in = Santoku.INSTANCE.getAssets().open("models/" + key + ".stl"); FileOutputStream fos = new FileOutputStream(f); byte[] buffer = new byte[10240]; int c; while ((c = in.read(buffer)) != -1) { @@ -595,9 +595,9 @@ public class FileMenu extends ListBedMenu { fragment.loadGCode(f); } else { fragment.loadModel(f); - SliceBeam.EVENT_BUS.fireEvent(new ObjectsListChangedEvent()); + Santoku.EVENT_BUS.fireEvent(new ObjectsListChangedEvent()); } - SliceBeam.EVENT_BUS.fireEvent(new NeedSnackbarEvent(R.string.MenuFileOpenFileLoaded)); + Santoku.EVENT_BUS.fireEvent(new NeedSnackbarEvent(R.string.MenuFileOpenFileLoaded)); } catch (Slic3rRuntimeError e) { f.delete(); @@ -618,7 +618,7 @@ public class FileMenu extends ListBedMenu { } }).start(); }, 200); - SliceBeam.EVENT_BUS.fireEvent(new NeedDismissCalibrationsMenu()); + Santoku.EVENT_BUS.fireEvent(new NeedDismissCalibrationsMenu()); dismiss(true); } diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/components/bed_menu/ListBedMenu.java b/app/src/main/java/com/dark98/santoku/components/bed_menu/ListBedMenu.java similarity index 86% rename from app/src/main/java/ru/ytkab0bp/slicebeam/components/bed_menu/ListBedMenu.java rename to app/src/main/java/com/dark98/santoku/components/bed_menu/ListBedMenu.java index 7f46a5f..d6b4508 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/components/bed_menu/ListBedMenu.java +++ b/app/src/main/java/com/dark98/santoku/components/bed_menu/ListBedMenu.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.components.bed_menu; +package com.dark98.santoku.components.bed_menu; import android.content.Context; import android.graphics.Rect; @@ -11,11 +11,11 @@ import androidx.recyclerview.widget.RecyclerView; import java.util.List; -import ru.ytkab0bp.slicebeam.SliceBeam; -import ru.ytkab0bp.slicebeam.fragment.BedFragment; -import ru.ytkab0bp.slicebeam.recycler.SimpleRecyclerAdapter; -import ru.ytkab0bp.slicebeam.recycler.SimpleRecyclerItem; -import ru.ytkab0bp.slicebeam.utils.ViewUtils; +import com.dark98.santoku.Santoku; +import com.dark98.santoku.fragment.BedFragment; +import com.dark98.santoku.recycler.SimpleRecyclerAdapter; +import com.dark98.santoku.recycler.SimpleRecyclerItem; +import com.dark98.santoku.utils.ViewUtils; public abstract class ListBedMenu extends BedMenu { protected BedFragment fragment; @@ -69,13 +69,13 @@ public abstract class ListBedMenu extends BedMenu { @Override public void onViewCreated(View v) { super.onViewCreated(v); - SliceBeam.EVENT_BUS.registerListener(ListBedMenu.this); + Santoku.EVENT_BUS.registerListener(ListBedMenu.this); } @Override public void onViewDestroyed() { super.onViewDestroyed(); - SliceBeam.EVENT_BUS.unregisterListener(ListBedMenu.this); + Santoku.EVENT_BUS.unregisterListener(ListBedMenu.this); } protected abstract List onCreateItems(boolean portrait); diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/components/bed_menu/OrientationMenu.java b/app/src/main/java/com/dark98/santoku/components/bed_menu/OrientationMenu.java similarity index 94% rename from app/src/main/java/ru/ytkab0bp/slicebeam/components/bed_menu/OrientationMenu.java rename to app/src/main/java/com/dark98/santoku/components/bed_menu/OrientationMenu.java index c49d05c..56d19e0 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/components/bed_menu/OrientationMenu.java +++ b/app/src/main/java/com/dark98/santoku/components/bed_menu/OrientationMenu.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.components.bed_menu; +package com.dark98.santoku.components.bed_menu; import android.content.Context; import android.graphics.drawable.Drawable; @@ -26,25 +26,25 @@ import java.util.List; import java.util.Locale; import ru.ytkab0bp.eventbus.EventHandler; -import ru.ytkab0bp.slicebeam.R; -import ru.ytkab0bp.slicebeam.SliceBeam; -import ru.ytkab0bp.slicebeam.components.BeamAlertDialogBuilder; -import ru.ytkab0bp.slicebeam.components.UnfoldMenu; -import ru.ytkab0bp.slicebeam.events.FlattenModeResetEvent; -import ru.ytkab0bp.slicebeam.events.LongClickTranslationEvent; -import ru.ytkab0bp.slicebeam.events.NeedSnackbarEvent; -import ru.ytkab0bp.slicebeam.events.ObjectsListChangedEvent; -import ru.ytkab0bp.slicebeam.events.SelectedObjectChangedEvent; -import ru.ytkab0bp.slicebeam.recycler.SimpleRecyclerItem; -import ru.ytkab0bp.slicebeam.recycler.SpaceItem; -import ru.ytkab0bp.slicebeam.slic3r.Model; -import ru.ytkab0bp.slicebeam.theme.ThemesRepo; -import ru.ytkab0bp.slicebeam.utils.Vec3d; -import ru.ytkab0bp.slicebeam.utils.ViewUtils; -import ru.ytkab0bp.slicebeam.view.BeamButton; -import ru.ytkab0bp.slicebeam.view.DividerView; -import ru.ytkab0bp.slicebeam.view.PositionScrollView; -import ru.ytkab0bp.slicebeam.view.TextColorImageSpan; +import com.dark98.santoku.R; +import com.dark98.santoku.Santoku; +import com.dark98.santoku.components.BeamAlertDialogBuilder; +import com.dark98.santoku.components.UnfoldMenu; +import com.dark98.santoku.events.FlattenModeResetEvent; +import com.dark98.santoku.events.LongClickTranslationEvent; +import com.dark98.santoku.events.NeedSnackbarEvent; +import com.dark98.santoku.events.ObjectsListChangedEvent; +import com.dark98.santoku.events.SelectedObjectChangedEvent; +import com.dark98.santoku.recycler.SimpleRecyclerItem; +import com.dark98.santoku.recycler.SpaceItem; +import com.dark98.santoku.slic3r.Model; +import com.dark98.santoku.theme.ThemesRepo; +import com.dark98.santoku.utils.Vec3d; +import com.dark98.santoku.utils.ViewUtils; +import com.dark98.santoku.view.BeamButton; +import com.dark98.santoku.view.DividerView; +import com.dark98.santoku.view.PositionScrollView; +import com.dark98.santoku.view.TextColorImageSpan; public class OrientationMenu extends ListBedMenu { private boolean hasSelection() { @@ -61,7 +61,7 @@ public class OrientationMenu extends ListBedMenu { fragment.getGlView().requestRender(); } }); - SliceBeam.EVENT_BUS.fireEvent(new NeedSnackbarEvent(R.string.MenuOrientationArrangeFinished)); + Santoku.EVENT_BUS.fireEvent(new NeedSnackbarEvent(R.string.MenuOrientationArrangeFinished)); }).setEnabled(fragment.getGlView().getRenderer().getModel() != null), new SpaceItem(portrait ? ViewUtils.dp(8) : 0, portrait ? 0 : ViewUtils.dp(8)), new BedMenuItem(R.string.MenuOrientationAutoOrient, R.drawable.menu_orientation_auto_28).setEnabled(hasSelection()).onClick(view -> { @@ -76,7 +76,7 @@ public class OrientationMenu extends ListBedMenu { fragment.getGlView().getRenderer().invalidateGlModel(i); fragment.getGlView().requestRender(); - SliceBeam.EVENT_BUS.fireEvent(new NeedSnackbarEvent(R.string.MenuOrientationAutoOrientDone, Snackbar.LENGTH_SHORT)); + Santoku.EVENT_BUS.fireEvent(new NeedSnackbarEvent(R.string.MenuOrientationAutoOrientDone, Snackbar.LENGTH_SHORT)); }), new BedMenuItem(R.string.MenuOrientationFlatten, R.drawable.menu_orientation_flatten_28).setEnabled(hasSelection()).setCheckable((buttonView, isChecked) -> { fragment.getGlView().getRenderer().setInFlattenMode(isChecked); @@ -200,10 +200,10 @@ public class OrientationMenu extends ListBedMenu { } private CharSequence formatTrackTitle(int res, double value) { - SpannableStringBuilder sb = SpannableStringBuilder.valueOf(SliceBeam.INSTANCE.getString(res, value)); + SpannableStringBuilder sb = SpannableStringBuilder.valueOf(Santoku.INSTANCE.getString(res, value)); sb.append(" d"); int size = ViewUtils.dp(14); - Drawable dr = ContextCompat.getDrawable(SliceBeam.INSTANCE, R.drawable.edit_outline_28); + Drawable dr = ContextCompat.getDrawable(Santoku.INSTANCE, R.drawable.edit_outline_28); dr.setTint(ThemesRepo.getColor(android.R.attr.textColorSecondary)); dr.setBounds(0, 0, size, size); sb.setSpan(new TextColorImageSpan(dr, 0), sb.length() - 1, sb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); @@ -355,7 +355,7 @@ public class OrientationMenu extends ListBedMenu { protected void onCreate() { super.onCreate(); - SliceBeam.EVENT_BUS.registerListener(this); + Santoku.EVENT_BUS.registerListener(this); setSelectionValues(); } @@ -363,7 +363,7 @@ public class OrientationMenu extends ListBedMenu { protected void onDestroy() { super.onDestroy(); - SliceBeam.EVENT_BUS.unregisterListener(this); + Santoku.EVENT_BUS.unregisterListener(this); stopScroll(); } @@ -501,10 +501,10 @@ public class OrientationMenu extends ListBedMenu { } private CharSequence formatTrackTitle(int res, double value) { - SpannableStringBuilder sb = SpannableStringBuilder.valueOf(SliceBeam.INSTANCE.getString(res, value)); + SpannableStringBuilder sb = SpannableStringBuilder.valueOf(Santoku.INSTANCE.getString(res, value)); sb.append(" d"); int size = ViewUtils.dp(14); - Drawable dr = ContextCompat.getDrawable(SliceBeam.INSTANCE, R.drawable.edit_outline_28); + Drawable dr = ContextCompat.getDrawable(Santoku.INSTANCE, R.drawable.edit_outline_28); dr.setTint(ThemesRepo.getColor(android.R.attr.textColorSecondary)); dr.setBounds(0, 0, size, size); sb.setSpan(new TextColorImageSpan(dr, 0), sb.length() - 1, sb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); @@ -666,7 +666,7 @@ public class OrientationMenu extends ListBedMenu { protected void onCreate() { super.onCreate(); - SliceBeam.EVENT_BUS.registerListener(this); + Santoku.EVENT_BUS.registerListener(this); setSelectionValues(); } @@ -674,7 +674,7 @@ public class OrientationMenu extends ListBedMenu { protected void onDestroy() { super.onDestroy(); - SliceBeam.EVENT_BUS.unregisterListener(this); + Santoku.EVENT_BUS.unregisterListener(this); stopScroll(); } diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/components/bed_menu/SliceMenu.java b/app/src/main/java/com/dark98/santoku/components/bed_menu/SliceMenu.java similarity index 90% rename from app/src/main/java/ru/ytkab0bp/slicebeam/components/bed_menu/SliceMenu.java rename to app/src/main/java/com/dark98/santoku/components/bed_menu/SliceMenu.java index 0143ce5..5ac6b31 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/components/bed_menu/SliceMenu.java +++ b/app/src/main/java/com/dark98/santoku/components/bed_menu/SliceMenu.java @@ -1,6 +1,6 @@ -package ru.ytkab0bp.slicebeam.components.bed_menu; +package com.dark98.santoku.components.bed_menu; -import static ru.ytkab0bp.slicebeam.utils.DebugUtils.assertTrue; +import static com.dark98.santoku.utils.DebugUtils.assertTrue; import android.annotation.SuppressLint; import android.app.Activity; @@ -46,28 +46,28 @@ import java.util.UUID; import cz.msebera.android.httpclient.Header; import cz.msebera.android.httpclient.entity.ContentType; import cz.msebera.android.httpclient.message.BasicHeader; -import ru.ytkab0bp.slicebeam.BuildConfig; -import ru.ytkab0bp.slicebeam.MainActivity; -import ru.ytkab0bp.slicebeam.R; -import ru.ytkab0bp.slicebeam.SliceBeam; -import ru.ytkab0bp.slicebeam.components.BeamAlertDialogBuilder; -import ru.ytkab0bp.slicebeam.components.UnfoldMenu; -import ru.ytkab0bp.slicebeam.config.ConfigObject; -import ru.ytkab0bp.slicebeam.events.NeedDismissSnackbarEvent; -import ru.ytkab0bp.slicebeam.events.NeedSnackbarEvent; -import ru.ytkab0bp.slicebeam.fragment.BedFragment; -import ru.ytkab0bp.slicebeam.print_host.ElegooLinkClient; -import ru.ytkab0bp.slicebeam.recycler.SimpleRecyclerItem; -import ru.ytkab0bp.slicebeam.slic3r.GCodeProcessorResult; -import ru.ytkab0bp.slicebeam.slic3r.GCodeViewer; -import ru.ytkab0bp.slicebeam.slic3r.Slic3rLocalization; -import ru.ytkab0bp.slicebeam.theme.IThemeView; -import ru.ytkab0bp.slicebeam.theme.ThemesRepo; -import ru.ytkab0bp.slicebeam.utils.ViewUtils; -import ru.ytkab0bp.slicebeam.view.DividerView; -import ru.ytkab0bp.slicebeam.view.PositionScrollView; -import ru.ytkab0bp.slicebeam.view.SegmentsView; -import ru.ytkab0bp.slicebeam.view.SnackbarsLayout; +import com.dark98.santoku.BuildConfig; +import com.dark98.santoku.MainActivity; +import com.dark98.santoku.R; +import com.dark98.santoku.Santoku; +import com.dark98.santoku.components.BeamAlertDialogBuilder; +import com.dark98.santoku.components.UnfoldMenu; +import com.dark98.santoku.config.ConfigObject; +import com.dark98.santoku.events.NeedDismissSnackbarEvent; +import com.dark98.santoku.events.NeedSnackbarEvent; +import com.dark98.santoku.fragment.BedFragment; +import com.dark98.santoku.print_host.ElegooLinkClient; +import com.dark98.santoku.recycler.SimpleRecyclerItem; +import com.dark98.santoku.slic3r.GCodeProcessorResult; +import com.dark98.santoku.slic3r.GCodeViewer; +import com.dark98.santoku.slic3r.Slic3rLocalization; +import com.dark98.santoku.theme.IThemeView; +import com.dark98.santoku.theme.ThemesRepo; +import com.dark98.santoku.utils.ViewUtils; +import com.dark98.santoku.view.DividerView; +import com.dark98.santoku.view.PositionScrollView; +import com.dark98.santoku.view.SegmentsView; +import com.dark98.santoku.view.SnackbarsLayout; public class SliceMenu extends ListBedMenu { private AsyncHttpClient client = new AsyncHttpClient(); @@ -82,7 +82,7 @@ public class SliceMenu extends ListBedMenu { @Override protected List onCreateItems(boolean portrait) { - lastUid = SliceBeam.CONFIG_UID; + lastUid = Santoku.CONFIG_UID; List items = new ArrayList<>(Arrays.asList( new BedMenuItem(R.string.MenuSliceInfo, R.drawable.clock_circle_dashed_outline_24).onClick(v -> fragment.showUnfoldMenu(new InfoMenu(), v)), new BedMenuItem(R.string.MenuSliceLayers, R.drawable.square_stack_up_outline_28).onClick(v -> fragment.showUnfoldMenu(new LayersMenu(), v)), @@ -114,7 +114,7 @@ public class SliceMenu extends ListBedMenu { } }) )); - ConfigObject obj = SliceBeam.CONFIG.findPrinter(SliceBeam.CONFIG.presets.get("printer")); + ConfigObject obj = Santoku.CONFIG.findPrinter(Santoku.CONFIG.presets.get("printer")); assertTrue(obj != null); String type = obj.get("host_type"); if (type == null) type = "octoprint"; @@ -138,7 +138,7 @@ public class SliceMenu extends ListBedMenu { host = "http://" + host; } String tag = UUID.randomUUID().toString(); - SliceBeam.EVENT_BUS.fireEvent(new NeedSnackbarEvent(SnackbarsLayout.Type.LOADING, R.string.MenuSliceSendToPrinterLoading).tag(tag)); + Santoku.EVENT_BUS.fireEvent(new NeedSnackbarEvent(SnackbarsLayout.Type.LOADING, R.string.MenuSliceSendToPrinterLoading).tag(tag)); Header[] headers = TextUtils.isEmpty(apiKey) ? new Header[0] : new Header[] {new BasicHeader("X-Api-Key", apiKey)}; RequestParams params = new RequestParams(); try { @@ -149,7 +149,7 @@ public class SliceMenu extends ListBedMenu { params.put("select", String.valueOf(print)); params.put("print", String.valueOf(print)); - client.post(SliceBeam.INSTANCE, host + "/api/files/local", headers, params, null, new AsyncHttpResponseHandler() { + client.post(Santoku.INSTANCE, host + "/api/files/local", headers, params, null, new AsyncHttpResponseHandler() { @Override public void onSuccess(int statusCode, Header[] headers, byte[] responseBody) { try { @@ -157,8 +157,8 @@ public class SliceMenu extends ListBedMenu { if (!obj.has("action") && !obj.has("files")) { throw new JSONException(obj.toString()); } - SliceBeam.EVENT_BUS.fireEvent(new NeedDismissSnackbarEvent(tag)); - SliceBeam.EVENT_BUS.fireEvent(new NeedSnackbarEvent(print ? SnackbarsLayout.Type.INFO : SnackbarsLayout.Type.DONE, print ? R.string.MenuSliceSendToPrinterPrintStarted : R.string.MenuSliceSendToPrinterOK)); + Santoku.EVENT_BUS.fireEvent(new NeedDismissSnackbarEvent(tag)); + Santoku.EVENT_BUS.fireEvent(new NeedSnackbarEvent(print ? SnackbarsLayout.Type.INFO : SnackbarsLayout.Type.DONE, print ? R.string.MenuSliceSendToPrinterPrintStarted : R.string.MenuSliceSendToPrinterOK)); } catch (JSONException e) { onFailure(statusCode, headers, responseBody, e); } @@ -166,7 +166,7 @@ public class SliceMenu extends ListBedMenu { @Override public void onFailure(int statusCode, Header[] headers, byte[] responseBody, Throwable error) { - SliceBeam.EVENT_BUS.fireEvent(new NeedDismissSnackbarEvent(tag)); + Santoku.EVENT_BUS.fireEvent(new NeedDismissSnackbarEvent(tag)); ViewUtils.postOnMainThread(() -> new BeamAlertDialogBuilder(fragment.getContext()) .setTitle(R.string.MenuSliceSendToPrinterFailed) .setMessage(error.toString()) @@ -180,7 +180,7 @@ public class SliceMenu extends ListBedMenu { host = "http://" + host; } String elegooTag = UUID.randomUUID().toString(); - SliceBeam.EVENT_BUS.fireEvent(new NeedSnackbarEvent(SnackbarsLayout.Type.LOADING, R.string.MenuSliceSendToPrinterLoading).tag(elegooTag)); + Santoku.EVENT_BUS.fireEvent(new NeedSnackbarEvent(SnackbarsLayout.Type.LOADING, R.string.MenuSliceSendToPrinterLoading).tag(elegooTag)); String finalHost = host; final boolean timelapse = config != null && "1".equals(config.get("elegoolink_timelapse")); final boolean bedLeveling = config != null && "1".equals(config.get("elegoolink_bed_leveling")); @@ -195,9 +195,9 @@ public class SliceMenu extends ListBedMenu { new Thread(() -> { ElegooLinkClient.Result result = ElegooLinkClient.upload(BedFragment.getTempGCodePath(), finalHost, name, print, timelapse, bedLeveling, bedType); ViewUtils.postOnMainThread(() -> { - SliceBeam.EVENT_BUS.fireEvent(new NeedDismissSnackbarEvent(elegooTag)); + Santoku.EVENT_BUS.fireEvent(new NeedDismissSnackbarEvent(elegooTag)); if (result.ok) { - SliceBeam.EVENT_BUS.fireEvent(new NeedSnackbarEvent(print ? SnackbarsLayout.Type.INFO : SnackbarsLayout.Type.DONE, print ? R.string.MenuSliceSendToPrinterPrintStarted : R.string.MenuSliceSendToPrinterOK)); + Santoku.EVENT_BUS.fireEvent(new NeedSnackbarEvent(print ? SnackbarsLayout.Type.INFO : SnackbarsLayout.Type.DONE, print ? R.string.MenuSliceSendToPrinterPrintStarted : R.string.MenuSliceSendToPrinterOK)); } else { new BeamAlertDialogBuilder(fragment.getContext()) .setTitle(R.string.MenuSliceSendToPrinterFailed) @@ -218,7 +218,7 @@ public class SliceMenu extends ListBedMenu { v.addOnAttachStateChangeListener(new View.OnAttachStateChangeListener() { @Override public void onViewAttachedToWindow(@NonNull View v) { - if (lastUid != SliceBeam.CONFIG_UID) { + if (lastUid != Santoku.CONFIG_UID) { adapter.setItems(onCreateItems(v.getWidth() < v.getHeight())); } } @@ -386,9 +386,9 @@ public class SliceMenu extends ListBedMenu { private static String formatComplex(double weight, double length, float time) { StringBuilder sb = new StringBuilder(); if (weight > 0) { - sb.append(format.format(weight)).append(" ").append(SliceBeam.INSTANCE.getString(R.string.MenuSliceInfoWeight)).append(" | "); + sb.append(format.format(weight)).append(" ").append(Santoku.INSTANCE.getString(R.string.MenuSliceInfoWeight)).append(" | "); } - sb.append(format.format(length)).append(" ").append(SliceBeam.INSTANCE.getString(R.string.MenuSliceInfoLength)).append(" | "); + sb.append(format.format(length)).append(" ").append(Santoku.INSTANCE.getString(R.string.MenuSliceInfoLength)).append(" | "); sb.append(formatTime(time)); return sb.toString(); } @@ -401,17 +401,17 @@ public class SliceMenu extends ListBedMenu { StringBuilder sb = new StringBuilder(); if (hours > 0) { - sb.append(hours).append(" ").append(SliceBeam.INSTANCE.getString(R.string.MenuSliceInfoHour)); + sb.append(hours).append(" ").append(Santoku.INSTANCE.getString(R.string.MenuSliceInfoHour)); } if (minutes > 0) { if (sb.length() > 0) sb.append(" "); - sb.append(minutes).append(" ").append(SliceBeam.INSTANCE.getString(R.string.MenuSliceInfoMinute)); + sb.append(minutes).append(" ").append(Santoku.INSTANCE.getString(R.string.MenuSliceInfoMinute)); } if (seconds > 0 || sb.length() == 0) { if (sb.length() > 0) sb.append(" "); - sb.append(seconds).append(" ").append(SliceBeam.INSTANCE.getString(R.string.MenuSliceInfoSecond)); + sb.append(seconds).append(" ").append(Santoku.INSTANCE.getString(R.string.MenuSliceInfoSecond)); } return sb.toString(); diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/components/bed_menu/TransformMenu.java b/app/src/main/java/com/dark98/santoku/components/bed_menu/TransformMenu.java similarity index 95% rename from app/src/main/java/ru/ytkab0bp/slicebeam/components/bed_menu/TransformMenu.java rename to app/src/main/java/com/dark98/santoku/components/bed_menu/TransformMenu.java index cf02100..2ff35e6 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/components/bed_menu/TransformMenu.java +++ b/app/src/main/java/com/dark98/santoku/components/bed_menu/TransformMenu.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.components.bed_menu; +package com.dark98.santoku.components.bed_menu; import android.content.Context; import android.graphics.drawable.Drawable; @@ -26,24 +26,24 @@ import java.util.Locale; import java.util.concurrent.atomic.AtomicBoolean; import ru.ytkab0bp.eventbus.EventHandler; -import ru.ytkab0bp.slicebeam.R; -import ru.ytkab0bp.slicebeam.SliceBeam; -import ru.ytkab0bp.slicebeam.components.BeamAlertDialogBuilder; -import ru.ytkab0bp.slicebeam.components.UnfoldMenu; -import ru.ytkab0bp.slicebeam.events.ObjectsListChangedEvent; -import ru.ytkab0bp.slicebeam.events.SelectedObjectChangedEvent; -import ru.ytkab0bp.slicebeam.recycler.PreferenceSwitchItem; -import ru.ytkab0bp.slicebeam.recycler.SimpleRecyclerItem; -import ru.ytkab0bp.slicebeam.render.GLRenderer; -import ru.ytkab0bp.slicebeam.slic3r.Model; -import ru.ytkab0bp.slicebeam.theme.ThemesRepo; -import ru.ytkab0bp.slicebeam.utils.DoubleMatrix; -import ru.ytkab0bp.slicebeam.utils.Prefs; -import ru.ytkab0bp.slicebeam.utils.Vec3d; -import ru.ytkab0bp.slicebeam.utils.ViewUtils; -import ru.ytkab0bp.slicebeam.view.DividerView; -import ru.ytkab0bp.slicebeam.view.PositionScrollView; -import ru.ytkab0bp.slicebeam.view.TextColorImageSpan; +import com.dark98.santoku.R; +import com.dark98.santoku.Santoku; +import com.dark98.santoku.components.BeamAlertDialogBuilder; +import com.dark98.santoku.components.UnfoldMenu; +import com.dark98.santoku.events.ObjectsListChangedEvent; +import com.dark98.santoku.events.SelectedObjectChangedEvent; +import com.dark98.santoku.recycler.PreferenceSwitchItem; +import com.dark98.santoku.recycler.SimpleRecyclerItem; +import com.dark98.santoku.render.GLRenderer; +import com.dark98.santoku.slic3r.Model; +import com.dark98.santoku.theme.ThemesRepo; +import com.dark98.santoku.utils.DoubleMatrix; +import com.dark98.santoku.utils.Prefs; +import com.dark98.santoku.utils.Vec3d; +import com.dark98.santoku.utils.ViewUtils; +import com.dark98.santoku.view.DividerView; +import com.dark98.santoku.view.PositionScrollView; +import com.dark98.santoku.view.TextColorImageSpan; public class TransformMenu extends ListBedMenu { private double[] tempMatrix = new double[16]; @@ -116,7 +116,7 @@ public class TransformMenu extends ListBedMenu { renderer.resetGlModels(); } fragment.getGlView().requestRender(); - SliceBeam.EVENT_BUS.fireEvent(new ObjectsListChangedEvent()); + Santoku.EVENT_BUS.fireEvent(new ObjectsListChangedEvent()); ViewUtils.postOnMainThread(() -> Toast.makeText(fragment.getContext(), fragment.getContext().getResources().getQuantityString(R.plurals.MenuTransformCloneSuccessCount, clones, clones), Toast.LENGTH_SHORT).show()); }); fragment.getGlView().requestRender(); @@ -330,10 +330,10 @@ public class TransformMenu extends ListBedMenu { } private CharSequence formatTrackTitle(int res, double value, double mm) { - SpannableStringBuilder sb = SpannableStringBuilder.valueOf(SliceBeam.INSTANCE.getString(res, value, mm)); + SpannableStringBuilder sb = SpannableStringBuilder.valueOf(Santoku.INSTANCE.getString(res, value, mm)); sb.append(" d"); int size = ViewUtils.dp(14); - Drawable dr = ContextCompat.getDrawable(SliceBeam.INSTANCE, R.drawable.edit_outline_28); + Drawable dr = ContextCompat.getDrawable(Santoku.INSTANCE, R.drawable.edit_outline_28); dr.setTint(ThemesRepo.getColor(android.R.attr.textColorSecondary)); dr.setBounds(0, 0, size, size); sb.setSpan(new TextColorImageSpan(dr, 0), sb.length() - 1, sb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); @@ -588,7 +588,7 @@ public class TransformMenu extends ListBedMenu { protected void onCreate() { super.onCreate(); - SliceBeam.EVENT_BUS.registerListener(this); + Santoku.EVENT_BUS.registerListener(this); setSelectionValues(); } @@ -596,7 +596,7 @@ public class TransformMenu extends ListBedMenu { protected void onDestroy() { super.onDestroy(); - SliceBeam.EVENT_BUS.unregisterListener(this); + Santoku.EVENT_BUS.unregisterListener(this); stopScroll(); } diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/config/ConfigObject.java b/app/src/main/java/com/dark98/santoku/config/ConfigObject.java similarity index 89% rename from app/src/main/java/ru/ytkab0bp/slicebeam/config/ConfigObject.java rename to app/src/main/java/com/dark98/santoku/config/ConfigObject.java index 39b83df..38225fa 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/config/ConfigObject.java +++ b/app/src/main/java/com/dark98/santoku/config/ConfigObject.java @@ -1,12 +1,12 @@ -package ru.ytkab0bp.slicebeam.config; +package com.dark98.santoku.config; import java.util.HashMap; import java.util.Map; -import ru.ytkab0bp.slicebeam.BuildConfig; -import ru.ytkab0bp.slicebeam.R; -import ru.ytkab0bp.slicebeam.SliceBeam; -import ru.ytkab0bp.slicebeam.fragment.ProfileListFragment; +import com.dark98.santoku.BuildConfig; +import com.dark98.santoku.R; +import com.dark98.santoku.Santoku; +import com.dark98.santoku.fragment.ProfileListFragment; /** @noinspection CopyConstructorMissesField*/ public class ConfigObject implements ProfileListFragment.ProfileListItem { @@ -70,11 +70,11 @@ public class ConfigObject implements ProfileListFragment.ProfileListItem { public boolean isSelected() { switch (profileListType) { case PROFILE_LIST_PRINT: - return getTitle().equals(SliceBeam.CONFIG.presets.get("print")); + return getTitle().equals(Santoku.CONFIG.presets.get("print")); case PROFILE_LIST_FILAMENT: - return getTitle().equals(SliceBeam.CONFIG.presets.get("filament")); + return getTitle().equals(Santoku.CONFIG.presets.get("filament")); case PROFILE_LIST_PRINTER: - return getTitle().equals(SliceBeam.CONFIG.presets.get("printer")); + return getTitle().equals(Santoku.CONFIG.presets.get("printer")); } return false; } @@ -89,7 +89,7 @@ public class ConfigObject implements ProfileListFragment.ProfileListItem { } public static ConfigObject createCustomPrinterProfile() { - ConfigObject custom = new ConfigObject(SliceBeam.INSTANCE.getString(R.string.IntroCustomProfileName)); + ConfigObject custom = new ConfigObject(Santoku.INSTANCE.getString(R.string.IntroCustomProfileName)); custom.put("printer_technology", "FFF"); custom.put("bed_shape", "0x0,200x0,200x200,0x200"); custom.put("auto_arrange_bed_clearance", "5"); @@ -137,7 +137,7 @@ public class ConfigObject implements ProfileListFragment.ProfileListItem { } public static ConfigObject createCustomFilamentProfile() { - ConfigObject genericFilament = new ConfigObject(SliceBeam.INSTANCE.getString(R.string.IntroCustomProfileFilamentName)); + ConfigObject genericFilament = new ConfigObject(Santoku.INSTANCE.getString(R.string.IntroCustomProfileFilamentName)); genericFilament.profileListType = ConfigObject.PROFILE_LIST_FILAMENT; genericFilament.put("first_layer_bed_temperature", "60"); genericFilament.put("bed_temperature", "60"); diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/events/BeamServerDataUpdatedEvent.java b/app/src/main/java/com/dark98/santoku/events/BeamServerDataUpdatedEvent.java similarity index 69% rename from app/src/main/java/ru/ytkab0bp/slicebeam/events/BeamServerDataUpdatedEvent.java rename to app/src/main/java/com/dark98/santoku/events/BeamServerDataUpdatedEvent.java index c5deec9..23508af 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/events/BeamServerDataUpdatedEvent.java +++ b/app/src/main/java/com/dark98/santoku/events/BeamServerDataUpdatedEvent.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.events; +package com.dark98.santoku.events; import ru.ytkab0bp.eventbus.Event; diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/events/CloudFeaturesUpdatedEvent.java b/app/src/main/java/com/dark98/santoku/events/CloudFeaturesUpdatedEvent.java similarity index 69% rename from app/src/main/java/ru/ytkab0bp/slicebeam/events/CloudFeaturesUpdatedEvent.java rename to app/src/main/java/com/dark98/santoku/events/CloudFeaturesUpdatedEvent.java index 33ba49e..2452f21 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/events/CloudFeaturesUpdatedEvent.java +++ b/app/src/main/java/com/dark98/santoku/events/CloudFeaturesUpdatedEvent.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.events; +package com.dark98.santoku.events; import ru.ytkab0bp.eventbus.Event; diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/events/CloudLoginStateUpdatedEvent.java b/app/src/main/java/com/dark98/santoku/events/CloudLoginStateUpdatedEvent.java similarity index 69% rename from app/src/main/java/ru/ytkab0bp/slicebeam/events/CloudLoginStateUpdatedEvent.java rename to app/src/main/java/com/dark98/santoku/events/CloudLoginStateUpdatedEvent.java index ce29678..ddaf65f 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/events/CloudLoginStateUpdatedEvent.java +++ b/app/src/main/java/com/dark98/santoku/events/CloudLoginStateUpdatedEvent.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.events; +package com.dark98.santoku.events; import ru.ytkab0bp.eventbus.Event; diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/events/CloudModelsRemainingCountUpdatedEvent.java b/app/src/main/java/com/dark98/santoku/events/CloudModelsRemainingCountUpdatedEvent.java similarity index 72% rename from app/src/main/java/ru/ytkab0bp/slicebeam/events/CloudModelsRemainingCountUpdatedEvent.java rename to app/src/main/java/com/dark98/santoku/events/CloudModelsRemainingCountUpdatedEvent.java index e3d5b78..65aead1 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/events/CloudModelsRemainingCountUpdatedEvent.java +++ b/app/src/main/java/com/dark98/santoku/events/CloudModelsRemainingCountUpdatedEvent.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.events; +package com.dark98.santoku.events; import ru.ytkab0bp.eventbus.Event; diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/events/CloudSyncFinishedEvent.java b/app/src/main/java/com/dark98/santoku/events/CloudSyncFinishedEvent.java similarity index 68% rename from app/src/main/java/ru/ytkab0bp/slicebeam/events/CloudSyncFinishedEvent.java rename to app/src/main/java/com/dark98/santoku/events/CloudSyncFinishedEvent.java index 660c3cb..833272b 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/events/CloudSyncFinishedEvent.java +++ b/app/src/main/java/com/dark98/santoku/events/CloudSyncFinishedEvent.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.events; +package com.dark98.santoku.events; import ru.ytkab0bp.eventbus.Event; diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/events/CloudUserInfoUpdatedEvent.java b/app/src/main/java/com/dark98/santoku/events/CloudUserInfoUpdatedEvent.java similarity index 69% rename from app/src/main/java/ru/ytkab0bp/slicebeam/events/CloudUserInfoUpdatedEvent.java rename to app/src/main/java/com/dark98/santoku/events/CloudUserInfoUpdatedEvent.java index 611f6a3..b8d6ede 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/events/CloudUserInfoUpdatedEvent.java +++ b/app/src/main/java/com/dark98/santoku/events/CloudUserInfoUpdatedEvent.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.events; +package com.dark98.santoku.events; import ru.ytkab0bp.eventbus.Event; diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/events/FlattenModeResetEvent.java b/app/src/main/java/com/dark98/santoku/events/FlattenModeResetEvent.java similarity index 68% rename from app/src/main/java/ru/ytkab0bp/slicebeam/events/FlattenModeResetEvent.java rename to app/src/main/java/com/dark98/santoku/events/FlattenModeResetEvent.java index c681df2..4f18ed2 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/events/FlattenModeResetEvent.java +++ b/app/src/main/java/com/dark98/santoku/events/FlattenModeResetEvent.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.events; +package com.dark98.santoku.events; import ru.ytkab0bp.eventbus.Event; diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/events/LongClickTranslationEvent.java b/app/src/main/java/com/dark98/santoku/events/LongClickTranslationEvent.java similarity index 89% rename from app/src/main/java/ru/ytkab0bp/slicebeam/events/LongClickTranslationEvent.java rename to app/src/main/java/com/dark98/santoku/events/LongClickTranslationEvent.java index ed8435b..959d6dd 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/events/LongClickTranslationEvent.java +++ b/app/src/main/java/com/dark98/santoku/events/LongClickTranslationEvent.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.events; +package com.dark98.santoku.events; import ru.ytkab0bp.eventbus.Event; diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/events/NeedDismissAIGeneratorMenu.java b/app/src/main/java/com/dark98/santoku/events/NeedDismissAIGeneratorMenu.java similarity index 69% rename from app/src/main/java/ru/ytkab0bp/slicebeam/events/NeedDismissAIGeneratorMenu.java rename to app/src/main/java/com/dark98/santoku/events/NeedDismissAIGeneratorMenu.java index eeaff86..a9ee98a 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/events/NeedDismissAIGeneratorMenu.java +++ b/app/src/main/java/com/dark98/santoku/events/NeedDismissAIGeneratorMenu.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.events; +package com.dark98.santoku.events; import ru.ytkab0bp.eventbus.Event; diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/events/NeedDismissCalibrationsMenu.java b/app/src/main/java/com/dark98/santoku/events/NeedDismissCalibrationsMenu.java similarity index 69% rename from app/src/main/java/ru/ytkab0bp/slicebeam/events/NeedDismissCalibrationsMenu.java rename to app/src/main/java/com/dark98/santoku/events/NeedDismissCalibrationsMenu.java index 2db621e..d87a13a 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/events/NeedDismissCalibrationsMenu.java +++ b/app/src/main/java/com/dark98/santoku/events/NeedDismissCalibrationsMenu.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.events; +package com.dark98.santoku.events; import ru.ytkab0bp.eventbus.Event; diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/events/NeedDismissSnackbarEvent.java b/app/src/main/java/com/dark98/santoku/events/NeedDismissSnackbarEvent.java similarity index 83% rename from app/src/main/java/ru/ytkab0bp/slicebeam/events/NeedDismissSnackbarEvent.java rename to app/src/main/java/com/dark98/santoku/events/NeedDismissSnackbarEvent.java index eb04dbb..5fd7c58 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/events/NeedDismissSnackbarEvent.java +++ b/app/src/main/java/com/dark98/santoku/events/NeedDismissSnackbarEvent.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.events; +package com.dark98.santoku.events; import ru.ytkab0bp.eventbus.Event; diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/events/NeedSnackbarEvent.java b/app/src/main/java/com/dark98/santoku/events/NeedSnackbarEvent.java similarity index 74% rename from app/src/main/java/ru/ytkab0bp/slicebeam/events/NeedSnackbarEvent.java rename to app/src/main/java/com/dark98/santoku/events/NeedSnackbarEvent.java index dbc997b..d6f813e 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/events/NeedSnackbarEvent.java +++ b/app/src/main/java/com/dark98/santoku/events/NeedSnackbarEvent.java @@ -1,10 +1,10 @@ -package ru.ytkab0bp.slicebeam.events; +package com.dark98.santoku.events; import android.view.View; import ru.ytkab0bp.eventbus.Event; -import ru.ytkab0bp.slicebeam.SliceBeam; -import ru.ytkab0bp.slicebeam.view.SnackbarsLayout; +import com.dark98.santoku.Santoku; +import com.dark98.santoku.view.SnackbarsLayout; @Event public class NeedSnackbarEvent { @@ -25,12 +25,12 @@ public class NeedSnackbarEvent { } public NeedSnackbarEvent(int title, Object... args) { - this.title = SliceBeam.INSTANCE.getString(title, args); + this.title = Santoku.INSTANCE.getString(title, args); } public NeedSnackbarEvent(SnackbarsLayout.Type type, int title, Object... args) { this.type = type; - this.title = SliceBeam.INSTANCE.getString(title, args); + this.title = Santoku.INSTANCE.getString(title, args); } public NeedSnackbarEvent tag(String tag) { @@ -39,7 +39,7 @@ public class NeedSnackbarEvent { } public NeedSnackbarEvent button(int title, View.OnClickListener click) { - this.buttonTitle = SliceBeam.INSTANCE.getString(title); + this.buttonTitle = Santoku.INSTANCE.getString(title); this.buttonClick = click; return this; } diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/events/ObjectsListChangedEvent.java b/app/src/main/java/com/dark98/santoku/events/ObjectsListChangedEvent.java similarity index 68% rename from app/src/main/java/ru/ytkab0bp/slicebeam/events/ObjectsListChangedEvent.java rename to app/src/main/java/com/dark98/santoku/events/ObjectsListChangedEvent.java index 5e9d8ac..0c3c0e2 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/events/ObjectsListChangedEvent.java +++ b/app/src/main/java/com/dark98/santoku/events/ObjectsListChangedEvent.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.events; +package com.dark98.santoku.events; import ru.ytkab0bp.eventbus.Event; diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/events/SelectedObjectChangedEvent.java b/app/src/main/java/com/dark98/santoku/events/SelectedObjectChangedEvent.java similarity index 69% rename from app/src/main/java/ru/ytkab0bp/slicebeam/events/SelectedObjectChangedEvent.java rename to app/src/main/java/com/dark98/santoku/events/SelectedObjectChangedEvent.java index 52b1daf..472e136 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/events/SelectedObjectChangedEvent.java +++ b/app/src/main/java/com/dark98/santoku/events/SelectedObjectChangedEvent.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.events; +package com.dark98.santoku.events; import ru.ytkab0bp.eventbus.Event; diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/events/SlicingProgressEvent.java b/app/src/main/java/com/dark98/santoku/events/SlicingProgressEvent.java similarity index 86% rename from app/src/main/java/ru/ytkab0bp/slicebeam/events/SlicingProgressEvent.java rename to app/src/main/java/com/dark98/santoku/events/SlicingProgressEvent.java index bfc32c6..033ee9b 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/events/SlicingProgressEvent.java +++ b/app/src/main/java/com/dark98/santoku/events/SlicingProgressEvent.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.events; +package com.dark98.santoku.events; public class SlicingProgressEvent { public final int progress; diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/fragment/BedFragment.java b/app/src/main/java/com/dark98/santoku/fragment/BedFragment.java similarity index 90% rename from app/src/main/java/ru/ytkab0bp/slicebeam/fragment/BedFragment.java rename to app/src/main/java/com/dark98/santoku/fragment/BedFragment.java index 5649e1e..f3578ed 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/fragment/BedFragment.java +++ b/app/src/main/java/com/dark98/santoku/fragment/BedFragment.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.fragment; +package com.dark98.santoku.fragment; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -32,37 +32,37 @@ import com.google.android.material.navigation.NavigationBarView; import java.io.File; import ru.ytkab0bp.eventbus.EventHandler; -import ru.ytkab0bp.slicebeam.R; -import ru.ytkab0bp.slicebeam.SliceBeam; -import ru.ytkab0bp.slicebeam.components.BeamAlertDialogBuilder; -import ru.ytkab0bp.slicebeam.components.SliceProgressBottomSheet; -import ru.ytkab0bp.slicebeam.components.UnfoldMenu; -import ru.ytkab0bp.slicebeam.components.bed_menu.BedMenu; -import ru.ytkab0bp.slicebeam.components.bed_menu.CameraMenu; -import ru.ytkab0bp.slicebeam.components.bed_menu.FileMenu; -import ru.ytkab0bp.slicebeam.components.bed_menu.OrientationMenu; -import ru.ytkab0bp.slicebeam.components.bed_menu.SliceMenu; -import ru.ytkab0bp.slicebeam.components.bed_menu.TransformMenu; -import ru.ytkab0bp.slicebeam.config.ConfigObject; -import ru.ytkab0bp.slicebeam.events.FlattenModeResetEvent; -import ru.ytkab0bp.slicebeam.events.NeedDismissSnackbarEvent; -import ru.ytkab0bp.slicebeam.events.NeedSnackbarEvent; -import ru.ytkab0bp.slicebeam.events.SlicingProgressEvent; -import ru.ytkab0bp.slicebeam.navigation.Fragment; -import ru.ytkab0bp.slicebeam.slic3r.Bed3D; -import ru.ytkab0bp.slicebeam.slic3r.GCodeProcessorResult; -import ru.ytkab0bp.slicebeam.slic3r.GCodeThumbnailer; -import ru.ytkab0bp.slicebeam.slic3r.Model; -import ru.ytkab0bp.slicebeam.slic3r.Slic3rRuntimeError; -import ru.ytkab0bp.slicebeam.theme.ThemesRepo; -import ru.ytkab0bp.slicebeam.utils.Vec3d; -import ru.ytkab0bp.slicebeam.utils.ViewUtils; -import ru.ytkab0bp.slicebeam.view.BedSwipeDownLayout; -import ru.ytkab0bp.slicebeam.view.DividerView; -import ru.ytkab0bp.slicebeam.view.GLView; -import ru.ytkab0bp.slicebeam.view.SnackbarsLayout; -import ru.ytkab0bp.slicebeam.view.ThemeBottomNavigationView; -import ru.ytkab0bp.slicebeam.view.ThemeRailNavigationView; +import com.dark98.santoku.R; +import com.dark98.santoku.Santoku; +import com.dark98.santoku.components.BeamAlertDialogBuilder; +import com.dark98.santoku.components.SliceProgressBottomSheet; +import com.dark98.santoku.components.UnfoldMenu; +import com.dark98.santoku.components.bed_menu.BedMenu; +import com.dark98.santoku.components.bed_menu.CameraMenu; +import com.dark98.santoku.components.bed_menu.FileMenu; +import com.dark98.santoku.components.bed_menu.OrientationMenu; +import com.dark98.santoku.components.bed_menu.SliceMenu; +import com.dark98.santoku.components.bed_menu.TransformMenu; +import com.dark98.santoku.config.ConfigObject; +import com.dark98.santoku.events.FlattenModeResetEvent; +import com.dark98.santoku.events.NeedDismissSnackbarEvent; +import com.dark98.santoku.events.NeedSnackbarEvent; +import com.dark98.santoku.events.SlicingProgressEvent; +import com.dark98.santoku.navigation.Fragment; +import com.dark98.santoku.slic3r.Bed3D; +import com.dark98.santoku.slic3r.GCodeProcessorResult; +import com.dark98.santoku.slic3r.GCodeThumbnailer; +import com.dark98.santoku.slic3r.Model; +import com.dark98.santoku.slic3r.Slic3rRuntimeError; +import com.dark98.santoku.theme.ThemesRepo; +import com.dark98.santoku.utils.Vec3d; +import com.dark98.santoku.utils.ViewUtils; +import com.dark98.santoku.view.BedSwipeDownLayout; +import com.dark98.santoku.view.DividerView; +import com.dark98.santoku.view.GLView; +import com.dark98.santoku.view.SnackbarsLayout; +import com.dark98.santoku.view.ThemeBottomNavigationView; +import com.dark98.santoku.view.ThemeRailNavigationView; public class BedFragment extends Fragment { private final static boolean DEBUG_VIEWER = false; @@ -129,14 +129,14 @@ public class BedFragment extends Fragment { } public static File getTempGCodePath() { - return tempExportingFile != null ? tempExportingFile : new File(SliceBeam.INSTANCE.getCacheDir(), "temp.gcode"); + return tempExportingFile != null ? tempExportingFile : new File(Santoku.INSTANCE.getCacheDir(), "temp.gcode"); } @Override public void onCreate() { super.onCreate(); - SliceBeam.EVENT_BUS.registerListener(this); + Santoku.EVENT_BUS.registerListener(this); } @EventHandler(runOnMainThread = true) @@ -210,7 +210,7 @@ public class BedFragment extends Fragment { public void onDestroy() { super.onDestroy(); - SliceBeam.EVENT_BUS.unregisterListener(this); + Santoku.EVENT_BUS.unregisterListener(this); for (int i = 0; i < menuMap.size(); i++) { menuMap.valueAt(i).onViewDestroyed(); @@ -232,7 +232,7 @@ public class BedFragment extends Fragment { public void onResume() { super.onResume(); glView.onResume(); - ConfigObject cfg = SliceBeam.CONFIG.findPrinter(SliceBeam.CONFIG.presets.get("printer")); + ConfigObject cfg = Santoku.CONFIG.findPrinter(Santoku.CONFIG.presets.get("printer")); boolean enable = cfg != null && cfg.get("host_type") != null && !TextUtils.isEmpty(cfg.get("print_host")) && panelWebView != null; swipeDownLayout.setEnableTop(enable); if (enable) { @@ -388,7 +388,7 @@ public class BedFragment extends Fragment { .show(); } else { tempExportingFile = null; - File cfg = SliceBeam.getCurrentConfigFile(); + File cfg = Santoku.getCurrentConfigFile(); File gcode = getTempGCodePath(); if (!DEBUG_VIEWER) { @@ -399,12 +399,12 @@ public class BedFragment extends Fragment { Process.setThreadPriority(-20); try { - SliceBeam.genCurrentConfig(); + Santoku.genCurrentConfig(); } catch (Exception e) { Log.e("BedFragment", "Failed to write config", e); ViewUtils.postOnMainThread(()->{ - SliceBeam.EVENT_BUS.fireEvent(new SlicingProgressEvent(100, "")); + Santoku.EVENT_BUS.fireEvent(new SlicingProgressEvent(100, "")); new BeamAlertDialogBuilder(ctx) .setTitle(R.string.SliceFailed) .setMessage(e.getMessage()) @@ -414,12 +414,12 @@ public class BedFragment extends Fragment { } if (!DEBUG_VIEWER) { - gCodeResult = glView.getRenderer().getModel().slice(cfg.getAbsolutePath(), gcode.getAbsolutePath(), (progress, text) -> SliceBeam.EVENT_BUS.fireEvent(new SlicingProgressEvent(progress, text))); - GCodeThumbnailer.addThumbnailsToGcode(gcode, SliceBeam.buildCurrentConfigObject(), glView); - SliceBeam.EVENT_BUS.fireEvent(new SlicingProgressEvent(100, "")); + gCodeResult = glView.getRenderer().getModel().slice(cfg.getAbsolutePath(), gcode.getAbsolutePath(), (progress, text) -> Santoku.EVENT_BUS.fireEvent(new SlicingProgressEvent(progress, text))); + GCodeThumbnailer.addThumbnailsToGcode(gcode, Santoku.buildCurrentConfigObject(), glView); + Santoku.EVENT_BUS.fireEvent(new SlicingProgressEvent(100, "")); } else { gCodeResult = new GCodeProcessorResult(gcode); - GCodeThumbnailer.addThumbnailsToGcode(gcode, SliceBeam.buildCurrentConfigObject(), glView); + GCodeThumbnailer.addThumbnailsToGcode(gcode, Santoku.buildCurrentConfigObject(), glView); } ViewUtils.postOnMainThread(()-> { glView.queueEvent(()->{ @@ -438,7 +438,7 @@ public class BedFragment extends Fragment { } catch (Exception e) { Log.e("BedFragment", "Slice failed", e); ViewUtils.postOnMainThread(()->{ - SliceBeam.EVENT_BUS.fireEvent(new SlicingProgressEvent(100, "")); + Santoku.EVENT_BUS.fireEvent(new SlicingProgressEvent(100, "")); new BeamAlertDialogBuilder(ctx) .setTitle(R.string.SliceFailed) .setMessage(e.getMessage()) @@ -491,7 +491,7 @@ public class BedFragment extends Fragment { private void selectMenu(Context ctx, boolean portrait, int slot) { if (glView.getRenderer().resetFlattenMode()) { glView.requestRender(); - SliceBeam.EVENT_BUS.fireEvent(new FlattenModeResetEvent()); + Santoku.EVENT_BUS.fireEvent(new FlattenModeResetEvent()); } isAnimatingMenu = true; diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/fragment/FilamentConfigFragment.java b/app/src/main/java/com/dark98/santoku/fragment/FilamentConfigFragment.java similarity index 87% rename from app/src/main/java/ru/ytkab0bp/slicebeam/fragment/FilamentConfigFragment.java rename to app/src/main/java/com/dark98/santoku/fragment/FilamentConfigFragment.java index cc518d5..2e475db 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/fragment/FilamentConfigFragment.java +++ b/app/src/main/java/com/dark98/santoku/fragment/FilamentConfigFragment.java @@ -1,18 +1,18 @@ -package ru.ytkab0bp.slicebeam.fragment; +package com.dark98.santoku.fragment; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Objects; -import ru.ytkab0bp.slicebeam.R; -import ru.ytkab0bp.slicebeam.SliceBeam; -import ru.ytkab0bp.slicebeam.config.ConfigObject; -import ru.ytkab0bp.slicebeam.recycler.SpaceItem; -import ru.ytkab0bp.slicebeam.slic3r.PrintConfigDef; -import ru.ytkab0bp.slicebeam.slic3r.Slic3rLocalization; -import ru.ytkab0bp.slicebeam.slic3r.Slic3rUtils; -import ru.ytkab0bp.slicebeam.utils.ViewUtils; +import com.dark98.santoku.R; +import com.dark98.santoku.Santoku; +import com.dark98.santoku.config.ConfigObject; +import com.dark98.santoku.recycler.SpaceItem; +import com.dark98.santoku.slic3r.PrintConfigDef; +import com.dark98.santoku.slic3r.Slic3rLocalization; +import com.dark98.santoku.slic3r.Slic3rUtils; +import com.dark98.santoku.utils.ViewUtils; public class FilamentConfigFragment extends ProfileListFragment { private List compatItems; @@ -29,18 +29,18 @@ public class FilamentConfigFragment extends ProfileListFragment { @Override protected List getItems(boolean filter) { - List list = SliceBeam.CONFIG.filamentConfigs; + List list = Santoku.CONFIG.filamentConfigs; if (filter) { - String printer = SliceBeam.CONFIG.presets.get("printer"); - String print = SliceBeam.CONFIG.presets.get("print"); - if (Objects.equals(lastPrinter, printer) && Objects.equals(lastPrint, print) && compatItems != null && lastUid == SliceBeam.CONFIG_UID) { + String printer = Santoku.CONFIG.presets.get("printer"); + String print = Santoku.CONFIG.presets.get("print"); + if (Objects.equals(lastPrinter, printer) && Objects.equals(lastPrint, print) && compatItems != null && lastUid == Santoku.CONFIG_UID) { return compatItems; } List nList = new ArrayList<>(list.size()); - Slic3rUtils.ConfigChecker checker = new Slic3rUtils.ConfigChecker(SliceBeam.CONFIG.findPrinter(printer).serialize()); - if (SliceBeam.CONFIG.findPrint(print) != null) { - Slic3rUtils.ConfigChecker printChecker = new Slic3rUtils.ConfigChecker(SliceBeam.CONFIG.findPrint(print).serialize()); + Slic3rUtils.ConfigChecker checker = new Slic3rUtils.ConfigChecker(Santoku.CONFIG.findPrinter(printer).serialize()); + if (Santoku.CONFIG.findPrint(print) != null) { + Slic3rUtils.ConfigChecker printChecker = new Slic3rUtils.ConfigChecker(Santoku.CONFIG.findPrint(print).serialize()); for (ConfigObject obj : list) { if (checker.checkCompatibility(obj.get("compatible_printers_condition")) && printChecker.checkCompatibility(obj.get("compatible_prints_condition"))) { nList.add(obj); @@ -51,7 +51,7 @@ public class FilamentConfigFragment extends ProfileListFragment { checker.release(); lastPrinter = printer; lastPrint = print; - lastUid = SliceBeam.CONFIG_UID; + lastUid = Santoku.CONFIG_UID; return compatItems = (List) nList; } return (List) list; @@ -218,14 +218,14 @@ public class FilamentConfigFragment extends ProfileListFragment { @Override protected void cloneCurrentProfile() { - ConfigObject obj = new ConfigObject(SliceBeam.INSTANCE.getString(R.string.SettingsProfileCopy, currentConfig.getTitle())); + ConfigObject obj = new ConfigObject(Santoku.INSTANCE.getString(R.string.SettingsProfileCopy, currentConfig.getTitle())); obj.values.putAll(currentConfig.values); currentConfig = new ConfigObject(obj); - SliceBeam.CONFIG.filamentConfigs.add(obj); - SliceBeam.CONFIG.presets.put("filament", obj.getTitle()); - SliceBeam.saveConfig(); - SliceBeam.getCurrentConfigFile().delete(); + Santoku.CONFIG.filamentConfigs.add(obj); + Santoku.CONFIG.presets.put("filament", obj.getTitle()); + Santoku.saveConfig(); + Santoku.getCurrentConfigFile().delete(); currentConfig = new ConfigObject(obj); dropdownView.setTitle(getCurrentConfig().getTitle()); @@ -235,7 +235,7 @@ public class FilamentConfigFragment extends ProfileListFragment { @Override protected void deleteCurrentProfile() { compatItems = null; - SliceBeam.CONFIG.filamentConfigs.remove(SliceBeam.CONFIG.findFilament(currentConfig.getTitle())); + Santoku.CONFIG.filamentConfigs.remove(Santoku.CONFIG.findFilament(currentConfig.getTitle())); selectItem(getItems(true).get(0)); dropdownView.setTitle(getCurrentConfig().getTitle()); @@ -244,21 +244,21 @@ public class FilamentConfigFragment extends ProfileListFragment { @Override protected void onApplyConfig(String title) { compatItems = null; - ConfigObject obj = SliceBeam.CONFIG.findFilament(currentConfig.getTitle()); + ConfigObject obj = Santoku.CONFIG.findFilament(currentConfig.getTitle()); obj.setTitle(title); obj.values.putAll(currentConfig.values); currentConfig.setTitle(title); - SliceBeam.CONFIG.presets.put("filament", title); - SliceBeam.saveConfig(); - SliceBeam.getCurrentConfigFile().delete(); + Santoku.CONFIG.presets.put("filament", title); + Santoku.saveConfig(); + Santoku.getCurrentConfigFile().delete(); dropdownView.setTitle(title); } @Override protected void onResetConfig() { - currentConfig = new ConfigObject(SliceBeam.CONFIG.findFilament(SliceBeam.CONFIG.presets.get("filament"))); + currentConfig = new ConfigObject(Santoku.CONFIG.findFilament(Santoku.CONFIG.presets.get("filament"))); } @Override @@ -274,7 +274,7 @@ public class FilamentConfigFragment extends ProfileListFragment { @Override protected void selectItem(ProfileListItem item) { currentConfig = new ConfigObject((ConfigObject) item); - SliceBeam.CONFIG.presets.put("filament", item.getTitle()); - SliceBeam.saveConfig(); + Santoku.CONFIG.presets.put("filament", item.getTitle()); + Santoku.saveConfig(); } } diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/fragment/PrintConfigFragment.java b/app/src/main/java/com/dark98/santoku/fragment/PrintConfigFragment.java similarity index 92% rename from app/src/main/java/ru/ytkab0bp/slicebeam/fragment/PrintConfigFragment.java rename to app/src/main/java/com/dark98/santoku/fragment/PrintConfigFragment.java index 5473378..f8a6abf 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/fragment/PrintConfigFragment.java +++ b/app/src/main/java/com/dark98/santoku/fragment/PrintConfigFragment.java @@ -1,17 +1,17 @@ -package ru.ytkab0bp.slicebeam.fragment; +package com.dark98.santoku.fragment; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Objects; -import ru.ytkab0bp.slicebeam.R; -import ru.ytkab0bp.slicebeam.SliceBeam; -import ru.ytkab0bp.slicebeam.config.ConfigObject; -import ru.ytkab0bp.slicebeam.recycler.SpaceItem; -import ru.ytkab0bp.slicebeam.slic3r.PrintConfigDef; -import ru.ytkab0bp.slicebeam.slic3r.Slic3rUtils; -import ru.ytkab0bp.slicebeam.utils.ViewUtils; +import com.dark98.santoku.R; +import com.dark98.santoku.Santoku; +import com.dark98.santoku.config.ConfigObject; +import com.dark98.santoku.recycler.SpaceItem; +import com.dark98.santoku.slic3r.PrintConfigDef; +import com.dark98.santoku.slic3r.Slic3rUtils; +import com.dark98.santoku.utils.ViewUtils; public class PrintConfigFragment extends ProfileListFragment { private List compatItems; @@ -28,15 +28,15 @@ public class PrintConfigFragment extends ProfileListFragment { @Override protected List getItems(boolean filter) { - List list = SliceBeam.CONFIG.printConfigs; + List list = Santoku.CONFIG.printConfigs; if (filter) { - String printer = SliceBeam.CONFIG.presets.get("printer"); - if (Objects.equals(lastPrinter, printer) && compatItems != null && lastUid == SliceBeam.CONFIG_UID) { + String printer = Santoku.CONFIG.presets.get("printer"); + if (Objects.equals(lastPrinter, printer) && compatItems != null && lastUid == Santoku.CONFIG_UID) { return compatItems; } List nList = new ArrayList<>(list.size()); - Slic3rUtils.ConfigChecker checker = new Slic3rUtils.ConfigChecker(SliceBeam.CONFIG.findPrinter(printer).serialize()); + Slic3rUtils.ConfigChecker checker = new Slic3rUtils.ConfigChecker(Santoku.CONFIG.findPrinter(printer).serialize()); for (ConfigObject obj : list) { if (checker.checkCompatibility(obj.get("compatible_printers_condition"))) { nList.add(obj); @@ -44,7 +44,7 @@ public class PrintConfigFragment extends ProfileListFragment { } checker.release(); lastPrinter = printer; - lastUid = SliceBeam.CONFIG_UID; + lastUid = Santoku.CONFIG_UID; return compatItems = (List) nList; } return (List) list; @@ -354,14 +354,14 @@ public class PrintConfigFragment extends ProfileListFragment { @Override protected void cloneCurrentProfile() { - ConfigObject obj = new ConfigObject(SliceBeam.INSTANCE.getString(R.string.SettingsProfileCopy, currentConfig.getTitle())); + ConfigObject obj = new ConfigObject(Santoku.INSTANCE.getString(R.string.SettingsProfileCopy, currentConfig.getTitle())); obj.values.putAll(currentConfig.values); currentConfig = new ConfigObject(obj); - SliceBeam.CONFIG.printConfigs.add(obj); - SliceBeam.CONFIG.presets.put("print", obj.getTitle()); - SliceBeam.saveConfig(); - SliceBeam.getCurrentConfigFile().delete(); + Santoku.CONFIG.printConfigs.add(obj); + Santoku.CONFIG.presets.put("print", obj.getTitle()); + Santoku.saveConfig(); + Santoku.getCurrentConfigFile().delete(); currentConfig = new ConfigObject(obj); dropdownView.setTitle(getCurrentConfig().getTitle()); @@ -371,7 +371,7 @@ public class PrintConfigFragment extends ProfileListFragment { @Override protected void deleteCurrentProfile() { compatItems = null; - SliceBeam.CONFIG.printConfigs.remove(SliceBeam.CONFIG.findPrint(currentConfig.getTitle())); + Santoku.CONFIG.printConfigs.remove(Santoku.CONFIG.findPrint(currentConfig.getTitle())); selectItem(getItems(true).get(0)); dropdownView.setTitle(getCurrentConfig().getTitle()); @@ -380,28 +380,28 @@ public class PrintConfigFragment extends ProfileListFragment { @Override protected void onApplyConfig(String title) { compatItems = null; - ConfigObject obj = SliceBeam.CONFIG.findPrint(currentConfig.getTitle()); + ConfigObject obj = Santoku.CONFIG.findPrint(currentConfig.getTitle()); obj.setTitle(title); obj.values.putAll(currentConfig.values); currentConfig.setTitle(title); - SliceBeam.CONFIG.presets.put("print", title); - SliceBeam.saveConfig(); - SliceBeam.getCurrentConfigFile().delete(); + Santoku.CONFIG.presets.put("print", title); + Santoku.saveConfig(); + Santoku.getCurrentConfigFile().delete(); dropdownView.setTitle(title); } @Override protected void onResetConfig() { - ConfigObject print = SliceBeam.CONFIG.findPrint(SliceBeam.CONFIG.presets.get("print")); + ConfigObject print = Santoku.CONFIG.findPrint(Santoku.CONFIG.presets.get("print")); if (print != null) { currentConfig = new ConfigObject(print); } else { - currentConfig = new ConfigObject(SliceBeam.INSTANCE.getString(R.string.IntroCustomProfileName)); - SliceBeam.CONFIG.printConfigs.add(new ConfigObject(currentConfig)); - SliceBeam.saveConfig(); - SliceBeam.getCurrentConfigFile().delete(); + currentConfig = new ConfigObject(Santoku.INSTANCE.getString(R.string.IntroCustomProfileName)); + Santoku.CONFIG.printConfigs.add(new ConfigObject(currentConfig)); + Santoku.saveConfig(); + Santoku.getCurrentConfigFile().delete(); } } @@ -418,7 +418,7 @@ public class PrintConfigFragment extends ProfileListFragment { @Override protected void selectItem(ProfileListItem item) { currentConfig = new ConfigObject((ConfigObject) item); - SliceBeam.CONFIG.presets.put("print", item.getTitle()); - SliceBeam.saveConfig(); + Santoku.CONFIG.presets.put("print", item.getTitle()); + Santoku.saveConfig(); } } diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/fragment/PrinterConfigFragment.java b/app/src/main/java/com/dark98/santoku/fragment/PrinterConfigFragment.java similarity index 89% rename from app/src/main/java/ru/ytkab0bp/slicebeam/fragment/PrinterConfigFragment.java rename to app/src/main/java/com/dark98/santoku/fragment/PrinterConfigFragment.java index 88b1c17..dcc9227 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/fragment/PrinterConfigFragment.java +++ b/app/src/main/java/com/dark98/santoku/fragment/PrinterConfigFragment.java @@ -1,17 +1,17 @@ -package ru.ytkab0bp.slicebeam.fragment; +package com.dark98.santoku.fragment; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import ru.ytkab0bp.slicebeam.R; -import ru.ytkab0bp.slicebeam.SliceBeam; -import ru.ytkab0bp.slicebeam.config.ConfigObject; -import ru.ytkab0bp.slicebeam.recycler.SpaceItem; -import ru.ytkab0bp.slicebeam.slic3r.PrintConfigDef; -import ru.ytkab0bp.slicebeam.slic3r.ConfigOptionDef; -import ru.ytkab0bp.slicebeam.slic3r.Slic3rLocalization; -import ru.ytkab0bp.slicebeam.utils.ViewUtils; +import com.dark98.santoku.R; +import com.dark98.santoku.Santoku; +import com.dark98.santoku.config.ConfigObject; +import com.dark98.santoku.recycler.SpaceItem; +import com.dark98.santoku.slic3r.PrintConfigDef; +import com.dark98.santoku.slic3r.ConfigOptionDef; +import com.dark98.santoku.slic3r.Slic3rLocalization; +import com.dark98.santoku.utils.ViewUtils; public class PrinterConfigFragment extends ProfileListFragment { private ConfigObject currentConfig; @@ -24,7 +24,7 @@ public class PrinterConfigFragment extends ProfileListFragment { @Override protected List getItems(boolean filter) { - return (List) SliceBeam.CONFIG.printerConfigs; + return (List) Santoku.CONFIG.printerConfigs; } @Override @@ -202,14 +202,14 @@ public class PrinterConfigFragment extends ProfileListFragment { @Override protected void cloneCurrentProfile() { - ConfigObject obj = new ConfigObject(SliceBeam.INSTANCE.getString(R.string.SettingsProfileCopy, currentConfig.getTitle())); + ConfigObject obj = new ConfigObject(Santoku.INSTANCE.getString(R.string.SettingsProfileCopy, currentConfig.getTitle())); obj.values.putAll(currentConfig.values); currentConfig = new ConfigObject(obj); - SliceBeam.CONFIG.printerConfigs.add(obj); - SliceBeam.CONFIG.presets.put("printer", obj.getTitle()); - SliceBeam.saveConfig(); - SliceBeam.getCurrentConfigFile().delete(); + Santoku.CONFIG.printerConfigs.add(obj); + Santoku.CONFIG.presets.put("printer", obj.getTitle()); + Santoku.saveConfig(); + Santoku.getCurrentConfigFile().delete(); currentConfig = new ConfigObject(obj); dropdownView.setTitle(getCurrentConfig().getTitle()); @@ -217,28 +217,28 @@ public class PrinterConfigFragment extends ProfileListFragment { @Override protected void deleteCurrentProfile() { - SliceBeam.CONFIG.printerConfigs.remove(SliceBeam.CONFIG.findPrinter(currentConfig.getTitle())); + Santoku.CONFIG.printerConfigs.remove(Santoku.CONFIG.findPrinter(currentConfig.getTitle())); selectItem(getItems(true).get(0)); dropdownView.setTitle(getCurrentConfig().getTitle()); } @Override protected void onApplyConfig(String title) { - ConfigObject obj = SliceBeam.CONFIG.findPrinter(currentConfig.getTitle()); + ConfigObject obj = Santoku.CONFIG.findPrinter(currentConfig.getTitle()); obj.setTitle(title); obj.values.putAll(currentConfig.values); currentConfig.setTitle(title); - SliceBeam.CONFIG.presets.put("printer", title); - SliceBeam.saveConfig(); - SliceBeam.getCurrentConfigFile().delete(); + Santoku.CONFIG.presets.put("printer", title); + Santoku.saveConfig(); + Santoku.getCurrentConfigFile().delete(); dropdownView.setTitle(title); } @Override protected void onResetConfig() { - currentConfig = new ConfigObject(SliceBeam.CONFIG.findPrinter(SliceBeam.CONFIG.presets.get("printer"))); + currentConfig = new ConfigObject(Santoku.CONFIG.findPrinter(Santoku.CONFIG.presets.get("printer"))); } @Override @@ -254,10 +254,10 @@ public class PrinterConfigFragment extends ProfileListFragment { @Override protected void selectItem(ProfileListItem item) { currentConfig = new ConfigObject((ConfigObject) item); - SliceBeam.CONFIG.presets.put("printer", item.getTitle()); + Santoku.CONFIG.presets.put("printer", item.getTitle()); // TODO: Reset print/filament profiles, maybe physical profiles? - SliceBeam.saveConfig(); + Santoku.saveConfig(); } @Override diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/fragment/ProfileListFragment.java b/app/src/main/java/com/dark98/santoku/fragment/ProfileListFragment.java similarity index 97% rename from app/src/main/java/ru/ytkab0bp/slicebeam/fragment/ProfileListFragment.java rename to app/src/main/java/com/dark98/santoku/fragment/ProfileListFragment.java index 1792e80..584258e 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/fragment/ProfileListFragment.java +++ b/app/src/main/java/com/dark98/santoku/fragment/ProfileListFragment.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.fragment; +package com.dark98.santoku.fragment; import android.annotation.SuppressLint; import android.content.Context; @@ -49,30 +49,30 @@ import java.util.Map; import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; -import ru.ytkab0bp.slicebeam.R; -import ru.ytkab0bp.slicebeam.SliceBeam; -import ru.ytkab0bp.slicebeam.cloud.CloudAPI; -import ru.ytkab0bp.slicebeam.cloud.CloudController; -import ru.ytkab0bp.slicebeam.components.BeamAlertDialogBuilder; -import ru.ytkab0bp.slicebeam.components.BeamColorPickerPopUp; -import ru.ytkab0bp.slicebeam.config.ConfigObject; -import ru.ytkab0bp.slicebeam.navigation.Fragment; -import ru.ytkab0bp.slicebeam.recycler.CubicBezierItemAnimator; -import ru.ytkab0bp.slicebeam.recycler.PreferenceItem; -import ru.ytkab0bp.slicebeam.recycler.PreferenceSwitchItem; -import ru.ytkab0bp.slicebeam.recycler.SimpleRecyclerItem; -import ru.ytkab0bp.slicebeam.slic3r.ConfigOptionDef; -import ru.ytkab0bp.slicebeam.slic3r.PrintConfigDef; -import ru.ytkab0bp.slicebeam.slic3r.Slic3rConfigWrapper; -import ru.ytkab0bp.slicebeam.slic3r.Slic3rLocalization; -import ru.ytkab0bp.slicebeam.theme.IThemeView; -import ru.ytkab0bp.slicebeam.theme.ThemesRepo; -import ru.ytkab0bp.slicebeam.utils.Prefs; -import ru.ytkab0bp.slicebeam.utils.ViewUtils; -import ru.ytkab0bp.slicebeam.view.BeamButton; -import ru.ytkab0bp.slicebeam.view.DividerView; -import ru.ytkab0bp.slicebeam.view.FadeRecyclerView; -import ru.ytkab0bp.slicebeam.view.ProfileDropdownView; +import com.dark98.santoku.R; +import com.dark98.santoku.Santoku; +import com.dark98.santoku.cloud.CloudAPI; +import com.dark98.santoku.cloud.CloudController; +import com.dark98.santoku.components.BeamAlertDialogBuilder; +import com.dark98.santoku.components.BeamColorPickerPopUp; +import com.dark98.santoku.config.ConfigObject; +import com.dark98.santoku.navigation.Fragment; +import com.dark98.santoku.recycler.CubicBezierItemAnimator; +import com.dark98.santoku.recycler.PreferenceItem; +import com.dark98.santoku.recycler.PreferenceSwitchItem; +import com.dark98.santoku.recycler.SimpleRecyclerItem; +import com.dark98.santoku.slic3r.ConfigOptionDef; +import com.dark98.santoku.slic3r.PrintConfigDef; +import com.dark98.santoku.slic3r.Slic3rConfigWrapper; +import com.dark98.santoku.slic3r.Slic3rLocalization; +import com.dark98.santoku.theme.IThemeView; +import com.dark98.santoku.theme.ThemesRepo; +import com.dark98.santoku.utils.Prefs; +import com.dark98.santoku.utils.ViewUtils; +import com.dark98.santoku.view.BeamButton; +import com.dark98.santoku.view.DividerView; +import com.dark98.santoku.view.FadeRecyclerView; +import com.dark98.santoku.view.ProfileDropdownView; public abstract class ProfileListFragment extends Fragment { public final static int SPECIAL_TYPE_CLOUD_HEADER = 0; @@ -507,13 +507,13 @@ public abstract class ProfileListFragment extends Fragment { @Override public void onCreate() { super.onCreate(); - SliceBeam.EVENT_BUS.registerListener(this); + Santoku.EVENT_BUS.registerListener(this); } @Override public void onDestroy() { super.onDestroy(); - SliceBeam.EVENT_BUS.unregisterListener(this); + Santoku.EVENT_BUS.unregisterListener(this); unfolded.clear(); } diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/fragment/SettingsFragment.java b/app/src/main/java/com/dark98/santoku/fragment/SettingsFragment.java similarity index 92% rename from app/src/main/java/ru/ytkab0bp/slicebeam/fragment/SettingsFragment.java rename to app/src/main/java/com/dark98/santoku/fragment/SettingsFragment.java index 23ada81..19e0f04 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/fragment/SettingsFragment.java +++ b/app/src/main/java/com/dark98/santoku/fragment/SettingsFragment.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.fragment; +package com.dark98.santoku.fragment; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -20,19 +20,19 @@ import java.util.Collections; import java.util.List; import ru.ytkab0bp.eventbus.EventHandler; -import ru.ytkab0bp.slicebeam.BeamServerData; -import ru.ytkab0bp.slicebeam.R; -import ru.ytkab0bp.slicebeam.SetupActivity; -import ru.ytkab0bp.slicebeam.SliceBeam; -import ru.ytkab0bp.slicebeam.components.BeamAlertDialogBuilder; -import ru.ytkab0bp.slicebeam.components.BeamColorPickerPopUp; -import ru.ytkab0bp.slicebeam.config.ConfigObject; -import ru.ytkab0bp.slicebeam.events.BeamServerDataUpdatedEvent; -import ru.ytkab0bp.slicebeam.events.CloudUserInfoUpdatedEvent; -import ru.ytkab0bp.slicebeam.recycler.PreferenceItem; -import ru.ytkab0bp.slicebeam.theme.BeamTheme; -import ru.ytkab0bp.slicebeam.theme.ThemesRepo; -import ru.ytkab0bp.slicebeam.utils.Prefs; +import com.dark98.santoku.BeamServerData; +import com.dark98.santoku.R; +import com.dark98.santoku.SetupActivity; +import com.dark98.santoku.Santoku; +import com.dark98.santoku.components.BeamAlertDialogBuilder; +import com.dark98.santoku.components.BeamColorPickerPopUp; +import com.dark98.santoku.config.ConfigObject; +import com.dark98.santoku.events.BeamServerDataUpdatedEvent; +import com.dark98.santoku.events.CloudUserInfoUpdatedEvent; +import com.dark98.santoku.recycler.PreferenceItem; +import com.dark98.santoku.theme.BeamTheme; +import com.dark98.santoku.theme.ThemesRepo; +import com.dark98.santoku.utils.Prefs; public class SettingsFragment extends ProfileListFragment { @@ -163,8 +163,8 @@ public class SettingsFragment extends ProfileListFragment { .setTitle(R.string.SettingsResetToDefaultTitle) .setMessage(R.string.SettingsResetToDefaultDescription) .setPositiveButton(android.R.string.ok, (dialog, which) -> { - SliceBeam.getConfigFile().delete(); - SliceBeam.CONFIG = null; + Santoku.getConfigFile().delete(); + Santoku.CONFIG = null; Prefs.getPrefs().edit().clear().apply(); Prefs.setLastCommit(); act.startActivity(new Intent(act, SetupActivity.class)); diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/navigation/DelegateSlotImpl.java b/app/src/main/java/com/dark98/santoku/navigation/DelegateSlotImpl.java similarity index 85% rename from app/src/main/java/ru/ytkab0bp/slicebeam/navigation/DelegateSlotImpl.java rename to app/src/main/java/com/dark98/santoku/navigation/DelegateSlotImpl.java index 67aac0c..6eb093e 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/navigation/DelegateSlotImpl.java +++ b/app/src/main/java/com/dark98/santoku/navigation/DelegateSlotImpl.java @@ -1,14 +1,14 @@ -package ru.ytkab0bp.slicebeam.navigation; +package com.dark98.santoku.navigation; import androidx.annotation.DrawableRes; import androidx.annotation.StringRes; -import ru.ytkab0bp.slicebeam.R; -import ru.ytkab0bp.slicebeam.fragment.BedFragment; -import ru.ytkab0bp.slicebeam.fragment.FilamentConfigFragment; -import ru.ytkab0bp.slicebeam.fragment.PrintConfigFragment; -import ru.ytkab0bp.slicebeam.fragment.PrinterConfigFragment; -import ru.ytkab0bp.slicebeam.fragment.SettingsFragment; +import com.dark98.santoku.R; +import com.dark98.santoku.fragment.BedFragment; +import com.dark98.santoku.fragment.FilamentConfigFragment; +import com.dark98.santoku.fragment.PrintConfigFragment; +import com.dark98.santoku.fragment.PrinterConfigFragment; +import com.dark98.santoku.fragment.SettingsFragment; public abstract class DelegateSlotImpl extends NavigationDelegate { public int getSlotCount() { diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/navigation/Fragment.java b/app/src/main/java/com/dark98/santoku/navigation/Fragment.java similarity index 92% rename from app/src/main/java/ru/ytkab0bp/slicebeam/navigation/Fragment.java rename to app/src/main/java/com/dark98/santoku/navigation/Fragment.java index d52a039..31af37e 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/navigation/Fragment.java +++ b/app/src/main/java/com/dark98/santoku/navigation/Fragment.java @@ -1,11 +1,11 @@ -package ru.ytkab0bp.slicebeam.navigation; +package com.dark98.santoku.navigation; import android.content.Context; import android.view.View; import androidx.annotation.CallSuper; -import ru.ytkab0bp.slicebeam.theme.ThemesRepo; +import com.dark98.santoku.theme.ThemesRepo; public abstract class Fragment { private View mView; diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/navigation/MobileNavigationDelegate.java b/app/src/main/java/com/dark98/santoku/navigation/MobileNavigationDelegate.java similarity index 93% rename from app/src/main/java/ru/ytkab0bp/slicebeam/navigation/MobileNavigationDelegate.java rename to app/src/main/java/com/dark98/santoku/navigation/MobileNavigationDelegate.java index 130a6bb..1f229d9 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/navigation/MobileNavigationDelegate.java +++ b/app/src/main/java/com/dark98/santoku/navigation/MobileNavigationDelegate.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.navigation; +package com.dark98.santoku.navigation; import android.annotation.SuppressLint; import android.content.Context; @@ -23,12 +23,12 @@ import androidx.core.content.ContextCompat; import com.google.android.material.bottomnavigation.BottomNavigationView; import com.google.android.material.navigation.NavigationBarView; -import ru.ytkab0bp.slicebeam.R; -import ru.ytkab0bp.slicebeam.theme.ThemesRepo; -import ru.ytkab0bp.slicebeam.utils.ViewUtils; -import ru.ytkab0bp.slicebeam.view.TextColorImageSpan; -import ru.ytkab0bp.slicebeam.view.ThemeBottomNavigationView; -import ru.ytkab0bp.slicebeam.view.ThemeRailNavigationView; +import com.dark98.santoku.R; +import com.dark98.santoku.theme.ThemesRepo; +import com.dark98.santoku.utils.ViewUtils; +import com.dark98.santoku.view.TextColorImageSpan; +import com.dark98.santoku.view.ThemeBottomNavigationView; +import com.dark98.santoku.view.ThemeRailNavigationView; public class MobileNavigationDelegate extends DelegateSlotImpl { private boolean portrait; diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/navigation/NavigationDelegate.java b/app/src/main/java/com/dark98/santoku/navigation/NavigationDelegate.java similarity index 98% rename from app/src/main/java/ru/ytkab0bp/slicebeam/navigation/NavigationDelegate.java rename to app/src/main/java/com/dark98/santoku/navigation/NavigationDelegate.java index 4f4bb40..9073f70 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/navigation/NavigationDelegate.java +++ b/app/src/main/java/com/dark98/santoku/navigation/NavigationDelegate.java @@ -1,6 +1,6 @@ -package ru.ytkab0bp.slicebeam.navigation; +package com.dark98.santoku.navigation; -import static ru.ytkab0bp.slicebeam.utils.DebugUtils.assertTrue; +import static com.dark98.santoku.utils.DebugUtils.assertTrue; import android.content.Context; import android.util.SparseArray; @@ -14,7 +14,7 @@ import androidx.dynamicanimation.animation.SpringForce; import java.util.Stack; -import ru.ytkab0bp.slicebeam.theme.ThemesRepo; +import com.dark98.santoku.theme.ThemesRepo; public abstract class NavigationDelegate { protected Context context; diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/print_host/ElegooLinkClient.java b/app/src/main/java/com/dark98/santoku/print_host/ElegooLinkClient.java similarity index 99% rename from app/src/main/java/ru/ytkab0bp/slicebeam/print_host/ElegooLinkClient.java rename to app/src/main/java/com/dark98/santoku/print_host/ElegooLinkClient.java index ebb995f..d737762 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/print_host/ElegooLinkClient.java +++ b/app/src/main/java/com/dark98/santoku/print_host/ElegooLinkClient.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.print_host; +package com.dark98.santoku.print_host; import org.json.JSONArray; import org.json.JSONException; diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/recycler/BigHeaderItem.java b/app/src/main/java/com/dark98/santoku/recycler/BigHeaderItem.java similarity index 89% rename from app/src/main/java/ru/ytkab0bp/slicebeam/recycler/BigHeaderItem.java rename to app/src/main/java/com/dark98/santoku/recycler/BigHeaderItem.java index a25ca56..d79e1f3 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/recycler/BigHeaderItem.java +++ b/app/src/main/java/com/dark98/santoku/recycler/BigHeaderItem.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.recycler; +package com.dark98.santoku.recycler; import android.content.Context; import android.util.TypedValue; @@ -8,8 +8,8 @@ import android.widget.TextView; import androidx.recyclerview.widget.RecyclerView; -import ru.ytkab0bp.slicebeam.theme.ThemesRepo; -import ru.ytkab0bp.slicebeam.utils.ViewUtils; +import com.dark98.santoku.theme.ThemesRepo; +import com.dark98.santoku.utils.ViewUtils; public class BigHeaderItem extends SimpleRecyclerItem { public String title; diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/recycler/CubicBezierItemAnimator.java b/app/src/main/java/com/dark98/santoku/recycler/CubicBezierItemAnimator.java similarity index 99% rename from app/src/main/java/ru/ytkab0bp/slicebeam/recycler/CubicBezierItemAnimator.java rename to app/src/main/java/com/dark98/santoku/recycler/CubicBezierItemAnimator.java index df1265c..247d1ff 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/recycler/CubicBezierItemAnimator.java +++ b/app/src/main/java/com/dark98/santoku/recycler/CubicBezierItemAnimator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package ru.ytkab0bp.slicebeam.recycler; +package com.dark98.santoku.recycler; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -29,7 +29,7 @@ import androidx.recyclerview.widget.SimpleItemAnimator; import java.util.ArrayList; import java.util.List; -import ru.ytkab0bp.slicebeam.utils.ViewUtils; +import com.dark98.santoku.utils.ViewUtils; /** * This implementation of {@link RecyclerView.ItemAnimator} provides basic diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/recycler/DividerItem.java b/app/src/main/java/com/dark98/santoku/recycler/DividerItem.java similarity index 80% rename from app/src/main/java/ru/ytkab0bp/slicebeam/recycler/DividerItem.java rename to app/src/main/java/com/dark98/santoku/recycler/DividerItem.java index cb98ffe..3a1f7dd 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/recycler/DividerItem.java +++ b/app/src/main/java/com/dark98/santoku/recycler/DividerItem.java @@ -1,12 +1,12 @@ -package ru.ytkab0bp.slicebeam.recycler; +package com.dark98.santoku.recycler; import android.content.Context; import android.view.ViewGroup; import androidx.recyclerview.widget.RecyclerView; -import ru.ytkab0bp.slicebeam.utils.ViewUtils; -import ru.ytkab0bp.slicebeam.view.DividerView; +import com.dark98.santoku.utils.ViewUtils; +import com.dark98.santoku.view.DividerView; public class DividerItem extends SimpleRecyclerItem { @Override diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/recycler/PreferenceItem.java b/app/src/main/java/com/dark98/santoku/recycler/PreferenceItem.java similarity index 96% rename from app/src/main/java/ru/ytkab0bp/slicebeam/recycler/PreferenceItem.java rename to app/src/main/java/com/dark98/santoku/recycler/PreferenceItem.java index da6b3aa..50c2c88 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/recycler/PreferenceItem.java +++ b/app/src/main/java/com/dark98/santoku/recycler/PreferenceItem.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.recycler; +package com.dark98.santoku.recycler; import android.content.Context; import android.content.res.ColorStateList; @@ -20,11 +20,11 @@ import androidx.appcompat.widget.AppCompatImageView; import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.RecyclerView; -import ru.ytkab0bp.slicebeam.SliceBeam; -import ru.ytkab0bp.slicebeam.theme.BeamTheme; -import ru.ytkab0bp.slicebeam.theme.IThemeView; -import ru.ytkab0bp.slicebeam.theme.ThemesRepo; -import ru.ytkab0bp.slicebeam.utils.ViewUtils; +import com.dark98.santoku.Santoku; +import com.dark98.santoku.theme.BeamTheme; +import com.dark98.santoku.theme.IThemeView; +import com.dark98.santoku.theme.ThemesRepo; +import com.dark98.santoku.utils.ViewUtils; public class PreferenceItem extends SimpleRecyclerItem { private Drawable mIcon; @@ -75,7 +75,7 @@ public class PreferenceItem extends SimpleRecyclerItem { private Drawable mIcon; @@ -64,7 +64,7 @@ public class PreferenceSwitchItem extends SimpleRecyclerItem { public String title; diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/render/Camera.java b/app/src/main/java/com/dark98/santoku/render/Camera.java similarity index 95% rename from app/src/main/java/ru/ytkab0bp/slicebeam/render/Camera.java rename to app/src/main/java/com/dark98/santoku/render/Camera.java index f4fdfdd..bd4e33c 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/render/Camera.java +++ b/app/src/main/java/com/dark98/santoku/render/Camera.java @@ -1,9 +1,9 @@ -package ru.ytkab0bp.slicebeam.render; +package com.dark98.santoku.render; import androidx.core.math.MathUtils; -import ru.ytkab0bp.slicebeam.utils.DoubleMatrix; -import ru.ytkab0bp.slicebeam.utils.Vec3d; +import com.dark98.santoku.utils.DoubleMatrix; +import com.dark98.santoku.utils.Vec3d; public class Camera { private double[] viewMatrix = new double[16]; diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/render/CoordAxes.java b/app/src/main/java/com/dark98/santoku/render/CoordAxes.java similarity index 88% rename from app/src/main/java/ru/ytkab0bp/slicebeam/render/CoordAxes.java rename to app/src/main/java/com/dark98/santoku/render/CoordAxes.java index 48b78cb..49dcc84 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/render/CoordAxes.java +++ b/app/src/main/java/com/dark98/santoku/render/CoordAxes.java @@ -1,13 +1,13 @@ -package ru.ytkab0bp.slicebeam.render; +package com.dark98.santoku.render; -import ru.ytkab0bp.slicebeam.R; -import ru.ytkab0bp.slicebeam.slic3r.GLModel; -import ru.ytkab0bp.slicebeam.slic3r.GLShaderProgram; -import ru.ytkab0bp.slicebeam.slic3r.GLShadersManager; -import ru.ytkab0bp.slicebeam.slic3r.Slic3rUtils; -import ru.ytkab0bp.slicebeam.theme.ThemesRepo; -import ru.ytkab0bp.slicebeam.utils.DoubleMatrix; -import ru.ytkab0bp.slicebeam.utils.Vec3d; +import com.dark98.santoku.R; +import com.dark98.santoku.slic3r.GLModel; +import com.dark98.santoku.slic3r.GLShaderProgram; +import com.dark98.santoku.slic3r.GLShadersManager; +import com.dark98.santoku.slic3r.Slic3rUtils; +import com.dark98.santoku.theme.ThemesRepo; +import com.dark98.santoku.utils.DoubleMatrix; +import com.dark98.santoku.utils.Vec3d; public class CoordAxes { public Vec3d origin = new Vec3d(0, 0, 0); diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/render/GLRenderer.java b/app/src/main/java/com/dark98/santoku/render/GLRenderer.java similarity index 95% rename from app/src/main/java/ru/ytkab0bp/slicebeam/render/GLRenderer.java rename to app/src/main/java/com/dark98/santoku/render/GLRenderer.java index 25f9ebd..dfb2e57 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/render/GLRenderer.java +++ b/app/src/main/java/com/dark98/santoku/render/GLRenderer.java @@ -1,7 +1,7 @@ -package ru.ytkab0bp.slicebeam.render; +package com.dark98.santoku.render; import static android.opengl.GLES30.*; -import static ru.ytkab0bp.slicebeam.utils.DebugUtils.assertTrue; +import static com.dark98.santoku.utils.DebugUtils.assertTrue; import android.graphics.Bitmap; import android.graphics.Color; @@ -18,24 +18,24 @@ import java.nio.IntBuffer; import javax.microedition.khronos.egl.EGLConfig; import javax.microedition.khronos.opengles.GL10; -import ru.ytkab0bp.slicebeam.R; -import ru.ytkab0bp.slicebeam.SliceBeam; -import ru.ytkab0bp.slicebeam.events.ObjectsListChangedEvent; -import ru.ytkab0bp.slicebeam.events.SelectedObjectChangedEvent; -import ru.ytkab0bp.slicebeam.slic3r.Bed3D; -import ru.ytkab0bp.slicebeam.slic3r.GCodeProcessorResult; -import ru.ytkab0bp.slicebeam.slic3r.GCodeViewer; -import ru.ytkab0bp.slicebeam.slic3r.GLModel; -import ru.ytkab0bp.slicebeam.slic3r.GLShaderProgram; -import ru.ytkab0bp.slicebeam.slic3r.GLShadersManager; -import ru.ytkab0bp.slicebeam.slic3r.Model; -import ru.ytkab0bp.slicebeam.slic3r.Slic3rUtils; -import ru.ytkab0bp.slicebeam.theme.ThemesRepo; -import ru.ytkab0bp.slicebeam.utils.DoubleMatrix; -import ru.ytkab0bp.slicebeam.utils.Prefs; -import ru.ytkab0bp.slicebeam.utils.Vec3d; -import ru.ytkab0bp.slicebeam.utils.ViewUtils; -import ru.ytkab0bp.slicebeam.view.GLView; +import com.dark98.santoku.R; +import com.dark98.santoku.Santoku; +import com.dark98.santoku.events.ObjectsListChangedEvent; +import com.dark98.santoku.events.SelectedObjectChangedEvent; +import com.dark98.santoku.slic3r.Bed3D; +import com.dark98.santoku.slic3r.GCodeProcessorResult; +import com.dark98.santoku.slic3r.GCodeViewer; +import com.dark98.santoku.slic3r.GLModel; +import com.dark98.santoku.slic3r.GLShaderProgram; +import com.dark98.santoku.slic3r.GLShadersManager; +import com.dark98.santoku.slic3r.Model; +import com.dark98.santoku.slic3r.Slic3rUtils; +import com.dark98.santoku.theme.ThemesRepo; +import com.dark98.santoku.utils.DoubleMatrix; +import com.dark98.santoku.utils.Prefs; +import com.dark98.santoku.utils.Vec3d; +import com.dark98.santoku.utils.ViewUtils; +import com.dark98.santoku.view.GLView; public class GLRenderer implements GLSurfaceView.Renderer { private final static float FOV = 60f; @@ -425,7 +425,7 @@ public class GLRenderer implements GLSurfaceView.Renderer { glEnable(GL_DEPTH_TEST); boolean bottom = Prefs.isOrthoProjectionEnabled() ? camera.getDirForward().z > 0 : camera.getDirToBed().z > 0; - if (lastConfigUid != SliceBeam.CONFIG_UID) { + if (lastConfigUid != Santoku.CONFIG_UID) { configureBed(); } if (bed.isValid() && bedVisible) { @@ -567,14 +567,14 @@ public class GLRenderer implements GLSurfaceView.Renderer { selX = selY = selZ = 0; selRotX = selRotY = selRotZ = 0; selScaleX = selScaleY = selScaleZ = 1; - SliceBeam.EVENT_BUS.fireEvent(new SelectedObjectChangedEvent()); + Santoku.EVENT_BUS.fireEvent(new SelectedObjectChangedEvent()); } if (model.getObjectsCount() == 0) { model.release(); model = null; } - SliceBeam.EVENT_BUS.fireEvent(new ObjectsListChangedEvent()); + Santoku.EVENT_BUS.fireEvent(new ObjectsListChangedEvent()); return true; } @@ -640,7 +640,7 @@ public class GLRenderer implements GLSurfaceView.Renderer { flattenPlanes.clear(); selectedObject = -1; - SliceBeam.EVENT_BUS.fireEvent(new SelectedObjectChangedEvent()); + Santoku.EVENT_BUS.fireEvent(new SelectedObjectChangedEvent()); return true; } @@ -658,7 +658,7 @@ public class GLRenderer implements GLSurfaceView.Renderer { selRotX = selRotY = selRotZ = 0; selScaleX = selScaleY = selScaleZ = 1; } - SliceBeam.EVENT_BUS.fireEvent(new SelectedObjectChangedEvent()); + Santoku.EVENT_BUS.fireEvent(new SelectedObjectChangedEvent()); } return render; } @@ -793,9 +793,9 @@ public class GLRenderer implements GLSurfaceView.Renderer { private void configureBed() { try { - lastConfigUid = SliceBeam.CONFIG_UID; - SliceBeam.genCurrentConfig(); - bed.configure(SliceBeam.getCurrentConfigFile()); + lastConfigUid = Santoku.CONFIG_UID; + Santoku.genCurrentConfig(); + bed.configure(Santoku.getCurrentConfigFile()); } catch (Exception e) { Log.e("GLRenderer", "Failed to update config", e); } diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/slic3r/Bed3D.java b/app/src/main/java/com/dark98/santoku/slic3r/Bed3D.java similarity index 93% rename from app/src/main/java/ru/ytkab0bp/slicebeam/slic3r/Bed3D.java rename to app/src/main/java/com/dark98/santoku/slic3r/Bed3D.java index 0e2110b..897fbdb 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/slic3r/Bed3D.java +++ b/app/src/main/java/com/dark98/santoku/slic3r/Bed3D.java @@ -1,17 +1,17 @@ -package ru.ytkab0bp.slicebeam.slic3r; +package com.dark98.santoku.slic3r; import static android.opengl.GLES30.*; -import static ru.ytkab0bp.slicebeam.utils.DebugUtils.assertTrue; +import static com.dark98.santoku.utils.DebugUtils.assertTrue; import java.io.File; -import ru.ytkab0bp.slicebeam.R; -import ru.ytkab0bp.slicebeam.render.CoordAxes; -import ru.ytkab0bp.slicebeam.theme.ThemesRepo; -import ru.ytkab0bp.slicebeam.utils.DoubleMatrix; -import ru.ytkab0bp.slicebeam.utils.Vec3d; -import ru.ytkab0bp.slicebeam.utils.ViewUtils; +import com.dark98.santoku.R; +import com.dark98.santoku.render.CoordAxes; +import com.dark98.santoku.theme.ThemesRepo; +import com.dark98.santoku.utils.DoubleMatrix; +import com.dark98.santoku.utils.Vec3d; +import com.dark98.santoku.utils.ViewUtils; public class Bed3D { private final static float GROUND_Z = -0.02f; diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/slic3r/ConfigOptionDef.java b/app/src/main/java/com/dark98/santoku/slic3r/ConfigOptionDef.java similarity index 99% rename from app/src/main/java/ru/ytkab0bp/slicebeam/slic3r/ConfigOptionDef.java rename to app/src/main/java/com/dark98/santoku/slic3r/ConfigOptionDef.java index b44096f..b7b7e0d 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/slic3r/ConfigOptionDef.java +++ b/app/src/main/java/com/dark98/santoku/slic3r/ConfigOptionDef.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.slic3r; +package com.dark98.santoku.slic3r; import android.text.TextUtils; diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/slic3r/GCodeProcessorResult.java b/app/src/main/java/com/dark98/santoku/slic3r/GCodeProcessorResult.java similarity index 96% rename from app/src/main/java/ru/ytkab0bp/slicebeam/slic3r/GCodeProcessorResult.java rename to app/src/main/java/com/dark98/santoku/slic3r/GCodeProcessorResult.java index 07f3e66..ab2361a 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/slic3r/GCodeProcessorResult.java +++ b/app/src/main/java/com/dark98/santoku/slic3r/GCodeProcessorResult.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.slic3r; +package com.dark98.santoku.slic3r; import java.io.File; diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/slic3r/GCodeThumbnailer.java b/app/src/main/java/com/dark98/santoku/slic3r/GCodeThumbnailer.java similarity index 98% rename from app/src/main/java/ru/ytkab0bp/slicebeam/slic3r/GCodeThumbnailer.java rename to app/src/main/java/com/dark98/santoku/slic3r/GCodeThumbnailer.java index 3b6ba07..d88a0dd 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/slic3r/GCodeThumbnailer.java +++ b/app/src/main/java/com/dark98/santoku/slic3r/GCodeThumbnailer.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.slic3r; +package com.dark98.santoku.slic3r; import android.graphics.Bitmap; import android.graphics.Canvas; @@ -23,8 +23,8 @@ import java.util.concurrent.TimeUnit; import java.util.regex.Matcher; import java.util.regex.Pattern; -import ru.ytkab0bp.slicebeam.config.ConfigObject; -import ru.ytkab0bp.slicebeam.view.GLView; +import com.dark98.santoku.config.ConfigObject; +import com.dark98.santoku.view.GLView; public final class GCodeThumbnailer { private static final String TAG = "GCodeThumbnailer"; diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/slic3r/GCodeViewer.java b/app/src/main/java/com/dark98/santoku/slic3r/GCodeViewer.java similarity index 96% rename from app/src/main/java/ru/ytkab0bp/slicebeam/slic3r/GCodeViewer.java rename to app/src/main/java/com/dark98/santoku/slic3r/GCodeViewer.java index bff9905..eed7a3a 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/slic3r/GCodeViewer.java +++ b/app/src/main/java/com/dark98/santoku/slic3r/GCodeViewer.java @@ -1,6 +1,6 @@ -package ru.ytkab0bp.slicebeam.slic3r; +package com.dark98.santoku.slic3r; -import static ru.ytkab0bp.slicebeam.utils.DebugUtils.assertTrue; +import static com.dark98.santoku.utils.DebugUtils.assertTrue; import android.graphics.Color; @@ -10,8 +10,8 @@ import androidx.core.util.Pair; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -import ru.ytkab0bp.slicebeam.R; -import ru.ytkab0bp.slicebeam.theme.ThemesRepo; +import com.dark98.santoku.R; +import com.dark98.santoku.theme.ThemesRepo; public class GCodeViewer { @Retention(RetentionPolicy.SOURCE) diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/slic3r/GLModel.java b/app/src/main/java/com/dark98/santoku/slic3r/GLModel.java similarity index 92% rename from app/src/main/java/ru/ytkab0bp/slicebeam/slic3r/GLModel.java rename to app/src/main/java/com/dark98/santoku/slic3r/GLModel.java index 20fe8c7..01d7ce3 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/slic3r/GLModel.java +++ b/app/src/main/java/com/dark98/santoku/slic3r/GLModel.java @@ -1,15 +1,15 @@ -package ru.ytkab0bp.slicebeam.slic3r; +package com.dark98.santoku.slic3r; -import static ru.ytkab0bp.slicebeam.utils.DebugUtils.assertTrue; +import static com.dark98.santoku.utils.DebugUtils.assertTrue; import android.graphics.Color; import java.util.ArrayList; -import ru.ytkab0bp.slicebeam.render.Camera; -import ru.ytkab0bp.slicebeam.render.GLRenderer; -import ru.ytkab0bp.slicebeam.utils.Prefs; -import ru.ytkab0bp.slicebeam.utils.Vec3d; +import com.dark98.santoku.render.Camera; +import com.dark98.santoku.render.GLRenderer; +import com.dark98.santoku.utils.Prefs; +import com.dark98.santoku.utils.Vec3d; public class GLModel { long pointer; diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/slic3r/GLShaderProgram.java b/app/src/main/java/com/dark98/santoku/slic3r/GLShaderProgram.java similarity index 94% rename from app/src/main/java/ru/ytkab0bp/slicebeam/slic3r/GLShaderProgram.java rename to app/src/main/java/com/dark98/santoku/slic3r/GLShaderProgram.java index 6a18608..0cea670 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/slic3r/GLShaderProgram.java +++ b/app/src/main/java/com/dark98/santoku/slic3r/GLShaderProgram.java @@ -1,6 +1,6 @@ -package ru.ytkab0bp.slicebeam.slic3r; +package com.dark98.santoku.slic3r; -import static ru.ytkab0bp.slicebeam.utils.DebugUtils.assertTrue; +import static com.dark98.santoku.utils.DebugUtils.assertTrue; import android.content.res.AssetManager; import android.graphics.Color; @@ -13,8 +13,8 @@ import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.nio.FloatBuffer; -import ru.ytkab0bp.slicebeam.SliceBeam; -import ru.ytkab0bp.slicebeam.utils.IOUtils; +import com.dark98.santoku.Santoku; +import com.dark98.santoku.utils.IOUtils; public class GLShaderProgram { long pointer; @@ -39,7 +39,7 @@ public class GLShaderProgram { }; public GLShaderProgram(String name) { - AssetManager assets = SliceBeam.INSTANCE.getAssets(); + AssetManager assets = Santoku.INSTANCE.getAssets(); try { pointer = Native.shader_init_from_texts(name, IOUtils.readString(assets.open("shaders/" + name + ".fs")), IOUtils.readString(assets.open("shaders/" + name + ".vs"))); } catch (IOException e) { diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/slic3r/GLShadersManager.java b/app/src/main/java/com/dark98/santoku/slic3r/GLShadersManager.java similarity index 98% rename from app/src/main/java/ru/ytkab0bp/slicebeam/slic3r/GLShadersManager.java rename to app/src/main/java/com/dark98/santoku/slic3r/GLShadersManager.java index 64ed2f3..45ea871 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/slic3r/GLShadersManager.java +++ b/app/src/main/java/com/dark98/santoku/slic3r/GLShadersManager.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.slic3r; +package com.dark98.santoku.slic3r; import android.opengl.GLES30; diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/slic3r/Model.java b/app/src/main/java/com/dark98/santoku/slic3r/Model.java similarity index 98% rename from app/src/main/java/ru/ytkab0bp/slicebeam/slic3r/Model.java rename to app/src/main/java/com/dark98/santoku/slic3r/Model.java index 6d1eb19..1cbb277 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/slic3r/Model.java +++ b/app/src/main/java/com/dark98/santoku/slic3r/Model.java @@ -1,11 +1,11 @@ -package ru.ytkab0bp.slicebeam.slic3r; +package com.dark98.santoku.slic3r; import java.io.File; import java.util.ArrayList; import java.util.List; import java.util.UUID; -import ru.ytkab0bp.slicebeam.utils.Vec3d; +import com.dark98.santoku.utils.Vec3d; public class Model { public final String key = UUID.randomUUID().toString(); diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/slic3r/Native.java b/app/src/main/java/com/dark98/santoku/slic3r/Native.java similarity index 97% rename from app/src/main/java/ru/ytkab0bp/slicebeam/slic3r/Native.java rename to app/src/main/java/com/dark98/santoku/slic3r/Native.java index 68291f8..0d47274 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/slic3r/Native.java +++ b/app/src/main/java/com/dark98/santoku/slic3r/Native.java @@ -1,6 +1,6 @@ -package ru.ytkab0bp.slicebeam.slic3r; +package com.dark98.santoku.slic3r; -import ru.ytkab0bp.slicebeam.SliceBeam; +import com.dark98.santoku.Santoku; class Native { static { @@ -12,7 +12,7 @@ class Native { System.loadLibrary("slic3r"); - set_svg_path_prefix(SliceBeam.INSTANCE.getCacheDir().getAbsolutePath()); + set_svg_path_prefix(Santoku.INSTANCE.getCacheDir().getAbsolutePath()); } static native void get_print_config_def(PrintConfigDef def); diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/slic3r/OCCTLoader.java b/app/src/main/java/com/dark98/santoku/slic3r/OCCTLoader.java similarity index 95% rename from app/src/main/java/ru/ytkab0bp/slicebeam/slic3r/OCCTLoader.java rename to app/src/main/java/com/dark98/santoku/slic3r/OCCTLoader.java index 51c0aaf..563339e 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/slic3r/OCCTLoader.java +++ b/app/src/main/java/com/dark98/santoku/slic3r/OCCTLoader.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.slic3r; +package com.dark98.santoku.slic3r; import java.util.Arrays; import java.util.List; diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/slic3r/PrintConfigDef.java b/app/src/main/java/com/dark98/santoku/slic3r/PrintConfigDef.java similarity index 98% rename from app/src/main/java/ru/ytkab0bp/slicebeam/slic3r/PrintConfigDef.java rename to app/src/main/java/com/dark98/santoku/slic3r/PrintConfigDef.java index a9e8393..894f7a2 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/slic3r/PrintConfigDef.java +++ b/app/src/main/java/com/dark98/santoku/slic3r/PrintConfigDef.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.slic3r; +package com.dark98.santoku.slic3r; import androidx.annotation.Keep; import androidx.annotation.Nullable; diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/slic3r/Slic3rConfigWrapper.java b/app/src/main/java/com/dark98/santoku/slic3r/Slic3rConfigWrapper.java similarity index 99% rename from app/src/main/java/ru/ytkab0bp/slicebeam/slic3r/Slic3rConfigWrapper.java rename to app/src/main/java/com/dark98/santoku/slic3r/Slic3rConfigWrapper.java index 68b6112..d51fb89 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/slic3r/Slic3rConfigWrapper.java +++ b/app/src/main/java/com/dark98/santoku/slic3r/Slic3rConfigWrapper.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.slic3r; +package com.dark98.santoku.slic3r; import java.io.BufferedReader; import java.io.File; @@ -13,8 +13,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import ru.ytkab0bp.slicebeam.BuildConfig; -import ru.ytkab0bp.slicebeam.config.ConfigObject; +import com.dark98.santoku.BuildConfig; +import com.dark98.santoku.config.ConfigObject; public class Slic3rConfigWrapper { public final static String BLACKLISTED_SYMBOLS = "<>[]:/\\|?*\""; diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/slic3r/Slic3rLocalization.java b/app/src/main/java/com/dark98/santoku/slic3r/Slic3rLocalization.java similarity index 94% rename from app/src/main/java/ru/ytkab0bp/slicebeam/slic3r/Slic3rLocalization.java rename to app/src/main/java/com/dark98/santoku/slic3r/Slic3rLocalization.java index 0cb3c95..9c5264c 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/slic3r/Slic3rLocalization.java +++ b/app/src/main/java/com/dark98/santoku/slic3r/Slic3rLocalization.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.slic3r; +package com.dark98.santoku.slic3r; import android.text.TextUtils; @@ -12,7 +12,7 @@ import java.util.HashMap; import java.util.Locale; import java.util.Map; -import ru.ytkab0bp.slicebeam.SliceBeam; +import com.dark98.santoku.Santoku; public class Slic3rLocalization { private static Map localesMap = new HashMap() { @@ -38,7 +38,7 @@ public class Slic3rLocalization { private Map map = new HashMap<>(); public Slic3rLocalization(String key) throws IOException { - InputStream in = SliceBeam.INSTANCE.getAssets().open("localization/" + key + ".po"); + InputStream in = Santoku.INSTANCE.getAssets().open("localization/" + key + ".po"); BufferedReader r = new BufferedReader(new InputStreamReader(in)); String line; StringBuilder msgId = null; diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/slic3r/Slic3rRuntimeError.java b/app/src/main/java/com/dark98/santoku/slic3r/Slic3rRuntimeError.java similarity index 90% rename from app/src/main/java/ru/ytkab0bp/slicebeam/slic3r/Slic3rRuntimeError.java rename to app/src/main/java/com/dark98/santoku/slic3r/Slic3rRuntimeError.java index 872e788..6e8a897 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/slic3r/Slic3rRuntimeError.java +++ b/app/src/main/java/com/dark98/santoku/slic3r/Slic3rRuntimeError.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.slic3r; +package com.dark98.santoku.slic3r; public class Slic3rRuntimeError extends Exception { public Slic3rRuntimeError() { diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/slic3r/Slic3rUtils.java b/app/src/main/java/com/dark98/santoku/slic3r/Slic3rUtils.java similarity index 90% rename from app/src/main/java/ru/ytkab0bp/slicebeam/slic3r/Slic3rUtils.java rename to app/src/main/java/com/dark98/santoku/slic3r/Slic3rUtils.java index c0b4125..053e868 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/slic3r/Slic3rUtils.java +++ b/app/src/main/java/com/dark98/santoku/slic3r/Slic3rUtils.java @@ -1,10 +1,10 @@ -package ru.ytkab0bp.slicebeam.slic3r; +package com.dark98.santoku.slic3r; -import static ru.ytkab0bp.slicebeam.utils.DebugUtils.assertTrue; +import static com.dark98.santoku.utils.DebugUtils.assertTrue; import android.text.TextUtils; -import ru.ytkab0bp.slicebeam.utils.Vec3d; +import com.dark98.santoku.utils.Vec3d; public class Slic3rUtils { public static void calcViewNormalMatrix(double[] viewMatrix, double[] worldMatrix, double[] normalMatrix) { diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/slic3r/SliceListener.java b/app/src/main/java/com/dark98/santoku/slic3r/SliceListener.java similarity index 68% rename from app/src/main/java/ru/ytkab0bp/slicebeam/slic3r/SliceListener.java rename to app/src/main/java/com/dark98/santoku/slic3r/SliceListener.java index 0a83b30..e92dfcd 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/slic3r/SliceListener.java +++ b/app/src/main/java/com/dark98/santoku/slic3r/SliceListener.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.slic3r; +package com.dark98.santoku.slic3r; public interface SliceListener { void onProgress(int progress, String text); diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/theme/BeamTheme.java b/app/src/main/java/com/dark98/santoku/theme/BeamTheme.java similarity index 97% rename from app/src/main/java/ru/ytkab0bp/slicebeam/theme/BeamTheme.java rename to app/src/main/java/com/dark98/santoku/theme/BeamTheme.java index 475d60e..9e54aa1 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/theme/BeamTheme.java +++ b/app/src/main/java/com/dark98/santoku/theme/BeamTheme.java @@ -1,11 +1,11 @@ -package ru.ytkab0bp.slicebeam.theme; +package com.dark98.santoku.theme; import android.util.SparseIntArray; import androidx.annotation.StringRes; -import ru.ytkab0bp.slicebeam.R; -import ru.ytkab0bp.slicebeam.utils.Prefs; +import com.dark98.santoku.R; +import com.dark98.santoku.utils.Prefs; public class BeamTheme { public final static BeamTheme LIGHT = new BeamTheme() {{ diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/theme/IThemeView.java b/app/src/main/java/com/dark98/santoku/theme/IThemeView.java similarity index 61% rename from app/src/main/java/ru/ytkab0bp/slicebeam/theme/IThemeView.java rename to app/src/main/java/com/dark98/santoku/theme/IThemeView.java index 25619fb..08fc74d 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/theme/IThemeView.java +++ b/app/src/main/java/com/dark98/santoku/theme/IThemeView.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.theme; +package com.dark98.santoku.theme; public interface IThemeView { void onApplyTheme(); diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/theme/ThemesRepo.java b/app/src/main/java/com/dark98/santoku/theme/ThemesRepo.java similarity index 82% rename from app/src/main/java/ru/ytkab0bp/slicebeam/theme/ThemesRepo.java rename to app/src/main/java/com/dark98/santoku/theme/ThemesRepo.java index 9ee6178..699edbb 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/theme/ThemesRepo.java +++ b/app/src/main/java/com/dark98/santoku/theme/ThemesRepo.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.theme; +package com.dark98.santoku.theme; import android.annotation.SuppressLint; import android.app.Activity; @@ -8,9 +8,9 @@ import android.view.ViewGroup; import androidx.recyclerview.widget.RecyclerView; -import ru.ytkab0bp.slicebeam.MainActivity; -import ru.ytkab0bp.slicebeam.SliceBeam; -import ru.ytkab0bp.slicebeam.utils.Prefs; +import com.dark98.santoku.MainActivity; +import com.dark98.santoku.Santoku; +import com.dark98.santoku.utils.Prefs; public class ThemesRepo { private static Boolean resolvedSystemMode; @@ -18,7 +18,7 @@ public class ThemesRepo { public static BeamTheme getCurrent() { if (Prefs.getThemeMode() == Prefs.ThemeMode.SYSTEM) { if (resolvedSystemMode == null) { - resolvedSystemMode = (SliceBeam.INSTANCE.getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES; + resolvedSystemMode = (Santoku.INSTANCE.getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES; } return resolvedSystemMode ? BeamTheme.DARK : BeamTheme.LIGHT; } diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/utils/DebugUtils.java b/app/src/main/java/com/dark98/santoku/utils/DebugUtils.java similarity index 83% rename from app/src/main/java/ru/ytkab0bp/slicebeam/utils/DebugUtils.java rename to app/src/main/java/com/dark98/santoku/utils/DebugUtils.java index 1cf50f1..30380f4 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/utils/DebugUtils.java +++ b/app/src/main/java/com/dark98/santoku/utils/DebugUtils.java @@ -1,6 +1,6 @@ -package ru.ytkab0bp.slicebeam.utils; +package com.dark98.santoku.utils; -import ru.ytkab0bp.slicebeam.BuildConfig; +import com.dark98.santoku.BuildConfig; public class DebugUtils { public static void assertTrue(boolean value) { diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/utils/DoubleMatrix.java b/app/src/main/java/com/dark98/santoku/utils/DoubleMatrix.java similarity index 99% rename from app/src/main/java/ru/ytkab0bp/slicebeam/utils/DoubleMatrix.java rename to app/src/main/java/com/dark98/santoku/utils/DoubleMatrix.java index 768a66c..b0db480 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/utils/DoubleMatrix.java +++ b/app/src/main/java/com/dark98/santoku/utils/DoubleMatrix.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ru.ytkab0bp.slicebeam.utils; +package com.dark98.santoku.utils; import androidx.annotation.NonNull; diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/utils/IOUtils.java b/app/src/main/java/com/dark98/santoku/utils/IOUtils.java similarity index 98% rename from app/src/main/java/ru/ytkab0bp/slicebeam/utils/IOUtils.java rename to app/src/main/java/com/dark98/santoku/utils/IOUtils.java index c256a9a..6a4987a 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/utils/IOUtils.java +++ b/app/src/main/java/com/dark98/santoku/utils/IOUtils.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.utils; +package com.dark98.santoku.utils; import android.content.ContentResolver; import android.database.Cursor; @@ -23,14 +23,14 @@ import java.util.Map; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import ru.ytkab0bp.slicebeam.SliceBeam; -import ru.ytkab0bp.slicebeam.config.ConfigObject; +import com.dark98.santoku.Santoku; +import com.dark98.santoku.config.ConfigObject; public class IOUtils { public static ExecutorService IO_POOL = Executors.newCachedThreadPool(); public static String getDisplayName(Uri uri) { - ContentResolver resolver = SliceBeam.INSTANCE.getContentResolver(); + ContentResolver resolver = Santoku.INSTANCE.getContentResolver(); String[] projection = {MediaStore.MediaColumns.DISPLAY_NAME}; Cursor metaCursor = resolver.query(uri, projection, null, null, null); diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/utils/Prefs.java b/app/src/main/java/com/dark98/santoku/utils/Prefs.java similarity index 97% rename from app/src/main/java/ru/ytkab0bp/slicebeam/utils/Prefs.java rename to app/src/main/java/com/dark98/santoku/utils/Prefs.java index 77b0624..2f2ad1d 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/utils/Prefs.java +++ b/app/src/main/java/com/dark98/santoku/utils/Prefs.java @@ -1,12 +1,12 @@ -package ru.ytkab0bp.slicebeam.utils; +package com.dark98.santoku.utils; import android.app.Application; import android.content.SharedPreferences; import android.preference.PreferenceManager; -import ru.ytkab0bp.slicebeam.BuildConfig; -import ru.ytkab0bp.slicebeam.R; -import ru.ytkab0bp.slicebeam.SetupActivity; +import com.dark98.santoku.BuildConfig; +import com.dark98.santoku.R; +import com.dark98.santoku.SetupActivity; public class Prefs { public final static int CAMERA_CONTROL_MODE_ROTATE_MOVE = 0, diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/utils/RandomUtils.java b/app/src/main/java/com/dark98/santoku/utils/RandomUtils.java similarity index 90% rename from app/src/main/java/ru/ytkab0bp/slicebeam/utils/RandomUtils.java rename to app/src/main/java/com/dark98/santoku/utils/RandomUtils.java index 86dee66..c14f995 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/utils/RandomUtils.java +++ b/app/src/main/java/com/dark98/santoku/utils/RandomUtils.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.utils; +package com.dark98.santoku.utils; import java.util.Random; diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/utils/ThreadLocalDoubleArray.java b/app/src/main/java/com/dark98/santoku/utils/ThreadLocalDoubleArray.java similarity index 89% rename from app/src/main/java/ru/ytkab0bp/slicebeam/utils/ThreadLocalDoubleArray.java rename to app/src/main/java/com/dark98/santoku/utils/ThreadLocalDoubleArray.java index a5e0e93..d30243f 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/utils/ThreadLocalDoubleArray.java +++ b/app/src/main/java/com/dark98/santoku/utils/ThreadLocalDoubleArray.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.utils; +package com.dark98.santoku.utils; import androidx.annotation.Nullable; diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/utils/Vec3d.java b/app/src/main/java/com/dark98/santoku/utils/Vec3d.java similarity index 98% rename from app/src/main/java/ru/ytkab0bp/slicebeam/utils/Vec3d.java rename to app/src/main/java/com/dark98/santoku/utils/Vec3d.java index 9f54b43..b8278af 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/utils/Vec3d.java +++ b/app/src/main/java/com/dark98/santoku/utils/Vec3d.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.utils; +package com.dark98.santoku.utils; public class Vec3d { public double x, y, z; diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/utils/VibrationUtils.java b/app/src/main/java/com/dark98/santoku/utils/VibrationUtils.java similarity index 92% rename from app/src/main/java/ru/ytkab0bp/slicebeam/utils/VibrationUtils.java rename to app/src/main/java/com/dark98/santoku/utils/VibrationUtils.java index a43097a..d07c3be 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/utils/VibrationUtils.java +++ b/app/src/main/java/com/dark98/santoku/utils/VibrationUtils.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.utils; +package com.dark98.santoku.utils; import android.content.Context; import android.os.Build; diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/utils/ViewUtils.java b/app/src/main/java/com/dark98/santoku/utils/ViewUtils.java similarity index 92% rename from app/src/main/java/ru/ytkab0bp/slicebeam/utils/ViewUtils.java rename to app/src/main/java/com/dark98/santoku/utils/ViewUtils.java index 70adc5f..cce9dc7 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/utils/ViewUtils.java +++ b/app/src/main/java/com/dark98/santoku/utils/ViewUtils.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.utils; +package com.dark98.santoku.utils; import android.animation.TimeInterpolator; import android.content.res.ColorStateList; @@ -14,7 +14,7 @@ import android.view.animation.PathInterpolator; import java.util.HashMap; import java.util.Map; -import ru.ytkab0bp.slicebeam.SliceBeam; +import com.dark98.santoku.Santoku; public class ViewUtils { public final static TimeInterpolator CUBIC_INTERPOLATOR = new PathInterpolator(0.25f, 0, 0.25f, 1f); @@ -43,7 +43,7 @@ public class ViewUtils { public static Typeface getTypeface(String key) { Typeface typeface = typefaceCache.get(key); if (typeface == null) { - typefaceCache.put(key, typeface = Typeface.createFromAsset(SliceBeam.INSTANCE.getAssets(), "font/" + key + ".ttf")); + typefaceCache.put(key, typeface = Typeface.createFromAsset(Santoku.INSTANCE.getAssets(), "font/" + key + ".ttf")); } return typeface; } @@ -78,6 +78,6 @@ public class ViewUtils { } public static int dp(float dp) { - return (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, SliceBeam.INSTANCE.getResources().getDisplayMetrics()); + return (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, Santoku.INSTANCE.getResources().getDisplayMetrics()); } } diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/view/BeamButton.java b/app/src/main/java/com/dark98/santoku/view/BeamButton.java similarity index 84% rename from app/src/main/java/ru/ytkab0bp/slicebeam/view/BeamButton.java rename to app/src/main/java/com/dark98/santoku/view/BeamButton.java index e68f819..3b42c45 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/view/BeamButton.java +++ b/app/src/main/java/com/dark98/santoku/view/BeamButton.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.view; +package com.dark98.santoku.view; import android.content.Context; import android.util.TypedValue; @@ -6,10 +6,10 @@ import android.view.Gravity; import androidx.appcompat.widget.AppCompatTextView; -import ru.ytkab0bp.slicebeam.R; -import ru.ytkab0bp.slicebeam.theme.IThemeView; -import ru.ytkab0bp.slicebeam.theme.ThemesRepo; -import ru.ytkab0bp.slicebeam.utils.ViewUtils; +import com.dark98.santoku.R; +import com.dark98.santoku.theme.IThemeView; +import com.dark98.santoku.theme.ThemesRepo; +import com.dark98.santoku.utils.ViewUtils; public class BeamButton extends AppCompatTextView implements IThemeView { private int colorRes = android.R.attr.colorAccent; diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/view/BeamSwitch.java b/app/src/main/java/com/dark98/santoku/view/BeamSwitch.java similarity index 86% rename from app/src/main/java/ru/ytkab0bp/slicebeam/view/BeamSwitch.java rename to app/src/main/java/com/dark98/santoku/view/BeamSwitch.java index a22cbea..0263dc1 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/view/BeamSwitch.java +++ b/app/src/main/java/com/dark98/santoku/view/BeamSwitch.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.view; +package com.dark98.santoku.view; import android.content.Context; import android.content.res.ColorStateList; @@ -8,9 +8,9 @@ import androidx.annotation.NonNull; import com.google.android.material.materialswitch.MaterialSwitch; -import ru.ytkab0bp.slicebeam.R; -import ru.ytkab0bp.slicebeam.theme.IThemeView; -import ru.ytkab0bp.slicebeam.theme.ThemesRepo; +import com.dark98.santoku.R; +import com.dark98.santoku.theme.IThemeView; +import com.dark98.santoku.theme.ThemesRepo; public class BeamSwitch extends MaterialSwitch implements IThemeView { public BeamSwitch(@NonNull Context context) { diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/view/BedSwipeDownLayout.java b/app/src/main/java/com/dark98/santoku/view/BedSwipeDownLayout.java similarity index 98% rename from app/src/main/java/ru/ytkab0bp/slicebeam/view/BedSwipeDownLayout.java rename to app/src/main/java/com/dark98/santoku/view/BedSwipeDownLayout.java index 53fd3d5..fb368b0 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/view/BedSwipeDownLayout.java +++ b/app/src/main/java/com/dark98/santoku/view/BedSwipeDownLayout.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.view; +package com.dark98.santoku.view; import android.content.Context; import android.graphics.Canvas; @@ -19,9 +19,9 @@ import androidx.dynamicanimation.animation.FloatValueHolder; import androidx.dynamicanimation.animation.SpringAnimation; import androidx.dynamicanimation.animation.SpringForce; -import ru.ytkab0bp.slicebeam.theme.IThemeView; -import ru.ytkab0bp.slicebeam.theme.ThemesRepo; -import ru.ytkab0bp.slicebeam.utils.ViewUtils; +import com.dark98.santoku.theme.IThemeView; +import com.dark98.santoku.theme.ThemesRepo; +import com.dark98.santoku.utils.ViewUtils; public class BedSwipeDownLayout extends FrameLayout implements IThemeView { private final static int TOP_MARGIN_DP = 28; diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/view/BoostySubsView.java b/app/src/main/java/com/dark98/santoku/view/BoostySubsView.java similarity index 95% rename from app/src/main/java/ru/ytkab0bp/slicebeam/view/BoostySubsView.java rename to app/src/main/java/com/dark98/santoku/view/BoostySubsView.java index f2ad5fd..d599df3 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/view/BoostySubsView.java +++ b/app/src/main/java/com/dark98/santoku/view/BoostySubsView.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.view; +package com.dark98.santoku.view; import android.content.Context; import android.graphics.Canvas; @@ -13,9 +13,9 @@ import androidx.core.math.MathUtils; import java.util.ArrayList; import java.util.List; -import ru.ytkab0bp.slicebeam.R; -import ru.ytkab0bp.slicebeam.theme.ThemesRepo; -import ru.ytkab0bp.slicebeam.utils.ViewUtils; +import com.dark98.santoku.R; +import com.dark98.santoku.theme.ThemesRepo; +import com.dark98.santoku.utils.ViewUtils; public class BoostySubsView extends View { private TextPaint paint = new TextPaint(); diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/view/DividerView.java b/app/src/main/java/com/dark98/santoku/view/DividerView.java similarity index 84% rename from app/src/main/java/ru/ytkab0bp/slicebeam/view/DividerView.java rename to app/src/main/java/com/dark98/santoku/view/DividerView.java index 5da239f..0614be2 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/view/DividerView.java +++ b/app/src/main/java/com/dark98/santoku/view/DividerView.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.view; +package com.dark98.santoku.view; import android.content.Context; import android.graphics.Canvas; @@ -7,9 +7,9 @@ import android.view.View; import androidx.annotation.NonNull; -import ru.ytkab0bp.slicebeam.R; -import ru.ytkab0bp.slicebeam.theme.IThemeView; -import ru.ytkab0bp.slicebeam.theme.ThemesRepo; +import com.dark98.santoku.R; +import com.dark98.santoku.theme.IThemeView; +import com.dark98.santoku.theme.ThemesRepo; public class DividerView extends View implements IThemeView { private Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG); diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/view/FadeRecyclerView.java b/app/src/main/java/com/dark98/santoku/view/FadeRecyclerView.java similarity index 96% rename from app/src/main/java/ru/ytkab0bp/slicebeam/view/FadeRecyclerView.java rename to app/src/main/java/com/dark98/santoku/view/FadeRecyclerView.java index 6e36b9b..9d57b5a 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/view/FadeRecyclerView.java +++ b/app/src/main/java/com/dark98/santoku/view/FadeRecyclerView.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.view; +package com.dark98.santoku.view; import android.content.Context; import android.graphics.Bitmap; @@ -16,9 +16,9 @@ import androidx.core.math.MathUtils; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import ru.ytkab0bp.slicebeam.theme.IThemeView; -import ru.ytkab0bp.slicebeam.theme.ThemesRepo; -import ru.ytkab0bp.slicebeam.utils.ViewUtils; +import com.dark98.santoku.theme.IThemeView; +import com.dark98.santoku.theme.ThemesRepo; +import com.dark98.santoku.utils.ViewUtils; public class FadeRecyclerView extends RecyclerView implements IThemeView { private final static int HEIGHT_DP = 32; diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/view/GLView.java b/app/src/main/java/com/dark98/santoku/view/GLView.java similarity index 96% rename from app/src/main/java/ru/ytkab0bp/slicebeam/view/GLView.java rename to app/src/main/java/com/dark98/santoku/view/GLView.java index 851272f..f0b1157 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/view/GLView.java +++ b/app/src/main/java/com/dark98/santoku/view/GLView.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.view; +package com.dark98.santoku.view; import android.annotation.SuppressLint; import android.content.Context; @@ -29,16 +29,16 @@ import javax.microedition.khronos.egl.EGL10; import javax.microedition.khronos.egl.EGLConfig; import javax.microedition.khronos.egl.EGLDisplay; -import ru.ytkab0bp.slicebeam.R; -import ru.ytkab0bp.slicebeam.SliceBeam; -import ru.ytkab0bp.slicebeam.events.LongClickTranslationEvent; -import ru.ytkab0bp.slicebeam.render.GLRenderer; -import ru.ytkab0bp.slicebeam.slic3r.GLModel; -import ru.ytkab0bp.slicebeam.theme.IThemeView; -import ru.ytkab0bp.slicebeam.theme.ThemesRepo; -import ru.ytkab0bp.slicebeam.utils.Prefs; -import ru.ytkab0bp.slicebeam.utils.Vec3d; -import ru.ytkab0bp.slicebeam.utils.ViewUtils; +import com.dark98.santoku.R; +import com.dark98.santoku.Santoku; +import com.dark98.santoku.events.LongClickTranslationEvent; +import com.dark98.santoku.render.GLRenderer; +import com.dark98.santoku.slic3r.GLModel; +import com.dark98.santoku.theme.IThemeView; +import com.dark98.santoku.theme.ThemesRepo; +import com.dark98.santoku.utils.Prefs; +import com.dark98.santoku.utils.Vec3d; +import com.dark98.santoku.utils.ViewUtils; public class GLView extends GLSurfaceView implements IThemeView { private GLRenderer renderer; @@ -393,7 +393,7 @@ public class GLView extends GLSurfaceView implements IThemeView { getRenderer().getModel().translate(j, longClickTranslation.x, longClickTranslation.y, 0); getRenderer().invalidateGlModel(j); requestRender(); - SliceBeam.EVENT_BUS.fireEvent(new LongClickTranslationEvent(longClickTranslation.x, longClickTranslation.y, false)); + Santoku.EVENT_BUS.fireEvent(new LongClickTranslationEvent(longClickTranslation.x, longClickTranslation.y, false)); }); } longClickGesture = false; @@ -494,7 +494,7 @@ public class GLView extends GLSurfaceView implements IThemeView { longClickTranslation.x = result.position.x - tempVec.x - longClickOffset.x; longClickTranslation.y = result.position.y - tempVec.y - longClickOffset.y; getRenderer().setSelectionTranslation(longClickTranslation.x, longClickTranslation.y, 0); - SliceBeam.EVENT_BUS.fireEvent(new LongClickTranslationEvent(longClickTranslation.x, longClickTranslation.y, true)); + Santoku.EVENT_BUS.fireEvent(new LongClickTranslationEvent(longClickTranslation.x, longClickTranslation.y, true)); } requestRender(); diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/view/MiniColorView.java b/app/src/main/java/com/dark98/santoku/view/MiniColorView.java similarity index 91% rename from app/src/main/java/ru/ytkab0bp/slicebeam/view/MiniColorView.java rename to app/src/main/java/com/dark98/santoku/view/MiniColorView.java index b06e775..ca3bd04 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/view/MiniColorView.java +++ b/app/src/main/java/com/dark98/santoku/view/MiniColorView.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.view; +package com.dark98.santoku.view; import android.content.Context; import android.graphics.Canvas; @@ -12,10 +12,10 @@ import androidx.dynamicanimation.animation.FloatValueHolder; import androidx.dynamicanimation.animation.SpringAnimation; import androidx.dynamicanimation.animation.SpringForce; -import ru.ytkab0bp.slicebeam.R; -import ru.ytkab0bp.slicebeam.theme.ThemesRepo; -import ru.ytkab0bp.slicebeam.utils.Prefs; -import ru.ytkab0bp.slicebeam.utils.ViewUtils; +import com.dark98.santoku.R; +import com.dark98.santoku.theme.ThemesRepo; +import com.dark98.santoku.utils.Prefs; +import com.dark98.santoku.utils.ViewUtils; public class MiniColorView extends View { private Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG); diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/view/MirrorView.java b/app/src/main/java/com/dark98/santoku/view/MirrorView.java similarity index 93% rename from app/src/main/java/ru/ytkab0bp/slicebeam/view/MirrorView.java rename to app/src/main/java/com/dark98/santoku/view/MirrorView.java index c6b26c9..06d2a3c 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/view/MirrorView.java +++ b/app/src/main/java/com/dark98/santoku/view/MirrorView.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.view; +package com.dark98.santoku.view; import android.content.Context; import android.graphics.Canvas; diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/view/PositionScrollView.java b/app/src/main/java/com/dark98/santoku/view/PositionScrollView.java similarity index 98% rename from app/src/main/java/ru/ytkab0bp/slicebeam/view/PositionScrollView.java rename to app/src/main/java/com/dark98/santoku/view/PositionScrollView.java index d02984b..786f96f 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/view/PositionScrollView.java +++ b/app/src/main/java/com/dark98/santoku/view/PositionScrollView.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.view; +package com.dark98.santoku.view; import android.annotation.SuppressLint; import android.content.Context; @@ -29,11 +29,11 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import ru.ytkab0bp.slicebeam.theme.IThemeView; -import ru.ytkab0bp.slicebeam.theme.ThemesRepo; -import ru.ytkab0bp.slicebeam.utils.Prefs; -import ru.ytkab0bp.slicebeam.utils.VibrationUtils; -import ru.ytkab0bp.slicebeam.utils.ViewUtils; +import com.dark98.santoku.theme.IThemeView; +import com.dark98.santoku.theme.ThemesRepo; +import com.dark98.santoku.utils.Prefs; +import com.dark98.santoku.utils.VibrationUtils; +import com.dark98.santoku.utils.ViewUtils; public class PositionScrollView extends View implements IThemeView { private final static int STEP = 1; diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/view/ProfileDropdownView.java b/app/src/main/java/com/dark98/santoku/view/ProfileDropdownView.java similarity index 94% rename from app/src/main/java/ru/ytkab0bp/slicebeam/view/ProfileDropdownView.java rename to app/src/main/java/com/dark98/santoku/view/ProfileDropdownView.java index 8f66149..054f7c5 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/view/ProfileDropdownView.java +++ b/app/src/main/java/com/dark98/santoku/view/ProfileDropdownView.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.view; +package com.dark98.santoku.view; import android.annotation.SuppressLint; import android.content.Context; @@ -16,10 +16,10 @@ import androidx.annotation.NonNull; import androidx.core.content.ContextCompat; import androidx.core.graphics.ColorUtils; -import ru.ytkab0bp.slicebeam.R; -import ru.ytkab0bp.slicebeam.theme.IThemeView; -import ru.ytkab0bp.slicebeam.theme.ThemesRepo; -import ru.ytkab0bp.slicebeam.utils.ViewUtils; +import com.dark98.santoku.R; +import com.dark98.santoku.theme.IThemeView; +import com.dark98.santoku.theme.ThemesRepo; +import com.dark98.santoku.utils.ViewUtils; public class ProfileDropdownView extends View implements IThemeView { private Paint bgPaint = new Paint(Paint.ANTI_ALIAS_FLAG); diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/view/SegmentsView.java b/app/src/main/java/com/dark98/santoku/view/SegmentsView.java similarity index 96% rename from app/src/main/java/ru/ytkab0bp/slicebeam/view/SegmentsView.java rename to app/src/main/java/com/dark98/santoku/view/SegmentsView.java index 7515c93..1100898 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/view/SegmentsView.java +++ b/app/src/main/java/com/dark98/santoku/view/SegmentsView.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.view; +package com.dark98.santoku.view; import android.content.Context; import android.graphics.Canvas; @@ -13,10 +13,10 @@ import androidx.dynamicanimation.animation.SpringForce; import java.util.Arrays; -import ru.ytkab0bp.slicebeam.R; -import ru.ytkab0bp.slicebeam.slic3r.GCodeViewer; -import ru.ytkab0bp.slicebeam.theme.ThemesRepo; -import ru.ytkab0bp.slicebeam.utils.ViewUtils; +import com.dark98.santoku.R; +import com.dark98.santoku.slic3r.GCodeViewer; +import com.dark98.santoku.theme.ThemesRepo; +import com.dark98.santoku.utils.ViewUtils; public class SegmentsView extends View { private Path path = new Path(); diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/view/SnackbarsLayout.java b/app/src/main/java/com/dark98/santoku/view/SnackbarsLayout.java similarity index 98% rename from app/src/main/java/ru/ytkab0bp/slicebeam/view/SnackbarsLayout.java rename to app/src/main/java/com/dark98/santoku/view/SnackbarsLayout.java index 6bd5a53..a5729b0 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/view/SnackbarsLayout.java +++ b/app/src/main/java/com/dark98/santoku/view/SnackbarsLayout.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.view; +package com.dark98.santoku.view; import android.annotation.SuppressLint; import android.content.Context; @@ -28,9 +28,9 @@ import androidx.dynamicanimation.animation.SpringForce; import java.util.Objects; -import ru.ytkab0bp.slicebeam.R; -import ru.ytkab0bp.slicebeam.theme.ThemesRepo; -import ru.ytkab0bp.slicebeam.utils.ViewUtils; +import com.dark98.santoku.R; +import com.dark98.santoku.theme.ThemesRepo; +import com.dark98.santoku.utils.ViewUtils; public class SnackbarsLayout extends FrameLayout { public SnackbarsLayout(@NonNull Context context) { diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/view/TextColorImageSpan.java b/app/src/main/java/com/dark98/santoku/view/TextColorImageSpan.java similarity index 95% rename from app/src/main/java/ru/ytkab0bp/slicebeam/view/TextColorImageSpan.java rename to app/src/main/java/com/dark98/santoku/view/TextColorImageSpan.java index 736e8f0..786dbf9 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/view/TextColorImageSpan.java +++ b/app/src/main/java/com/dark98/santoku/view/TextColorImageSpan.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.view; +package com.dark98.santoku.view; import android.graphics.Canvas; import android.graphics.Paint; diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/view/ThemeBottomNavigationView.java b/app/src/main/java/com/dark98/santoku/view/ThemeBottomNavigationView.java similarity index 82% rename from app/src/main/java/ru/ytkab0bp/slicebeam/view/ThemeBottomNavigationView.java rename to app/src/main/java/com/dark98/santoku/view/ThemeBottomNavigationView.java index 4416793..4831a93 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/view/ThemeBottomNavigationView.java +++ b/app/src/main/java/com/dark98/santoku/view/ThemeBottomNavigationView.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.view; +package com.dark98.santoku.view; import android.content.Context; import android.content.res.ColorStateList; @@ -7,15 +7,15 @@ import androidx.annotation.NonNull; import com.google.android.material.bottomnavigation.BottomNavigationView; -import ru.ytkab0bp.slicebeam.R; -import ru.ytkab0bp.slicebeam.theme.IThemeView; -import ru.ytkab0bp.slicebeam.theme.ThemesRepo; +import com.dark98.santoku.R; +import com.dark98.santoku.theme.IThemeView; +import com.dark98.santoku.theme.ThemesRepo; public class ThemeBottomNavigationView extends BottomNavigationView implements IThemeView { public ThemeBottomNavigationView(@NonNull Context context) { super(context); - setItemTextAppearanceInactive(R.style.Theme_SliceBeam_NavigationTextFix); - setItemTextAppearanceActive(R.style.Theme_SliceBeam_NavigationTextFixActive); + setItemTextAppearanceInactive(R.style.Theme_Santoku_NavigationTextFix); + setItemTextAppearanceActive(R.style.Theme_Santoku_NavigationTextFixActive); onApplyTheme(); } diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/view/ThemeRailNavigationView.java b/app/src/main/java/com/dark98/santoku/view/ThemeRailNavigationView.java similarity index 90% rename from app/src/main/java/ru/ytkab0bp/slicebeam/view/ThemeRailNavigationView.java rename to app/src/main/java/com/dark98/santoku/view/ThemeRailNavigationView.java index 429ca61..564357d 100644 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/view/ThemeRailNavigationView.java +++ b/app/src/main/java/com/dark98/santoku/view/ThemeRailNavigationView.java @@ -1,4 +1,4 @@ -package ru.ytkab0bp.slicebeam.view; +package com.dark98.santoku.view; import android.content.Context; import android.content.res.ColorStateList; @@ -8,9 +8,9 @@ import androidx.annotation.NonNull; import com.google.android.material.navigationrail.NavigationRailView; -import ru.ytkab0bp.slicebeam.R; -import ru.ytkab0bp.slicebeam.theme.IThemeView; -import ru.ytkab0bp.slicebeam.theme.ThemesRepo; +import com.dark98.santoku.R; +import com.dark98.santoku.theme.IThemeView; +import com.dark98.santoku.theme.ThemesRepo; public class ThemeRailNavigationView extends NavigationRailView implements IThemeView { public ThemeRailNavigationView(@NonNull Context context) { diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/boot/PrefsTask.java b/app/src/main/java/ru/ytkab0bp/slicebeam/boot/PrefsTask.java deleted file mode 100644 index 7285861..0000000 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/boot/PrefsTask.java +++ /dev/null @@ -1,10 +0,0 @@ -package ru.ytkab0bp.slicebeam.boot; - -import ru.ytkab0bp.slicebeam.SliceBeam; -import ru.ytkab0bp.slicebeam.utils.Prefs; - -public class PrefsTask extends BootTask { - public PrefsTask() { - super(()->Prefs.init(SliceBeam.INSTANCE)); - } -} diff --git a/app/src/main/java/ru/ytkab0bp/slicebeam/boot/VibrationUtilsTask.java b/app/src/main/java/ru/ytkab0bp/slicebeam/boot/VibrationUtilsTask.java deleted file mode 100644 index f75f773..0000000 --- a/app/src/main/java/ru/ytkab0bp/slicebeam/boot/VibrationUtilsTask.java +++ /dev/null @@ -1,12 +0,0 @@ -package ru.ytkab0bp.slicebeam.boot; - -import ru.ytkab0bp.slicebeam.SliceBeam; -import ru.ytkab0bp.slicebeam.utils.VibrationUtils; - -public class VibrationUtilsTask extends BootTask { - - public VibrationUtilsTask() { - super(() -> VibrationUtils.init(SliceBeam.INSTANCE)); - onWorker(); - } -} diff --git a/app/src/main/jni/libslic3r/GCode/GCodeProcessor.cpp b/app/src/main/jni/libslic3r/GCode/GCodeProcessor.cpp index 98527ff..8d925ab 100644 --- a/app/src/main/jni/libslic3r/GCode/GCodeProcessor.cpp +++ b/app/src/main/jni/libslic3r/GCode/GCodeProcessor.cpp @@ -535,7 +535,7 @@ void GCodeProcessorResult::reset() { } const std::vector> GCodeProcessor::Producers = { - { EProducer::SliceBeam, "generated by Slice Beam" }, + { EProducer::Santoku, "generated by Santoku" }, { EProducer::PrusaSlicer, "generated by PrusaSlicer" }, { EProducer::Slic3rPE, "generated by Slic3r Prusa Edition" }, { EProducer::Slic3r, "generated by Slic3r" }, @@ -619,7 +619,7 @@ void GCodeProcessor::apply_config(const PrintConfig& config) m_binarizer.set_enabled(config.binary_gcode); m_result.is_binary_file = config.binary_gcode; - m_producer = EProducer::SliceBeam; + m_producer = EProducer::Santoku; m_flavor = config.gcode_flavor; m_result.backtrace_enabled = is_XL_printer(config); @@ -1124,7 +1124,7 @@ void GCodeProcessor::process_ascii_file(const std::string& filename, GCodeReader // if the gcode was produced by PrusaSlicer, // extract the config from it - if (m_producer == EProducer::SliceBeam || m_producer == EProducer::PrusaSlicer || m_producer == EProducer::Slic3rPE || m_producer == EProducer::Slic3r) { + if (m_producer == EProducer::Santoku || m_producer == EProducer::PrusaSlicer || m_producer == EProducer::Slic3rPE || m_producer == EProducer::Slic3r) { DynamicPrintConfig config; config.apply(FullPrintConfig::defaults()); // Silently substitute unknown values by new ones for loading configurations from PrusaSlicer's own G-code. @@ -1231,7 +1231,7 @@ void GCodeProcessor::process_binary_file(const std::string& filename, GCodeReade auto producer_it = std::find_if(file_metadata_block.raw_data.begin(), file_metadata_block.raw_data.end(), [](const std::pair& item) { return item.first == "Producer"; }); if (producer_it != file_metadata_block.raw_data.end() && boost::starts_with(producer_it->second, std::string(SLIC3R_APP_NAME))) - m_producer = EProducer::SliceBeam; + m_producer = EProducer::Santoku; else m_producer = EProducer::Unknown; res = read_next_block_header(*file.f, file_header, block_header, cs_buffer.data(), cs_buffer.size()); @@ -1892,7 +1892,7 @@ void GCodeProcessor::process_tags(const std::string_view comment, bool producers return; } - if (!producers_enabled || m_producer == EProducer::PrusaSlicer || m_producer == EProducer::SliceBeam) { + if (!producers_enabled || m_producer == EProducer::PrusaSlicer || m_producer == EProducer::Santoku) { // height tag if (boost::starts_with(comment, reserved_tag(ETags::Height))) { if (!parse_number(comment.substr(reserved_tag(ETags::Height).size()), m_forced_height)) @@ -2011,7 +2011,7 @@ bool GCodeProcessor::process_producers_tags(const std::string_view comment) case EProducer::Slic3rPE: case EProducer::Slic3r: case EProducer::SuperSlicer: - case EProducer::SliceBeam: + case EProducer::Santoku: case EProducer::PrusaSlicer: { return process_prusaslicer_tags(comment); } case EProducer::Cura: { return process_cura_tags(comment); } case EProducer::Simplify3D: { return process_simplify3d_tags(comment); } @@ -3669,8 +3669,8 @@ void GCodeProcessor::process_T(const std::string_view command) else { unsigned char id = static_cast(eid); if (m_extruder_id != id) { - if (((m_producer == EProducer::SliceBeam || m_producer == EProducer::PrusaSlicer || m_producer == EProducer::Slic3rPE || m_producer == EProducer::Slic3r) && id >= m_result.extruders_count) || - ((m_producer != EProducer::SliceBeam && m_producer != EProducer::PrusaSlicer && m_producer != EProducer::Slic3rPE && m_producer != EProducer::Slic3r) && id >= m_result.extruder_colors.size())) + if (((m_producer == EProducer::Santoku || m_producer == EProducer::PrusaSlicer || m_producer == EProducer::Slic3rPE || m_producer == EProducer::Slic3r) && id >= m_result.extruders_count) || + ((m_producer != EProducer::Santoku && m_producer != EProducer::PrusaSlicer && m_producer != EProducer::Slic3rPE && m_producer != EProducer::Slic3r) && id >= m_result.extruder_colors.size())) BOOST_LOG_TRIVIAL(error) << "GCodeProcessor encountered an invalid toolchange, maybe from a custom gcode (" << command << ")."; else { unsigned char old_extruder_id = m_extruder_id; diff --git a/app/src/main/jni/libslic3r/GCode/GCodeProcessor.hpp b/app/src/main/jni/libslic3r/GCode/GCodeProcessor.hpp index 9343ea6..7888efb 100644 --- a/app/src/main/jni/libslic3r/GCode/GCodeProcessor.hpp +++ b/app/src/main/jni/libslic3r/GCode/GCodeProcessor.hpp @@ -544,7 +544,7 @@ namespace Slic3r { enum class EProducer { Unknown, - SliceBeam, + Santoku, PrusaSlicer, Slic3rPE, Slic3r, diff --git a/app/src/main/jni/libslic3r_version.h b/app/src/main/jni/libslic3r_version.h index af52ea5..29b28d2 100644 --- a/app/src/main/jni/libslic3r_version.h +++ b/app/src/main/jni/libslic3r_version.h @@ -1,7 +1,7 @@ #ifndef __SLIC3R_VERSION_H #define __SLIC3R_VERSION_H -#define SLIC3R_APP_NAME "Slice Beam" -#define SLIC3R_APP_KEY "SliceBeam" +#define SLIC3R_APP_NAME "Santoku" +#define SLIC3R_APP_KEY "Santoku" #endif /* __SLIC3R_VERSION_H */ diff --git a/app/src/main/jni/slicebeam/GLModel.cpp b/app/src/main/jni/santoku/GLModel.cpp similarity index 100% rename from app/src/main/jni/slicebeam/GLModel.cpp rename to app/src/main/jni/santoku/GLModel.cpp diff --git a/app/src/main/jni/slicebeam/GLModel.hpp b/app/src/main/jni/santoku/GLModel.hpp similarity index 100% rename from app/src/main/jni/slicebeam/GLModel.hpp rename to app/src/main/jni/santoku/GLModel.hpp diff --git a/app/src/main/jni/slicebeam/GLShader.cpp b/app/src/main/jni/santoku/GLShader.cpp similarity index 100% rename from app/src/main/jni/slicebeam/GLShader.cpp rename to app/src/main/jni/santoku/GLShader.cpp diff --git a/app/src/main/jni/slicebeam/GLShader.hpp b/app/src/main/jni/santoku/GLShader.hpp similarity index 98% rename from app/src/main/jni/slicebeam/GLShader.hpp rename to app/src/main/jni/santoku/GLShader.hpp index f94c30f..61b3370 100644 --- a/app/src/main/jni/slicebeam/GLShader.hpp +++ b/app/src/main/jni/santoku/GLShader.hpp @@ -5,8 +5,8 @@ ///|/ ///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher ///|/ -#ifndef SLICEBEAM_GUI_GLSHADER_HPP -#define SLICEBEAM_GUI_GLSHADER_HPP +#ifndef SANTOKU_GUI_GLSHADER_HPP +#define SANTOKU_GUI_GLSHADER_HPP #include #include @@ -107,4 +107,4 @@ public: } // namespace Slic3r -#endif /* SLICEBEAM_GUI_GLSHADER_HPP */ +#endif /* SANTOKU_GUI_GLSHADER_HPP */ diff --git a/app/src/main/jni/slicebeam/beam_native.cpp b/app/src/main/jni/santoku/beam_native.cpp similarity index 82% rename from app/src/main/jni/slicebeam/beam_native.cpp rename to app/src/main/jni/santoku/beam_native.cpp index d4b99fa..244c05f 100644 --- a/app/src/main/jni/slicebeam/beam_native.cpp +++ b/app/src/main/jni/santoku/beam_native.cpp @@ -103,33 +103,33 @@ extern "C" { staticVM = vm; - sliceListenerClass = env->FindClass("ru/ytkab0bp/slicebeam/slic3r/SliceListener"); + sliceListenerClass = env->FindClass("com/dark98/santoku/slic3r/SliceListener"); sliceListenerOnProgress = env->GetMethodID(sliceListenerClass, "onProgress", "(ILjava/lang/String;)V"); - shadersManagerClass = static_cast(env->NewGlobalRef(env->FindClass("ru/ytkab0bp/slicebeam/slic3r/GLShadersManager"))); + shadersManagerClass = static_cast(env->NewGlobalRef(env->FindClass("com/dark98/santoku/slic3r/GLShadersManager"))); shadersManagerGetCurrent = env->GetStaticMethodID(shadersManagerClass, "getCurrentShaderPointer", "()J"); return JNI_VERSION_1_6; } - JNIEXPORT void JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_set_1svg_1path_1prefix(JNIEnv *env, jclass, jstring path) { + JNIEXPORT void JNICALL Java_com_dark98_santoku_slic3r_Native_set_1svg_1path_1prefix(JNIEnv *env, jclass, jstring path) { const char* chars = env->GetStringUTFChars(path, JNI_FALSE); Slic3r::svg_path_prefix = std::string(chars); env->ReleaseStringUTFChars(path, chars); } - JNIEXPORT void JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_get_1print_1config_1def(JNIEnv *env, jclass, jobject def) { - jclass printConfigDefClass = env->FindClass("ru/ytkab0bp/slicebeam/slic3r/PrintConfigDef"); - jmethodID printConfigAddOption = env->GetMethodID(printConfigDefClass, "addOption", "(Ljava/lang/String;Lru/ytkab0bp/slicebeam/slic3r/ConfigOptionDef;)V"); + JNIEXPORT void JNICALL Java_com_dark98_santoku_slic3r_Native_get_1print_1config_1def(JNIEnv *env, jclass, jobject def) { + jclass printConfigDefClass = env->FindClass("com/dark98/santoku/slic3r/PrintConfigDef"); + jmethodID printConfigAddOption = env->GetMethodID(printConfigDefClass, "addOption", "(Ljava/lang/String;Lcom/dark98/santoku/slic3r/ConfigOptionDef;)V"); jmethodID printConfigResolveEnum = env->GetStaticMethodID(printConfigDefClass, "resolveEnum", "(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/Object;"); - jclass configOptionDefClass = env->FindClass("ru/ytkab0bp/slicebeam/slic3r/ConfigOptionDef"); + jclass configOptionDefClass = env->FindClass("com/dark98/santoku/slic3r/ConfigOptionDef"); jmethodID configOptionDefCtr = env->GetMethodID(configOptionDefClass, "", "()V"); jfieldID keyField = env->GetFieldID(configOptionDefClass, "key", "Ljava/lang/String;"); - jfieldID typeField = env->GetFieldID(configOptionDefClass, "type", "Lru/ytkab0bp/slicebeam/slic3r/ConfigOptionDef$ConfigOptionType;"); - jfieldID guiTypeField = env->GetFieldID(configOptionDefClass, "guiType", "Lru/ytkab0bp/slicebeam/slic3r/ConfigOptionDef$GUIType;"); + jfieldID typeField = env->GetFieldID(configOptionDefClass, "type", "Lcom/dark98/santoku/slic3r/ConfigOptionDef$ConfigOptionType;"); + jfieldID guiTypeField = env->GetFieldID(configOptionDefClass, "guiType", "Lcom/dark98/santoku/slic3r/ConfigOptionDef$GUIType;"); jfieldID labelField = env->GetFieldID(configOptionDefClass, "label", "Ljava/lang/String;"); jfieldID fullLabelField = env->GetFieldID(configOptionDefClass, "fullLabel", "Ljava/lang/String;"); - jfieldID printerTechField = env->GetFieldID(configOptionDefClass, "printerTechnology", "Lru/ytkab0bp/slicebeam/slic3r/ConfigOptionDef$PrinterTechnology;"); + jfieldID printerTechField = env->GetFieldID(configOptionDefClass, "printerTechnology", "Lcom/dark98/santoku/slic3r/ConfigOptionDef$PrinterTechnology;"); jfieldID categoryField = env->GetFieldID(configOptionDefClass, "category", "Ljava/lang/String;"); jfieldID tooltipField = env->GetFieldID(configOptionDefClass, "tooltip", "Ljava/lang/String;"); jfieldID sidetextField = env->GetFieldID(configOptionDefClass, "sidetext", "Ljava/lang/String;"); @@ -140,7 +140,7 @@ extern "C" { jfieldID widthField = env->GetFieldID(configOptionDefClass, "width", "I"); jfieldID minField = env->GetFieldID(configOptionDefClass, "min", "F"); jfieldID maxField = env->GetFieldID(configOptionDefClass, "max", "F"); - jfieldID modeField = env->GetFieldID(configOptionDefClass, "mode", "Lru/ytkab0bp/slicebeam/slic3r/ConfigOptionDef$ConfigOptionMode;"); + jfieldID modeField = env->GetFieldID(configOptionDefClass, "mode", "Lcom/dark98/santoku/slic3r/ConfigOptionDef$ConfigOptionMode;"); jfieldID defaultValueField = env->GetFieldID(configOptionDefClass, "defaultValue", "Ljava/lang/String;"); jfieldID enumLabelsField = env->GetFieldID(configOptionDefClass, "enumLabels", "[Ljava/lang/String;"); jfieldID enumValuesField = env->GetFieldID(configOptionDefClass, "enumValues", "[Ljava/lang/String;"); @@ -291,15 +291,15 @@ extern "C" { } jobject keyValue = env->NewStringUTF(key.c_str()); - jobject typeValue = resolveEnum((char*) "ru/ytkab0bp/slicebeam/slic3r/ConfigOptionDef$ConfigOptionType", (char*) typeStr); - jobject guiTypeValue = resolveEnum((char*) "ru/ytkab0bp/slicebeam/slic3r/ConfigOptionDef$GUIType", (char*) guiTypeStr); + jobject typeValue = resolveEnum((char*) "com/dark98/santoku/slic3r/ConfigOptionDef$ConfigOptionType", (char*) typeStr); + jobject guiTypeValue = resolveEnum((char*) "com/dark98/santoku/slic3r/ConfigOptionDef$GUIType", (char*) guiTypeStr); jobject labelValue = env->NewStringUTF(nCfgDef->label.c_str()); jobject fullLabelValue = env->NewStringUTF(nCfgDef->full_label.c_str()); - jobject printerTechValue = resolveEnum((char*) "ru/ytkab0bp/slicebeam/slic3r/ConfigOptionDef$PrinterTechnology", (char*) techStr); + jobject printerTechValue = resolveEnum((char*) "com/dark98/santoku/slic3r/ConfigOptionDef$PrinterTechnology", (char*) techStr); jobject categoryValue = env->NewStringUTF(nCfgDef->category.c_str()); jobject tooltipValue = env->NewStringUTF(nCfgDef->tooltip.c_str()); jobject sidetextValue = env->NewStringUTF(nCfgDef->sidetext.c_str()); - jobject modeValue = resolveEnum((char*) "ru/ytkab0bp/slicebeam/slic3r/ConfigOptionDef$ConfigOptionMode", (char*) modeStr); + jobject modeValue = resolveEnum((char*) "com/dark98/santoku/slic3r/ConfigOptionDef$ConfigOptionMode", (char*) modeStr); env->SetObjectField(cfgDef, keyField, keyValue); env->SetObjectField(cfgDef, typeField, typeValue); @@ -365,7 +365,7 @@ extern "C" { } } - JNIEXPORT jlong JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_model_1read_1from_1file(JNIEnv *env, jclass, jstring path, jstring base_name) { + JNIEXPORT jlong JNICALL Java_com_dark98_santoku_slic3r_Native_model_1read_1from_1file(JNIEnv *env, jclass, jstring path, jstring base_name) { const char* chars = env->GetStringUTFChars(path, JNI_FALSE); const char* baseChars = env->GetStringUTFChars(base_name, JNI_FALSE); @@ -375,7 +375,7 @@ extern "C" { ref->model = Model::read_from_file(std::string(chars), nullptr, nullptr, Model::LoadAttribute::AddDefaultInstances); ref->base_name = std::string(baseChars); } catch (const Slic3r::RuntimeError& e) { - env->ThrowNew(env->FindClass("ru/ytkab0bp/slicebeam/slic3r/Slic3rRuntimeError"), e.what()); + env->ThrowNew(env->FindClass("com/dark98/santoku/slic3r/Slic3rRuntimeError"), e.what()); return 0; } catch (const std::exception& e) { env->ThrowNew(env->FindClass("java/lang/RuntimeException"), e.what()); @@ -388,12 +388,12 @@ extern "C" { return (jlong) (intptr_t) ref; } - JNIEXPORT jlong JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_model_1create(JNIEnv *env, jclass) { + JNIEXPORT jlong JNICALL Java_com_dark98_santoku_slic3r_Native_model_1create(JNIEnv *env, jclass) { ModelRef* ref = new ModelRef(); return (jlong) (intptr_t) ref; } - JNIEXPORT jlong JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_models_1merge(JNIEnv* env, jclass, jlongArray ptrsArr) { + JNIEXPORT jlong JNICALL Java_com_dark98_santoku_slic3r_Native_models_1merge(JNIEnv* env, jclass, jlongArray ptrsArr) { ModelRef* ref = new ModelRef(); jlong* ptrs = env->GetLongArrayElements(ptrsArr, JNI_FALSE); @@ -407,23 +407,23 @@ extern "C" { return (jlong) (intptr_t) ref; } - JNIEXPORT jint JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_model_1get_1objects_1count(JNIEnv* env, jclass, jlong ptr) { + JNIEXPORT jint JNICALL Java_com_dark98_santoku_slic3r_Native_model_1get_1objects_1count(JNIEnv* env, jclass, jlong ptr) { ModelRef* model = (ModelRef *) (intptr_t) ptr; return model->model.objects.size(); } - JNIEXPORT void JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_model_1add_1object_1from_1another(JNIEnv* env, jclass, jlong ptr, jlong fromPtr, jint i) { + JNIEXPORT void JNICALL Java_com_dark98_santoku_slic3r_Native_model_1add_1object_1from_1another(JNIEnv* env, jclass, jlong ptr, jlong fromPtr, jint i) { ModelRef* model = (ModelRef *) (intptr_t) ptr; ModelRef* from = (ModelRef *) (intptr_t) fromPtr; model->model.add_object(*from->model.objects[i]); } - JNIEXPORT void JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_model_1delete_1object(JNIEnv* env, jclass, jlong ptr, jint i) { + JNIEXPORT void JNICALL Java_com_dark98_santoku_slic3r_Native_model_1delete_1object(JNIEnv* env, jclass, jlong ptr, jint i) { ModelRef* model = (ModelRef *) (intptr_t) ptr; model->model.delete_object(i); } - JNIEXPORT jdoubleArray JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_model_1get_1rotation(JNIEnv* env, jclass, jlong ptr, jint object_index) { + JNIEXPORT jdoubleArray JNICALL Java_com_dark98_santoku_slic3r_Native_model_1get_1rotation(JNIEnv* env, jclass, jlong ptr, jint object_index) { ModelRef* model = (ModelRef *) (intptr_t) ptr; ModelObject* obj = model->model.objects[object_index]; jdoubleArray arr = env->NewDoubleArray(3); @@ -431,7 +431,7 @@ extern "C" { return arr; } - JNIEXPORT jdoubleArray JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_model_1get_1mirror(JNIEnv* env, jclass, jlong ptr, jint object_index) { + JNIEXPORT jdoubleArray JNICALL Java_com_dark98_santoku_slic3r_Native_model_1get_1mirror(JNIEnv* env, jclass, jlong ptr, jint object_index) { ModelRef* model = (ModelRef *) (intptr_t) ptr; ModelObject* obj = model->model.objects[object_index]; jdoubleArray arr = env->NewDoubleArray(3); @@ -439,7 +439,7 @@ extern "C" { return arr; } - JNIEXPORT jdoubleArray JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_model_1get_1scale(JNIEnv* env, jclass, jlong ptr, jint object_index) { + JNIEXPORT jdoubleArray JNICALL Java_com_dark98_santoku_slic3r_Native_model_1get_1scale(JNIEnv* env, jclass, jlong ptr, jint object_index) { ModelRef* model = (ModelRef *) (intptr_t) ptr; ModelObject* obj = model->model.objects[object_index]; jdoubleArray arr = env->NewDoubleArray(3); @@ -447,7 +447,7 @@ extern "C" { return arr; } - JNIEXPORT jdoubleArray JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_model_1get_1translation(JNIEnv* env, jclass, jlong ptr, jint object_index) { + JNIEXPORT jdoubleArray JNICALL Java_com_dark98_santoku_slic3r_Native_model_1get_1translation(JNIEnv* env, jclass, jlong ptr, jint object_index) { ModelRef* model = (ModelRef *) (intptr_t) ptr; ModelObject* obj = model->model.objects[object_index]; Vec3d offset = obj->bounding_box_exact().center(); @@ -456,17 +456,17 @@ extern "C" { return arr; } - JNIEXPORT void JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_model_1translate(JNIEnv* env, jclass, jlong ptr, jint i, jdouble x, jdouble y, jdouble z) { + JNIEXPORT void JNICALL Java_com_dark98_santoku_slic3r_Native_model_1translate(JNIEnv* env, jclass, jlong ptr, jint i, jdouble x, jdouble y, jdouble z) { ModelRef* model = (ModelRef *) (intptr_t) ptr; model->model.objects[i]->translate(x, y, z); } - JNIEXPORT void JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_model_1ensure_1on_1bed(JNIEnv* env, jclass, jlong ptr, jint i) { + JNIEXPORT void JNICALL Java_com_dark98_santoku_slic3r_Native_model_1ensure_1on_1bed(JNIEnv* env, jclass, jlong ptr, jint i) { ModelRef* model = (ModelRef *) (intptr_t) ptr; model->model.objects[i]->ensure_on_bed(false); } - JNIEXPORT void JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_model_1scale(JNIEnv* env, jclass, jlong ptr, jint i, jdouble x, jdouble y, jdouble z) { + JNIEXPORT void JNICALL Java_com_dark98_santoku_slic3r_Native_model_1scale(JNIEnv* env, jclass, jlong ptr, jint i, jdouble x, jdouble y, jdouble z) { ModelRef* model = (ModelRef *) (intptr_t) ptr; Vec3d factor(x, y, z); ModelVolumePtrs ptrs = model->model.objects[i]->volumes; @@ -476,12 +476,12 @@ extern "C" { model->model.objects[i]->invalidate_bounding_box(); } - JNIEXPORT jboolean JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_model_1is_1left_1handed(JNIEnv* env, jclass, jlong ptr, jint i) { + JNIEXPORT jboolean JNICALL Java_com_dark98_santoku_slic3r_Native_model_1is_1left_1handed(JNIEnv* env, jclass, jlong ptr, jint i) { ModelRef* model = (ModelRef *) (intptr_t) ptr; return model->model.objects[i]->volumes[0]->is_left_handed(); } - JNIEXPORT void JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_model_1rotate(JNIEnv* env, jclass, jlong ptr, jint i, jdouble x, jdouble y, jdouble z) { + JNIEXPORT void JNICALL Java_com_dark98_santoku_slic3r_Native_model_1rotate(JNIEnv* env, jclass, jlong ptr, jint i, jdouble x, jdouble y, jdouble z) { ModelRef* model = (ModelRef *) (intptr_t) ptr; Vec3d vec(x, y, z); ModelVolumePtrs ptrs = model->model.objects[i]->volumes; @@ -505,7 +505,7 @@ extern "C" { model->model.objects[i]->invalidate_bounding_box(); } - JNIEXPORT void JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_model_1flatten_1rotate(JNIEnv* env, jclass, jlong ptr, jint i, jlong surface_ptr) { + JNIEXPORT void JNICALL Java_com_dark98_santoku_slic3r_Native_model_1flatten_1rotate(JNIEnv* env, jclass, jlong ptr, jint i, jlong surface_ptr) { ModelRef* model = (ModelRef *) (intptr_t) ptr; GLModelRef* surface = (GLModelRef*) (intptr_t) surface_ptr; @@ -521,12 +521,12 @@ extern "C" { model->model.objects[i]->invalidate_bounding_box(); } - JNIEXPORT void JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_model_1translate_1global(JNIEnv* env, jclass, jlong ptr, jdouble x, jdouble y, jdouble z) { + JNIEXPORT void JNICALL Java_com_dark98_santoku_slic3r_Native_model_1translate_1global(JNIEnv* env, jclass, jlong ptr, jdouble x, jdouble y, jdouble z) { ModelRef* model = (ModelRef *) (intptr_t) ptr; model->model.translate(x, y, z); } - JNIEXPORT jdoubleArray JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_model_1get_1bounding_1box_1approx(JNIEnv* env, jclass, jlong ptr, jint i) { + JNIEXPORT jdoubleArray JNICALL Java_com_dark98_santoku_slic3r_Native_model_1get_1bounding_1box_1approx(JNIEnv* env, jclass, jlong ptr, jint i) { ModelRef* ref = (ModelRef*) (intptr_t) ptr; jdoubleArray arr = env->NewDoubleArray(6); jdouble* elements = new jdouble[6]; @@ -540,7 +540,7 @@ extern "C" { return arr; } - JNIEXPORT jdoubleArray JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_model_1get_1bounding_1box_1exact(JNIEnv* env, jclass, jlong ptr, jint i) { + JNIEXPORT jdoubleArray JNICALL Java_com_dark98_santoku_slic3r_Native_model_1get_1bounding_1box_1exact(JNIEnv* env, jclass, jlong ptr, jint i) { ModelRef* ref = (ModelRef*) (intptr_t) ptr; jdoubleArray arr = env->NewDoubleArray(6); jdouble* elements = new jdouble[6]; @@ -554,7 +554,7 @@ extern "C" { return arr; } - JNIEXPORT jdoubleArray JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_model_1get_1bounding_1box_1approx_1global(JNIEnv* env, jclass, jlong ptr) { + JNIEXPORT jdoubleArray JNICALL Java_com_dark98_santoku_slic3r_Native_model_1get_1bounding_1box_1approx_1global(JNIEnv* env, jclass, jlong ptr) { ModelRef* ref = (ModelRef*) (intptr_t) ptr; jdoubleArray arr = env->NewDoubleArray(6); jdouble* elements = new jdouble[6]; @@ -568,7 +568,7 @@ extern "C" { return arr; } - JNIEXPORT jdoubleArray JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_model_1get_1bounding_1box_1exact_1global(JNIEnv* env, jclass, jlong ptr) { + JNIEXPORT jdoubleArray JNICALL Java_com_dark98_santoku_slic3r_Native_model_1get_1bounding_1box_1exact_1global(JNIEnv* env, jclass, jlong ptr) { ModelRef* ref = (ModelRef*) (intptr_t) ptr; jdoubleArray arr = env->NewDoubleArray(6); jdouble* elements = new jdouble[6]; @@ -582,7 +582,7 @@ extern "C" { return arr; } - JNIEXPORT jlongArray JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_model_1create_1flatten_1planes(JNIEnv* env, jclass, jlong ptr, jint i) { + JNIEXPORT jlongArray JNICALL Java_com_dark98_santoku_slic3r_Native_model_1create_1flatten_1planes(JNIEnv* env, jclass, jlong ptr, jint i) { ModelRef* ref = (ModelRef*) (intptr_t) ptr; const ModelObject* mo = ref->model.objects[i]; TriangleMesh ch; @@ -813,31 +813,31 @@ extern "C" { return arr; } - JNIEXPORT void JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_model_1auto_1orient(JNIEnv* env, jclass, jlong ptr, jint i) { + JNIEXPORT void JNICALL Java_com_dark98_santoku_slic3r_Native_model_1auto_1orient(JNIEnv* env, jclass, jlong ptr, jint i) { ModelRef* model = (ModelRef*) (intptr_t) ptr; ModelObject* obj = model->model.objects[i]; orientation::orient(obj); } - JNIEXPORT jboolean JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_model_1is_1big_1object(JNIEnv* env, jclass, jlong ptr, jint i) { + JNIEXPORT jboolean JNICALL Java_com_dark98_santoku_slic3r_Native_model_1is_1big_1object(JNIEnv* env, jclass, jlong ptr, jint i) { ModelRef* model = (ModelRef*) (intptr_t) ptr; ModelObject* obj = model->model.objects[i]; return obj->volumes.size() == 1 && obj->volumes.front()->mesh().its.indices.size() >= 500000; } - JNIEXPORT jint JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_model_1get_1extruder(JNIEnv* env, jclass, jlong ptr, jint i) { + JNIEXPORT jint JNICALL Java_com_dark98_santoku_slic3r_Native_model_1get_1extruder(JNIEnv* env, jclass, jlong ptr, jint i) { ModelRef* model = (ModelRef*) (intptr_t) ptr; ModelObject* obj = model->model.objects[i]; return obj->config.has("extruder") ? obj->config.opt_int("extruder") : -1; } - JNIEXPORT void JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_model_1set_1extruder(JNIEnv* env, jclass, jlong ptr, jint i, jint extruder) { + JNIEXPORT void JNICALL Java_com_dark98_santoku_slic3r_Native_model_1set_1extruder(JNIEnv* env, jclass, jlong ptr, jint i, jint extruder) { ModelRef* model = (ModelRef*) (intptr_t) ptr; ModelObject* obj = model->model.objects[i]; obj->config.set("extruder", extruder); } - JNIEXPORT jlong JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_model_1slice(JNIEnv* env, jclass, jlong ptr, jstring configPath, jstring path, jobject listener) { + JNIEXPORT jlong JNICALL Java_com_dark98_santoku_slic3r_Native_model_1slice(JNIEnv* env, jclass, jlong ptr, jstring configPath, jstring path, jobject listener) { try { ModelRef* model = (ModelRef*) (intptr_t) ptr; @@ -854,14 +854,14 @@ extern "C" { std::string err = config.validate(); if (!err.empty()) { - env->ThrowNew(env->FindClass("ru/ytkab0bp/slicebeam/slic3r/Slic3rRuntimeError"), err.c_str()); + env->ThrowNew(env->FindClass("com/dark98/santoku/slic3r/Slic3rRuntimeError"), err.c_str()); return 0; } print.apply(model->model, config); err = print.validate(); if (!err.empty()) { - env->ThrowNew(env->FindClass("ru/ytkab0bp/slicebeam/slic3r/Slic3rRuntimeError"), err.c_str()); + env->ThrowNew(env->FindClass("com/dark98/santoku/slic3r/Slic3rRuntimeError"), err.c_str()); return 0; } @@ -897,12 +897,12 @@ extern "C" { return (jlong) (intptr_t) resultRef; } catch (const std::exception& e) { - env->ThrowNew(env->FindClass("ru/ytkab0bp/slicebeam/slic3r/Slic3rRuntimeError"), e.what()); + env->ThrowNew(env->FindClass("com/dark98/santoku/slic3r/Slic3rRuntimeError"), e.what()); return 0; } } - JNIEXPORT void JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_model_1export_13mf(JNIEnv* env, jclass, jlong ptr, jstring configPath, jstring path) { + JNIEXPORT void JNICALL Java_com_dark98_santoku_slic3r_Native_model_1export_13mf(JNIEnv* env, jclass, jlong ptr, jstring configPath, jstring path) { auto model = reinterpret_cast(ptr); try { @@ -916,16 +916,16 @@ extern "C" { Slic3r::store_3mf(pathChars, &model->model, &config, false, nullptr, false); env->ReleaseStringUTFChars(path, pathChars); } catch (const std::exception& e) { - env->ThrowNew(env->FindClass("ru/ytkab0bp/slicebeam/slic3r/Slic3rRuntimeError"), e.what()); + env->ThrowNew(env->FindClass("com/dark98/santoku/slic3r/Slic3rRuntimeError"), e.what()); } } - JNIEXPORT void JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_model_1release(JNIEnv* env, jclass, jlong ptr) { + JNIEXPORT void JNICALL Java_com_dark98_santoku_slic3r_Native_model_1release(JNIEnv* env, jclass, jlong ptr) { ModelRef* model = (ModelRef*) (intptr_t) ptr; delete model; } - JNIEXPORT jlong JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_gcoderesult_1load_1file(JNIEnv* env, jclass, jstring path, jstring name) { + JNIEXPORT jlong JNICALL Java_com_dark98_santoku_slic3r_Native_gcoderesult_1load_1file(JNIEnv* env, jclass, jstring path, jstring name) { GCodeResultRef* ref = new GCodeResultRef(); GCodeProcessor processor; @@ -949,7 +949,7 @@ extern "C" { } } - JNIEXPORT jstring JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_gcoderesult_1get_1recommended_1name(JNIEnv* env, jclass, jlong ptr) { + JNIEXPORT jstring JNICALL Java_com_dark98_santoku_slic3r_Native_gcoderesult_1get_1recommended_1name(JNIEnv* env, jclass, jlong ptr) { GCodeResultRef* ref = (GCodeResultRef*) (intptr_t) ptr; return env->NewStringUTF(ref->name.c_str()); } @@ -1007,26 +1007,26 @@ extern "C" { return gRole; } - JNIEXPORT jdouble JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_gcoderesult_1get_1used_1filament_1mm(JNIEnv* env, jclass, jlong ptr, jint role) { + JNIEXPORT jdouble JNICALL Java_com_dark98_santoku_slic3r_Native_gcoderesult_1get_1used_1filament_1mm(JNIEnv* env, jclass, jlong ptr, jint role) { GCodeResultRef* ref = (GCodeResultRef*) (intptr_t) ptr; std::pair info = ref->result.print_statistics.used_filaments_per_role.find(mapGCodeRole(role))->second; return info.first * 1000.0 / 25.4; } - JNIEXPORT jdouble JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_gcoderesult_1get_1used_1filament_1g(JNIEnv* env, jclass, jlong ptr, jint role) { + JNIEXPORT jdouble JNICALL Java_com_dark98_santoku_slic3r_Native_gcoderesult_1get_1used_1filament_1g(JNIEnv* env, jclass, jlong ptr, jint role) { GCodeResultRef* ref = (GCodeResultRef*) (intptr_t) ptr; std::pair info = ref->result.print_statistics.used_filaments_per_role.find(mapGCodeRole(role))->second; return info.second; } - JNIEXPORT void JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_gcoderesult_1release(JNIEnv* env, jclass, jlong ptr) { + JNIEXPORT void JNICALL Java_com_dark98_santoku_slic3r_Native_gcoderesult_1release(JNIEnv* env, jclass, jlong ptr) { GCodeResultRef* ref = (GCodeResultRef*) (intptr_t) ptr; delete ref; } - JNIEXPORT jlong JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_shader_1init_1from_1texts(JNIEnv* env, jclass, jstring name, jstring fsText, jstring vsText) { + JNIEXPORT jlong JNICALL Java_com_dark98_santoku_slic3r_Native_shader_1init_1from_1texts(JNIEnv* env, jclass, jstring name, jstring fsText, jstring vsText) { const char* nameChars = env->GetStringUTFChars(name, JNI_FALSE); const char* fsChars = env->GetStringUTFChars(fsText, JNI_FALSE); const char* vsChars = env->GetStringUTFChars(vsText, JNI_FALSE); @@ -1043,18 +1043,18 @@ extern "C" { return (jlong) (intptr_t) ref; } - JNIEXPORT jlong JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_glmodel_1create(JNIEnv* env, jclass) { + JNIEXPORT jlong JNICALL Java_com_dark98_santoku_slic3r_Native_glmodel_1create(JNIEnv* env, jclass) { GLModelRef* ref = new GLModelRef(); return (jlong) (intptr_t) ref; } - JNIEXPORT void JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_glmodel_1init_1raycast_1data(JNIEnv* env, jclass, jlong ptr) { + JNIEXPORT void JNICALL Java_com_dark98_santoku_slic3r_Native_glmodel_1init_1raycast_1data(JNIEnv* env, jclass, jlong ptr) { GLModelRef* ref = (GLModelRef*) (intptr_t) ptr; ref->emesh = new AABBMesh(ref->mesh, true); ref->normals = its_face_normals(ref->mesh.its); } - JNIEXPORT jdoubleArray JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_glmodel_1raycast_1closest_1hit(JNIEnv* env, jclass, jlong ptr, jdoubleArray pointArr, jdoubleArray directionArr) { + JNIEXPORT jdoubleArray JNICALL Java_com_dark98_santoku_slic3r_Native_glmodel_1raycast_1closest_1hit(JNIEnv* env, jclass, jlong ptr, jdoubleArray pointArr, jdoubleArray directionArr) { GLModelRef* ref = (GLModelRef*) (intptr_t) ptr; jdouble* point = env->GetDoubleArrayElements(pointArr, JNI_FALSE); jdouble* direction = env->GetDoubleArrayElements(directionArr, JNI_FALSE); @@ -1078,31 +1078,31 @@ extern "C" { return arr; } - JNIEXPORT void JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_glmodel_1init_1from_1model(JNIEnv* env, jclass, jlong ptr, jlong model) { + JNIEXPORT void JNICALL Java_com_dark98_santoku_slic3r_Native_glmodel_1init_1from_1model(JNIEnv* env, jclass, jlong ptr, jlong model) { GLModelRef* ref = (GLModelRef*) (intptr_t) ptr; ModelRef* mRef = (ModelRef*) (intptr_t) model; ref->mesh = mRef->model.mesh(); ref->model.init_from(ref->mesh.its); } - JNIEXPORT void JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_glmodel_1init_1from_1model_1object(JNIEnv* env, jclass, jlong ptr, jlong model, jint i) { + JNIEXPORT void JNICALL Java_com_dark98_santoku_slic3r_Native_glmodel_1init_1from_1model_1object(JNIEnv* env, jclass, jlong ptr, jlong model, jint i) { GLModelRef* ref = (GLModelRef*) (intptr_t) ptr; ModelRef* mRef = (ModelRef*) (intptr_t) model; ref->mesh = mRef->model.objects[i]->mesh(); ref->model.init_from(ref->mesh.its); } - JNIEXPORT void JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_glmodel_1set_1color(JNIEnv* env, jclass, jlong ptr, jfloat red, jfloat green, jfloat blue, jfloat alpha) { + JNIEXPORT void JNICALL Java_com_dark98_santoku_slic3r_Native_glmodel_1set_1color(JNIEnv* env, jclass, jlong ptr, jfloat red, jfloat green, jfloat blue, jfloat alpha) { GLModelRef* ref = (GLModelRef*) (intptr_t) ptr; ref->model.set_color(ColorRGBA(red, green, blue, alpha)); } - JNIEXPORT void JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_glmodel_1stilized_1arrow(JNIEnv* env, jclass, jlong ptr, jfloat tip_radius, jfloat tip_length, jfloat stem_radius, jfloat stem_length) { + JNIEXPORT void JNICALL Java_com_dark98_santoku_slic3r_Native_glmodel_1stilized_1arrow(JNIEnv* env, jclass, jlong ptr, jfloat tip_radius, jfloat tip_length, jfloat stem_radius, jfloat stem_length) { GLModelRef* ref = (GLModelRef*) (intptr_t) ptr; ref->model.init_from(stilized_arrow(16, tip_radius, tip_length, stem_radius, stem_length)); } - JNIEXPORT void JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_glmodel_1init_1background_1triangles(JNIEnv* env, jclass, jlong ptr) { + JNIEXPORT void JNICALL Java_com_dark98_santoku_slic3r_Native_glmodel_1init_1background_1triangles(JNIEnv* env, jclass, jlong ptr) { GLModelRef* ref = (GLModelRef*) (intptr_t) ptr; ref->model.reset(); @@ -1124,7 +1124,7 @@ extern "C" { ref->model.init_from(std::move(init_data)); } - JNIEXPORT void JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_glmodel_1init_1bounding_1box(JNIEnv* env, jclass, jlong ptr, jlong modelPtr, jint i) { + JNIEXPORT void JNICALL Java_com_dark98_santoku_slic3r_Native_glmodel_1init_1bounding_1box(JNIEnv* env, jclass, jlong ptr, jlong modelPtr, jint i) { GLModelRef* ref = (GLModelRef*) (intptr_t) ptr; ModelRef* modelRef = (ModelRef*) (intptr_t) modelPtr; @@ -1208,12 +1208,12 @@ extern "C" { } } - JNIEXPORT void JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_glmodel_1render(JNIEnv* env, jclass, jlong ptr) { + JNIEXPORT void JNICALL Java_com_dark98_santoku_slic3r_Native_glmodel_1render(JNIEnv* env, jclass, jlong ptr) { GLModelRef* ref = (GLModelRef*) (intptr_t) ptr; ref->model.render(); } - JNIEXPORT void JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_glmodel_1reset(JNIEnv* env, jclass, jlong ptr) { + JNIEXPORT void JNICALL Java_com_dark98_santoku_slic3r_Native_glmodel_1reset(JNIEnv* env, jclass, jlong ptr) { GLModelRef* ref = (GLModelRef*) (intptr_t) ptr; ref->model.reset(); ref->mesh.clear(); @@ -1221,28 +1221,28 @@ extern "C" { ref->normals.clear(); } - JNIEXPORT jboolean JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_glmodel_1is_1initialized(JNIEnv* env, jclass, jlong ptr) { + JNIEXPORT jboolean JNICALL Java_com_dark98_santoku_slic3r_Native_glmodel_1is_1initialized(JNIEnv* env, jclass, jlong ptr) { GLModelRef* ref = (GLModelRef*) (intptr_t) ptr; return ref->model.is_initialized(); } - JNIEXPORT jboolean JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_glmodel_1is_1empty(JNIEnv* env, jclass, jlong ptr) { + JNIEXPORT jboolean JNICALL Java_com_dark98_santoku_slic3r_Native_glmodel_1is_1empty(JNIEnv* env, jclass, jlong ptr) { GLModelRef* ref = (GLModelRef*) (intptr_t) ptr; return ref->model.is_empty(); } - JNIEXPORT void JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_glmodel_1release(JNIEnv* env, jclass, jlong ptr) { + JNIEXPORT void JNICALL Java_com_dark98_santoku_slic3r_Native_glmodel_1release(JNIEnv* env, jclass, jlong ptr) { GLModelRef* ref = (GLModelRef*) (intptr_t) ptr; ref->model.reset(); delete ref; } - JNIEXPORT jint JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_shader_1get_1id(JNIEnv* env, jclass, jlong ptr) { + JNIEXPORT jint JNICALL Java_com_dark98_santoku_slic3r_Native_shader_1get_1id(JNIEnv* env, jclass, jlong ptr) { ShaderRef* shader = (ShaderRef*) (intptr_t) ptr; return shader->program.get_id(); } - JNIEXPORT jint JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_shader_1get_1uniform_1location(JNIEnv* env, jclass, jlong ptr, jstring name) { + JNIEXPORT jint JNICALL Java_com_dark98_santoku_slic3r_Native_shader_1get_1uniform_1location(JNIEnv* env, jclass, jlong ptr, jstring name) { const char* chars = env->GetStringUTFChars(name, JNI_FALSE); ShaderRef* shader = (ShaderRef*) (intptr_t) ptr; if (shader) { @@ -1253,7 +1253,7 @@ extern "C" { return 0; } - JNIEXPORT jint JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_shader_1get_1attrib_1location(JNIEnv* env, jclass, jlong ptr, jstring name) { + JNIEXPORT jint JNICALL Java_com_dark98_santoku_slic3r_Native_shader_1get_1attrib_1location(JNIEnv* env, jclass, jlong ptr, jstring name) { const char *chars = env->GetStringUTFChars(name, JNI_FALSE); ShaderRef *shader = (ShaderRef *) (intptr_t) ptr; if (shader) { @@ -1264,22 +1264,22 @@ extern "C" { return 0; } - JNIEXPORT void JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_shader_1start_1using(JNIEnv* env, jclass, jlong ptr) { + JNIEXPORT void JNICALL Java_com_dark98_santoku_slic3r_Native_shader_1start_1using(JNIEnv* env, jclass, jlong ptr) { ShaderRef* shader = (ShaderRef*) (intptr_t) ptr; shader->program.start_using(); } - JNIEXPORT void JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_shader_1stop_1using(JNIEnv* env, jclass, jlong ptr) { + JNIEXPORT void JNICALL Java_com_dark98_santoku_slic3r_Native_shader_1stop_1using(JNIEnv* env, jclass, jlong ptr) { ShaderRef* shader = (ShaderRef*) (intptr_t) ptr; shader->program.stop_using(); } - JNIEXPORT void JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_shader_1release(JNIEnv* env, jclass, jlong ptr) { + JNIEXPORT void JNICALL Java_com_dark98_santoku_slic3r_Native_shader_1release(JNIEnv* env, jclass, jlong ptr) { ShaderRef* shader = (ShaderRef*) (intptr_t) ptr; delete shader; } - JNIEXPORT void JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_utils_1calc_1view_1normal_1matrix(JNIEnv* env, jclass, jdoubleArray view_matrix, jdoubleArray world_matrix, jdoubleArray normal_matrix) { + JNIEXPORT void JNICALL Java_com_dark98_santoku_slic3r_Native_utils_1calc_1view_1normal_1matrix(JNIEnv* env, jclass, jdoubleArray view_matrix, jdoubleArray world_matrix, jdoubleArray normal_matrix) { jdouble* viewMatrix = env->GetDoubleArrayElements(view_matrix, JNI_FALSE); jdouble* worldMatrix = env->GetDoubleArrayElements(world_matrix, JNI_FALSE); @@ -1293,7 +1293,7 @@ extern "C" { env->ReleaseDoubleArrayElements(world_matrix, worldMatrix, JNI_ABORT); } - JNIEXPORT jlong JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_utils_1config_1create(JNIEnv* env, jclass, jstring config) { + JNIEXPORT jlong JNICALL Java_com_dark98_santoku_slic3r_Native_utils_1config_1create(JNIEnv* env, jclass, jstring config) { ConfigRef* ref = new ConfigRef(); const char* config_ini = env->GetStringUTFChars(config, JNI_FALSE); ref->config.load_from_ini_string(config_ini, ForwardCompatibilitySubstitutionRule::Disable); @@ -1306,12 +1306,12 @@ extern "C" { return (jlong) (intptr_t) ref; } - JNIEXPORT void JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_utils_1config_1release(JNIEnv* env, jclass, jlong ptr) { + JNIEXPORT void JNICALL Java_com_dark98_santoku_slic3r_Native_utils_1config_1release(JNIEnv* env, jclass, jlong ptr) { ConfigRef* ref = (ConfigRef*) (intptr_t) ptr; delete ref; } - JNIEXPORT jboolean JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_utils_1config_1check_1compatibility(JNIEnv* env, jclass, jlong ptr, jstring cond) { + JNIEXPORT jboolean JNICALL Java_com_dark98_santoku_slic3r_Native_utils_1config_1check_1compatibility(JNIEnv* env, jclass, jlong ptr, jstring cond) { ConfigRef* ref = (ConfigRef*) (intptr_t) ptr; const char* condition = env->GetStringUTFChars(cond, JNI_FALSE); @@ -1327,7 +1327,7 @@ extern "C" { return value; } - JNIEXPORT jstring JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_utils_1config_1eval(JNIEnv* env, jclass, jlong ptr, jstring cond) { + JNIEXPORT jstring JNICALL Java_com_dark98_santoku_slic3r_Native_utils_1config_1eval(JNIEnv* env, jclass, jlong ptr, jstring cond) { ConfigRef *ref = (ConfigRef *) (intptr_t) ptr; const char *condition = env->GetStringUTFChars(cond, JNI_FALSE); @@ -1339,12 +1339,12 @@ extern "C" { } catch (const std::runtime_error &err) { env->ReleaseStringUTFChars(cond, condition); - env->ThrowNew(env->FindClass("ru/ytkab0bp/slicebeam/slic3r/Slic3rRuntimeError"), err.what()); + env->ThrowNew(env->FindClass("com/dark98/santoku/slic3r/Slic3rRuntimeError"), err.what()); return nullptr; } } - JNIEXPORT jdoubleArray JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_utils_1unproject(JNIEnv* env, jclass, jdoubleArray view_matrix, jdoubleArray projection_matrix, jint screen_width, jint screen_height, jdouble screen_x, jdouble screen_y) { + JNIEXPORT jdoubleArray JNICALL Java_com_dark98_santoku_slic3r_Native_utils_1unproject(JNIEnv* env, jclass, jdoubleArray view_matrix, jdoubleArray projection_matrix, jint screen_width, jint screen_height, jdouble screen_x, jdouble screen_y) { jdouble* viewMatrix = env->GetDoubleArrayElements(view_matrix, JNI_FALSE); jdouble* projectionMatrix = env->GetDoubleArrayElements(projection_matrix, JNI_FALSE); @@ -1365,7 +1365,7 @@ extern "C" { return arr; } - JNIEXPORT jlong JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_bed_1create(JNIEnv* env, jclass, jlongArray data) { + JNIEXPORT jlong JNICALL Java_com_dark98_santoku_slic3r_Native_bed_1create(JNIEnv* env, jclass, jlongArray data) { BedRef* ref = new BedRef(); GLModelRef* refs = new GLModelRef[3]; refs[0] = GLModelRef(); @@ -1382,7 +1382,7 @@ extern "C" { return (jlong) (intptr_t) ref; } - JNIEXPORT void JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_bed_1configure(JNIEnv* env, jclass, jlong ptr, jstring config_path) { + JNIEXPORT void JNICALL Java_com_dark98_santoku_slic3r_Native_bed_1configure(JNIEnv* env, jclass, jlong ptr, jstring config_path) { BedRef* ref = (BedRef*) (intptr_t) ptr; const char* chars = env->GetStringUTFChars(config_path, JNI_FALSE); @@ -1395,7 +1395,7 @@ extern "C" { ref->contour = ExPolygon(Polygon::new_scale(bed_shape)); const BoundingBox bbox = ref->contour.contour.bounding_box(); if (!bbox.defined) { - env->ThrowNew(env->FindClass("ru/ytkab0bp/slicebeam/slic3r/Slic3rRuntimeError"), "Invalid bed shape"); + env->ThrowNew(env->FindClass("com/dark98/santoku/slic3r/Slic3rRuntimeError"), "Invalid bed shape"); return; } @@ -1409,7 +1409,7 @@ extern "C" { bed_util_init_contourlines(ref->contour, ref->contourlines); } - JNIEXPORT void JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_bed_1init_1triangles_1mesh(JNIEnv* env, jclass, jlong ptr, jlong triangles_ptr) { + JNIEXPORT void JNICALL Java_com_dark98_santoku_slic3r_Native_bed_1init_1triangles_1mesh(JNIEnv* env, jclass, jlong ptr, jlong triangles_ptr) { auto ref = reinterpret_cast(ptr); auto tRef = reinterpret_cast(triangles_ptr); @@ -1422,7 +1422,7 @@ extern "C" { bed_util_init_triangles_its(contour, &tRef->mesh.its); } - JNIEXPORT jboolean JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_bed_1arrange(JNIEnv* env, jclass, jlong ptr, jlong model) { + JNIEXPORT jboolean JNICALL Java_com_dark98_santoku_slic3r_Native_bed_1arrange(JNIEnv* env, jclass, jlong ptr, jlong model) { BedRef* ref = (BedRef*) (intptr_t) ptr; ModelRef* mRef = (ModelRef*) (intptr_t) model; @@ -1489,7 +1489,7 @@ extern "C" { return arranged; } - JNIEXPORT jdoubleArray JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_bed_1get_1bounding_1volume(JNIEnv* env, jclass, jlong ptr) { + JNIEXPORT jdoubleArray JNICALL Java_com_dark98_santoku_slic3r_Native_bed_1get_1bounding_1volume(JNIEnv* env, jclass, jlong ptr) { BedRef* ref = (BedRef*) (intptr_t) ptr; jdoubleArray arr = env->NewDoubleArray(6); jdouble* elements = new jdouble[6]; @@ -1503,22 +1503,22 @@ extern "C" { return arr; } - JNIEXPORT jint JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_bed_1get_1bounding_1volume_1max_1size(JNIEnv* env, jclass, jlong ptr) { + JNIEXPORT jint JNICALL Java_com_dark98_santoku_slic3r_Native_bed_1get_1bounding_1volume_1max_1size(JNIEnv* env, jclass, jlong ptr) { BedRef* ref = (BedRef*) (intptr_t) ptr; return ref->build_volume.bounding_volume().max_size(); } - JNIEXPORT void JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_bed_1release(JNIEnv* env, jclass, jlong ptr) { + JNIEXPORT void JNICALL Java_com_dark98_santoku_slic3r_Native_bed_1release(JNIEnv* env, jclass, jlong ptr) { BedRef* ref = (BedRef*) (intptr_t) ptr; delete ref; } - JNIEXPORT jlong JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_vgcode_1create(JNIEnv* env, jclass) { + JNIEXPORT jlong JNICALL Java_com_dark98_santoku_slic3r_Native_vgcode_1create(JNIEnv* env, jclass) { GCodeViewerRef* ref = new GCodeViewerRef(); return (jlong) (intptr_t) ref; } - JNIEXPORT void JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_vgcode_1set_1colors(JNIEnv* env, jclass, jlong ptr, jintArray colorsArr) { + JNIEXPORT void JNICALL Java_com_dark98_santoku_slic3r_Native_vgcode_1set_1colors(JNIEnv* env, jclass, jlong ptr, jintArray colorsArr) { GCodeViewerRef* ref = (GCodeViewerRef*) (intptr_t) ptr; jint* colors = env->GetIntArrayElements(colorsArr, JNI_FALSE); @@ -1532,7 +1532,7 @@ extern "C" { env->ReleaseIntArrayElements(colorsArr, colors, JNI_ABORT); } - JNIEXPORT void JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_vgcode_1render(JNIEnv* env, jclass, jlong ptr, jfloatArray viewMatrixArr, jfloatArray projectionMatrixArr) { + JNIEXPORT void JNICALL Java_com_dark98_santoku_slic3r_Native_vgcode_1render(JNIEnv* env, jclass, jlong ptr, jfloatArray viewMatrixArr, jfloatArray projectionMatrixArr) { GCodeViewerRef* ref = (GCodeViewerRef*) (intptr_t) ptr; jfloat* viewMatrix = env->GetFloatArrayElements(viewMatrixArr, JNI_FALSE); jfloat* projectionMatrix = env->GetFloatArrayElements(projectionMatrixArr, JNI_FALSE); @@ -1548,19 +1548,19 @@ extern "C" { env->ReleaseFloatArrayElements(projectionMatrixArr, projectionMatrix, JNI_ABORT); } - JNIEXPORT void JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_vgcode_1init(JNIEnv* env, jclass, jlong ptr) { + JNIEXPORT void JNICALL Java_com_dark98_santoku_slic3r_Native_vgcode_1init(JNIEnv* env, jclass, jlong ptr) { GCodeViewerRef* ref = (GCodeViewerRef*) (intptr_t) ptr; if (ref->initialized) return; ref->viewer.init(reinterpret_cast(glGetString(GL_VERSION))); ref->initialized = true; } - JNIEXPORT jboolean JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_vgcode_1is_1initialized(JNIEnv* env, jclass, jlong ptr) { + JNIEXPORT jboolean JNICALL Java_com_dark98_santoku_slic3r_Native_vgcode_1is_1initialized(JNIEnv* env, jclass, jlong ptr) { GCodeViewerRef* ref = (GCodeViewerRef*) (intptr_t) ptr; return ref->initialized; } - JNIEXPORT void JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_vgcode_1load(JNIEnv* env, jclass, jlong ptr, jlong resultPtr) { + JNIEXPORT void JNICALL Java_com_dark98_santoku_slic3r_Native_vgcode_1load(JNIEnv* env, jclass, jlong ptr, jlong resultPtr) { GCodeViewerRef* ref = (GCodeViewerRef*) (intptr_t) ptr; GCodeResultRef* resultRef = (GCodeResultRef*) (intptr_t) resultPtr; @@ -1569,23 +1569,23 @@ extern "C" { ref->viewer.set_time_mode(libvgcode::ETimeMode::Normal); } - JNIEXPORT void JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_vgcode_1reset(JNIEnv* env, jclass, jlong ptr) { + JNIEXPORT void JNICALL Java_com_dark98_santoku_slic3r_Native_vgcode_1reset(JNIEnv* env, jclass, jlong ptr) { GCodeViewerRef* ref = (GCodeViewerRef*) (intptr_t) ptr; ref->viewer.reset(); ref->initialized = false; } - JNIEXPORT jlong JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_vgcode_1get_1layers_1count(JNIEnv* env, jclass, jlong ptr) { + JNIEXPORT jlong JNICALL Java_com_dark98_santoku_slic3r_Native_vgcode_1get_1layers_1count(JNIEnv* env, jclass, jlong ptr) { GCodeViewerRef* ref = (GCodeViewerRef*) (intptr_t) ptr; return ref->viewer.get_layers_count(); } - JNIEXPORT void JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_vgcode_1set_1layers_1view_1range(JNIEnv* env, jclass, jlong ptr, jlong min, jlong max) { + JNIEXPORT void JNICALL Java_com_dark98_santoku_slic3r_Native_vgcode_1set_1layers_1view_1range(JNIEnv* env, jclass, jlong ptr, jlong min, jlong max) { GCodeViewerRef* ref = (GCodeViewerRef*) (intptr_t) ptr; ref->viewer.set_layers_view_range(static_cast(min), static_cast(max)); } - JNIEXPORT jlongArray JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_vgcode_1get_1layers_1view_1range(JNIEnv* env, jclass, jlong ptr) { + JNIEXPORT jlongArray JNICALL Java_com_dark98_santoku_slic3r_Native_vgcode_1get_1layers_1view_1range(JNIEnv* env, jclass, jlong ptr) { GCodeViewerRef* ref = (GCodeViewerRef*) (intptr_t) ptr; jlongArray arr = env->NewLongArray(2); auto range = ref->viewer.get_layers_view_range(); @@ -1595,13 +1595,13 @@ extern "C" { return arr; } - JNIEXPORT void JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_vgcode_1release(JNIEnv* env, jclass, jlong ptr) { + JNIEXPORT void JNICALL Java_com_dark98_santoku_slic3r_Native_vgcode_1release(JNIEnv* env, jclass, jlong ptr) { GCodeViewerRef* ref = (GCodeViewerRef*) (intptr_t) ptr; ref->viewer.shutdown(); delete ref; } - JNIEXPORT jfloat JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_vgcode_1get_1estimated_1time(JNIEnv* env, jclass, jlong ptr) { + JNIEXPORT jfloat JNICALL Java_com_dark98_santoku_slic3r_Native_vgcode_1get_1estimated_1time(JNIEnv* env, jclass, jlong ptr) { GCodeViewerRef* ref = (GCodeViewerRef*) (intptr_t) ptr; return ref->viewer.get_estimated_time(); } @@ -1659,17 +1659,17 @@ extern "C" { return crole; } - JNIEXPORT jfloat JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_vgcode_1get_1estimated_1time_1role(JNIEnv* env, jclass, jlong ptr, jint role) { + JNIEXPORT jfloat JNICALL Java_com_dark98_santoku_slic3r_Native_vgcode_1get_1estimated_1time_1role(JNIEnv* env, jclass, jlong ptr, jint role) { GCodeViewerRef* ref = (GCodeViewerRef*) (intptr_t) ptr; return ref->viewer.get_extrusion_role_estimated_time(mapRole(role)); } - JNIEXPORT jboolean JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_vgcode_1is_1extrusion_1role_1visible(JNIEnv* env, jclass, jlong ptr, jint role) { + JNIEXPORT jboolean JNICALL Java_com_dark98_santoku_slic3r_Native_vgcode_1is_1extrusion_1role_1visible(JNIEnv* env, jclass, jlong ptr, jint role) { GCodeViewerRef* ref = (GCodeViewerRef*) (intptr_t) ptr; return ref->viewer.is_extrusion_role_visible(mapRole(role)); } - JNIEXPORT void JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_vgcode_1toggle_1extrusion_1role_1visibility(JNIEnv* env, jclass, jlong ptr, jint role) { + JNIEXPORT void JNICALL Java_com_dark98_santoku_slic3r_Native_vgcode_1toggle_1extrusion_1role_1visibility(JNIEnv* env, jclass, jlong ptr, jint role) { GCodeViewerRef* ref = (GCodeViewerRef*) (intptr_t) ptr; ref->viewer.toggle_extrusion_role_visibility(mapRole(role)); } diff --git a/app/src/main/jni/santoku/beam_native.hpp b/app/src/main/jni/santoku/beam_native.hpp new file mode 100644 index 0000000..c9499ac --- /dev/null +++ b/app/src/main/jni/santoku/beam_native.hpp @@ -0,0 +1,8 @@ +#import "GLShader.hpp" + +#ifndef SANTOKU_BEAM_NATIVE_HPP +#define SANTOKU_BEAM_NATIVE_HPP + +Slic3r::GLShaderProgram* get_current_shader(); + +#endif //SANTOKU_BEAM_NATIVE_HPP diff --git a/app/src/main/jni/slicebeam/bed_utils.hpp b/app/src/main/jni/santoku/bed_utils.hpp similarity index 98% rename from app/src/main/jni/slicebeam/bed_utils.hpp rename to app/src/main/jni/santoku/bed_utils.hpp index f18659b..1d3ac45 100644 --- a/app/src/main/jni/slicebeam/bed_utils.hpp +++ b/app/src/main/jni/santoku/bed_utils.hpp @@ -5,8 +5,8 @@ #include -#ifndef SLICEBEAM_BED_UTILS_HPP -#define SLICEBEAM_BED_UTILS_HPP +#ifndef SANTOKU_BED_UTILS_HPP +#define SANTOKU_BED_UTILS_HPP #define GROUND_Z -0.02f @@ -141,4 +141,4 @@ void bed_util_init_contourlines(ExPolygon& contour, GLModel* glContourlines) { glContourlines->set_color({ 1.0f, 1.0f, 1.0f, 0.5f }); } -#endif //SLICEBEAM_BED_UTILS_HPP +#endif //SANTOKU_BED_UTILS_HPP diff --git a/app/src/main/jni/slicebeam/libvgcode_utils.hpp b/app/src/main/jni/santoku/libvgcode_utils.hpp similarity index 100% rename from app/src/main/jni/slicebeam/libvgcode_utils.hpp rename to app/src/main/jni/santoku/libvgcode_utils.hpp diff --git a/app/src/main/jni/slicebeam/beam_native.hpp b/app/src/main/jni/slicebeam/beam_native.hpp deleted file mode 100644 index 52f2b41..0000000 --- a/app/src/main/jni/slicebeam/beam_native.hpp +++ /dev/null @@ -1,8 +0,0 @@ -#import "GLShader.hpp" - -#ifndef SLICEBEAM_BEAM_NATIVE_HPP -#define SLICEBEAM_BEAM_NATIVE_HPP - -Slic3r::GLShaderProgram* get_current_shader(); - -#endif //SLICEBEAM_BEAM_NATIVE_HPP diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2f07511..7572d94 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ - Slice Beam + Santoku Preview Print Print profile diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 012179d..92bd289 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -1,5 +1,5 @@ - - - \ No newline at end of file