y-axis shifting while zoom out fixed

murgupluoglu · Apr 3, 2019 · f3f3c6f · f3f3c6f
1 parent 26b4823
commit f3f3c6f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/app/src/main/java/com/murgupluoglu/seatviewsample/MockActivity.kt b/app/src/main/java/com/murgupluoglu/seatviewsample/MockActivity.kt
@@ -6,7 +6,7 @@ import com.murgupluoglu.seatview.Seat
 import kotlinx.android.synthetic.main.activity_main.*
 import org.json.JSONArray
 import org.json.JSONObject
-import java.util.HashMap
+import java.util.*
 
 /**
  * Created by Mustafa Urgupluoglu on 3.04.2019.

diff --git a/app/src/main/res/layout/activity_mock.xml b/app/src/main/res/layout/activity_mock.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">

diff --git a/seatview/src/main/java/com/murgupluoglu/seatview/SeatView.kt b/seatview/src/main/java/com/murgupluoglu/seatview/SeatView.kt
@@ -84,7 +84,7 @@ class SeatView : View {
                 }
                 invalidate()
             } else {
-                // click blank area
+                // clicked blank area
             }
 
 

diff --git a/seatview/src/main/java/com/murgupluoglu/seatview/SeatViewConfig.kt b/seatview/src/main/java/com/murgupluoglu/seatview/SeatViewConfig.kt
@@ -3,7 +3,6 @@ package com.murgupluoglu.seatview
 import android.content.Context
 import android.graphics.Path
 import android.graphics.RectF
-import android.util.Log
 import java.math.BigDecimal
 
 class SeatViewConfig(val context: Context) {
@@ -277,7 +276,6 @@ class SeatViewConfig(val context: Context) {
             if (seatViewRect.left < windowRect.left + seatNamesBarWidth) {
                 xOffset -= moveX
                 xOffset = xOffset.round(2)
-                Log.e("TAG", xOffset.toString())
             }
         } else {
             if (seatViewRect.right > windowRect.right) {
@@ -337,6 +335,12 @@ class SeatViewConfig(val context: Context) {
 
         xOffset = touchX - (virtualWidth * ratioX).toInt()
         yOffset = touchY - (virtualHeight * ratioY).toInt()
+        if(yOffset > yOffsetDefault){
+            yOffset = yOffsetDefault
+        }
+        if(xOffset > xOffsetDefault){
+            xOffset = xOffsetDefault
+        }
     }
 
     fun isSafeSelect(rowIndex: Int, columnIndex: Int): Boolean {