aboutsummaryrefslogtreecommitdiff
path: root/src/mobile
diff options
context:
space:
mode:
Diffstat (limited to 'src/mobile')
-rw-r--r--src/mobile/MobileInterface.scss8
-rw-r--r--src/mobile/MobileInterface.tsx24
-rw-r--r--src/mobile/MobileMenu.scss9
3 files changed, 33 insertions, 8 deletions
diff --git a/src/mobile/MobileInterface.scss b/src/mobile/MobileInterface.scss
index f75e60a37..215ce02e5 100644
--- a/src/mobile/MobileInterface.scss
+++ b/src/mobile/MobileInterface.scss
@@ -17,6 +17,14 @@
position: relative;
touch-action: none;
width: 100%;
+
+ -webkit-touch-callout:none;
+ -webkit-user-select:none;
+ -khtml-user-select:none;
+ -moz-user-select:none;
+ -ms-user-select:none;
+ user-select:none;
+ -webkit-tap-highlight-color:rgba(0,0,0,0);
}
.mobileInterface-background {
diff --git a/src/mobile/MobileInterface.tsx b/src/mobile/MobileInterface.tsx
index 211cc7a1a..979094dda 100644
--- a/src/mobile/MobileInterface.tsx
+++ b/src/mobile/MobileInterface.tsx
@@ -39,6 +39,7 @@ import { SelectionManager } from "../client/util/SelectionManager";
import { SketchPicker } from "react-color";
import { ScriptField } from "../fields/ScriptField";
import InkOptionsMenu from "../client/views/collections/collectionFreeForm/InkOptionsMenu";
+import { RadialMenu } from "../client/views/nodes/RadialMenu";
library.add(faTasks, faMobile, faThLarge, faWindowClose, faEdit, faTrashAlt, faPalette, faAngleRight, faBell, faTrash, faCamera, faExpand, faCaretDown, faCaretLeft, faCaretRight, faCaretSquareDown, faCaretSquareRight, faArrowsAltH, faPlus, faMinus,
faTerminal, faToggleOn, fileSolid, faExternalLinkAlt, faLocationArrow, faSearch, faFileDownload, faStop, faCalculator, faWindowMaximize, faAddressCard,
@@ -87,6 +88,14 @@ export class MobileInterface extends React.Component {
this._homeDoc._viewType === "stacking" ? this.menuListView = true : this.menuListView = false;
Doc.SetSelectedTool(InkTool.None);
this.switchCurrentView((userDoc: Doc) => this._homeDoc);
+
+ document.removeEventListener("dblclick", this.onReactDoubleClick);
+ document.addEventListener("dblclick", this.onReactDoubleClick);
+ }
+
+ onReactDoubleClick = (e: MouseEvent) => {
+ console.log("tapped");
+ e.stopPropagation();
}
@action
@@ -499,20 +508,20 @@ export class MobileInterface extends React.Component {
const button = document.getElementById("inkButton") as HTMLElement;
// const color = InkingControl.Instance.selectedColor;
const color = "lightpink";
- button.style.backgroundColor = this._ink ? "white" : color;
+ button.style.backgroundColor = this._ink ? "white" : "black";
button.style.color = this._ink ? "black" : "white";
if (!this._ink) {
console.log("INK IS ACTIVE");
// InkingControl.Instance.switchTool(InkTool.Pen);
Doc.SetSelectedTool(InkTool.Pen);
- InkOptionsMenu.Instance.jumpTo(300, 300);
+ //InkOptionsMenu.Instance.jumpTo(300, 300);
this._ink = true;
} else {
console.log("INK IS INACTIVE");
// InkingControl.Instance.switchTool(InkTool.None);
Doc.SetSelectedTool(InkTool.None);
- InkOptionsMenu.Instance.fadeOut(true);
+ //InkOptionsMenu.Instance.fadeOut(true);
this._ink = false;
}
}
@@ -520,7 +529,11 @@ export class MobileInterface extends React.Component {
inkMenu = () => {
if (this._activeDoc._viewType === "docking") {
if (this._ink) {
- return <InkOptionsMenu />
+ console.log("here");
+ return <div className="colorSelector">
+ <InkOptionsMenu />
+ </div>
+
}
}
}
@@ -724,8 +737,8 @@ export class MobileInterface extends React.Component {
{this.drawInk()}
{this.uploadAudioButton()}
{/* {this.colorTool()} */}
- {this.inkMenu()}
</div>
+ {this.inkMenu()}
<GestureOverlay>
{this.displayWorkspaces()}
{this.renderDefaultContent()}
@@ -764,7 +777,6 @@ export class MobileInterface extends React.Component {
} else if (!this.imageUploadActive) {
}
- console.log("upload");
return (
<div>
<div className="closeUpload" onClick={this.toggleUpload}>
diff --git a/src/mobile/MobileMenu.scss b/src/mobile/MobileMenu.scss
index 44d3acb6f..8d996f779 100644
--- a/src/mobile/MobileMenu.scss
+++ b/src/mobile/MobileMenu.scss
@@ -334,12 +334,17 @@ body {
top: -450px;
}
-.toolbar .colorSelector {
+.colorSelector {
+ position: absolute;
+ top: 550px;
+ left: 300px;
+ transform: translate(-50%, 0);
+ z-index: 100;
display: inline-flex;
width: max-content;
- padding: 5px;
height: max-content;
pointer-events: all;
+ font-size: 90px;
}
.widthSelector {