Skip to content

Commit a9ed27a

Browse files
authored
Merge pull request #360 from Spendesk/chore/fix-code-inspection-warnings
Fix kotlin code inspector errors
2 parents 310001a + 33ebe1b commit a9ed27a

File tree

7 files changed

+16
-25
lines changed

7 files changed

+16
-25
lines changed

library-compose/src/main/java/com/spendesk/grapes/compose/appbar/GrapesNavigationBar.kt

+14-13
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1+
@file:Suppress("MatchingDeclarationName")
2+
13
package com.spendesk.grapes.compose.appbar
24

35
import androidx.annotation.DrawableRes
46
import androidx.annotation.StringRes
57
import androidx.compose.foundation.layout.RowScope
6-
import androidx.compose.foundation.layout.Spacer
78
import androidx.compose.foundation.layout.WindowInsets
8-
import androidx.compose.foundation.layout.width
99
import androidx.compose.material3.Icon
1010
import androidx.compose.material3.NavigationBar
1111
import androidx.compose.material3.NavigationBarDefaults
@@ -17,7 +17,6 @@ import androidx.compose.ui.Modifier
1717
import androidx.compose.ui.res.painterResource
1818
import androidx.compose.ui.res.stringResource
1919
import androidx.compose.ui.tooling.preview.Preview
20-
import androidx.compose.ui.unit.sp
2120
import com.spendesk.grapes.compose.R
2221
import com.spendesk.grapes.compose.theme.GrapesTheme
2322

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

2928
interface GrapesNavigationItem {
29+
3030
@get:StringRes val title: Int
31+
3132
@get:DrawableRes val icon: Int
3233
}
3334

