mirror of
https://github.com/Dark98/SliceBeam.git
synced 2026-07-02 16:49:02 +00:00
New flatten icon, migrate libslic3r_version to use gradle variables
This commit is contained in:
+3
-1
@@ -20,7 +20,9 @@ android {
|
||||
externalNativeBuild {
|
||||
cmake {
|
||||
arguments '-DANDROID_STL=c++_shared', '-DANDROID_PLATFORM=21',
|
||||
'-DCMAKE_BUILD_TYPE=Release' // Disabling this results in drastically degradation of slicing times on debug builds
|
||||
'-DCMAKE_BUILD_TYPE=Release', // Disabling this results in drastically degradation of slicing times on debug builds
|
||||
"-DSLIC3R_VERSION=${defaultConfig.versionName}",
|
||||
"-DSLIC3R_BUILD_ID=${defaultConfig.versionCode}"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -61,7 +61,7 @@ public class OrientationMenu extends ListBedMenu {
|
||||
SliceBeam.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.MenuOrientationFlatten, R.drawable.menu_orientation_position_28).setEnabled(hasSelection()).setCheckable((buttonView, isChecked) -> {
|
||||
new BedMenuItem(R.string.MenuOrientationFlatten, R.drawable.menu_orientation_flatten_28).setEnabled(hasSelection()).setCheckable((buttonView, isChecked) -> {
|
||||
fragment.getGlView().getRenderer().setInFlattenMode(isChecked);
|
||||
fragment.getGlView().requestRender();
|
||||
}, false),
|
||||
|
||||
@@ -3,7 +3,5 @@
|
||||
|
||||
#define SLIC3R_APP_NAME "Slice Beam"
|
||||
#define SLIC3R_APP_KEY "SliceBeam"
|
||||
#define SLIC3R_VERSION "0.1.0"
|
||||
#define SLIC3R_BUILD_ID "1"
|
||||
|
||||
#endif /* __SLIC3R_VERSION_H */
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="28dp"
|
||||
android:height="28dp"
|
||||
android:viewportWidth="28"
|
||||
android:viewportHeight="28">
|
||||
<path
|
||||
android:fillColor="#FF000000"
|
||||
android:pathData="M18.2,16.5l1.1,-4.1l-3,-3l-1.1,4.1L18.2,16.5zM19.4,16.8l4.1,-1.1l1.1,-4.1l-4.1,1.1L19.4,16.8zM20.2,11.6l4.1,-1.1l-3,-3l-4.1,1.1L20.2,11.6zM14.3,14.4c-0.2,-0.2 -0.3,-0.3 -0.3,-0.5c-0.1,-0.2 -0.1,-0.4 0,-0.6l1.3,-4.7c0.1,-0.2 0.2,-0.4 0.3,-0.6s0.3,-0.3 0.6,-0.3L21,6.3c0.2,-0.1 0.4,-0.1 0.6,0s0.4,0.2 0.6,0.3l3.5,3.5c0.2,0.2 0.3,0.3 0.3,0.5c0.1,0.2 0.1,0.4 0,0.6L24.7,16c-0.1,0.2 -0.2,0.4 -0.3,0.6c-0.2,0.2 -0.3,0.3 -0.6,0.3L19,18.2c-0.2,0.1 -0.4,0.1 -0.6,0S18,18 17.9,17.9L14.3,14.4z"
|
||||
android:strokeWidth="0.5"
|
||||
android:strokeColor="#000000"/>
|
||||
<path
|
||||
android:fillColor="#FF000000"
|
||||
android:pathData="M2.5,14.9c0.3,-0.3 0.9,-0.3 1.2,0l1,0.9V15c0,-3.2 2.6,-5.7 5.7,-5.7h0h1.5c0.5,0 0.9,0.4 0.9,0.9S12.4,11 11.9,11h-1.5c-2.2,0 -4,1.8 -4,4l0,0v0.9l1,-1c0.3,-0.3 0.9,-0.4 1.2,0c0.3,0.3 0.4,0.9 0,1.2c0,0 0,0 0,0l-2.4,2.4c-0.3,0.3 -0.9,0.3 -1.2,0l-2.4,-2.4C2.2,15.8 2.2,15.2 2.5,14.9L2.5,14.9z"
|
||||
android:fillType="evenOdd"/>
|
||||
<path
|
||||
android:fillColor="#FF000000"
|
||||
android:pathData="M3,22.5L25,22.5"
|
||||
android:strokeWidth="2"
|
||||
android:strokeColor="#000000"
|
||||
android:fillType="evenOdd"
|
||||
android:strokeLineCap="round"/>
|
||||
</vector>
|
||||
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user