Up version 1.3.4

* fix right support * re-upload files * some changes in sample
whalemare · Feb 8, 2018 · 7692c8b · 7692c8b
1 parent 4254f56
commit 7692c8b
Show file tree

Hide file tree

Showing 9 changed files with 74 additions and 31 deletions.
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@ Library for speedy implementation menu with BottomSheet
 
 [![Release](https://jitpack.io/v/whalemare/sheetmenu.svg)](https://jitpack.io/#whalemare/sheetmenu)
 
-![Screenshot](screens/1.3.3.gif)
+![Screenshot](screens/$app_version.gif)
 
 Usage
 -----
@@ -50,19 +50,19 @@ Install
 
 Be sure, that you have `Jitpack` in your root gradle file
 
-```
+```diff
 allprojects {
     repositories {
       jcenter()
-      maven { url "https://jitpack.io" }
++     maven { url "https://jitpack.io" }
     }
 }
 ```
 
 Include dependency with `BottomSheet` in your app.gradle file with:
 
-```groovy
-compile 'com.github.whalemare:sheetmenu:1.3.3'
+```diff
++ implementation 'com.github.whalemare:sheetmenu:$app_version'
 ```
 
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -40,7 +40,7 @@ dependencies {
 //    compile 'com.github.whalemare:sheetmenu:1.3.2'
     compile 'com.android.support:appcompat-v7:25.3.1'
     compile 'com.android.support.constraint:constraint-layout:1.0.2'
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
     testCompile 'junit:junit:4.12'
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {

diff --git a/app/src/main/java/ru/whalemare/bottomsheet/MainActivityKotlin.kt b/app/src/main/java/ru/whalemare/bottomsheet/MainActivityKotlin.kt
@@ -49,7 +49,7 @@ open class MainActivityKotlin : AppCompatActivity() {
     fun setupGrid() {
         SheetMenu(
                 titleId = if (needTitle) R.string.title else 0,
-                menu = R.menu.menu_icons,
+                menu = R.menu.menu_long_icons,
                 layoutManager = GridLayoutManager(this, 3),
                 click = MenuItem.OnMenuItemClickListener {
                     toast("Click on ${it.title}")

diff --git a/app/src/main/res/menu/menu_icons.xml b/app/src/main/res/menu/menu_icons.xml
@@ -1,18 +1,38 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <group android:checkableBehavior="all">
+
+        <item
+            android:id="@+id/action_one"
+            android:icon="@drawable/ic_atom"
+            android:title="One"/>
+        <item
+            android:id="@+id/action_two"
+            android:icon="@drawable/ic_disco"
+            android:title="Two"/>
+        <item
+            android:id="@+id/action_three"
+            android:icon="@drawable/ic_atom"
+            android:title="Three"/>
+    </group>
     <item
-        android:id="@+id/action_one"
+        android:id="@+id/action_four"
+        android:icon="@drawable/ic_disco"
+        android:title="Four"/>
+    <item
+        android:id="@+id/action_five"
         android:icon="@drawable/ic_atom"
-        android:title="One"/>
+        android:title="Five"/>
     <item
-        android:id="@+id/action_two"
+        android:id="@+id/action_six"
         android:icon="@drawable/ic_disco"
-        android:title="Two"/>
+        android:title="Six"/>
     <item
-        android:id="@+id/action_three"
+        android:id="@+id/action_seven"
         android:icon="@drawable/ic_atom"
-        android:title="Three"/>
+        android:title="Seven"/>
     <item
-        android:id="@+id/action_four"
+        android:id="@+id/action_more"
         android:icon="@drawable/ic_disco"
-        android:title="Four"/>
+        android:title="More"/>
 </menu>
diff --git a/app/src/main/res/menu/menu_long_icons.xml b/app/src/main/res/menu/menu_long_icons.xml
@@ -0,0 +1,34 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/action_one"
+        android:icon="@drawable/ic_atom"
+        android:title="OneOne"/>
+    <item
+        android:id="@+id/action_two"
+        android:icon="@drawable/ic_disco"
+        android:title="Two Two Two"/>
+    <item
+        android:id="@+id/action_three"
+        android:icon="@drawable/ic_atom"
+        android:title="Three Three Three"/>
+    <item
+        android:id="@+id/action_four"
+        android:icon="@drawable/ic_disco"
+        android:title="Four Four Four"/>
+    <item
+        android:id="@+id/action_five"
+        android:icon="@drawable/ic_atom"
+        android:title="Five Five Five"/>
+    <item
+        android:id="@+id/action_six"
+        android:icon="@drawable/ic_disco"
+        android:title="Six Six Six"/>
+    <item
+        android:id="@+id/action_seven"
+        android:icon="@drawable/ic_atom"
+        android:title="Seven Seven Seven"/>
+    <item
+        android:id="@+id/action_more"
+        android:icon="@drawable/ic_disco"
+        android:title="More More More"/>
+</menu>
diff --git a/build.gradle b/build.gradle
@@ -1,8 +1,8 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.1.2-5'
-    ext.app_version = "1.3.3"
+    ext.kotlin_version = '1.2.21'
+    ext.app_version = "1.3.4"
     repositories {
         jcenter()
     }

diff --git a/sheetmenu/src/main/res/layout/item_linear.xml b/sheetmenu/src/main/res/layout/item_linear.xml
@@ -16,6 +16,7 @@
         android:layout_height="24dp"
         android:layout_gravity="center"
         android:layout_marginEnd="32dp"
+        android:layout_marginRight="32dp"
         tools:background="@color/gray_material"/>
 
     <TextView