@@ -40,8 +41,8 @@ fun GrapesNavigationBar(
4041
windowInsets: WindowInsets = NavigationBarDefaults.windowInsets,
4142
) {
4243
NavigationBar(
43-
containerColor = GrapesTheme.colors.mainWhite,
44-
contentColor = GrapesTheme.colors.mainPrimaryNormal,
44+
containerColor = GrapesTheme.colors.structureSurface,
45+
contentColor = GrapesTheme.colors.primaryNormal,
4546
windowInsets = windowInsets,
4647
modifier = modifier,
4748
) {
@@ -63,11 +64,11 @@ private fun RowScope.GrapesNavigationBarItem(
6364
) {
6465
val textStyle = GrapesTheme.typography.titleS
6566
val colors = NavigationBarItemDefaults.colors(
66-
indicatorColor = GrapesTheme.colors.mainWhite,
67-
selectedIconColor = GrapesTheme.colors.mainPrimaryNormal,
68-
selectedTextColor = GrapesTheme.colors.mainPrimaryNormal,
69-
unselectedIconColor = GrapesTheme.colors.mainNeutralDarker,
70-
unselectedTextColor = GrapesTheme.colors.mainNeutralDarker,
67+
indicatorColor = GrapesTheme.colors.structureSurface,
68+
selectedIconColor = GrapesTheme.colors.primaryNormal,
69+
selectedTextColor = GrapesTheme.colors.primaryNormal,
70+
unselectedIconColor = GrapesTheme.colors.neutralDark,
71+
unselectedTextColor = GrapesTheme.colors.neutralDark,
7172
)
7273

7374
NavigationBarItem(
@@ -95,15 +96,15 @@ private fun RowScope.GrapesNavigationBarItem(
9596
private fun Preview() {
9697
GrapesTheme {
9798
val tabs = listOf(
98-
object: GrapesNavigationItem {
99+
object : GrapesNavigationItem {
99100
override val title: Int = R.string.grapes_top_app_bar_back_icon_description
100101
override val icon: Int = R.drawable.ic_add
101102
},
102-
object: GrapesNavigationItem {
103+
object : GrapesNavigationItem {
103104
override val title: Int = R.string.grapes_top_app_bar_close_icon_description
104105
override val icon: Int = R.drawable.ic_arrow_back
105106
},
106-
object: GrapesNavigationItem {
107+
object : GrapesNavigationItem {
107108
override val title: Int = R.string.grapes_top_app_bar_more_icon_description
108109
override val icon: Int = R.drawable.ic_more_vertical
109110
}

library-compose/src/main/java/com/spendesk/grapes/compose/callout/atoms/GrapesCalloutContentBottomSignature.kt

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import androidx.compose.ui.draw.clip
1414
import androidx.compose.ui.graphics.painter.Painter
1515
import androidx.compose.ui.layout.ContentScale
1616
import androidx.compose.ui.res.painterResource
17-
import androidx.compose.ui.unit.dp
1817
import com.spendesk.grapes.compose.R
1918
import com.spendesk.grapes.compose.callout.GrapesCalloutDefaults
2019
import com.spendesk.grapes.compose.theme.GrapesTheme

library-compose/src/main/java/com/spendesk/grapes/compose/callout/atoms/GrapesCalloutContentCTASecondary.kt

-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ import androidx.compose.runtime.Composable
55
import androidx.compose.ui.Modifier
66
import com.spendesk.grapes.compose.button.GrapesButton
77
import com.spendesk.grapes.compose.button.GrapesButtonStyleDefaults
8-
import com.spendesk.grapes.compose.callout.CalloutType
9-
import com.spendesk.grapes.compose.callout.LocalGrapesCalloutType
108

119
/**
1210
* @author jean-philippe

library-compose/src/main/java/com/spendesk/grapes/compose/message/PasswordValidation.kt

-2
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,10 @@ import androidx.compose.foundation.layout.Arrangement
88
import androidx.compose.foundation.layout.Box
99
import androidx.compose.foundation.layout.Column
1010
import androidx.compose.foundation.layout.Row
11-
import androidx.compose.foundation.layout.Spacer
1211
import androidx.compose.foundation.layout.fillMaxSize
1312
import androidx.compose.foundation.layout.fillMaxWidth
1413
import androidx.compose.foundation.layout.padding
1514
import androidx.compose.foundation.layout.size
16-
import androidx.compose.foundation.shape.CircleShape
1715
import androidx.compose.material.Checkbox
1816
import androidx.compose.material.Icon
1917
import androidx.compose.material.Text

library-compose/src/main/java/com/spendesk/grapes/compose/template/molecule/InformativeComponent.kt

-3
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,7 @@ import androidx.compose.foundation.layout.padding
88
import androidx.compose.runtime.Composable
99
import androidx.compose.ui.Alignment
1010
import androidx.compose.ui.Modifier
11-
import androidx.compose.ui.geometry.Offset
1211
import androidx.compose.ui.graphics.Brush
13-
import androidx.compose.ui.graphics.Color
14-
import androidx.compose.ui.graphics.TileMode
1512
import com.spendesk.grapes.compose.theme.GrapesTheme
1613

1714
/**

library/src/main/java/com/spendesk/grapes/component/content/summary/block/SummaryBlockContentResponsibilityCenterGaugeView.kt

+2-3
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@ package com.spendesk.grapes.component.content.summary.block
33
import android.content.Context
44
import android.util.AttributeSet
55
import android.view.LayoutInflater
6-
import android.view.View
76
import androidx.annotation.DrawableRes
87
import androidx.annotation.FloatRange
98
import androidx.constraintlayout.widget.ConstraintLayout
109
import androidx.core.content.res.ResourcesCompat
1110
import com.spendesk.grapes.R
12-
import com.spendesk.grapes.databinding.SummaryBlockContentMapBinding
1311
import com.spendesk.grapes.databinding.ViewResponsibilityCenterGaugeBinding
1412
import com.spendesk.grapes.extensions.setDrawable
1513
import com.spendesk.grapes.extensions.visible
@@ -27,6 +25,7 @@ class SummaryBlockContentResponsibilityCenterGaugeView : ConstraintLayout {
2725
//endregion constructors
2826

2927
companion object Constants {
28+
3029
const val MAX_GAUGES = 3
3130
}
3231

@@ -65,4 +64,4 @@ class SummaryBlockContentResponsibilityCenterGaugeView : ConstraintLayout {
6564
}
6665
}
6766
}
68-
}
67+
}

library/src/main/java/com/spendesk/grapes/extensions/TextViewExtensions.kt

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package com.spendesk.grapes.extensions
22

33
import android.graphics.drawable.Drawable
44
import android.os.Build
5-
import android.util.TypedValue
65
import android.view.View
76
import android.widget.TextView
87
import androidx.core.content.ContextCompat

0 commit comments

Comments
 (0)