mirror
/
meshtastic-android
kopia lustrzana https://github.com/meshtastic/Meshtastic-Android
1
0
Forkuj 1
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Merge pull request #389 from meshtastic/release 

1.3.3
pull/390/head
Andre Kirchhoff 2022-03-08 10:35:52 -03:00 zatwierdzone przez GitHub
rodzic 2810fbbbbf 5bb7b49241
commit b6d90685c2
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
22 zmienionych plików z 29 dodań i 31 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

13
app/build.gradle
Wyświetl plik

@ -43,8 +43,8 @@ android {
applicationId "com.geeksville.mesh"
minSdkVersion 21 // The oldest emulator image I have tried is 22 (though 21 probably works)
targetSdkVersion 30 // 30 can't work until an explicit location permissions dialog is added
versionCode 20258 // format is Mmmss (where M is 1+the numeric major number
versionName "1.2.58"
versionCode 20303 // format is Mmmss (where M is 1+the numeric major number
versionName "1.3.3"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
// per https://developer.android.com/studio/write/vector-asset-studio
@ -122,8 +122,6 @@ protobuf {
dependencies {
def room_version = '2.4.1'
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'androidx.appcompat:appcompat:1.4.1'
implementation 'androidx.core:core-ktx:1.7.0'
@ -134,13 +132,12 @@ dependencies {
implementation 'com.google.android.material:material:1.5.0'
implementation 'androidx.viewpager2:viewpager2:1.0.0'
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.4.0'
implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.4.1'
implementation "androidx.room:room-runtime:$room_version"
implementation "com.google.dagger:hilt-android:$hilt_version"
kapt "androidx.room:room-compiler:$room_version"
kapt "com.google.dagger:hilt-compiler:$hilt_version"
// optional - Kotlin Extensions and Coroutines support for Room
implementation "androidx.room:room-ktx:$room_version"
@ -161,14 +158,14 @@ dependencies {
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
// For now I'm not using javalite, because I want JSON printing
implementation('com.google.protobuf:protobuf-java:3.15.8')
implementation 'com.google.protobuf:protobuf-java:3.15.8'
// For UART access
// implementation 'com.google.android.things:androidthings:1.0'
implementation 'com.github.mik3y:usb-serial-for-android:3.4.3'
// mapbox
implementation('com.mapbox.maps:android:10.2.0')
implementation 'com.mapbox.maps:android:10.2.0'
// mapbox specifies a really old version of okhttp3 which causes lots of API warnings. trying a newer version
implementation 'com.squareup.okhttp3:okhttp:4.9.0'

4
app/src/main/java/com/geeksville/mesh/service/MeshService.kt
Wyświetl plik

@ -105,7 +105,7 @@ class MeshService : Service(), Logging {
/** The minimmum firmware version we know how to talk to. We'll still be able to talk to 1.0 firmwares but only well enough to ask them to firmware update
*/
val minFirmwareVersion = DeviceVersion("1.2.0")
val minFirmwareVersion = DeviceVersion("1.3.0")
}
enum class ConnectionState {
@ -1531,7 +1531,7 @@ class MeshService : Service(), Logging {
try {
val mi = myNodeInfo
if (mi != null) {
debug("Sending our position/time to=$destNum lat=$lat, lon=$lon, alt=$alt")
debug("Sending our position/time to=$destNum lat=${lat.anonymize}, lon=${lon.anonymize}, alt=$alt")
val position = MeshProtos.Position.newBuilder().also {
it.longitudeI = Position.degI(lon)

2
app/src/main/res/values-cs/strings.xml
Wyświetl plik

@ -48,7 +48,7 @@
<string name="share">Sdílet</string>
<string name="disconnected">Odpojeno</string>
<string name="device_sleeping">Zařízení spí</string>
<string name="connected_count">Pripojeno: %s z %s je online</string>
<string name="connected_count">Pripojeno: %1$s z %2$s je online</string>
<string name="list_of_nodes">Seznam vysílačů v síti</string>
<string name="update_firmware">Aktualizace softwaru</string>
<string name="connected_to">Připojeno k vysílači (%s)</string>

2
app/src/main/res/values-el/strings.xml
Wyświetl plik

@ -48,7 +48,7 @@
<string name="share">Κοινοποίηση</string>
<string name="disconnected">Αποσυνδεδεμένο</string>
<string name="device_sleeping">Συσκευή σε ύπνωση</string>
<string name="connected_count">Συνδεδεμένος: %s από %s online</string>
<string name="connected_count">Συνδεδεμένος: %1$s από %2$s online</string>
<string name="list_of_nodes">Λίστα κόμβων δικτύου</string>
<string name="update_firmware">Αναβάθμιση Firmware</string>
<string name="connected">Συνδεδεμένο στο radio</string>

2
app/src/main/res/values-es/strings.xml
Wyświetl plik

@ -45,7 +45,7 @@
<string name="share">Compartir</string>
<string name="disconnected">Desconectado</string>
<string name="device_sleeping">Dispositivo en reposo</string>
<string name="connected_count">Conectado: %s de %s en línea</string>
<string name="connected_count">Conectado: %1$s de %2$s en línea</string>
<string name="list_of_nodes">Una lista de nodos en la red</string>
<string name="update_firmware">Actualizar el firmware</string>
<string name="connected">Conectado a la radio</string>

2
app/src/main/res/values-fr/strings.xml
Wyświetl plik

@ -49,7 +49,7 @@
<string name="share">Partager</string>
<string name="disconnected">Déconnecté</string>
<string name="device_sleeping">Appareil en veille</string>
<string name="connected_count">Connecté: %s sur %s en ligne</string>
<string name="connected_count">Connecté: %1$s sur %2$s en ligne</string>
<string name="list_of_nodes">Une liste de nœuds dans le réseau</string>
<string name="update_firmware">Mise à jour du Firmware</string>
<string name="connected">Connecté à une radio</string>

2
app/src/main/res/values-ht/strings.xml
Wyświetl plik

@ -46,7 +46,7 @@
<string name="share">Pataje</string>
<string name="disconnected">Dekonekte</string>
<string name="device_sleeping">Aparèy ap dòmi</string>
<string name="connected_count">Konekte: %s nan %s disponib</string>
<string name="connected_count">Konekte: %1$s nan %2$s disponib</string>
<string name="list_of_nodes">Yon lis ne elektwonik nan rezo a</string>
<string name="update_firmware">Mete ajou mikrolojisyèl</string>
<string name="connected">Konekte ak radyo</string>

2
app/src/main/res/values-hu/strings.xml
Wyświetl plik

@ -47,7 +47,7 @@
<string name="share">Megosztás</string>
<string name="disconnected">Szétkapcsolva</string>
<string name="device_sleeping">Az eszköz alszik</string>
<string name="connected_count">Kapcsolódva: %s a %s-ból(ből) elérhető</string>
<string name="connected_count">Kapcsolódva: %1$s a %2$s-ból(ből) elérhető</string>
<string name="list_of_nodes">Hálózati állomások listája</string>
<string name="update_firmware">Firmware frissítés</string>
<string name="connected">Kapcsolódva a rádióhoz</string>

2
app/src/main/res/values-ja/strings.xml
Wyświetl plik

@ -48,7 +48,7 @@ mapboxの有償プラン（または代替地図プロバイダ）を検討さ
<string name="share">シェア</string>
<string name="disconnected">切断</string>
<string name="device_sleeping">スリープ</string>
<string name="connected_count">接続済み：%s人オンライン%s人中</string>
<string name="connected_count">接続済み：%1$s人オンライン%2$s人中</string>
<string name="list_of_nodes">ネットワーク内のノードリスト</string>
<string name="update_firmware">ファームウェアアップデート</string>
<string name="connected_to">Meshtasticデバイスに接続しました。(%s)</string>

2
app/src/main/res/values-ko-rKR/strings.xml
Wyświetl plik

@ -46,7 +46,7 @@
<string name="share">공유</string>
<string name="disconnected">연결 해제</string>
<string name="device_sleeping">장치 잠자기</string>
<string name="connected_count">연결: %s 온라인( 전체 %s)</string>
<string name="connected_count">연결: %1$s 온라인( 전체 %2$s)</string>
<string name="list_of_nodes">네트워크안은 모든 노드의 목록</string>
<string name="update_firmware">펌웨어 업데이트</string>
<string name="connected">라디오로 연결됨</string>

2
app/src/main/res/values-nl/strings.xml
Wyświetl plik

@ -48,7 +48,7 @@
<string name="share">Deel</string>
<string name="disconnected">Niet verbonden</string>
<string name="device_sleeping">Apparaat in slaapstand</string>
<string name="connected_count">Verbonden: %s van %s online</string>
<string name="connected_count">Verbonden: %1$s van %2$s online</string>
<string name="list_of_nodes">Een lijst van de aansluitpunten in het netwerk</string>
<string name="update_firmware">Programma Updaten</string>
<string name="connected">Verbonden met een radio</string>

2
app/src/main/res/values-no/strings.xml
Wyświetl plik

@ -48,7 +48,7 @@
<string name="share">Del</string>
<string name="disconnected">Frakoblet</string>
<string name="device_sleeping">Enhet sover</string>
<string name="connected_count">Tilkoblet: %s av %s på nett</string>
<string name="connected_count">Tilkoblet: %1$s av %2$s på nett</string>
<string name="list_of_nodes">En liste over noder i nettverket</string>
<string name="update_firmware">Oppdater Firmware</string>
<string name="connected">Tilkoblet radio</string>

2
app/src/main/res/values-pl/strings.xml
Wyświetl plik

@ -53,7 +53,7 @@
<string name="share">Udostępnij</string>
<string name="disconnected">Rozłączone</string>
<string name="device_sleeping">Urządzenie uśpione.</string>
<string name="connected_count">Połączono: %s of %s online</string>
<string name="connected_count">Połączono: %1$s of %2$s online</string>
<string name="list_of_nodes">Lista użytkowników w sieci</string>
<string name="update_firmware">Aktualizuj oprogramowanie.</string>
<string name="connected">Połączony z urządzeniem</string>

2
app/src/main/res/values-pt-rBR/strings.xml
Wyświetl plik

@ -48,7 +48,7 @@
<string name="share">Compartilhar</string>
<string name="disconnected">Desconectado</string>
<string name="device_sleeping">Dispositivo em suspensão (sleep)</string>
<string name="connected_count">Conectado: %s de %s online</string>
<string name="connected_count">Conectado: %1$s de %2$s online</string>
<string name="list_of_nodes">Lista de dispositivos na rede</string>
<string name="update_firmware">Atualizar Firmware</string>
<string name="connected">Conectado ao rádio</string>

2
app/src/main/res/values-pt/strings.xml
Wyświetl plik

@ -47,7 +47,7 @@
<string name="share">Partilha</string>
<string name="disconnected">Desconectado</string>
<string name="device_sleeping">Dispositivo a dormir</string>
<string name="connected_count">Conectado: %s de %s online</string>
<string name="connected_count">Conectado: %1$s de %2$s online</string>
<string name="list_of_nodes">Lista de nós na rede</string>
<string name="update_firmware">Atualizar Firmware</string>
<string name="connected">Conectado ao rádio</string>

2
app/src/main/res/values-ro/strings.xml
Wyświetl plik

@ -48,7 +48,7 @@
<string name="share">Distribuie</string>
<string name="disconnected">Deconectat</string>
<string name="device_sleeping">Dispozitiv în sleep mode</string>
<string name="connected_count">Connectat: %s din %s online</string>
<string name="connected_count">Connectat: %1$s din %2$s online</string>
<string name="list_of_nodes">O lista cu nodurile din rețea</string>
<string name="update_firmware">Updateaza firmware-ul</string>
<string name="connected">Connectat la dispozitiv</string>

2
app/src/main/res/values-sk/strings.xml
Wyświetl plik

@ -48,7 +48,7 @@
<string name="share">Zdieľať</string>
<string name="disconnected">Odpojené</string>
<string name="device_sleeping">Vysielač uspatý</string>
<string name="connected_count">Pripojený: %s z %s je online</string>
<string name="connected_count">Pripojený: %1$s z %2$s je online</string>
<string name="list_of_nodes">Zoznam vysielačov v sieti</string>
<string name="update_firmware">Aktualizácia firmvéru</string>
<string name="connected">Pripojené k vysielaču</string>

2
app/src/main/res/values-sl/strings.xml
Wyświetl plik

@ -46,7 +46,7 @@
<string name="share">Deliti</string>
<string name="disconnected">Prekinjeno</string>
<string name="device_sleeping">Naprava je v "spanju"</string>
<string name="connected_count">Povezano: %s od %s je na mreži</string>
<string name="connected_count">Povezano: %1$s od %2$s je na mreži</string>
<string name="list_of_nodes">Seznam vozlišč v omrežju</string>
<string name="update_firmware">Posodobite vdelano programsko opremo</string>
<string name="connected">Povezana z radiem</string>

2
app/src/main/res/values-tr/strings.xml
Wyświetl plik

@ -48,7 +48,7 @@
<string name="share">Paylaş</string>
<string name="disconnected">Bağlantı sonlandı</string>
<string name="device_sleeping">Cihaz uyku durumunda</string>
<string name="connected_count">Bağlandı: %s / %s online</string>
<string name="connected_count">Bağlandı: %1$s / %2$s online</string>
<string name="list_of_nodes">Ağdaki node listesi</string>
<string name="update_firmware">Yazılım güncelle</string>
<string name="connected">Radyoya bağlandı</string>

2
app/src/main/res/values-zh/strings.xml
Wyświetl plik

@ -48,7 +48,7 @@
<string name="share">分享</string>
<string name="disconnected">断开连接</string>
<string name="device_sleeping">设备休眠中</string>
<string name="connected_count">连接: %s 中 %s 在线</string>
<string name="connected_count">连接: %1$s 中 %2$s 在线</string>
<string name="list_of_nodes">网络中节点列表</string>
<string name="update_firmware">更新固件</string>
<string name="connected">连接设备</string>

2
app/src/main/res/values/strings.xml
Wyświetl plik

@ -52,7 +52,7 @@
<string name="share">Share</string>
<string name="disconnected">Disconnected</string>
<string name="device_sleeping">Device sleeping</string>
<string name="connected_count">Connected: %s of %s online</string>
<string name="connected_count">Connected: %1$s of %2$s online</string>
<string name="list_of_nodes">A list of nodes in the network</string>
<string name="update_firmware">Update Firmware</string>
<string name="connected">Connected to radio</string>

5
build.gradle
Wyświetl plik

@ -2,7 +2,8 @@
buildscript {
ext.kotlin_version = '1.6.10'
ext.coroutines_version = "1.5.2"
ext.coroutines_version = '1.6.0'
ext.room_version = '2.4.2'
ext.hilt_version = '2.40.5'
repositories {
@ -10,7 +11,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.1.1'
classpath 'com.android.tools.build:gradle:7.1.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"