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

Commit

Permalink
Fix the problem of bounded ripple effect (#11)
Browse files Browse the repository at this point in the history 
* fixed bounded ripple effect

* Made some modifications

* Small fix

Co-authored-by: Shreyas Patil <shreyaspatilg@gmail.com>
  • Loading branch information
@zainfikrih @PatilShreyas
zainfikrih and PatilShreyas committed Feb 1, 2020
1 parent a7a69b0 commit 6987610
Show file tree
Hide file tree
Showing 12 changed files with 142 additions and 11 deletions.
3 changes: 3 additions & 0 deletions .idea/codeStyles/Project.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions MaterialNavigationView/src/main/res/color/navigation_item_background_tint.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@

<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?attr/colorSecondary" android:alpha="0.12" android:state_checked="true" />
<item android:color="@android:color/white" android:alpha="0.12" android:state_pressed="true"/>
<item android:color="@android:color/transparent" />
</selector>
38 changes: 38 additions & 0 deletions MaterialNavigationView/src/main/res/drawable-v21/navigation_item_background_default.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>

<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?attr/colorControlHighlight">
<item android:id="@android:id/mask">
<inset
android:insetLeft="@dimen/nav_item_background_inset_default"
android:insetTop="@dimen/nav_item_background_inset_default"
android:insetRight="@dimen/nav_item_background_inset_right_default"
android:insetBottom="@dimen/nav_item_background_inset_default">
<shape>
<corners
android:bottomLeftRadius="@dimen/nav_item_background_radius_default"
android:bottomRightRadius="@dimen/nav_item_background_radius_default"
android:topLeftRadius="@dimen/nav_item_background_radius_default"
android:topRightRadius="@dimen/nav_item_background_radius_default" />
</shape>
</inset>
</item>
<item android:state_checked="true">
<inset
android:insetLeft="@dimen/nav_item_background_inset_default"
android:insetTop="@dimen/nav_item_background_inset_default"
android:insetRight="@dimen/nav_item_background_inset_right_default"
android:insetBottom="@dimen/nav_item_background_inset_default">
<shape>
<corners
android:bottomLeftRadius="@dimen/nav_item_background_radius_default"
android:bottomRightRadius="@dimen/nav_item_background_radius_default"
android:topLeftRadius="@dimen/nav_item_background_radius_default"
android:topRightRadius="@dimen/nav_item_background_radius_default" />
</shape>
</inset>
</item>
<item>
<color android:color="@android:color/transparent" />
</item>
</ripple>
39 changes: 39 additions & 0 deletions MaterialNavigationView/src/main/res/drawable-v21/navigation_item_background_rounded_rect.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<?xml version="1.0" encoding="utf-8"?>

<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?attr/colorControlHighlight">
<item android:id="@android:id/mask">
<inset
android:insetLeft="@dimen/nav_item_background_inset_left_sq"
android:insetTop="@dimen/nav_item_background_inset_top_sq"
android:insetRight="@dimen/nav_item_background_inset_right_sq"
android:insetBottom="@dimen/nav_item_background_inset_bottom_sq">
<shape>
<corners
android:bottomLeftRadius="@dimen/nav_item_background_corner_radius_left_sq"
android:bottomRightRadius="@dimen/nav_item_background_corner_radius_right_sq"
android:topLeftRadius="@dimen/nav_item_background_corner_radius_left_sq"
android:topRightRadius="@dimen/nav_item_background_corner_radius_right_sq" />

</shape>
</inset>
</item>
<item android:state_checked="true">
<inset
android:insetLeft="@dimen/nav_item_background_inset_left_sq"
android:insetTop="@dimen/nav_item_background_inset_top_sq"
android:insetRight="@dimen/nav_item_background_inset_right_sq"
android:insetBottom="@dimen/nav_item_background_inset_bottom_sq">
<shape>
<corners
android:bottomLeftRadius="@dimen/nav_item_background_corner_radius_left_sq"
android:bottomRightRadius="@dimen/nav_item_background_corner_radius_right_sq"
android:topLeftRadius="@dimen/nav_item_background_corner_radius_left_sq"
android:topRightRadius="@dimen/nav_item_background_corner_radius_right_sq" />
</shape>
</inset>
</item>
<item>
<color android:color="@android:color/transparent" />
</item>
</ripple>
34 changes: 34 additions & 0 deletions ...rialNavigationView/src/main/res/drawable-v21/navigation_item_background_rounded_right.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>

<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?attr/colorControlHighlight">
<item android:id="@android:id/mask">
<inset
android:insetLeft="@dimen/nav_item_background_inset_left"
android:insetRight="@dimen/nav_item_background_inset_right">
<shape>
<corners
android:bottomLeftRadius="@dimen/nav_item_background_corner_radius_left"
android:bottomRightRadius="@dimen/nav_item_background_corner_radius_right"
android:topLeftRadius="@dimen/nav_item_background_corner_radius_left"
android:topRightRadius="@dimen/nav_item_background_corner_radius_right" />
</shape>
</inset>
</item>
<item>
<inset
android:insetLeft="@dimen/nav_item_background_inset_left"
android:insetRight="@dimen/nav_item_background_inset_right">
<shape>
<corners
android:bottomLeftRadius="@dimen/nav_item_background_corner_radius_left"
android:bottomRightRadius="@dimen/nav_item_background_corner_radius_right"
android:topLeftRadius="@dimen/nav_item_background_corner_radius_left"
android:topRightRadius="@dimen/nav_item_background_corner_radius_right" />
</shape>
</inset>
</item>
<item>
<color android:color="@android:color/transparent" />
</item>
</ripple>
9 changes: 9 additions & 0 deletions MaterialNavigationView/src/main/res/values-v21/styles.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,13 @@
<resources>

<style name="Widget" parent="@android:style/Widget.Material" />

<style name="Widget.NavigationView" parent="@style/Widget.MaterialComponents.NavigationView">
<item name="itemBackground">@drawable/navigation_item_background_default</item>
<item name="itemHorizontalPadding">@dimen/nav_item_horizontal_padding</item>
</style>

<style name="Widget.NavigationView.RippleEffect" parent="">
<item name="android:colorControlHighlight">@android:color/transparent</item>
</style>
</resources>
2 changes: 2 additions & 0 deletions MaterialNavigationView/src/main/res/values/styles.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,6 @@
<item name="itemHorizontalPadding">@dimen/nav_item_horizontal_padding</item>
</style>

<style name="Widget.NavigationView.RippleEffect" parent=""/>

</resources>
4 changes: 2 additions & 2 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ dependencies {
implementation 'androidx.navigation:navigation-ui-ktx:2.0.0'

// Material Navigation View Library
implementation 'com.shreyaspatil:MaterialNavigationView:1.1'
// implementation 'com.shreyaspatil:MaterialNavigationView:1.1'

testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test:runner:1.2.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
// implementation project(path: ':MaterialNavigationView')
implementation project(path: ':MaterialNavigationView')
}
1 change: 1 addition & 0 deletions app/src/main/res/layout/activity_main.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="start"
android:theme="@style/Widget.NavigationView.RippleEffect"
app:headerLayout="@layout/nav_header_main"
app:insetForeground="@android:color/transparent"
app:itemIconTint="@color/navigation_item_tint"
Expand Down
20 changes: 11 additions & 9 deletions app/src/main/res/menu/activity_main_drawer.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,18 @@
android:title="@string/menu_tools" />
</group>

<item android:title="Communicate">
<item android:title="@string/communicate">
<menu>
<item
android:id="@+id/nav_share"
android:icon="@drawable/ic_menu_share"
android:title="@string/menu_share" />
<item
android:id="@+id/nav_send"
android:icon="@drawable/ic_menu_send"
android:title="@string/menu_send" />
<group android:checkableBehavior="single">
<item
android:id="@+id/nav_share"
android:icon="@drawable/ic_menu_share"
android:title="@string/menu_share" />
<item
android:id="@+id/nav_send"
android:icon="@drawable/ic_menu_send"
android:title="@string/menu_send" />
</group>
</menu>
</item>

Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@
<string name="menu_tools">Tools</string>
<string name="menu_share">Share</string>
<string name="menu_send">Send</string>
<string name="communicate">Communicate</string>
</resources>
1 change: 1 addition & 0 deletions app/src/main/res/values/styles.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
<item name="colorSecondary">@color/colorPrimary</item>
<item name="colorControlHighlight">@android:color/black</item>
<item name="android:fontFamily">@font/montserrat</item>
</style>

Expand Down

0 comments on commit 6987610

Please sign in to comment.