Skip to content

Commit 7692c8b

Browse files
whalemarewhalemare
committed
Up version 1.3.4
* fix right support * re-upload files * some changes in sample
1 parent 4254f56 commit 7692c8b

File tree

9 files changed

+74
-31
lines changed

9 files changed

+74
-31
lines changed

‎.idea/inspectionProfiles/Project_Default.xml‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/misc.xml‎

Lines changed: 1 addition & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Library for speedy implementation menu with BottomSheet
33

44
[![Release](https://jitpack.io/v/whalemare/sheetmenu.svg)](https://jitpack.io/#whalemare/sheetmenu)
55

6-
![Screenshot](screens/1.3.3.gif)
6+
![Screenshot](screens/$app_version.gif)
77

88
Usage
99
-----
@@ -50,19 +50,19 @@ Install
5050

5151
Be sure, that you have `Jitpack` in your root gradle file
5252

53-
```
53+
```diff
5454
allprojects {
5555
repositories {
5656
jcenter()
57-
maven { url "https://jitpack.io" }
57+
+ maven { url "https://jitpack.io" }
5858
}
5959
}
6060
```
6161

6262
Include dependency with `BottomSheet` in your app.gradle file with:
6363

64-
```groovy
65-
compile 'com.github.whalemare:sheetmenu:1.3.3'
64+
```diff
65+
+ implementation 'com.github.whalemare:sheetmenu:$app_version'
6666
```
6767

6868

‎app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ dependencies {
4040
// compile 'com.github.whalemare:sheetmenu:1.3.2'
4141
compile 'com.android.support:appcompat-v7:25.3.1'
4242
compile 'com.android.support.constraint:constraint-layout:1.0.2'
43-
compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
43+
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
4444

4545
testCompile 'junit:junit:4.12'
4646
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {

‎app/src/main/java/ru/whalemare/bottomsheet/MainActivityKotlin.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ open class MainActivityKotlin : AppCompatActivity() {
4949
fun setupGrid() {
5050
SheetMenu(
5151
titleId = if (needTitle) R.string.title else 0,
52-
menu = R.menu.menu_icons,
52+
menu = R.menu.menu_long_icons,
5353
layoutManager = GridLayoutManager(this, 3),
5454
click = MenuItem.OnMenuItemClickListener {
5555
toast("Click on ${it.title}")

‎app/src/main/res/menu/menu_icons.xml‎

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,38 @@
11
<menu xmlns:android="http://schemas.android.com/apk/res/android">
2+
3+
<group android:checkableBehavior="all">
4+
5+
<item
6+
android:id="@+id/action_one"
7+
android:icon="@drawable/ic_atom"
8+
android:title="One"/>
9+
<item
10+
android:id="@+id/action_two"
11+
android:icon="@drawable/ic_disco"
12+
android:title="Two"/>
13+
<item
14+
android:id="@+id/action_three"
15+
android:icon="@drawable/ic_atom"
16+
android:title="Three"/>
17+
</group>
218
<item
3-
android:id="@+id/action_one"
19+
android:id="@+id/action_four"
20+
android:icon="@drawable/ic_disco"
21+
android:title="Four"/>
22+
<item
23+
android:id="@+id/action_five"
424
android:icon="@drawable/ic_atom"
5-
android:title="One"/>
25+
android:title="Five"/>
626
<item
7-
android:id="@+id/action_two"
27+
android:id="@+id/action_six"
828
android:icon="@drawable/ic_disco"
9-
android:title="Two"/>
29+
android:title="Six"/>
1030
<item
11-
android:id="@+id/action_three"
31+
android:id="@+id/action_seven"
1232
android:icon="@drawable/ic_atom"
13-
android:title="Three"/>
33+
android:title="Seven"/>
1434
<item
15-
android:id="@+id/action_four"
35+
android:id="@+id/action_more"
1636
android:icon="@drawable/ic_disco"
17-
android:title="Four"/>
37+
android:title="More"/>
1838
</menu>

‎app/src/main/res/menu/menu_long_icons.xml‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<menu xmlns:android="http://schemas.android.com/apk/res/android">
2+
<item
3+
android:id="@+id/action_one"
4+
android:icon="@drawable/ic_atom"
5+
android:title="OneOne"/>
6+
<item
7+
android:id="@+id/action_two"
8+
android:icon="@drawable/ic_disco"
9+
android:title="Two Two Two"/>
10+
<item
11+
android:id="@+id/action_three"
12+
android:icon="@drawable/ic_atom"
13+
android:title="Three Three Three"/>
14+
<item
15+
android:id="@+id/action_four"
16+
android:icon="@drawable/ic_disco"
17+
android:title="Four Four Four"/>
18+
<item
19+
android:id="@+id/action_five"
20+
android:icon="@drawable/ic_atom"
21+
android:title="Five Five Five"/>
22+
<item
23+
android:id="@+id/action_six"
24+
android:icon="@drawable/ic_disco"
25+
android:title="Six Six Six"/>
26+
<item
27+
android:id="@+id/action_seven"
28+
android:icon="@drawable/ic_atom"
29+
android:title="Seven Seven Seven"/>
30+
<item
31+
android:id="@+id/action_more"
32+
android:icon="@drawable/ic_disco"
33+
android:title="More More More"/>
34+
</menu>

‎build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = '1.1.2-5'
5-
ext.app_version = "1.3.3"
4+
ext.kotlin_version = '1.2.21'
5+
ext.app_version = "1.3.4"
66
repositories {
77
jcenter()
88
}

‎sheetmenu/src/main/res/layout/item_linear.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
android:layout_height="24dp"
1717
android:layout_gravity="center"
1818
android:layout_marginEnd="32dp"
19+
android:layout_marginRight="32dp"
1920
tools:background="@color/gray_material"/>
2021

2122
<TextView

0 commit comments

Comments
 (0)