mirror of
https://github.com/meshtastic/Meshtastic-Android.git
synced 2026-04-20 22:23:37 +00:00
repo(release): merge changes from 2.7.0 to main (#3070)
Signed-off-by: James Rich <2199651+jamesarich@users.noreply.github.com> Co-authored-by: DaneEvans <dane@goneepic.com>
This commit is contained in:
James Rich
GitHub
parent
94f30ef540
commit
3c726457eb
6 changed files with 84 additions and 79 deletions
9
.github/workflows/release.yml
vendored
9
.github/workflows/release.yml
vendored
|
|
@ -230,10 +230,11 @@ jobs:
|
|||
name: Release ${{ github.ref_name }}
|
||||
generate_release_notes: true
|
||||
files: |
|
||||
./google/bundle/app-google-release.aab
|
||||
./google/apk/app-google-release.apk
|
||||
./fdroid/app-fdroid-release.apk
|
||||
draft: false
|
||||
./build-artifacts/google/bundle/app-google-release.aab
|
||||
./build-artifacts/google/apk/app-google-release.apk
|
||||
./build-artifacts/fdroid/app-fdroid-release.apk
|
||||
./version_info.txt
|
||||
draft: ${{ contains(github.ref_name, '-internal') }}
|
||||
prerelease: ${{ contains(github.ref_name, '-internal') || contains(github.ref_name, '-closed') || contains(github.ref_name, '-open') }}
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
*
|
||||
* 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
|
||||
* 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
|
||||
|
|
@ -86,43 +86,45 @@ android {
|
|||
@Suppress("UnstableApiUsage")
|
||||
androidResources.localeFilters.addAll(
|
||||
listOf(
|
||||
"bg",
|
||||
"ca",
|
||||
"cs",
|
||||
"de",
|
||||
"el",
|
||||
"en",
|
||||
"es",
|
||||
"et",
|
||||
"fi",
|
||||
"fr",
|
||||
"fr-rHT",
|
||||
"ga",
|
||||
"gl",
|
||||
"hr",
|
||||
"hu",
|
||||
"is",
|
||||
"it",
|
||||
"iw",
|
||||
"ja",
|
||||
"ko",
|
||||
"lt",
|
||||
"nl",
|
||||
"nb",
|
||||
"pl",
|
||||
"pt",
|
||||
"ar-rSA",
|
||||
"b+sr+Latn",
|
||||
"bg-rBG",
|
||||
"ca-rES",
|
||||
"cs-rCZ",
|
||||
"de-rDE",
|
||||
"el-rGR",
|
||||
"es-rES",
|
||||
"et-rEE",
|
||||
"fi-rFI",
|
||||
"fr-rFR",
|
||||
"ga-rIE",
|
||||
"gl-rES",
|
||||
"hr-rHR",
|
||||
"ht-rHT",
|
||||
"hu-rHU",
|
||||
"is-rIS",
|
||||
"it-rIT",
|
||||
"iw-rIL",
|
||||
"ja-rJP",
|
||||
"ko-rKR",
|
||||
"lt-rLT",
|
||||
"nl-rNL",
|
||||
"no-rNO",
|
||||
"pl-rPL",
|
||||
"pt-rBR",
|
||||
"ro",
|
||||
"ru",
|
||||
"sk",
|
||||
"sl",
|
||||
"sq",
|
||||
"sr",
|
||||
"sv",
|
||||
"tr",
|
||||
"pt-rPT",
|
||||
"ro-rRO",
|
||||
"ru-rRU",
|
||||
"sk-rSK",
|
||||
"sl-rSI",
|
||||
"sq-rAL",
|
||||
"srp",
|
||||
"sv-rSE",
|
||||
"tr-rTR",
|
||||
"uk-rUA",
|
||||
"zh-rCN",
|
||||
"zh-rTW",
|
||||
"uk",
|
||||
),
|
||||
)
|
||||
ndk { abiFilters += listOf("armeabi-v7a", "arm64-v8a", "x86", "x86_64") }
|
||||
|
|
|
|||
|
|
@ -420,7 +420,7 @@ private fun VersionChecks(viewModel: UIViewModel) {
|
|||
LaunchedEffect(connectionState, myNodeInfo) {
|
||||
if (connectionState == ConnectionState.CONNECTED) {
|
||||
myNodeInfo?.let { info ->
|
||||
val isOld = info.minAppVersion > BuildConfig.VERSION_CODE
|
||||
val isOld = info.minAppVersion > BuildConfig.VERSION_CODE && BuildConfig.DEBUG.not()
|
||||
if (isOld) {
|
||||
viewModel.showAlert(
|
||||
context.getString(R.string.app_too_old),
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ object LanguageUtils : Logging {
|
|||
context.resources.getXml(R.xml.locales_config).use {
|
||||
while (it.eventType != XmlPullParser.END_DOCUMENT) {
|
||||
if (it.eventType == XmlPullParser.START_TAG && it.name == "locale") {
|
||||
languageTags += it.getAttributeValue(0)
|
||||
it.getAttributeValue(0)?.let { tag -> languageTags += tag }
|
||||
}
|
||||
it.next()
|
||||
}
|
||||
|
|
@ -66,7 +66,7 @@ object LanguageUtils : Logging {
|
|||
errormsg("Error parsing locale_config.xml ${e.message}")
|
||||
}
|
||||
return languageTags.associateBy { tag ->
|
||||
val loc = Locale(tag)
|
||||
val loc = Locale.forLanguageTag(tag)
|
||||
when (tag) {
|
||||
SYSTEM_DEFAULT -> context.getString(R.string.preferences_system_default)
|
||||
"fr-HT" -> context.getString(R.string.fr_HT)
|
||||
|
|
|
|||
|
|
@ -1,40 +1,42 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<locale-config xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<locale android:name="en"/> <!-- English (ultimate fallback locale) -->
|
||||
<locale android:name="bg"/> <!-- Bulgarian -->
|
||||
<locale android:name="ca"/> <!-- Catalan -->
|
||||
<locale android:name="cs"/> <!-- Czech -->
|
||||
<locale android:name="zh-CN"/> <!-- Chinese Simplified -->
|
||||
<locale android:name="zh-TW"/> <!-- Chinese Traditional -->
|
||||
<locale android:name="de"/> <!-- German -->
|
||||
<locale android:name="et"/> <!-- Estonian -->
|
||||
<locale android:name="es"/> <!-- Spanish (Spain) -->
|
||||
<locale android:name="fr"/> <!-- French (France) -->
|
||||
<locale android:name="ga"/> <!-- Irish -->
|
||||
<locale android:name="gl"/> <!-- Galician -->
|
||||
<locale android:name="hr"/> <!-- Croatian -->
|
||||
<locale android:name="el"/> <!-- Greek -->
|
||||
<locale android:name="fr-HT"/> <!-- Haitian Creole -->
|
||||
<locale android:name="it"/> <!-- Italian -->
|
||||
<locale android:name="is"/> <!-- Icelandic -->
|
||||
<locale android:name="iw"/> <!-- Hebrew -->
|
||||
<locale android:name="ja"/> <!-- Japanese -->
|
||||
<locale android:name="ko"/> <!-- Korean -->
|
||||
<locale android:name="lt"/> <!-- Lithuanian -->
|
||||
<locale android:name="hu"/> <!-- Hungarian -->
|
||||
<locale android:name="nl"/> <!-- Dutch -->
|
||||
<locale android:name="nb"/> <!-- Norwegian -->
|
||||
<locale android:name="pl"/> <!-- Polish -->
|
||||
<locale android:name="pt"/> <!-- Portuguese -->
|
||||
<locale android:name="pt-BR"/> <!-- Portuguese (Brazil) -->
|
||||
<locale android:name="ro"/> <!-- Romanian -->
|
||||
<locale android:name="ru"/> <!-- Russian -->
|
||||
<locale android:name="sq"/> <!-- Albanian -->
|
||||
<locale android:name="sr"/> <!-- Serbian (Cyrillic) -->
|
||||
<locale android:name="sk"/> <!-- Slovak -->
|
||||
<locale android:name="sl"/> <!-- Slovenian -->
|
||||
<locale android:name="fi"/> <!-- Finnish -->
|
||||
<locale android:name="sv"/> <!-- Swedish -->
|
||||
<locale android:name="tr"/> <!-- Turkish -->
|
||||
<locale android:name="uk"/> <!-- Ukrainian -->
|
||||
<locale android:name="en"/>
|
||||
<locale android:name="ar-SA"/>
|
||||
<locale android:name="sr-Latn"/>
|
||||
<locale android:name="bg-BG"/>
|
||||
<locale android:name="ca-ES"/>
|
||||
<locale android:name="cs-CZ"/>
|
||||
<locale android:name="de-DE"/>
|
||||
<locale android:name="el-GR"/>
|
||||
<locale android:name="es-ES"/>
|
||||
<locale android:name="et-EE"/>
|
||||
<locale android:name="fi-FI"/>
|
||||
<locale android:name="fr-FR"/>
|
||||
<locale android:name="ga-IE"/>
|
||||
<locale android:name="gl-ES"/>
|
||||
<locale android:name="hr-HR"/>
|
||||
<locale android:name="ht-HT"/>
|
||||
<locale android:name="hu-HU"/>
|
||||
<locale android:name="is-IS"/>
|
||||
<locale android:name="it-IT"/>
|
||||
<locale android:name="iw-IL"/>
|
||||
<locale android:name="ja-JP"/>
|
||||
<locale android:name="ko-KR"/>
|
||||
<locale android:name="lt-LT"/>
|
||||
<locale android:name="nl-NL"/>
|
||||
<locale android:name="nb-NO"/>
|
||||
<locale android:name="pl-PL"/>
|
||||
<locale android:name="pt-BR"/>
|
||||
<locale android:name="pt-PT"/>
|
||||
<locale android:name="ro-RO"/>
|
||||
<locale android:name="ru-RU"/>
|
||||
<locale android:name="sk-SK"/>
|
||||
<locale android:name="sl-SI"/>
|
||||
<locale android:name="sq-AL"/>
|
||||
<locale android:name="sr"/>
|
||||
<locale android:name="sv-SE"/>
|
||||
<locale android:name="tr-TR"/>
|
||||
<locale android:name="uk-UA"/>
|
||||
<locale android:name="zh-CN"/>
|
||||
<locale android:name="zh-TW"/>
|
||||
</locale-config>
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ object Configs {
|
|||
* to reflect the version number of the Git tag that will be created for that release.
|
||||
* @see [RELEASE_PROCESS.md]
|
||||
*/
|
||||
const val VERSION_NAME_BASE = "2.6.35"
|
||||
const val VERSION_NAME_BASE = "2.7.0"
|
||||
const val MIN_FW_VERSION = "2.5.14" // Minimum device firmware version supported by this app
|
||||
const val ABS_MIN_FW_VERSION = "2.3.15" // Minimum device firmware version supported by this app
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue