Skip to content
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
11 changes: 11 additions & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
*/

import com.geeksville.mesh.buildlogic.GitVersionValueSource
import com.mikepenz.aboutlibraries.plugin.DuplicateMode
import com.mikepenz.aboutlibraries.plugin.DuplicateRule
import java.io.FileInputStream
import java.util.Properties

Expand All @@ -31,6 +33,7 @@ plugins {
alias(libs.plugins.secrets)
alias(libs.plugins.dokka)
alias(libs.plugins.kover)
alias(libs.plugins.aboutlibraries)
}

val keystorePropertiesFile = rootProject.file("keystore.properties")
Expand Down Expand Up @@ -278,3 +281,11 @@ dokka {
maxHeapSize = "6g"
}
}

aboutLibraries {
export { excludeFields = listOf("generated") }
library {
duplicationMode = DuplicateMode.MERGE
duplicationRule = DuplicateRule.SIMPLE
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import org.meshtastic.core.navigation.Graph
import org.meshtastic.core.navigation.NodesRoutes
import org.meshtastic.core.navigation.Route
import org.meshtastic.core.navigation.SettingsRoutes
import org.meshtastic.feature.settings.AboutScreen
import org.meshtastic.feature.settings.SettingsScreen
import org.meshtastic.feature.settings.debugging.DebugScreen
import org.meshtastic.feature.settings.navigation.ConfigRoute
Expand Down Expand Up @@ -172,6 +173,8 @@ fun NavGraphBuilder.settingsGraph(navController: NavHostController) {
) {
DebugScreen(onNavigateUp = navController::navigateUp)
}

composable<SettingsRoutes.About> { AboutScreen(onNavigateUp = navController::navigateUp) }
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,8 @@ object SettingsRoutes {

@Serializable data object DebugPanel : Route

@Serializable data object About : Route

// endregion
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@
<string name="must_update">You must update this application on the app store (or Github). It is too old to talk to this radio firmware. Please read our <a href="https://meshtastic.org/docs/software/android/installation">docs</a> on this topic.</string>
<string name="none">None (disable)</string>
<string name="meshtastic_service_notifications">Service notifications</string>
<string name="about">About</string>
<string name="acknowledgements">Acknowledgements</string>
<string name="channel_invalid">This Channel URL is invalid and can not be used</string>
<string name="contact_invalid">This contact is invalid and can not be added</string>
<string name="debug_panel">Debug Panel</string>
Expand Down
5 changes: 3 additions & 2 deletions feature/map/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,11 @@ dependencies {
implementation(libs.androidx.lifecycle.viewmodel.compose)
implementation(libs.androidx.navigation.common)
implementation(libs.material)
implementation(libs.osmbonuspack)
implementation(libs.osmdroid.android)
implementation(libs.timber)

fdroidImplementation(libs.osmbonuspack)
fdroidImplementation(libs.osmdroid.android)

googleImplementation(libs.location.services)
googleImplementation(libs.maps.compose)
googleImplementation(libs.maps.compose.utils)
Expand Down
1 change: 1 addition & 0 deletions feature/settings/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ dependencies {
implementation(projects.core.strings)
implementation(projects.core.ui)

implementation(libs.aboutlibraries.compose.m3)
implementation(libs.accompanist.permissions)
implementation(libs.androidx.appcompat)
implementation(libs.androidx.compose.material.iconsExtended)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
/*
* Copyright (c) 2025 Meshtastic LLC
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/

package org.meshtastic.feature.settings

import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Scaffold
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.tooling.preview.Preview
import com.mikepenz.aboutlibraries.Libs
import com.mikepenz.aboutlibraries.ui.compose.m3.LibrariesContainer
import com.mikepenz.aboutlibraries.util.withContext
import org.jetbrains.compose.resources.stringResource
import org.meshtastic.core.strings.Res
import org.meshtastic.core.strings.acknowledgements
import org.meshtastic.core.ui.component.MainAppBar

@Composable
fun AboutScreen(onNavigateUp: () -> Unit) {
Scaffold(
topBar = {
MainAppBar(
title = stringResource(Res.string.acknowledgements),
canNavigateUp = true,
onNavigateUp = onNavigateUp,
ourNode = null,
showNodeChip = false,
actions = {},
onClickChip = {},
)
},
) { paddingValues ->
val context = LocalContext.current
val libraries = Libs.Builder().withContext(context).build()
LibrariesContainer(
showAuthor = true,
showVersion = true,
showDescription = true,
showLicenseBadges = true,
showFundingBadges = true,
modifier = Modifier.fillMaxSize().padding(paddingValues),
libraries = libraries,
)
}
}

@Preview
@Composable
fun AboutScreenPreview() {
MaterialTheme { AboutScreen(onNavigateUp = {}) }
}
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ import androidx.compose.material.icons.automirrored.rounded.KeyboardArrowRight
import androidx.compose.material.icons.filled.BugReport
import androidx.compose.material.icons.rounded.AppSettingsAlt
import androidx.compose.material.icons.rounded.FormatPaint
import androidx.compose.material.icons.rounded.Info
import androidx.compose.material.icons.rounded.Language
import androidx.compose.material.icons.rounded.LocationOn
import androidx.compose.material.icons.rounded.Memory
Expand Down Expand Up @@ -76,7 +77,9 @@ import org.jetbrains.compose.resources.stringResource
import org.meshtastic.core.common.gpsDisabled
import org.meshtastic.core.database.DatabaseConstants
import org.meshtastic.core.navigation.Route
import org.meshtastic.core.navigation.SettingsRoutes
import org.meshtastic.core.strings.Res
import org.meshtastic.core.strings.acknowledgements
import org.meshtastic.core.strings.analytics_okay
import org.meshtastic.core.strings.app_settings
import org.meshtastic.core.strings.app_version
Expand Down Expand Up @@ -422,6 +425,14 @@ fun SettingsScreen(
settingsLauncher.launch(intent)
}

ListItem(
text = stringResource(Res.string.acknowledgements),
leadingIcon = Icons.Rounded.Info,
trailingIcon = null,
) {
onNavigate(SettingsRoutes.About)
}

AppVersionButton(
excludedModulesUnlocked = excludedModulesUnlocked,
appVersionName = settingsViewModel.appVersionName,
Expand Down
3 changes: 3 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ ktor = "3.3.3"
ktorfit = "2.7.1"

# Other
aboutlibraries = "13.1.0"
coil = "3.3.0"
dd-sdk-android = "3.4.0"
detekt = "1.23.8"
Expand Down Expand Up @@ -128,6 +129,7 @@ androidx-test-runner = { module = "androidx.test:runner", version = "1.7.0" }
junit = { module = "junit:junit", version = "4.13.2" }

# Other
aboutlibraries-compose-m3 = { module = "com.mikepenz:aboutlibraries-compose-m3", version.ref = "aboutlibraries" }
coil = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coil" }
coil-network-core = { module = "io.coil-kt.coil3:coil-network-core", version.ref = "coil" }
coil-network-okhttp = { module = "io.coil-kt.coil3:coil-network-okhttp", version.ref = "coil" }
Expand Down Expand Up @@ -205,6 +207,7 @@ firebase-crashlytics = { id = "com.google.firebase.crashlytics", version = "3.0.
firebase-perf = { id = "com.google.firebase.firebase-perf", version = "2.0.2" }

# Other
aboutlibraries = { id = "com.mikepenz.aboutlibraries.plugin.android", version.ref = "aboutlibraries" }
datadog = { id = "com.datadoghq.dd-sdk-android-gradle-plugin", version = "1.21.0" }
dependency-analysis = { id = "com.autonomousapps.dependency-analysis", version = "3.5.1" }
detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
Expand Down
Loading