position drawing was added to cursor

AntonAsmirko · Mar 16, 2021 · 5dfd9b3 · 5dfd9b3
1 parent 159c9aa
commit 5dfd9b3
Show file tree

Hide file tree

Showing 47 changed files with 38 additions and 10 deletions.
diff --git a/.gradle/6.7.1/executionHistory/executionHistory.bin b/.gradle/6.7.1/executionHistory/executionHistory.bin
diff --git a/.gradle/6.7.1/executionHistory/executionHistory.lock b/.gradle/6.7.1/executionHistory/executionHistory.lock
diff --git a/.gradle/6.7.1/fileHashes/fileHashes.bin b/.gradle/6.7.1/fileHashes/fileHashes.bin
diff --git a/.gradle/6.7.1/fileHashes/fileHashes.lock b/.gradle/6.7.1/fileHashes/fileHashes.lock
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
diff --git a/build/classes/kotlin/main/LocationMarkerComposableKt.class b/build/classes/kotlin/main/LocationMarkerComposableKt.class
diff --git a/build/kotlin/compileKotlin/build-history.bin b/build/kotlin/compileKotlin/build-history.bin
diff --git a/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab b/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.values b/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.values
diff --git a/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.values.at
diff --git a/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.values.s b/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.values.s
@@ -1 +1 @@
-ъЯРВВВВВВВВВВВВВВВВВВВВВЗЖЬйт
+пёђїїїїїїїїїїїїїїїїїїїїїњіјЪдЯввввввввввввввввввввввввввввв
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.s b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.s
@@ -1 +1 @@
-������������
+켆
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/package-parts.tab b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/package-parts.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/package-parts.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/package-parts.tab.values.at
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.values b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.values
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.values.s b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.values.s
@@ -1 +1 @@
-К*в*в*ж*э*к*к*к*к*к*к*к*к*к*к*к*к*н*ч*к*к*к*к*к*к*к*к*к*к*к*к*к*к*к*к*к*к*к*к*к*к*к*к*о*Й+В+В+к0
+ë*×*×*Ö*Ü*Ë*Ë*Ë*Ë*Ë*Ë*Ë*Ë*Ë*Ë*Ë*Ë*Î*Þ*Ë*Ë*Ë*Ë*Ë*Ë*Ë*Ë*Ë*Ë*Ë*Ë*Ë*Ë*Ë*Ë*Ë*Ë*Ë*Ë*Ë*Ë*Ë*Ë*Ï*ê+÷+÷+Ë0á.å.å.å.å.å.å.å.å.å.Ã2Ò2Æ3Æ3Ð1Í0Í0Í0Í0Í0Í0Í0Í0Í0Í0Í0Í0Í0Í0Í0
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.s b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.s
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/counters.tab b/build/kotlin/compileKotlin/caches-jvm/lookups/counters.tab
@@ -1,2 +1,2 @@
-268
-264
+298
+294
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab b/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab.values.at
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.len b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.len
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.values.at
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab_i b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab_i
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream.len b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream.len
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.len b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.len
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.at
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.s b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.s
@@ -1 +1 @@
-уЩвКЯУыАпГюыщщйИгбшЪоясдПДИКЪЬлШэЧВйРчрЖШВюэДьвзбдмиЫЪЮьФдйНзЕФбЕщшюысЩполиЯЫуионщХпОПЭзЕрыУбТцрэфбпфуЕяигяЖВдЭЗИвЙИСб
+йефЬНВУасыьГгВАУМЖеЭгтКбцЯлкЧрщР!ПХК уГВ!РЕцсУЧэЭТКЫКтГь ХвювЗ
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab_i b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab_i
diff --git a/build/kotlin/compileKotlin/last-build.bin b/build/kotlin/compileKotlin/last-build.bin
diff --git a/build/resources/main/fonts/InterHinted-Regular.ttf b/build/resources/main/fonts/InterHinted-Regular.ttf
diff --git a/src/main/kotlin/LocationMarkerComposable.kt b/src/main/kotlin/LocationMarkerComposable.kt
@@ -1,11 +1,13 @@
 @file:Suppress("NAME_SHADOWING")
 
-import androidx.compose.material.rememberBottomDrawerState
-import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.geometry.Rect
 import androidx.compose.ui.graphics.Canvas
 import androidx.compose.ui.graphics.Paint
 import androidx.compose.ui.graphics.Path
+import androidx.compose.ui.graphics.nativeCanvas
+import org.jetbrains.skija.*
+
+val font = Font(Typeface.makeDefault(), 24f)
 
 fun Canvas.drawLocationMarker(
     path: Path,
@@ -51,7 +53,6 @@ fun Canvas.drawLocationMarker(
         mData[7] + mDifference
     )
     translate(originX, originY)
-    scale(1f, 1f)
     path.reset()
     drawPath(
         path.apply {
@@ -94,5 +95,33 @@ fun Canvas.drawLocationMarker(
         },
         paint
     )
+    val startX = -circleRadius / 2
+    val startY = -circleRadius * 2
+    var curPos = startX
+    val textItems = font
+        .getStringGlyphs(originX.toString())
+        .map {
+            val res = Pair(it, Point(curPos, startY))
+            curPos += font.size * 2 / 3
+            res
+        }
+    nativeCanvas.drawTextBlob(
+        TextBlob.makeFromPos(
+            textItems
+                .map { it.first }
+                .toShortArray(),
+            textItems
+                .map { it.second }
+                .toTypedArray(),
+            font
+        ),
+        originX,
+        originY,
+        font,
+        org.jetbrains.skija.Paint().apply {
+            color = 0xff000000.toInt()
+        }
+    )
+    path.reset()
     restore()
 }
diff --git a/src/main/resources/fonts/InterHinted-Regular.ttf b/src/main/resources/fonts/InterHinted-Regular.ttf
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		ъЯРВВВВВВВВВВВВВВВВВВВВВЗЖЬйт
		пёђїїїїїїїїїїїїїїїїїїїїїњіјЪдЯввввввввввввввввввввввввввввв
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		��
		켆
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		КввжэккккккккккккнчккккккккккккккккккккккккоЙ+В+В+к0
		ë××ÖÜËËËËËËËËËËËËÎÞËËËËËËËËËËËËËËËËËËËËËËËËÏê+÷+÷+Ë0á.å.å.å.å.å.å.å.å.å.Ã2Ò2Æ3Æ3Ð1Í0Í0Í0Í0Í0Í0Í0Í0Í0Í0Í0Í0Í0Í0Í0
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		уЩвКЯУыАпГюыщщйИгбшЪоясдПДИКЪЬлШэЧВйРчрЖШВюэДьвзбдмиЫЪЮьФдйНзЕФбЕщшюысЩполиЯЫуионщХпОПЭзЕрыУбТцрэфбпфуЕяигяЖВдЭЗИвЙИСб
		йефЬНВУасыьГгВАУМЖеЭгтКбцЯлкЧрщР!ПХК уГВ!РЕцсУЧэЭТКЫКтГь ХвювЗ