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.

Sign up for GitHub

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

Jump to bottom

Update syntax to latest ktlint version #314

Merged
merged 2 commits into from
Aug 17, 2023
Merged

Update syntax to latest ktlint version #314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb273e6
Fix Kotlin linter
Jean-BaptisteC Jul 4, 2023
eddc174
Merge branch 'master' into lint
Jean-BaptisteC Aug 17, 2023
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
4 changes: 3 additions & 1 deletion app/src/androidTest/java/org/eu/exodus_privacy/exodusprivacy/ExodusTestRunner.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ class ExodusTestRunner : AndroidJUnitRunner() {
context: Context
): Application {
return super.newApplication(
cl, HiltTestApplication::class.java.getName(), context
cl,
HiltTestApplication::class.java.getName(),
context
)
}
}
11 changes: 7 additions & 4 deletions app/src/main/java/org/eu/exodus_privacy/exodusprivacy/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,11 @@ class MainActivity : AppCompatActivity() {
viewModel.networkConnection.observe(this) { connected ->
Log.d(TAG, "Observing Network Connection.")
if (!connected) {
Snackbar
.make(binding.fragmentCoordinator, R.string.not_connected, Snackbar.LENGTH_LONG)
.setAnchorView(binding.bottomNavView) // Snackbar will appear above bottom nav view
Snackbar.make(
binding.fragmentCoordinator,
R.string.not_connected,
Snackbar.LENGTH_LONG
).setAnchorView(binding.bottomNavView) // Snackbar will appear above bottom nav view
.setAction(R.string.settings) {
try {
startActivity(Intent(Settings.ACTION_WIRELESS_SETTINGS))
Expand Down Expand Up @@ -99,7 +101,8 @@ class MainActivity : AppCompatActivity() {
!ExodusUpdateService.IS_SERVICE_RUNNING
) {
Log.d(
TAG, "Populating database for the first time."
TAG,
"Populating database for the first time."
)
val intent = Intent(this, ExodusUpdateService::class.java)
intent.apply {
Expand Down
5 changes: 3 additions & 2 deletions app/src/main/java/org/eu/exodus_privacy/exodusprivacy/fragments/about/AboutFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,11 @@ class AboutFragment : PreferenceFragmentCompat() {
}

private fun getLocaleWebsiteURL(): String {
return if (getLanguage() != "fr")
return if (getLanguage() != "fr") {
websiteURL + "en"
else
} else {
websiteURL + "fr"
}
}

override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
Expand Down
3 changes: 2 additions & 1 deletion ...rc/main/java/org/eu/exodus_privacy/exodusprivacy/fragments/dialog/ExodusDialogFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ class ExodusDialogFragment : DialogFragment() {
return MaterialAlertDialogBuilder(requireContext()).setTitle(getString(R.string.warning_title))
.setMessage(
HtmlCompat.fromHtml(
getString(R.string.warning_desc), HtmlCompat.FROM_HTML_MODE_COMPACT
getString(R.string.warning_desc),
HtmlCompat.FROM_HTML_MODE_COMPACT
)
).setPositiveButton(getString(R.string.accept)) { _, _ ->
Log.d(TAG, "Permission to transmit data granted!")
Expand Down
2 changes: 1 addition & 1 deletion ...in/java/org/eu/exodus_privacy/exodusprivacy/fragments/trackers/model/TrackersRVAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import org.eu.exodus_privacy.exodusprivacy.manager.database.tracker.TrackerData

class TrackersRVAdapter(
private val showSuggestions: Boolean,
private val currentDestinationId: Int,
private val currentDestinationId: Int
) :
ListAdapter<TrackerData, TrackersRVAdapter.ViewHolder>(TrackersDiffUtil()) {

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/eu/exodus_privacy/exodusprivacy/manager/network/NetworkManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import javax.inject.Singleton

@Singleton
class NetworkManager @Inject constructor(
@ApplicationContext private val context: Context,
@ApplicationContext private val context: Context
) {
private val TAG = NetworkManager::class.java.simpleName

Expand Down