Skip to content
This repository was archived by the owner on Jan 17, 2023. It is now read-only.

Commit 6987610

Browse files
zainfikrihPatilShreyas
zainfikrih
and
PatilShreyas
authored
Fix the problem of bounded ripple effect (#11)
* fixed bounded ripple effect * Made some modifications * Small fix Co-authored-by: Shreyas Patil <[email protected]>
1 parent a7a69b0 commit 6987610

File tree

12 files changed

+142
-11
lines changed

12 files changed

+142
-11
lines changed

‎.idea/codeStyles/Project.xml

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

‎MaterialNavigationView/src/main/res/color/navigation_item_background_tint.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22

33
<selector xmlns:android="http://schemas.android.com/apk/res/android">
44
<item android:color="?attr/colorSecondary" android:alpha="0.12" android:state_checked="true" />
5+
<item android:color="@android:color/white" android:alpha="0.12" android:state_pressed="true"/>
56
<item android:color="@android:color/transparent" />
67
</selector>

‎MaterialNavigationView/src/main/res/drawable-v21/navigation_item_background_default.xml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
3+
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
4+
android:color="?attr/colorControlHighlight">
5+
<item android:id="@android:id/mask">
6+
<inset
7+
android:insetLeft="@dimen/nav_item_background_inset_default"
8+
android:insetTop="@dimen/nav_item_background_inset_default"
9+
android:insetRight="@dimen/nav_item_background_inset_right_default"
10+
android:insetBottom="@dimen/nav_item_background_inset_default">
11+
<shape>
12+
<corners
13+
android:bottomLeftRadius="@dimen/nav_item_background_radius_default"
14+
android:bottomRightRadius="@dimen/nav_item_background_radius_default"
15+
android:topLeftRadius="@dimen/nav_item_background_radius_default"
16+
android:topRightRadius="@dimen/nav_item_background_radius_default" />
17+
</shape>
18+
</inset>
19+
</item>
20+
<item android:state_checked="true">
21+
<inset
22+
android:insetLeft="@dimen/nav_item_background_inset_default"
23+
android:insetTop="@dimen/nav_item_background_inset_default"
24+
android:insetRight="@dimen/nav_item_background_inset_right_default"
25+
android:insetBottom="@dimen/nav_item_background_inset_default">
26+
<shape>
27+
<corners
28+
android:bottomLeftRadius="@dimen/nav_item_background_radius_default"
29+
android:bottomRightRadius="@dimen/nav_item_background_radius_default"
30+
android:topLeftRadius="@dimen/nav_item_background_radius_default"
31+
android:topRightRadius="@dimen/nav_item_background_radius_default" />
32+
</shape>
33+
</inset>
34+
</item>
35+
<item>
36+
<color android:color="@android:color/transparent" />
37+
</item>
38+
</ripple>

‎MaterialNavigationView/src/main/res/drawable-v21/navigation_item_background_rounded_rect.xml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
3+
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
4+
android:color="?attr/colorControlHighlight">
5+
<item android:id="@android:id/mask">
6+
<inset
7+
android:insetLeft="@dimen/nav_item_background_inset_left_sq"
8+
android:insetTop="@dimen/nav_item_background_inset_top_sq"
9+
android:insetRight="@dimen/nav_item_background_inset_right_sq"
10+
android:insetBottom="@dimen/nav_item_background_inset_bottom_sq">
11+
<shape>
12+
<corners
13+
android:bottomLeftRadius="@dimen/nav_item_background_corner_radius_left_sq"
14+
android:bottomRightRadius="@dimen/nav_item_background_corner_radius_right_sq"
15+
android:topLeftRadius="@dimen/nav_item_background_corner_radius_left_sq"
16+
android:topRightRadius="@dimen/nav_item_background_corner_radius_right_sq" />
17+
18+
</shape>
19+
</inset>
20+
</item>
21+
<item android:state_checked="true">
22+
<inset
23+
android:insetLeft="@dimen/nav_item_background_inset_left_sq"
24+
android:insetTop="@dimen/nav_item_background_inset_top_sq"
25+
android:insetRight="@dimen/nav_item_background_inset_right_sq"
26+
android:insetBottom="@dimen/nav_item_background_inset_bottom_sq">
27+
<shape>
28+
<corners
29+
android:bottomLeftRadius="@dimen/nav_item_background_corner_radius_left_sq"
30+
android:bottomRightRadius="@dimen/nav_item_background_corner_radius_right_sq"
31+
android:topLeftRadius="@dimen/nav_item_background_corner_radius_left_sq"
32+
android:topRightRadius="@dimen/nav_item_background_corner_radius_right_sq" />
33+
</shape>
34+
</inset>
35+
</item>
36+
<item>
37+
<color android:color="@android:color/transparent" />
38+
</item>
39+
</ripple>

‎MaterialNavigationView/src/main/res/drawable-v21/navigation_item_background_rounded_right.xml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
3+
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
4+
android:color="?attr/colorControlHighlight">
5+
<item android:id="@android:id/mask">
6+
<inset
7+
android:insetLeft="@dimen/nav_item_background_inset_left"
8+
android:insetRight="@dimen/nav_item_background_inset_right">
9+
<shape>
10+
<corners
11+
android:bottomLeftRadius="@dimen/nav_item_background_corner_radius_left"
12+
android:bottomRightRadius="@dimen/nav_item_background_corner_radius_right"
13+
android:topLeftRadius="@dimen/nav_item_background_corner_radius_left"
14+
android:topRightRadius="@dimen/nav_item_background_corner_radius_right" />
15+
</shape>
16+
</inset>
17+
</item>
18+
<item>
19+
<inset
20+
android:insetLeft="@dimen/nav_item_background_inset_left"
21+
android:insetRight="@dimen/nav_item_background_inset_right">
22+
<shape>
23+
<corners
24+
android:bottomLeftRadius="@dimen/nav_item_background_corner_radius_left"
25+
android:bottomRightRadius="@dimen/nav_item_background_corner_radius_right"
26+
android:topLeftRadius="@dimen/nav_item_background_corner_radius_left"
27+
android:topRightRadius="@dimen/nav_item_background_corner_radius_right" />
28+
</shape>
29+
</inset>
30+
</item>
31+
<item>
32+
<color android:color="@android:color/transparent" />
33+
</item>
34+
</ripple>

‎MaterialNavigationView/src/main/res/values-v21/styles.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,13 @@
22
<resources>
33

44
<style name="Widget" parent="@android:style/Widget.Material" />
5+
6+
<style name="Widget.NavigationView" parent="@style/Widget.MaterialComponents.NavigationView">
7+
<item name="itemBackground">@drawable/navigation_item_background_default</item>
8+
<item name="itemHorizontalPadding">@dimen/nav_item_horizontal_padding</item>
9+
</style>
10+
11+
<style name="Widget.NavigationView.RippleEffect" parent="">
12+
<item name="android:colorControlHighlight">@android:color/transparent</item>
13+
</style>
514
</resources>

‎MaterialNavigationView/src/main/res/values/styles.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,6 @@
77
<item name="itemHorizontalPadding">@dimen/nav_item_horizontal_padding</item>
88
</style>
99

10+
<style name="Widget.NavigationView.RippleEffect" parent=""/>
11+
1012
</resources>

‎app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ dependencies {
3939
implementation 'androidx.navigation:navigation-ui-ktx:2.0.0'
4040

4141
// Material Navigation View Library
42-
implementation 'com.shreyaspatil:MaterialNavigationView:1.1'
42+
// implementation 'com.shreyaspatil:MaterialNavigationView:1.1'
4343

4444
testImplementation 'junit:junit:4.12'
4545
androidTestImplementation 'androidx.test:runner:1.2.0'
4646
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
47-
// implementation project(path: ':MaterialNavigationView')
47+
implementation project(path: ':MaterialNavigationView')
4848
}

‎app/src/main/res/layout/activity_main.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
android:layout_width="wrap_content"
1919
android:layout_height="match_parent"
2020
android:layout_gravity="start"
21+
android:theme="@style/Widget.NavigationView.RippleEffect"
2122
app:headerLayout="@layout/nav_header_main"
2223
app:insetForeground="@android:color/transparent"
2324
app:itemIconTint="@color/navigation_item_tint"

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

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,18 @@
2222
android:title="@string/menu_tools" />
2323
</group>
2424

25-
<item android:title="Communicate">
25+
<item android:title="@string/communicate">
2626
<menu>
27-
<item
28-
android:id="@+id/nav_share"
29-
android:icon="@drawable/ic_menu_share"
30-
android:title="@string/menu_share" />
31-
<item
32-
android:id="@+id/nav_send"
33-
android:icon="@drawable/ic_menu_send"
34-
android:title="@string/menu_send" />
27+
<group android:checkableBehavior="single">
28+
<item
29+
android:id="@+id/nav_share"
30+
android:icon="@drawable/ic_menu_share"
31+
android:title="@string/menu_share" />
32+
<item
33+
android:id="@+id/nav_send"
34+
android:icon="@drawable/ic_menu_send"
35+
android:title="@string/menu_send" />
36+
</group>
3537
</menu>
3638
</item>
3739

‎app/src/main/res/values/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@
77
<string name="menu_tools">Tools</string>
88
<string name="menu_share">Share</string>
99
<string name="menu_send">Send</string>
10+
<string name="communicate">Communicate</string>
1011
</resources>

‎app/src/main/res/values/styles.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
88
<item name="colorAccent">@color/colorAccent</item>
99
<item name="colorSecondary">@color/colorPrimary</item>
10+
<item name="colorControlHighlight">@android:color/black</item>
1011
<item name="android:fontFamily">@font/montserrat</item>
1112
</style>
1213

0 commit comments

Comments
 (0)