Skip to content

Commit 9d385bf

Browse files
naveensinghnaveensingh
authored
chore: ignore extra translations and update detekt rules
* chore: ignore extra translations in lint Extra translations are removed automatically by Weblate * chore: update detekt rules More compose-friendly * chore: update lint baselines
1 parent a12e865 commit 9d385bf

6 files changed

Lines changed: 75 additions & 26 deletions

File tree

‎app/build.gradle.kts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,9 @@ android {
129129

130130
detekt {
131131
baseline = file("detekt-baseline.xml")
132+
config.setFrom("$rootDir/detekt.yml")
133+
buildUponDefaultConfig = true
134+
allRules = false
132135
}
133136

134137
dependencies {
@@ -138,4 +141,5 @@ dependencies {
138141
implementation(libs.androidx.exifinterface)
139142
implementation(libs.androidx.lifecycle.runtime.ktx)
140143
implementation(libs.androidx.window)
144+
detektPlugins(libs.compose.detekt)
141145
}

‎app/detekt-baseline.xml‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,8 @@
1111
<ID>ImplicitDefaultLocale:MySize.kt$MySize$String.format("%.1f", (width * height.toFloat()) / ONE_MEGA_PIXEL)</ID>
1212
<ID>ImplicitDefaultLocale:VideoQuality.kt$VideoQuality$String.format("%.1f", (width * height.toFloat()) / ONE_MEGA_PIXEL)</ID>
1313
<ID>LargeClass:MainActivity.kt$MainActivity : SimpleActivityMediaSavedListenerCameraXPreviewListener</ID>
14-
<ID>LongMethod:ImageSaver.kt$ImageSaver$@SuppressLint("RestrictedApi") private fun saveImageToTempFile(): File?</ID>
15-
<ID>LongMethod:PhotoProcessor.kt$PhotoProcessor$override fun doInBackground(vararg params: ByteArray): String</ID>
16-
<ID>LongMethod:ShadowDrawable.kt$ShadowDrawable$override fun draw(canvas: Canvas)</ID>
17-
<ID>LongParameterList:CameraXInitializer.kt$CameraXInitializer$( previewView: PreviewView, listener: CameraXPreviewListener, mediaSoundHelper: MediaSoundHelper, outputUri: Uri?, isThirdPartyIntent: Boolean, initInPhotoMode: Boolean, )</ID>
1814
<ID>LongParameterList:CameraXPreview.kt$CameraXPreview$( private val activity: BaseSimpleActivity, private val previewView: PreviewView, private val mediaSoundHelper: MediaSoundHelper, private val mediaOutputHelper: MediaOutputHelper, private val cameraErrorHandler: CameraErrorHandler, private val listener: CameraXPreviewListener, private val isThirdPartyIntent: Boolean, initInPhotoMode: Boolean, )</ID>
1915
<ID>LongParameterList:ImageSaver.kt$ImageSaver$( private val contentResolver: ContentResolver, private val image: ImageProxy, private val mediaOutput: MediaOutput.ImageCaptureOutput, private val metadata: Metadata, private val jpegQuality: Int, private val saveExifAttributes: Boolean, private val onImageSaved: (Uri) -&gt; Unit, private val onError: (ImageCaptureException) -&gt; Unit, )</ID>
20-
<ID>LongParameterList:ImageSaver.kt$ImageSaver.Companion$( contentResolver: ContentResolver, image: ImageProxy, mediaOutput: MediaOutput.ImageCaptureOutput, metadata: Metadata, jpegQuality: Int, saveExifAttributes: Boolean, onImageSaved: (Uri) -&gt; Unit, onError: (ImageCaptureException) -&gt; Unit, )</ID>
2116
<ID>LoopWithTooManyJumpStatements:ImageQualityManager.kt$ImageQualityManager$for</ID>
2217
<ID>LoopWithTooManyJumpStatements:MediaActionSound.kt$MediaActionSound$for</ID>
2318
<ID>MagicNumber:BitmapUtils.kt$BitmapUtils$128</ID>
@@ -33,7 +28,6 @@
3328
<ID>MagicNumber:FocusCircleView.kt$FocusCircleView$500L</ID>
3429
<ID>MagicNumber:FocusCircleView.kt$FocusCircleView$50f</ID>
3530
<ID>MagicNumber:MainActivity.kt$MainActivity$90</ID>
36-
<ID>MagicNumber:MainActivity.kt$MainActivity.&lt;no name provided&gt;$1000</ID>
3731
<ID>MagicNumber:MainActivity.kt$MainActivity.&lt;no name provided&gt;$134</ID>
3832
<ID>MagicNumber:MainActivity.kt$MainActivity.&lt;no name provided&gt;$225</ID>
3933
<ID>MagicNumber:MainActivity.kt$MainActivity.&lt;no name provided&gt;$289</ID>
@@ -64,9 +58,6 @@
6458
<ID>MagicNumber:SettingsActivity.kt$SettingsActivity$90</ID>
6559
<ID>MagicNumber:SettingsActivity.kt$SettingsActivity$95</ID>
6660
<ID>MagicNumber:ShadowDrawable.kt$ShadowDrawable$255.0f</ID>
67-
<ID>MagicNumber:TimerMode.kt$TimerMode.TIMER_10$10000</ID>
68-
<ID>MagicNumber:TimerMode.kt$TimerMode.TIMER_3$3000</ID>
69-
<ID>MagicNumber:TimerMode.kt$TimerMode.TIMER_5$5000</ID>
7061
<ID>MagicNumber:VideoQuality.kt$VideoQuality$1.9f</ID>
7162
<ID>MagicNumber:VideoQuality.kt$VideoQuality$16</ID>
7263
<ID>MagicNumber:VideoQuality.kt$VideoQuality$19</ID>
@@ -79,14 +70,6 @@
7970
<ID>MagicNumber:VideoQuality.kt$VideoQuality$6</ID>
8071
<ID>MagicNumber:VideoQuality.kt$VideoQuality$8f</ID>
8172
<ID>MagicNumber:VideoQuality.kt$VideoQuality$9f</ID>
82-
<ID>MagicNumber:VideoQuality.kt$VideoQuality.FHD$1080</ID>
83-
<ID>MagicNumber:VideoQuality.kt$VideoQuality.FHD$1920</ID>
84-
<ID>MagicNumber:VideoQuality.kt$VideoQuality.HD$1280</ID>
85-
<ID>MagicNumber:VideoQuality.kt$VideoQuality.HD$720</ID>
86-
<ID>MagicNumber:VideoQuality.kt$VideoQuality.SD$480</ID>
87-
<ID>MagicNumber:VideoQuality.kt$VideoQuality.SD$720</ID>
88-
<ID>MagicNumber:VideoQuality.kt$VideoQuality.UHD$2160</ID>
89-
<ID>MagicNumber:VideoQuality.kt$VideoQuality.UHD$3840</ID>
9073
<ID>MaxLineLength:CameraErrorHandler.kt$CameraErrorHandler$VideoRecordEvent.Finalize.ERROR_INSUFFICIENT_STORAGE -&gt; context.toast(R.string.video_capture_insufficient_storage_error)</ID>
9174
<ID>MaxLineLength:ImageUtil.kt$ImageUtil$require(image.format == ImageFormat.YUV_420_888) { "Incorrect image format of the input image proxy: " + image.format }</ID>
9275
<ID>MaxLineLength:MainActivity.kt$MainActivity$binding.toggleCamera.setImageResource(if (frontCamera) R.drawable.ic_camera_rear_vector else R.drawable.ic_camera_front_vector)</ID>

‎app/lint-baseline.xml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@
5858
errorLine1="app-build-targetSDK = &quot;34&quot;"
5959
errorLine2=" ~~~~">
6060
<location
61-
file="$HOME/work/Camera/Camera/gradle/libs.versions.toml"
62-
line="18"
61+
file="$HOME/Projects/Fossify/FossifyOrg/Camera/gradle/libs.versions.toml"
62+
line="19"
6363
column="23"/>
6464
</issue>
6565

@@ -113,7 +113,7 @@
113113
errorLine1="distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip"
114114
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
115115
<location
116-
file="$HOME/work/Camera/Camera/gradle/wrapper/gradle-wrapper.properties"
116+
file="$HOME/Projects/Fossify/FossifyOrg/Camera/gradle/wrapper/gradle-wrapper.properties"
117117
line="3"
118118
column="17"/>
119119
</issue>
@@ -124,8 +124,8 @@
124124
errorLine1="gradlePlugins-agp = &quot;8.10.1&quot;"
125125
errorLine2=" ~~~~~~~~">
126126
<location
127-
file="$HOME/work/Camera/Camera/gradle/libs.versions.toml"
128-
line="15"
127+
file="$HOME/Projects/Fossify/FossifyOrg/Camera/gradle/libs.versions.toml"
128+
line="16"
129129
column="21"/>
130130
</issue>
131131

@@ -135,8 +135,8 @@
135135
errorLine1="androidx-ktx = &quot;2.8.6&quot;"
136136
errorLine2=" ~~~~~~~">
137137
<location
138-
file="$HOME/work/Camera/Camera/gradle/libs.versions.toml"
139-
line="11"
138+
file="$HOME/Projects/Fossify/FossifyOrg/Camera/gradle/libs.versions.toml"
139+
line="12"
140140
column="16"/>
141141
</issue>
142142

@@ -146,8 +146,8 @@
146146
errorLine1="app-build-compileSDKVersion = &quot;34&quot;"
147147
errorLine2=" ~~~~">
148148
<location
149-
file="$HOME/work/Camera/Camera/gradle/libs.versions.toml"
150-
line="17"
149+
file="$HOME/Projects/Fossify/FossifyOrg/Camera/gradle/libs.versions.toml"
150+
line="18"
151151
column="31"/>
152152
</issue>
153153

‎detekt.yml‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
build:
2+
maxIssues: 0
3+
weights:
4+
complexity: 2
5+
LongParameterList: 2
6+
style: 1
7+
8+
processors:
9+
active: true
10+
exclude:
11+
- "FunctionCountProcessor"
12+
- "PropertyCountProcessor"
13+
14+
config:
15+
validation: true
16+
17+
complexity:
18+
LongParameterList:
19+
active: true
20+
functionThreshold: 10
21+
constructorThreshold: 8
22+
ignoreDefaultParameters: true
23+
ignoreAnnotated:
24+
- "Composable"
25+
LongMethod:
26+
active: true
27+
threshold: 120
28+
ignoreAnnotated:
29+
- "Composable"
30+
- "Preview"
31+
32+
style:
33+
MagicNumber:
34+
active: true
35+
ignoreAnnotated: ["Composable"]
36+
ignoreEnums: true
37+
ignoreNumbers: ["-1", "0", "1", "2", "42", "1000"]
38+
MaxLineLength:
39+
active: true
40+
maxLineLength: 120
41+
excludePackageStatements: true
42+
excludeImportStatements: true
43+
44+
naming:
45+
FunctionNaming:
46+
active: true
47+
ignoreAnnotated: ["Composable", "Preview"]
48+
functionPattern: "[a-z][A-Za-z0-9]*"
49+
50+
Compose: # io.nlopez.compose.rules
51+
ComposableParametersOrdering:
52+
active: true
53+
ModifierDefaultValue:
54+
active: true
55+
MissingModifierDefaultValue:
56+
active: true
57+
PublicComposablePreview:
58+
active: true

‎gradle/libs.versions.toml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
kotlin = "2.2.0"
44
#Detekt
55
detekt = "1.23.8"
6+
detektCompose = "0.4.22"
67
#Androidx
78
androidx-document-file = "1.1.0"
89
androidx-exif-interface = "1.4.1"
@@ -31,6 +32,8 @@ androidx-window = { module = "androidx.window:window", version.ref = "androidx-w
3132
androidx-lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "androidx-ktx" }
3233
androidx-exifinterface = { module = "androidx.exifinterface:exifinterface", version.ref = "androidx-exif-interface" }
3334
androidx-documentfile = { module = "androidx.documentfile:documentfile", version.ref = "androidx-document-file" }
35+
#Compose
36+
compose-detekt = { module = "io.nlopez.compose.rules:detekt", version.ref = "detektCompose" }
3437
#Fossify
3538
fossify-commons = { module = "org.fossify:commons", version.ref = "commons" }
3639
[bundles]

‎lint.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,5 @@
3131
<issue id="IconDensities" severity="warning" />
3232
<issue id="GradleDependency" severity="warning" />
3333
<issue id="Overdraw" severity="warning" />
34+
<issue id="ExtraTranslation" severity="warning" />
3435
</lint>

0 commit comments

Comments
 (0)