From 5605c8da542a701d817af9209f3fa5ea010a757d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antonio=20Nicol=C3=A1s=20Pina?= <antonio@yaikostudio.com>
Date: Mon, 31 Aug 2020 16:33:55 +0200
Subject: [PATCH] V4.0 with better gesture detectors.

---
 .idea/jarRepositories.xml                     |   5 +
 .idea/misc.xml                                |   2 +-
 README.md                                     |  13 +-
 sample/build.gradle                           |   5 +
 .../textimageview/sample/MainActivity.kt      |  23 +-
 sample/src/main/res/layout/activity_main.xml  |  28 +-
 sample/src/main/res/values/strings.xml        |   1 -
 textimageview/build.gradle                    |  41 +-
 .../RotationGestureDetector.java              |  78 ---
 .../antonionicolaspina/textimageview/Text.kt  |  10 +
 .../textimageview/TextImageView.java          | 494 ------------------
 .../textimageview/TextImageView.kt            | 217 ++++++++
 .../textimageview/TextProperties.kt           |  33 ++
 textimageview/src/main/res/values/attrs.xml   |  25 +-
 14 files changed, 322 insertions(+), 653 deletions(-)
 delete mode 100644 textimageview/src/main/java/com/antonionicolaspina/textimageview/RotationGestureDetector.java
 create mode 100644 textimageview/src/main/java/com/antonionicolaspina/textimageview/Text.kt
 delete mode 100644 textimageview/src/main/java/com/antonionicolaspina/textimageview/TextImageView.java
 create mode 100644 textimageview/src/main/java/com/antonionicolaspina/textimageview/TextImageView.kt
 create mode 100644 textimageview/src/main/java/com/antonionicolaspina/textimageview/TextProperties.kt

diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index ba1cefd..5aefbc8 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -41,5 +41,10 @@
       <option name="name" value="MavenRepo" />
       <option name="url" value="https://repo.maven.apache.org/maven2/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="https://jitpack.io" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index f381712..2341319 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -39,7 +39,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/README.md b/README.md
index e70fe03..9ec1856 100644
--- a/README.md
+++ b/README.md
@@ -9,19 +9,18 @@ An ImageView subclass that draws one or more spannable, rotable, scalable texts
 
 Provided that this is an ImageView subclass, you can use Picasso, Glide, or any Image loader that you like to load the image into TextImageView.
 
-## New in 3.0
-You can enable text scale and rotation via multitouch gestures just by declaring it in your layout.
-Now you can stack multiple texts one on top of the other and control them.
+## New in 4.0
+Rewritten in kotlin+androidx
 
 ## Requirements
-Android 2.2, API 8
+Android 4.0, API 14
 
 ## Usage
 ### Gradle dependency
 
 ```groovy
 dependencies {
-  compile 'com.antonionicolaspina:textimageview:3.1.2'
+  implementation 'com.antonionicolaspina:textimageview:4.0'
 }
 ```
 
