Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix kotlin code inspector errors #360

Merged
merged 1 commit into from
Apr 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
@file:Suppress("MatchingDeclarationName")

package com.spendesk.grapes.compose.appbar

import androidx.annotation.DrawableRes
import androidx.annotation.StringRes
import androidx.compose.foundation.layout.RowScope
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.width
import androidx.compose.material3.Icon
import androidx.compose.material3.NavigationBar
import androidx.compose.material3.NavigationBarDefaults
Expand All @@ -17,7 +17,6 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.sp
import com.spendesk.grapes.compose.R
import com.spendesk.grapes.compose.theme.GrapesTheme

Expand All @@ -27,7 +26,9 @@ import com.spendesk.grapes.compose.theme.GrapesTheme
**/

interface GrapesNavigationItem {

@get:StringRes val title: Int

@get:DrawableRes val icon: Int
}

Expand All @@ -40,8 +41,8 @@ fun GrapesNavigationBar(
windowInsets: WindowInsets = NavigationBarDefaults.windowInsets,
) {
NavigationBar(
containerColor = GrapesTheme.colors.mainWhite,
contentColor = GrapesTheme.colors.mainPrimaryNormal,
containerColor = GrapesTheme.colors.structureSurface,
contentColor = GrapesTheme.colors.primaryNormal,
windowInsets = windowInsets,
modifier = modifier,
) {
Expand All @@ -63,11 +64,11 @@ private fun RowScope.GrapesNavigationBarItem(
) {
val textStyle = GrapesTheme.typography.titleS
val colors = NavigationBarItemDefaults.colors(
indicatorColor = GrapesTheme.colors.mainWhite,
selectedIconColor = GrapesTheme.colors.mainPrimaryNormal,
selectedTextColor = GrapesTheme.colors.mainPrimaryNormal,
unselectedIconColor = GrapesTheme.colors.mainNeutralDarker,
unselectedTextColor = GrapesTheme.colors.mainNeutralDarker,
indicatorColor = GrapesTheme.colors.structureSurface,
selectedIconColor = GrapesTheme.colors.primaryNormal,
selectedTextColor = GrapesTheme.colors.primaryNormal,
unselectedIconColor = GrapesTheme.colors.neutralDark,
unselectedTextColor = GrapesTheme.colors.neutralDark,
)

NavigationBarItem(
Expand Down Expand Up @@ -95,15 +96,15 @@ private fun RowScope.GrapesNavigationBarItem(
private fun Preview() {
GrapesTheme {
val tabs = listOf(
object: GrapesNavigationItem {
object : GrapesNavigationItem {
override val title: Int = R.string.grapes_top_app_bar_back_icon_description
override val icon: Int = R.drawable.ic_add
},
object: GrapesNavigationItem {
object : GrapesNavigationItem {
override val title: Int = R.string.grapes_top_app_bar_close_icon_description
override val icon: Int = R.drawable.ic_arrow_back
},
object: GrapesNavigationItem {
object : GrapesNavigationItem {
override val title: Int = R.string.grapes_top_app_bar_more_icon_description
override val icon: Int = R.drawable.ic_more_vertical
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.painter.Painter
import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.unit.dp
import com.spendesk.grapes.compose.R
import com.spendesk.grapes.compose.callout.GrapesCalloutDefaults
import com.spendesk.grapes.compose.theme.GrapesTheme
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import com.spendesk.grapes.compose.button.GrapesButton
import com.spendesk.grapes.compose.button.GrapesButtonStyleDefaults
import com.spendesk.grapes.compose.callout.CalloutType
import com.spendesk.grapes.compose.callout.LocalGrapesCalloutType

/**
* @author jean-philippe
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,10 @@ import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.material.Checkbox
import androidx.compose.material.Icon
import androidx.compose.material.Text
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,7 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.geometry.Offset
import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.TileMode
import com.spendesk.grapes.compose.theme.GrapesTheme

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,11 @@ package com.spendesk.grapes.component.content.summary.block
import android.content.Context
import android.util.AttributeSet
import android.view.LayoutInflater
import android.view.View
import androidx.annotation.DrawableRes
import androidx.annotation.FloatRange
import androidx.constraintlayout.widget.ConstraintLayout
import androidx.core.content.res.ResourcesCompat
import com.spendesk.grapes.R
import com.spendesk.grapes.databinding.SummaryBlockContentMapBinding
import com.spendesk.grapes.databinding.ViewResponsibilityCenterGaugeBinding
import com.spendesk.grapes.extensions.setDrawable
import com.spendesk.grapes.extensions.visible
Expand All @@ -27,6 +25,7 @@ class SummaryBlockContentResponsibilityCenterGaugeView : ConstraintLayout {
//endregion constructors

companion object Constants {

const val MAX_GAUGES = 3
}

Expand Down Expand Up @@ -65,4 +64,4 @@ class SummaryBlockContentResponsibilityCenterGaugeView : ConstraintLayout {
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package com.spendesk.grapes.extensions

import android.graphics.drawable.Drawable
import android.os.Build
import android.util.TypedValue
import android.view.View
import android.widget.TextView
import androidx.core.content.ContextCompat
Expand Down
Loading