Skip to content

Commit 67b0145

Browse files
author
Martin Styk
committed
Fix spotless code formatting and add spotlessCheck as mandatory check on master PR and master push
1 parent 3dc330c commit 67b0145

32 files changed

+39
-55
lines changed

.github/workflows/android-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
distribution: 'zulu'
2525
cache: gradle
2626

27-
- name: Create google-services.json
27+
- name: Create production google-services.json
2828
uses: 1arp/[email protected]
2929
with:
3030
path: app

.github/workflows/android.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,8 @@ jobs:
2020
distribution: 'zulu'
2121
cache: gradle
2222

23-
- name: Create google-services.json
24-
uses: 1arp/[email protected]
25-
with:
26-
path: app
27-
file: google-services.json
28-
content: ${{secrets.GOOGLE_SERVICES}}
29-
3023
- name: Grant execute permission for gradlew
3124
run: chmod +x gradlew
25+
3226
- name: Build with Lint check
33-
run: ./gradlew lintFreeDebug
27+
run: ./gradlew spotlessCheck lintFreeDebug

app/src/main/java/sk/styk/martin/apkanalyzer/manager/analytics/FragmentScreenTracker.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import dagger.hilt.android.scopes.ActivityScoped
66
import kotlinx.coroutines.flow.filter
77
import kotlinx.coroutines.flow.onEach
88
import kotlinx.coroutines.launch
9+
import sk.styk.martin.apkanalyzer.core.common.coroutines.DispatcherProvider
910
import sk.styk.martin.apkanalyzer.manager.navigationdrawer.ForegroundFragmentWatcher
1011
import sk.styk.martin.apkanalyzer.util.FragmentTag
11-
import sk.styk.martin.apkanalyzer.core.common.coroutines.DispatcherProvider
1212
import javax.inject.Inject
1313

1414
@ActivityScoped

app/src/main/java/sk/styk/martin/apkanalyzer/manager/file/ApkSaveManager.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import kotlinx.coroutines.flow.distinctUntilChanged
1010
import kotlinx.coroutines.flow.flow
1111
import kotlinx.coroutines.flow.flowOn
1212
import kotlinx.coroutines.yield
13+
import sk.styk.martin.apkanalyzer.core.common.coroutines.DispatcherProvider
1314
import sk.styk.martin.apkanalyzer.manager.notification.NotificationManager
1415
import sk.styk.martin.apkanalyzer.util.TAG_EXPORTS
15-
import sk.styk.martin.apkanalyzer.core.common.coroutines.DispatcherProvider
1616
import timber.log.Timber
1717
import java.io.File
1818
import java.io.FileInputStream

app/src/main/java/sk/styk/martin/apkanalyzer/manager/file/DrawableSaveManager.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import android.os.Environment
99
import android.provider.MediaStore
1010
import androidx.core.net.toUri
1111
import kotlinx.coroutines.withContext
12+
import sk.styk.martin.apkanalyzer.core.common.coroutines.DispatcherProvider
1213
import sk.styk.martin.apkanalyzer.manager.media.MediaManager
1314
import sk.styk.martin.apkanalyzer.manager.permission.hasScopedStorage
14-
import sk.styk.martin.apkanalyzer.core.common.coroutines.DispatcherProvider
1515
import sk.styk.martin.apkanalyzer.util.file.toBitmap
1616
import java.io.File
1717
import java.io.FileOutputStream

app/src/main/java/sk/styk/martin/apkanalyzer/manager/permission/PermissionManageExtension.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,4 @@ fun PermissionManager.withStoragePermission(withoutPermission: () -> Unit = {},
3838
},
3939
)
4040
}
41-
}
41+
}

app/src/main/java/sk/styk/martin/apkanalyzer/manager/persistence/SettingsManager.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ class SettingsManager @Inject constructor(
1212
enum class ColorScheme(private val persisted: String) {
1313
LIGHT("light"),
1414
DARK("dark"),
15-
DEFAULT("system");
15+
DEFAULT("system"),
16+
;
1617

1718
fun persist() = persisted
1819

app/src/main/java/sk/styk/martin/apkanalyzer/ui/appdetail/page/AppDetailPageFragmentViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import androidx.lifecycle.ViewModel
88
import androidx.lifecycle.map
99
import com.google.android.material.snackbar.Snackbar
1010
import sk.styk.martin.apkanalyzer.R
11-
import sk.styk.martin.apkanalyzer.manager.clipboard.ClipBoardManager
1211
import sk.styk.martin.apkanalyzer.core.appanalysis.model.AppDetailData
12+
import sk.styk.martin.apkanalyzer.manager.clipboard.ClipBoardManager
1313
import sk.styk.martin.apkanalyzer.ui.appdetail.AppDetailFragmentViewModel
1414
import sk.styk.martin.apkanalyzer.util.TextInfo
1515
import sk.styk.martin.apkanalyzer.util.components.DialogComponent

app/src/main/java/sk/styk/martin/apkanalyzer/ui/appdetail/page/DetailInfoDescriptionAdapter.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ abstract class DetailInfoDescriptionAdapter<VH> : RecyclerView.Adapter<VH>() whe
2727
protected val copyToClipboardEvent = SingleLiveEvent<CopyToClipboard>()
2828
val copyToClipboard: LiveData<CopyToClipboard> = copyToClipboardEvent
2929

30-
protected fun String?.orNa() : TextInfo = this?.let { TextInfo.from(it) } ?: TextInfo.from(R.string.NA)
31-
protected fun String?.orNone() : TextInfo = this?.let { TextInfo.from(it) } ?: TextInfo.from(R.string.none)
30+
protected fun String?.orNa(): TextInfo = this?.let { TextInfo.from(it) } ?: TextInfo.from(R.string.NA)
31+
protected fun String?.orNone(): TextInfo = this?.let { TextInfo.from(it) } ?: TextInfo.from(R.string.none)
3232
}

app/src/main/java/sk/styk/martin/apkanalyzer/ui/appdetail/page/activity/AppActivityDetailFragmentViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import androidx.lifecycle.LifecycleOwner
44
import dagger.assisted.Assisted
55
import dagger.assisted.AssistedFactory
66
import dagger.assisted.AssistedInject
7-
import sk.styk.martin.apkanalyzer.manager.clipboard.ClipBoardManager
87
import sk.styk.martin.apkanalyzer.core.appanalysis.model.AppDetailData
8+
import sk.styk.martin.apkanalyzer.manager.clipboard.ClipBoardManager
99
import sk.styk.martin.apkanalyzer.ui.appdetail.AppDetailFragmentViewModel
1010
import sk.styk.martin.apkanalyzer.ui.appdetail.page.AppDetailPageFragmentViewModel
1111

0 commit comments

Comments
 (0)