@@ -35,15 +34,13 @@ dependencies {
     android:textSize="30sp"
     android:textColor="#ff0000"
     app:tiv_panEnabled="true"
-    app:tiv_clampTextMode="textInside"
-    app:tiv_interline="10sp"
     app:tiv_scaleEnabled="true"
     app:tiv_rotationEnabled="true"
     android:src="@drawable/sample"/>
 ```
 
 ## License
-    Copyright 2016 Antonio Nicolás Pina
+    Copyright 2020 YaikoStudio
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/sample/build.gradle b/sample/build.gradle
index ca000fb..ba45a6e 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -1,10 +1,15 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
 
 android {
   compileSdkVersion 30
   buildToolsVersion "29.0.2"
 
+  androidExtensions {
+    experimental = true
+  }
+
   defaultConfig {
     applicationId "com.antonionicolaspina.textimageview.sample"
     minSdkVersion 14
diff --git a/sample/src/main/java/com/antonionicolaspina/textimageview/sample/MainActivity.kt b/sample/src/main/java/com/antonionicolaspina/textimageview/sample/MainActivity.kt
index 57dc265..2219267 100644
--- a/sample/src/main/java/com/antonionicolaspina/textimageview/sample/MainActivity.kt
+++ b/sample/src/main/java/com/antonionicolaspina/textimageview/sample/MainActivity.kt
@@ -1,22 +1,29 @@
 package com.antonionicolaspina.textimageview.sample
 
+import android.graphics.Color
 import android.graphics.Typeface
 import android.os.Bundle
-import android.view.View
-import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
+import com.antonionicolaspina.textimageview.Text
 import com.antonionicolaspina.textimageview.TextImageView
+import kotlinx.android.synthetic.main.activity_main.*
+import java.util.*
 
 class MainActivity : AppCompatActivity() {
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     setContentView(R.layout.activity_main)
-    val textImageView = findViewById<View>(R.id.text_image) as TextImageView
-    textImageView.setTypeface(Typeface.DEFAULT_BOLD)
-    val textView = findViewById<View>(R.id.text) as TextView
-    textImageView.setOnTextMovedListener { position ->
-      textView.text =
-        String.format("Position: [%.2f%%, %.2f%%]", position.x * 100f, position.y * 100f)
+
+    text_image.listener = object : TextImageView.Listener {
+      override fun textsChanged(texts: List<Text>) {
+        position_textview.text = texts.joinToString("\n")
+      }
+    }
+
+    add_more_button.setOnClickListener {
+      text_image.addText("Text ${Date()}")
+      text_image.setTypeface(Typeface.DEFAULT_BOLD)
+      text_image.setTextColor(Color.RED)
     }
   }
 }
diff --git a/sample/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml
index f6454b8..238bc39 100644
--- a/sample/src/main/res/layout/activity_main.xml
+++ b/sample/src/main/res/layout/activity_main.xml
@@ -7,26 +7,28 @@
   xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <TextView
-      android:id="@+id/text"
+      android:id="@+id/position_textview"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"/>
 
-    <com.antonionicolaspina.textimageview.TextImageView
-      android:id="@+id/text_image"
+    <FrameLayout
       android:layout_width="match_parent"
       android:layout_height="0dp"
-      android:layout_weight="1"
-      android:text="@string/sample_text"
-      android:textSize="30sp"
-      android:textColor="#ff0000"
-      app:tiv_panEnabled="true"
-      app:tiv_clampTextMode="textInside"
-      app:tiv_interline="10sp"
-      app:tiv_scaleEnabled="true"
-      app:tiv_rotationEnabled="true"
-      android:src="@drawable/sample"/>
+      android:layout_weight="1">
+        <com.antonionicolaspina.textimageview.TextImageView
+          android:id="@+id/text_image"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:adjustViewBounds="true"
+          android:layout_gravity="center_vertical"
+          app:tiv_panEnabled="true"
+          app:tiv_scaleEnabled="true"
+          app:tiv_rotationEnabled="true"
+          android:src="@drawable/sample"/>
+    </FrameLayout>
 
     <Button
+      android:id="@+id/add_more_button"
       android:layout_margin="@dimen/activity_horizontal_margin"
       android:layout_gravity="center_horizontal"
       android:layout_width="wrap_content"
diff --git a/sample/src/main/res/values/strings.xml b/sample/src/main/res/values/strings.xml
index b9d37c6..c6fc9cc 100644
--- a/sample/src/main/res/values/strings.xml
+++ b/sample/src/main/res/values/strings.xml
@@ -1,5 +1,4 @@
 <resources>
     <string name="app_name">TextImageView</string>
-    <string name="sample_text">Sample text\nwith multiline\nsupport!</string>
     <string name="add_text">Add more text</string>
 </resources>
diff --git a/textimageview/build.gradle b/textimageview/build.gradle
index 212a643..c3e6d15 100644
--- a/textimageview/build.gradle
+++ b/textimageview/build.gradle
@@ -3,35 +3,10 @@ apply plugin: 'kotlin-android'
 apply plugin: 'com.jfrog.bintray'
 apply plugin: 'maven-publish'
 
-/*
-ext {
-  bintrayRepo = 'maven'
-  bintrayName = 'textimageview'
-
-  publishedGroupId = 'com.antonionicolaspina'
-  libraryName = 'TextImageView'
-  artifact = 'textimageview'
-
-  libraryDescription = 'An ImageView subclass that draws one or more spannable, rotable, scalable texts on top of the image'
-
-  siteUrl = 'https://github.com/ANPez/TextImageView'
-  gitUrl = 'https://github.com/ANPez/TextImageView.git'
-
-  libraryVersion = '3.1.2'
-
-  developerId = 'anpez'
-  developerName = 'Antonio Nicolás Pina'
-  developerEmail = 'antonio@antonionicolaspina.com'
-
-  licenseName = 'The Apache Software License, Version 2.0'
-  licenseUrl = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-  allLicenses = ["Apache-2.0"]
-}
-*/
 //region Publish to jCenter
 def libGroupId = 'com.antonionicolaspina'
 def libArtifactId = 'textimageview'
-def libVersion = '3.1.2'
+def libVersion = '4.0'
 def libDesc = 'An ImageView subclass that draws one or more spannable, rotable, scalable texts on top of the image.'
 def libLicenses = ['Apache-2.0']
 def libVCSUrl = 'https://github.com/ANPez/TextImageView.git'
@@ -82,11 +57,20 @@ android {
   compileSdkVersion 30
   buildToolsVersion "29.0.2"
 
+  compileOptions {
+    sourceCompatibility JavaVersion.VERSION_1_8
+    targetCompatibility JavaVersion.VERSION_1_8
+  }
+
+  kotlinOptions {
+    jvmTarget = JavaVersion.VERSION_1_8.toString()
+  }
+
   defaultConfig {
     minSdkVersion 14
     targetSdkVersion 30
-    versionCode 11
-    versionName "3.1.2"
+    versionCode 12
+    versionName "4.0"
   }
   buildTypes {
     release {
@@ -101,4 +85,5 @@ dependencies {
   testImplementation 'junit:junit:4.12'
   implementation "androidx.core:core-ktx:1.3.1"
   implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+  implementation 'com.mapbox.mapboxsdk:mapbox-android-gestures:0.7.0'
 }
diff --git a/textimageview/src/main/java/com/antonionicolaspina/textimageview/RotationGestureDetector.java b/textimageview/src/main/java/com/antonionicolaspina/textimageview/RotationGestureDetector.java
deleted file mode 100644
index b7127e2..0000000
--- a/textimageview/src/main/java/com/antonionicolaspina/textimageview/RotationGestureDetector.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.antonionicolaspina.textimageview;
-
-import android.view.MotionEvent;
-
-public class RotationGestureDetector {
-    private static final int INVALID_POINTER_ID = -1;
-    private float fX, fY, sX, sY;
-    private int ptrID1, ptrID2;
-    private float mAngle;
-
-    private OnRotationGestureListener mListener;
-
-    public float getAngle() {
-        return mAngle;
-    }
-
-    public RotationGestureDetector(OnRotationGestureListener listener){
-        mListener = listener;
-        ptrID1 = INVALID_POINTER_ID;
-        ptrID2 = INVALID_POINTER_ID;
-    }
-
-    public boolean onTouchEvent(MotionEvent event){
-        switch (event.getActionMasked()) {
-            case MotionEvent.ACTION_DOWN:
-                ptrID1 = event.getPointerId(event.getActionIndex());
-                break;
-            case MotionEvent.ACTION_POINTER_DOWN:
-                ptrID2 = event.getPointerId(event.getActionIndex());
-                sX = event.getX(event.findPointerIndex(ptrID1));
-                sY = event.getY(event.findPointerIndex(ptrID1));
-                fX = event.getX(event.findPointerIndex(ptrID2));
-                fY = event.getY(event.findPointerIndex(ptrID2));
-                break;
-            case MotionEvent.ACTION_MOVE:
-                if(ptrID1 != INVALID_POINTER_ID && ptrID2 != INVALID_POINTER_ID){
-                    float nfX, nfY, nsX, nsY;
-                    nsX = event.getX(event.findPointerIndex(ptrID1));
-                    nsY = event.getY(event.findPointerIndex(ptrID1));
-                    nfX = event.getX(event.findPointerIndex(ptrID2));
-                    nfY = event.getY(event.findPointerIndex(ptrID2));
-
-                    mAngle = angleBetweenLines(fX, fY, sX, sY, nfX, nfY, nsX, nsY);
-
-                    if (mListener != null) {
-                        mListener.OnRotation(this);
-                    }
-                }
-                break;
-            case MotionEvent.ACTION_UP:
-                ptrID1 = INVALID_POINTER_ID;
-                break;
-            case MotionEvent.ACTION_POINTER_UP:
-                ptrID2 = INVALID_POINTER_ID;
-                break;
-            case MotionEvent.ACTION_CANCEL:
-                ptrID1 = INVALID_POINTER_ID;
-                ptrID2 = INVALID_POINTER_ID;
-                break;
-        }
-        return true;
-    }
-
-    private float angleBetweenLines (float fX, float fY, float sX, float sY, float nfX, float nfY, float nsX, float nsY)
-    {
-        float angle1 = (float) Math.atan2( (fY - sY), (fX - sX) );
-        float angle2 = (float) Math.atan2( (nfY - nsY), (nfX - nsX) );
-
-        float angle = ((float)Math.toDegrees(angle1 - angle2)) % 360;
-        if (angle < -180.f) angle += 360.0f;
-        if (angle > 180.f) angle -= 360.0f;
-        return angle;
-    }
-
-    public interface OnRotationGestureListener {
-        void OnRotation(RotationGestureDetector rotationDetector);
-    }
-}
\ No newline at end of file
diff --git a/textimageview/src/main/java/com/antonionicolaspina/textimageview/Text.kt b/textimageview/src/main/java/com/antonionicolaspina/textimageview/Text.kt
new file mode 100644
index 0000000..5a3258c
--- /dev/null
+++ b/textimageview/src/main/java/com/antonionicolaspina/textimageview/Text.kt
@@ -0,0 +1,10 @@
+package com.antonionicolaspina.textimageview
+
+import android.graphics.PointF
+
+data class Text(
+    val text: String,
+    val position: PointF = PointF(),
+    var scaleFactor: Float = 1f,
+    var rotationDegress: Float = 0f
+)
diff --git a/textimageview/src/main/java/com/antonionicolaspina/textimageview/TextImageView.java b/textimageview/src/main/java/com/antonionicolaspina/textimageview/TextImageView.java
deleted file mode 100644
index 6b4058c..0000000
--- a/textimageview/src/main/java/com/antonionicolaspina/textimageview/TextImageView.java
+++ /dev/null
@@ -1,494 +0,0 @@
-package com.antonionicolaspina.textimageview;
-
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.content.res.Resources;
-import android.content.res.TypedArray;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Matrix;
-import android.graphics.Paint;
-import android.graphics.PointF;
-import android.graphics.Rect;
-import android.graphics.RectF;
-import android.graphics.Typeface;
-import android.graphics.drawable.Drawable;
-import android.os.Build;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-import android.view.ScaleGestureDetector;
-import android.widget.ImageView;
-
-import java.util.ArrayList;
-
-public class TextImageView extends ImageView implements ScaleGestureDetector.OnScaleGestureListener, RotationGestureDetector.OnRotationGestureListener {
-  public interface OnTextMovedListener {
-    void textMoved(PointF position);
-  }
-  protected static class TextProperties {
-    private String text;
-
-    public float scale;
-    public float size;
-    public String[] textLines;
-    public Paint paint;
-    public ArrayList<Rect> textRects;
-    public PointF textPosition;
-    public PointF rotationCenter;
-    public float rotation;
-
-    public TextProperties(String text, float size, int color) {
-      this.scale = 1f;
-      this.size = size;
-      this.paint = new Paint(Paint.ANTI_ALIAS_FLAG);
-      this.textRects = new ArrayList<>();
-      this.textPosition = new PointF(0f, 0f);
-      this.rotationCenter = new PointF();
-      this.rotation = 0f;
-
-      paint.setColor(color);
-      paint.setTextSize(size);
-      setText(text);
-    }
-
-    public void setText(String text) {
-      this.text = text;
-      this.textLines = null;
-      if (null != text) {
-        this.textLines = text.split("\n");
-
-        textRects.clear();
-        for(int i=0; i<textLines.length; i++) {
-          Rect r = new Rect();
-          paint.getTextBounds(textLines[i], 0, textLines[i].length(), r);
-          textRects.add(i, r);
-        }
-      }
-    }
-
-    public String getText() {
-      return text;
-    }
-  }
-
-  public enum ClampMode {UNLIMITED, ORIGIN_INSIDE, TEXT_INSIDE}
-
-  private ScaleGestureDetector scaleDetector;
-  private RotationGestureDetector rotateDetector;
-
-  // region Global parameters
-  private float minSize;
-  private float maxSize;
-  private boolean panEnabled;
-  private boolean scaleEnabled;
-  private boolean rotationEnabled;
-  private ClampMode clampTextMode;
-  private int interline;
-  private RectF imageRect;
-  // endregion
-
-  // region Other members
-  private PointF focalPoint;
-  private OnTextMovedListener onTextMovedListener;
-  private float previousRotation = 0f;
-  private ArrayList<TextProperties> texts;
-  private int currentSize;
-  private int currentColor;
-  // endregion
-
-  public TextImageView(Context context) {
-    super(context);
-    init(context, null);
-  }
-
-  public TextImageView(Context context, AttributeSet attrs) {
-    super(context, attrs);
-    init(context, attrs);
-  }
-
-  public TextImageView(Context context, AttributeSet attrs, int defStyleAttr) {
-    super(context, attrs, defStyleAttr);
-    init(context, attrs);
-  }
-
-  @TargetApi(Build.VERSION_CODES.LOLLIPOP)
-  public TextImageView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
-    super(context, attrs, defStyleAttr, defStyleRes);
-    init(context, attrs);
-  }
-
-  protected void init(Context context, AttributeSet attributeSet) {
-    texts = new ArrayList<>();
-
-    imageRect  = new RectF();
-    focalPoint = new PointF();
-
-    Resources resources = context.getResources();
-
-    if (null != attributeSet) {
-      TypedArray attrs    = context.getTheme().obtainStyledAttributes(attributeSet, R.styleable.TextImageView, 0, 0);
-      currentSize = attrs.getDimensionPixelSize(R.styleable.TextImageView_android_textSize, resources.getDimensionPixelSize(R.dimen.default_text_size));
-      currentColor = attrs.getColor(R.styleable.TextImageView_android_textColor, Color.BLACK);
-      panEnabled = attrs.getBoolean(R.styleable.TextImageView_tiv_panEnabled, false);
-      scaleEnabled = attrs.getBoolean(R.styleable.TextImageView_tiv_scaleEnabled, false);
-      rotationEnabled = attrs.getBoolean(R.styleable.TextImageView_tiv_rotationEnabled, false);
-      interline = attrs.getDimensionPixelOffset(R.styleable.TextImageView_tiv_interline, 0);
-      clampTextMode = ClampMode.values()[attrs.getInt(R.styleable.TextImageView_tiv_clampTextMode, 0)];
-      setText(attrs.getString(R.styleable.TextImageView_android_text));
-
-      minSize = attrs.getDimensionPixelSize(R.styleable.TextImageView_tiv_minTextSize, resources.getDimensionPixelSize(R.dimen.default_min_text_size));
-      maxSize = attrs.getDimensionPixelSize(R.styleable.TextImageView_tiv_maxTextSize, resources.getDimensionPixelSize(R.dimen.default_max_text_size));
-      attrs.recycle();
-    }
-
-    scaleDetector  = new ScaleGestureDetector(context, this);
-    rotateDetector = new RotationGestureDetector(this);
-  }
-
-  @Override
-  protected void onDraw(Canvas canvas) {
-    super.onDraw(canvas);
-
-    if ( isInEditMode() && (0 == texts.size()) ) {
-      setText("sample text");
-    }
-
-    // Get rectangle of the drawable
-    imageRect.top  = 0;
-    imageRect.left = 0;
-
-    Drawable drawable = getDrawable();
-    if (null != drawable) {
-      imageRect.right = drawable.getIntrinsicWidth();
-      imageRect.bottom = drawable.getIntrinsicHeight();
-    }
-    // Translate and scale the rectangle
-    getImageMatrix().mapRect(imageRect);
-
-    for(TextProperties tp: texts) {
-      canvas.save();
-      if (rotationEnabled) {
-        canvas.rotate(-tp.rotation, tp.rotationCenter.x, tp.rotationCenter.y);
-      }
-
-      // Draw text
-      float top = tp.textPosition.y + imageRect.top;
-      for (int i = 0; i < tp.textLines.length; i++) {
-        int h = tp.textRects.get(i).height();
-        canvas.save();
-        canvas.translate(tp.textPosition.x + imageRect.left, top + h);
-        canvas.drawText(tp.textLines[i], 0, 0, tp.paint);
-        canvas.restore();
-        top += h + interline * tp.scale;
-      }
-      canvas.restore();
-    }
-  }
-
-  protected void recalculateFocalPoint(MotionEvent event) {
-    final int pointerCount = event.getPointerCount();
-    if (pointerCount <= 0) {
-      return;
-    }
-
-    focalPoint.x = 0f;
-    focalPoint.y = 0f;
-    for(int i=0; i<pointerCount; i++) {
-      focalPoint.x += event.getX(i);
-      focalPoint.y += event.getY(i);
-    }
-    focalPoint.x /= pointerCount;
-    focalPoint.y /= pointerCount;
-  }
-
-  protected static float between(float value, float min, float max) {
-    return Math.max(Math.min(value, max), min);
-  }
-
-  @Override
-  public boolean onTouchEvent(MotionEvent event) {
-    scaleDetector.onTouchEvent(event);
-    rotateDetector.onTouchEvent(event);
-    super.onTouchEvent(event);
-
-    final int action = event.getAction();
-    switch(action & MotionEvent.ACTION_MASK) {
-      case MotionEvent.ACTION_DOWN:
-      case MotionEvent.ACTION_UP:
-      case MotionEvent.ACTION_POINTER_UP:
-        recalculateFocalPoint(event);
-        return true;
-      case MotionEvent.ACTION_MOVE:
-        if (0 < texts.size()) {
-          final float x = focalPoint.x;
-          final float y = focalPoint.y;
-          TextProperties tp = texts.get(texts.size() - 1);
-
-          recalculateFocalPoint(event);
-
-          if (panEnabled) {
-            tp.textPosition.x += focalPoint.x - x;
-            tp.textPosition.y += focalPoint.y - y;
-
-            tp.rotationCenter.x += focalPoint.x - x;
-            tp.rotationCenter.y += focalPoint.y - y;
-
-            reclampText();
-
-            invalidate();
-          }
-        }
-        return true;
-    }
-    return false;
-  }
-
-  protected void reclampText() {
-    if (0 == texts.size()) {
-      return;
-    }
-
-    TextProperties tp = texts.get(texts.size()-1);
-    switch (clampTextMode) {
-      case UNLIMITED:
-        break;
-      case ORIGIN_INSIDE: {
-        RectF enclosingRect = calculateEnclosingRect();
-        enclosingRect.offset(-imageRect.left, -imageRect.top);
-        tp.textPosition.x -= enclosingRect.left-between(enclosingRect.left, 0, imageRect.width());
-        tp.textPosition.y -= enclosingRect.top-between(enclosingRect.top, 0, imageRect.height());
-        invalidate();
-        break;
-      }
-      case TEXT_INSIDE: {
-        RectF enclosingRect = calculateEnclosingRect();
-        enclosingRect.offset(-imageRect.left, -imageRect.top);
-        tp.textPosition.x -= enclosingRect.left - between(enclosingRect.left, 0, imageRect.width()-enclosingRect.width());
-        tp.textPosition.y -= enclosingRect.top - between(enclosingRect.top, 0, imageRect.height()-enclosingRect.height());
-        invalidate();
-        break;
-      }
-    }
-
-    if (null != onTextMovedListener) {
-      PointF position = getTextPosition();
-      if ( (!Float.isNaN(position.x)) && (!Float.isNaN(position.y)) ) {
-        onTextMovedListener.textMoved(position);
-      }
-    }
-  }
-
-  protected RectF calculateEnclosingRect() {
-    if (0 == texts.size()) {
-      return null;
-    }
-
-    TextProperties tp = texts.get(texts.size()-1);
-
-    Matrix mat = new Matrix();
-    RectF globalRect = new RectF();
-    float top = tp.textPosition.y;
-    for(int i=0; i<tp.textLines.length; i++) {
-      int h = tp.textRects.get(i).height();
-      RectF rect = new RectF(0, 0, tp.textRects.get(i).width(), h);
-      rect.offset(imageRect.left, imageRect.top);
-
-      mat.reset();
-      mat.preRotate(-tp.rotation, tp.rotationCenter.x, tp.rotationCenter.y);
-      mat.preTranslate(tp.textPosition.x, top);
-
-      mat.mapRect(rect);
-
-      if (0 == i) {
-        globalRect.set(rect);
-      } else {
-        globalRect.top = Math.min(globalRect.top, rect.top);
-        globalRect.left = Math.min(globalRect.left, rect.left);
-        globalRect.bottom = Math.max(globalRect.bottom, rect.bottom);
-        globalRect.right = Math.max(globalRect.right, rect.right);
-      }
-      top += h + interline*tp.scale;
-    }
-
-    return globalRect;
-  }
-
-  @Override
-  public boolean onScale(ScaleGestureDetector scaleGestureDetector) {
-    if (scaleEnabled && (0<texts.size())) {
-      TextProperties tp = texts.get(texts.size()-1);
-      tp.scale *= scaleGestureDetector.getScaleFactor();
-      tp.paint.setTextSize(Math.max(minSize, Math.min(tp.scale * tp.size, maxSize)));
-      tp.scale = tp.paint.getTextSize() / tp.size;
-      tp.setText(tp.text);
-      reclampText();
-      invalidate();
-    }
-
-    return true;
-  }
-
-  @Override
-  public boolean onScaleBegin(ScaleGestureDetector scaleGestureDetector) {
-    return true;
-  }
-
-  @Override
-  public void onScaleEnd(ScaleGestureDetector scaleGestureDetector) {
-  }
-
-  @Override
-  public void OnRotation(RotationGestureDetector rotationDetector) {
-    if (rotationEnabled && (0<texts.size())) {
-      TextProperties tp = texts.get(texts.size()-1);
-      tp.rotation += rotationDetector.getAngle() - previousRotation;
-      previousRotation = rotationDetector.getAngle();
-
-      tp.rotationCenter.x = focalPoint.x;
-      tp.rotationCenter.y = focalPoint.y;
-      invalidate();
-    }
-  }
-
-  /**************
-   *** Public ***
-   **************/
-
-  /**
-   * Set text to be drawn over the image.
-   * @param text The text.
-   */
-  public void setText(String text) {
-    texts.clear();
-    addText(text);
-  }
-
-  /**
-   * Adds a text to be drawn over the image, above existing texts.
-   * @param text The text.
-   */
-  public void addText(String text) {
-    if (null != text) {
-      texts.add(new TextProperties(text, currentSize, currentColor));
-      reclampText();
-      invalidate();
-    }
-  }
-
-  /**
-   * Removes the text on the top of the stack.
-   */
-  public void removeText() {
-    if (0 < texts.size()) {
-      texts.remove(texts.size()-1);
-      invalidate();
-    }
-  }
-
-  /**
-   * Set the typeface to use for the text.
-   * @param typeface The typeface to be used.
-   */
-  public void setTypeface(Typeface typeface) {
-    TextProperties tp = texts.get(texts.size()-1);
-    tp.paint.setTypeface(typeface);
-    reclampText();
-    invalidate();
-  }
-
-  /**
-   * Enable or disable user-pan for the view.
-   * @param enabled Whether panning should be enabled.
-   */
-  public void setPanEnabled(boolean enabled) {
-    panEnabled = enabled;
-  }
-
-  /**
-   * Enable or disable user-scaling for the view.
-   * @param enabled Whether scaling should be enabled.
-   */
-  public void setScaleEnabled(boolean enabled) {
-    scaleEnabled = enabled;
-  }
-
-  /**
-   * Enable or disable user-rotation for the view.
-   * @param enabled Whether rotation should be enabled.
-   */
-  public void setRotationEnabled(boolean enabled) {
-    rotationEnabled = enabled;
-  }
-
-  /**
-   * Set the text color.
-   * @param color Color in the format of <a href="http://developer.android.com/reference/android/graphics/Color.html">android.graphics.Color</a>.
-   *
-   * @see <a href="http://developer.android.com/reference/android/graphics/Color.html">android.graphics.Color</a>
-   */
-  public void setTextColor(int color) {
-    TextProperties tp = texts.get(texts.size()-1);
-    tp.paint.setColor(color);
-    invalidate();
-  }
-
-  /**
-   * Set the default text size to the given value, interpreted as "scaled pixel" units.
-   * This size is adjusted based on the current density and user font size preference.
-   * @param textSize The scaled pixel size.
-   */
-  public void setTextSize(float textSize) {
-    TextProperties tp = texts.get(texts.size()-1);
-    tp.scale = 1f;
-    tp.size  = textSize;
-    tp.paint.setTextSize(textSize);
-    tp.setText(tp.text);
-    reclampText();
-    invalidate();
-  }
-
-  /**
-   * Return offset position between the text and the image. Considers both top left corners to the the calculation.
-   * @return Pointf containing x and y offsets, as a per-one value. Eg. (0,0)=top-left, (1,1)=bottom-right.
-   */
-  public PointF getTextPosition() {
-    RectF enclosingRect = calculateEnclosingRect();
-    enclosingRect.offset(-imageRect.left, -imageRect.top);
-    return new PointF(enclosingRect.left / imageRect.width(), enclosingRect.top / imageRect.height());
-  }
-
-  /**
-   * Set the listener to be fired when the text changes its location.
-   * @param listener the listener to be called, or null.
-   */
-  public void setOnTextMovedListener(OnTextMovedListener listener) {
-    this.onTextMovedListener = listener;
-  }
-
-  /**
-   * Get the relative size between the image and the text.
-   * @return Relative size. Eg. 0.5=text half the height of the image.
-   */
-  public float getTextRelativeSize() {
-    TextProperties tp = texts.get(texts.size()-1);
-    return tp.paint.getTextSize() / imageRect.height();
-  }
-
-  /**
-   * Get the text rotation.
-   * @return Rotation angle.
-   */
-  public float getTextRotation() {
-    TextProperties tp = texts.get(texts.size()-1);
-    return tp.rotation;
-  }
-
-  /**
-   * Return rotation center for the text on top.
-   * @return Pointf containing x and y offsets, as a per-one value. Eg. (0,0)=top-left, (1,1)=bottom-right.
-   */
-  public PointF getTextRelativeRotationCenter() {
-    TextProperties tp = texts.get(texts.size()-1);
-    return new PointF(tp.rotationCenter.x / imageRect.width(), tp.rotationCenter.y / imageRect.height());
-  }
-}
diff --git a/textimageview/src/main/java/com/antonionicolaspina/textimageview/TextImageView.kt b/textimageview/src/main/java/com/antonionicolaspina/textimageview/TextImageView.kt
new file mode 100644
index 0000000..113a114
--- /dev/null
+++ b/textimageview/src/main/java/com/antonionicolaspina/textimageview/TextImageView.kt
@@ -0,0 +1,217 @@
+package com.antonionicolaspina.textimageview
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.graphics.Canvas
+import android.graphics.Typeface
+import android.util.AttributeSet
+import android.view.MotionEvent
+import android.widget.ImageView
+import androidx.annotation.ColorInt
+import androidx.core.graphics.contains
+import androidx.core.graphics.toPoint
+import androidx.core.graphics.withMatrix
+import com.mapbox.android.gestures.*
+import kotlin.math.max
+import kotlin.math.min
+
+
+class TextImageView
+@JvmOverloads constructor(
+  context: Context, attributeSet: AttributeSet? = null, defStyleAttr: Int = 0
+): ImageView(context, attributeSet, defStyleAttr) {
+  interface Listener {
+    fun textsChanged(texts: List<Text>)
+  }
+
+  var panEnabled = false
+  var scaleEnabled = false
+  var rotationEnabled = false
+  var listener: Listener? = null
+  var initialTextSize = 0f
+  var minTextSize = 0f
+  var maxTextSize = 0f
+
+  private val texts = mutableListOf<TextProperties>()
+  private var selectedText: TextProperties? = null
+
+  init {
+    context.theme.obtainStyledAttributes(attributeSet, R.styleable.TextImageView, 0, 0).apply {
+      try {
+        panEnabled = getBoolean(R.styleable.TextImageView_tiv_panEnabled, false)
+        scaleEnabled = getBoolean(R.styleable.TextImageView_tiv_scaleEnabled, false)
+        rotationEnabled = getBoolean(R.styleable.TextImageView_tiv_rotationEnabled, false)
+
+        initialTextSize = getDimensionPixelSize(
+          R.styleable.TextImageView_tiv_initialTextSize, resources.getDimensionPixelSize(
+            R.dimen.default_text_size
+          )
+        ).toFloat()
+        minTextSize = getDimensionPixelSize(
+          R.styleable.TextImageView_tiv_minTextSize, resources.getDimensionPixelSize(
+            R.dimen.default_min_text_size
+          )
+        ).toFloat()
+        maxTextSize = getDimensionPixelSize(
+          R.styleable.TextImageView_tiv_maxTextSize, resources.getDimensionPixelSize(
+            R.dimen.default_max_text_size
+          )
+        ).toFloat()
+      } finally {
+        recycle()
+      }
+    }
+  }
+
+  override fun onDraw(canvas: Canvas) {
+    super.onDraw(canvas)
+
+    if (isInEditMode && texts.isEmpty()) {
+      setText("sample text")
+    }
+
+    texts.forEach { tp ->
+      canvas.withMatrix(tp.matrix) {
+        canvas.drawText(tp.text, 0f, 0f, tp.paint)
+      }
+    }
+  }
+
+  /**
+   * Set text to be drawn over the image.
+   * @param text The text.
+   */
+  fun setText(text: String) {
+    texts.clear()
+    addText(text)
+  }
+
+  /**
+   * Set the typeface to use for the text.
+   * @param typeface The typeface to be used.
+   */
+  fun setTypeface(typeface: Typeface?) {
+    selectedText?.let {
+      it.paint.typeface = typeface
+      textChanged(it)
+    }
+  }
+
+  /**
+   * Set the text color.
+   * @param color Color in the format of <a href="http://developer.android.com/reference/android/graphics/Color.html">android.graphics.Color</a>.
+   *
+   * @see <a href="http://developer.android.com/reference/android/graphics/Color.html">android.graphics.Color</a>
+   */
+  fun setTextColor(@ColorInt color: Int) {
+    selectedText?.let {
+      it.paint.color = color
+      textChanged(it)
+    }
+  }
+
+  /**
+   * Adds a text to be drawn over the image, above existing texts.
+   * @param text The text.
+   */
+  fun addText(text: String) {
+    val tp = TextProperties(text)
+    tp.paint.textSize = initialTextSize
+    texts.add(tp)
+    selectedText = tp
+    textChanged(tp)
+  }
+
+  //region Gestures
+  private val androidGesturesManager = AndroidGesturesManager(context).apply {
+    setMoveGestureListener(object : MoveGestureDetector.SimpleOnMoveGestureListener() {
+      override fun onMove(
+        detector: MoveGestureDetector,
+        distanceX: Float,
+        distanceY: Float
+      ): Boolean {
+        if (panEnabled) {
+          selectedText?.let {
+            it.position.x -= distanceX
+            it.position.y -= distanceY
+            textChanged(it)
+          }
+        }
+        return true
+      }
+    })
+
+    setStandardScaleGestureListener(object :
+      StandardScaleGestureDetector.SimpleStandardOnScaleGestureListener() {
+      override fun onScale(detector: StandardScaleGestureDetector): Boolean {
+        if (scaleEnabled) {
+          selectedText?.let {
+            val s = it.scaleFactor * detector.scaleFactor
+            val textSize = s * it.paint.textSize
+            it.scaleFactor = max(minTextSize, min(textSize, maxTextSize)) / it.paint.textSize
+            textChanged(it)
+          }
+        }
+        return true
+      }
+    })
+
+    setRotateGestureListener(object : RotateGestureDetector.SimpleOnRotateGestureListener() {
+      override fun onRotate(
+        detector: RotateGestureDetector,
+        rotationDegreesSinceLast: Float,
+        rotationDegreesSinceFirst: Float
+      ): Boolean {
+        if (rotationEnabled) {
+          selectedText?.let {
+            it.rotationDegress -= rotationDegreesSinceLast
+            textChanged(it)
+          }
+        }
+        return true
+      }
+    })
+
+    setStandardGestureListener(object : StandardGestureDetector.SimpleStandardOnGestureListener() {
+      override fun onDown(e: MotionEvent): Boolean {
+        texts.forEach { tp ->
+          val p = tp.inverseMap(e.x, e.y)
+
+          if (tp.boundingRect.contains(p.toPoint())) {
+            selectedText = tp
+          }
+        }
+        invalidate()
+        return true
+      }
+    })
+  }
+
+  @SuppressLint("ClickableViewAccessibility")
+  override fun onTouchEvent(event: MotionEvent?): Boolean {
+    androidGesturesManager.onTouchEvent(event)
+    return true
+  }
+  //endregion
+
+  private fun textChanged(tp: TextProperties) {
+    invalidate()
+
+    tp.paint.getTextBounds(tp.text, 0, tp.text.length, tp.boundingRect)
+
+    with(tp.matrix) {
+      reset()
+      setScale(tp.scaleFactor, tp.scaleFactor)
+      preTranslate(tp.position.x / tp.scaleFactor, tp.position.y / tp.scaleFactor)
+      preRotate(
+        tp.rotationDegress,
+        tp.boundingRect.exactCenterX() / tp.scaleFactor,
+        tp.boundingRect.exactCenterY() / tp.scaleFactor
+      )
+    }
+
+    val w = measuredWidth
+    val h = measuredHeight
+    listener?.textsChanged(texts.map { it.toText(w, h) })
+  }
+}
diff --git a/textimageview/src/main/java/com/antonionicolaspina/textimageview/TextProperties.kt b/textimageview/src/main/java/com/antonionicolaspina/textimageview/TextProperties.kt
new file mode 100644
index 0000000..a91c9f8
--- /dev/null
+++ b/textimageview/src/main/java/com/antonionicolaspina/textimageview/TextProperties.kt
@@ -0,0 +1,33 @@
+package com.antonionicolaspina.textimageview
+
+import android.graphics.Matrix
+import android.graphics.Paint
+import android.graphics.PointF
+import android.graphics.Rect
+
+internal data class TextProperties(
+    val text: String,
+    val paint: Paint = Paint(Paint.ANTI_ALIAS_FLAG),
+    val position: PointF = PointF(),
+    var scaleFactor: Float = 1f,
+    var rotationDegress: Float = 0f,
+    val boundingRect: Rect = Rect(),
+    val matrix: Matrix = Matrix()
+) {
+    private var inverseMatrix = Matrix()
+
+    fun toText(w: Int, h: Int) = Text(
+        text,
+        PointF(position.x/w, position.y/h),
+        scaleFactor,
+        rotationDegress
+    )
+
+    fun inverseMap(x: Float, y: Float): PointF {
+        val floats = listOf(x, y).toFloatArray()
+        matrix.invert(inverseMatrix)
+        inverseMatrix.mapPoints(floats)
+
+        return PointF(floats[0], floats[1])
+    }
+}
diff --git a/textimageview/src/main/res/values/attrs.xml b/textimageview/src/main/res/values/attrs.xml
index 9f0bc1d..5431401 100644
--- a/textimageview/src/main/res/values/attrs.xml
+++ b/textimageview/src/main/res/values/attrs.xml
@@ -1,18 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <declare-styleable name="TextImageView">
-        <!-- Text being drawn over the image -->
-        <attr name="android:text"/>
-
-        <!-- Color to apply to the text being drawn over the image -->
-        <attr name="android:textColor"/>
-
-        <!-- Size of the text being drawn over the image -->
-        <attr name="android:textSize"/>
-
         <!-- Whether or not to allow the user to scale the text -->
         <attr name="tiv_scaleEnabled" format="boolean" />
 
+        <!-- Initial size of the text being drawn over the image -->
+        <attr name="tiv_initialTextSize" format="dimension"/>
+
         <!-- Minimum size of the text being drawn over the image -->
         <attr name="tiv_minTextSize" format="dimension"/>
 
@@ -24,18 +18,5 @@
 
         <!-- Whether or not to allow the user to rotate the text -->
         <attr name="tiv_rotationEnabled" format="boolean" />
-
-        <!-- Whether or not to allow the user to move the text -->
-        <attr name="tiv_interline" format="dimension" />
-
-        <!-- Controls how the the positioning behaves in relation to the image -->
-        <attr name="tiv_clampTextMode" format="enum">
-            <!-- Do not limit text position -->
-            <enum name="unlimited" value="0" />
-            <!-- Top-left corner inside the area of the image -->
-            <enum name="originInside" value="1" />
-            <!-- The whole text should fit inside the area of the image -->
-            <enum name="textInside" value="2" />
-        </attr>
     </declare-styleable>
 </resources>