Skip to content

Commit

Permalink
implemented new line at the end of files.
Browse files Browse the repository at this point in the history
st235 committed Sep 20, 2020
1 parent b843259 commit 70cb088
Showing 12 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -25,4 +25,4 @@
<activity android:name=".screens.NotificationBadgeActivity" />
</application>

</manifest>
</manifest>
2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_notification_badge.xml
Original file line number Diff line number Diff line change
@@ -33,4 +33,4 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />

</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
2 changes: 1 addition & 1 deletion app/src/main/res/menu/notification_badge_menu.xml
Original file line number Diff line number Diff line change
@@ -19,4 +19,4 @@
android:title="@string/text3"
android:icon="@drawable/ic_bookmarks"
app:exb_color="#fa2" />
</menu>
</menu>
2 changes: 1 addition & 1 deletion app/src/main/res/menu/toolbar_menu.xml
Original file line number Diff line number Diff line change
@@ -3,4 +3,4 @@
<item
android:id="@+id/clear"
android:title="@string/action_clear" />
</menu>
</menu>
Original file line number Diff line number Diff line change
@@ -18,14 +18,14 @@ class ExpandableBottomBarNotification internal constructor(
* @param color - background color of a badge
*/
fun setBadgeColor(@ColorInt color: Int) {
view?.setNotifiationBadgeBackground(color)
view?.setNotificationBadgeBackground(color)
}

/**
* @param color - text color of a badge
*/
fun setBadgeTextColor(@ColorInt color: Int) {
view?.setNotifiationBadgeTextColor(color)
view?.setNotificationBadgeTextColor(color)
}

/**
Original file line number Diff line number Diff line change
@@ -11,8 +11,8 @@ internal interface ExpandableBottomBarNotificationBadge {

fun clearNotification()

fun setNotifiationBadgeBackground(@ColorInt color: Int)
fun setNotificationBadgeBackground(@ColorInt color: Int)

fun setNotifiationBadgeTextColor(@ColorInt color: Int)
fun setNotificationBadgeTextColor(@ColorInt color: Int)

}
}
Original file line number Diff line number Diff line change
@@ -172,8 +172,8 @@ internal class ExpandableItemViewController(

setIcon(menuItem.iconId, backgroundColorStateList)
setText(menuItem.text, backgroundColorStateList)
setNotifiationBadgeBackground(menuItem.badgeBackgroundColor ?: notificationBadgeColor)
setNotifiationBadgeTextColor(menuItem.badgeTextColor ?: notificationBadgeTextColor)
setNotificationBadgeBackground(menuItem.badgeBackgroundColor ?: notificationBadgeColor)
setNotificationBadgeTextColor(menuItem.badgeTextColor ?: notificationBadgeTextColor)

background = createHighlightedMenuShape()
setOnClickListener(onItemClickListener)
Original file line number Diff line number Diff line change
@@ -91,11 +91,11 @@ internal class ExpandableBottomBarMenuItemView @JvmOverloads constructor(
iconView.badgeText = null
}

override fun setNotifiationBadgeBackground(color: Int) {
override fun setNotificationBadgeBackground(color: Int) {
iconView.badgeColor = color
}

override fun setNotifiationBadgeTextColor(color: Int) {
override fun setNotificationBadgeTextColor(color: Int) {
iconView.badgeTextColor = color
}
}
}
Original file line number Diff line number Diff line change
@@ -7,4 +7,4 @@ import kotlinx.android.parcel.Parcelize
internal data class MenuItemSavedState(
val badgeState: NotificationBadgeSavedState,
val superState: Parcelable?
): Parcelable
): Parcelable
Original file line number Diff line number Diff line change
@@ -20,4 +20,4 @@
android:textStyle="bold"
android:visibility="gone" />

</merge>
</merge>
Original file line number Diff line number Diff line change
@@ -57,4 +57,4 @@ class ExpandableBottomBarMenuItemTest {
fun `test that right created item will not be rise an exception`() {
val item = ExpandableBottomBarMenuItem.ItemBuildRequest(builder, context).id(1).text("").icon(1).color(1).create()
}
}
}
Original file line number Diff line number Diff line change
@@ -34,4 +34,4 @@ class ExpandableItemViewControllerTest {
expandableItemViewController.unselect()
verify(itemView).deselect()
}
}
}

0 comments on commit 70cb088

Please sign in to comment.