Merge pull request #17 from zfman/dev

v2.0.3
zfman · Sep 2, 2018 · 9f00470 · 9f00470
2 parents 274f41b + 1306e6c
commit 9f00470
Show file tree

Hide file tree

Showing 118 changed files with 22,749 additions and 538 deletions.
diff --git a/AndroidTimetableView/.idea/caches/build_file_checksums.ser b/AndroidTimetableView/.idea/caches/build_file_checksums.ser
diff --git a/AndroidTimetableView/.idea/codeStyles/Project.xml b/AndroidTimetableView/.idea/codeStyles/Project.xml
diff --git a/AndroidTimetableView/.idea/misc.xml b/AndroidTimetableView/.idea/misc.xml
diff --git a/AndroidTimetableView/TimetableView/build.gradle b/AndroidTimetableView/TimetableView/build.gradle
@@ -55,7 +55,7 @@ publish {
     repoName='Maven'
     groupId = 'com.zhuangfei'//jcenter上的路径
     artifactId = 'TimetableView'//项目名称
-    publishVersion = '2.0.2'//版本号
+    publishVersion = '2.0.3'//版本号
     desc = 'A beautiful Android based curriculum schedule widget'//描述，不重要
     website = 'https://github.com/zfman/TimetableView'//网站，不重要；尽量模拟github上的地址，例如我这样的；当然你有地址最好了
 }
diff --git a/AndroidTimetableView/TimetableView/res/layout/view_content.xml b/AndroidTimetableView/TimetableView/res/layout/view_content.xml
@@ -12,9 +12,8 @@
         android:orientation="horizontal">
         <LinearLayout
             android:id="@+id/weekPanel_0"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_weight="1"
             android:paddingBottom="5dp"
             android:background="@color/app_white"
             android:orientation="vertical">
@@ -25,55 +24,55 @@
             android:id="@+id/weekPanel_1"
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_weight="1.5"
+            android:layout_weight="1"
             android:layout_marginBottom="5dp"
             android:orientation="vertical"></LinearLayout>
 
         <LinearLayout
             android:id="@+id/weekPanel_2"
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_weight="1.5"
+            android:layout_weight="1"
             android:layout_marginBottom="5dp"
             android:orientation="vertical"></LinearLayout>
 
         <LinearLayout
             android:id="@+id/weekPanel_3"
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_weight="1.5"
+            android:layout_weight="1"
             android:layout_marginBottom="5dp"
             android:orientation="vertical"></LinearLayout>
 
         <LinearLayout
             android:id="@+id/weekPanel_4"
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_weight="1.5"
+            android:layout_weight="1"
             android:layout_marginBottom="5dp"
             android:orientation="vertical"></LinearLayout>
 
         <LinearLayout
             android:id="@+id/weekPanel_5"
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_weight="1.5"
+            android:layout_weight="1"
             android:layout_marginBottom="5dp"
             android:orientation="vertical"></LinearLayout>
 
         <LinearLayout
             android:id="@+id/weekPanel_6"
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_weight="1.5"
+            android:layout_weight="1"
             android:layout_marginBottom="5dp"
             android:orientation="vertical"></LinearLayout>
 
         <LinearLayout
             android:id="@+id/weekPanel_7"
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_weight="1.5"
+            android:layout_weight="1"
             android:layout_marginBottom="5dp"
             android:orientation="vertical"></LinearLayout>
     </LinearLayout>