xXis height error4 fix

islandparadise14 · Feb 23, 2020 · 22c6a24 · 22c6a24
1 parent 87f74dd
commit 22c6a24
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 41 deletions.
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ If you only add a course, **the course time is automatically calculated** and ad
 Timetable Library for Android Development   
 Author : Mint Park / Seoul, South Korea   
 Email : [email protected]   
-Newest Version : 1.3.5 (JitPack)  
+Newest Version : 1.3.6 (JitPack)  
 
 ![Platform](https://img.shields.io/badge/Platform-Android-orange.svg)
 ![API](https://img.shields.io/badge/API-19%2B-green.svg)

diff --git a/app/build.gradle b/app/build.gradle
@@ -13,8 +13,8 @@ android {
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 29
-        versionCode 12
-        versionName "1.3.5"
+        versionCode 13
+        versionName "1.3.6"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

diff --git a/app/src/main/java/com/islandparadise14/mintable/MinTimeTableView.kt b/app/src/main/java/com/islandparadise14/mintable/MinTimeTableView.kt
@@ -143,8 +143,8 @@ class MinTimeTableView : BaseTimeTable {
         topMenu.layoutParams =  LayoutParams(LayoutParams.WRAP_CONTENT, topMenuHeightPx.roundToInt())
         mainTable.layoutParams = LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT)
         if (border) {
-            timetable.setBackgroundColor(lineColor)
-            timetable.setPadding(1,1,0,0)
+            borderBox.setBackgroundColor(lineColor)
+            borderBox.setPadding(dpToPx(tableContext,1f).roundToInt(),dpToPx(tableContext,1f).roundToInt(),0,0)
             averageWidth -= 1
         }
         removeViews(arrayOf(zeroPoint, topMenu, timeCell, mainTable))

diff --git a/app/src/main/res/layout/mintable.xml b/app/src/main/res/layout/mintable.xml
@@ -7,61 +7,69 @@
     android:id="@+id/timetable"
     android:orientation="horizontal">
 
-
     <LinearLayout
-        android:id="@+id/leftMenu"
-        android:layout_width="30dp"
-        android:layout_height="600dp"
+        android:id="@+id/borderBox"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:background="#dddddd"
-        android:orientation="vertical">
-
+        tools:layout_width="match_parent">
 
         <LinearLayout
-            android:id="@+id/zeroPoint"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:id="@+id/leftMenu"
+            android:layout_width="30dp"
+            android:layout_height="600dp"
+            android:background="#dddddd"
             android:orientation="vertical">
 
+
+            <LinearLayout
+                android:id="@+id/zeroPoint"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/timeCell"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+
+            </LinearLayout>
         </LinearLayout>
 
         <LinearLayout
-            android:id="@+id/timeCell"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:orientation="vertical">
 
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
 
+            <LinearLayout
+                android:id="@+id/topMenu"
+                android:layout_width="match_parent"
+                android:background="#dddddd"
+                android:layout_height="30dp"
+                android:orientation="horizontal">
 
-        <LinearLayout
-            android:id="@+id/topMenu"
-            android:layout_width="match_parent"
-            android:background="#dddddd"
-            android:layout_height="30dp"
-            android:orientation="horizontal">
+            </LinearLayout>
 
-        </LinearLayout>
+            <FrameLayout
+                android:id="@+id/mainTable"
+                android:layout_width="match_parent"
+                android:background="#dddddd"
+                android:layout_height="match_parent">
 
-        <FrameLayout
-            android:id="@+id/mainTable"
-            android:layout_width="match_parent"
-            android:background="#dddddd"
-            android:layout_height="match_parent">
+                <TextView
+                    android:id="@+id/textView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text=""
+                    tools:text="TimetableView"/>
 
-            <TextView
-                android:id="@+id/textView"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text=""
-                tools:text="TimetableView"/>
+            </FrameLayout>
 
-        </FrameLayout>
+        </LinearLayout>
 
     </LinearLayout>
 </LinearLayout>