mirror of
https://github.com/rhunk/SnapEnhance.git
synced 2025-05-08 10:24:32 +02:00
chore: update dependencies (#644)
Co-authored-by: rhunk <101876869+rhunk@users.noreply.github.com>
This commit is contained in:
parent
99a2baebaa
commit
630d93ede6
@ -6,7 +6,7 @@ import androidx.compose.animation.fadeIn
|
|||||||
import androidx.compose.animation.fadeOut
|
import androidx.compose.animation.fadeOut
|
||||||
import androidx.compose.foundation.layout.*
|
import androidx.compose.foundation.layout.*
|
||||||
import androidx.compose.material.icons.Icons
|
import androidx.compose.material.icons.Icons
|
||||||
import androidx.compose.material.icons.filled.ArrowBack
|
import androidx.compose.material.icons.automirrored.filled.ArrowBack
|
||||||
import androidx.compose.material3.*
|
import androidx.compose.material3.*
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.getValue
|
import androidx.compose.runtime.getValue
|
||||||
@ -60,7 +60,7 @@ class Navigation(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
) {
|
) {
|
||||||
Icon(Icons.Filled.ArrowBack, contentDescription = null)
|
Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = null)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}, actions = {
|
}, actions = {
|
||||||
@ -78,7 +78,6 @@ class Navigation(
|
|||||||
primaryRoutes.forEach { route ->
|
primaryRoutes.forEach { route ->
|
||||||
NavigationBarItem(
|
NavigationBarItem(
|
||||||
alwaysShowLabel = false,
|
alwaysShowLabel = false,
|
||||||
modifier = Modifier.fillMaxHeight(),
|
|
||||||
icon = {
|
icon = {
|
||||||
Icon(imageVector = route.routeInfo.icon, contentDescription = null)
|
Icon(imageVector = route.routeInfo.icon, contentDescription = null)
|
||||||
},
|
},
|
||||||
|
@ -8,7 +8,8 @@ import androidx.compose.foundation.lazy.LazyColumn
|
|||||||
import androidx.compose.foundation.lazy.items
|
import androidx.compose.foundation.lazy.items
|
||||||
import androidx.compose.foundation.lazy.rememberLazyListState
|
import androidx.compose.foundation.lazy.rememberLazyListState
|
||||||
import androidx.compose.material.icons.Icons
|
import androidx.compose.material.icons.Icons
|
||||||
import androidx.compose.material.icons.filled.*
|
import androidx.compose.material.icons.automirrored.filled.OpenInNew
|
||||||
|
import androidx.compose.material.icons.filled.*
|
||||||
import androidx.compose.material3.*
|
import androidx.compose.material3.*
|
||||||
import androidx.compose.runtime.*
|
import androidx.compose.runtime.*
|
||||||
import androidx.compose.ui.Alignment
|
import androidx.compose.ui.Alignment
|
||||||
@ -148,7 +149,7 @@ class TasksRoot : Routes.Route() {
|
|||||||
context.log.error("Failed to open file ${taskSelection.first().second}", it)
|
context.log.error("Failed to open file ${taskSelection.first().second}", it)
|
||||||
}
|
}
|
||||||
}) {
|
}) {
|
||||||
Icon(Icons.Filled.OpenInNew, contentDescription = "Open")
|
Icon(Icons.AutoMirrored.Filled.OpenInNew, contentDescription = "Open")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -348,8 +349,8 @@ class TasksRoot : Routes.Route() {
|
|||||||
}
|
}
|
||||||
if (taskProgress != -1) {
|
if (taskProgress != -1) {
|
||||||
LinearProgressIndicator(
|
LinearProgressIndicator(
|
||||||
progress = taskProgress.toFloat() / 100f,
|
progress = { taskProgress.toFloat() / 100f },
|
||||||
strokeCap = StrokeCap.Round
|
strokeCap = StrokeCap.Round,
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
task.extra?.let {
|
task.extra?.let {
|
||||||
|
@ -12,10 +12,10 @@ import androidx.compose.foundation.lazy.items
|
|||||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||||
import androidx.compose.foundation.text.KeyboardActions
|
import androidx.compose.foundation.text.KeyboardActions
|
||||||
import androidx.compose.material.icons.Icons
|
import androidx.compose.material.icons.Icons
|
||||||
|
import androidx.compose.material.icons.automirrored.filled.OpenInNew
|
||||||
import androidx.compose.material.icons.filled.Close
|
import androidx.compose.material.icons.filled.Close
|
||||||
import androidx.compose.material.icons.filled.FolderOpen
|
import androidx.compose.material.icons.filled.FolderOpen
|
||||||
import androidx.compose.material.icons.filled.MoreVert
|
import androidx.compose.material.icons.filled.MoreVert
|
||||||
import androidx.compose.material.icons.filled.OpenInNew
|
|
||||||
import androidx.compose.material.icons.filled.Search
|
import androidx.compose.material.icons.filled.Search
|
||||||
import androidx.compose.material.icons.rounded.Save
|
import androidx.compose.material.icons.rounded.Save
|
||||||
import androidx.compose.material3.*
|
import androidx.compose.material3.*
|
||||||
@ -239,7 +239,7 @@ class FeaturesRoot : Routes.Route() {
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
IconButton(onClick = it) {
|
IconButton(onClick = it) {
|
||||||
Icon(Icons.Filled.OpenInNew, contentDescription = null)
|
Icon(Icons.AutoMirrored.Filled.OpenInNew, contentDescription = null)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -5,7 +5,7 @@ import androidx.compose.foundation.clickable
|
|||||||
import androidx.compose.foundation.layout.*
|
import androidx.compose.foundation.layout.*
|
||||||
import androidx.compose.foundation.verticalScroll
|
import androidx.compose.foundation.verticalScroll
|
||||||
import androidx.compose.material.icons.Icons
|
import androidx.compose.material.icons.Icons
|
||||||
import androidx.compose.material.icons.filled.OpenInNew
|
import androidx.compose.material.icons.automirrored.filled.OpenInNew
|
||||||
import androidx.compose.material3.*
|
import androidx.compose.material3.*
|
||||||
import androidx.compose.runtime.*
|
import androidx.compose.runtime.*
|
||||||
import androidx.compose.ui.Alignment
|
import androidx.compose.ui.Alignment
|
||||||
@ -78,7 +78,7 @@ class HomeSettings : Routes.Route() {
|
|||||||
Text(text = title, modifier = Modifier.padding(start = 26.dp))
|
Text(text = title, modifier = Modifier.padding(start = 26.dp))
|
||||||
IconButton(onClick = { takeAction() }) {
|
IconButton(onClick = { takeAction() }) {
|
||||||
Icon(
|
Icon(
|
||||||
imageVector = Icons.Filled.OpenInNew,
|
imageVector = Icons.AutoMirrored.Filled.OpenInNew,
|
||||||
contentDescription = null,
|
contentDescription = null,
|
||||||
modifier = Modifier.size(24.dp)
|
modifier = Modifier.size(24.dp)
|
||||||
)
|
)
|
||||||
|
@ -5,8 +5,8 @@ import androidx.compose.foundation.clickable
|
|||||||
import androidx.compose.foundation.layout.*
|
import androidx.compose.foundation.layout.*
|
||||||
import androidx.compose.foundation.lazy.LazyColumn
|
import androidx.compose.foundation.lazy.LazyColumn
|
||||||
import androidx.compose.material.icons.Icons
|
import androidx.compose.material.icons.Icons
|
||||||
|
import androidx.compose.material.icons.automirrored.filled.LibraryBooks
|
||||||
import androidx.compose.material.icons.filled.FolderOpen
|
import androidx.compose.material.icons.filled.FolderOpen
|
||||||
import androidx.compose.material.icons.filled.LibraryBooks
|
|
||||||
import androidx.compose.material.icons.filled.Link
|
import androidx.compose.material.icons.filled.Link
|
||||||
import androidx.compose.material.icons.filled.Settings
|
import androidx.compose.material.icons.filled.Settings
|
||||||
import androidx.compose.material3.*
|
import androidx.compose.material3.*
|
||||||
@ -295,7 +295,7 @@ class ScriptingRoot : Routes.Route() {
|
|||||||
flags = Intent.FLAG_ACTIVITY_NEW_TASK
|
flags = Intent.FLAG_ACTIVITY_NEW_TASK
|
||||||
})
|
})
|
||||||
}) {
|
}) {
|
||||||
Icon(imageVector = Icons.Default.LibraryBooks, contentDescription = "Documentation")
|
Icon(imageVector = Icons.AutoMirrored.Default.LibraryBooks, contentDescription = "Documentation")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -250,11 +250,11 @@ class MessagingPreview: Routes.Route() {
|
|||||||
Text("Processed ${processMessageCount.intValue} messages")
|
Text("Processed ${processMessageCount.intValue} messages")
|
||||||
if (activeTask?.hasFixedGoal() == true) {
|
if (activeTask?.hasFixedGoal() == true) {
|
||||||
LinearProgressIndicator(
|
LinearProgressIndicator(
|
||||||
|
progress = { processMessageCount.intValue.toFloat() / selectedMessages.size.toFloat() },
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.fillMaxWidth()
|
.fillMaxWidth()
|
||||||
.padding(5.dp),
|
.padding(5.dp),
|
||||||
progress = processMessageCount.intValue.toFloat() / selectedMessages.size.toFloat(),
|
color = MaterialTheme.colorScheme.primary,
|
||||||
color = MaterialTheme.colorScheme.primary
|
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
CircularProgressIndicator(
|
CircularProgressIndicator(
|
||||||
|
@ -105,7 +105,7 @@ class SocialRoot : Routes.Route() {
|
|||||||
val group = groupList[index]
|
val group = groupList[index]
|
||||||
Column(
|
Column(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.padding(10.dp)
|
.padding(7.dp)
|
||||||
.fillMaxWidth()
|
.fillMaxWidth()
|
||||||
.weight(1f)
|
.weight(1f)
|
||||||
) {
|
) {
|
||||||
@ -137,7 +137,7 @@ class SocialRoot : Routes.Route() {
|
|||||||
)
|
)
|
||||||
Column(
|
Column(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.padding(10.dp)
|
.padding(7.dp)
|
||||||
.fillMaxWidth()
|
.fillMaxWidth()
|
||||||
.weight(1f)
|
.weight(1f)
|
||||||
) {
|
) {
|
||||||
@ -228,7 +228,7 @@ class SocialRoot : Routes.Route() {
|
|||||||
) { paddingValues ->
|
) { paddingValues ->
|
||||||
Column(modifier = Modifier.padding(paddingValues)) {
|
Column(modifier = Modifier.padding(paddingValues)) {
|
||||||
TabRow(selectedTabIndex = pagerState.currentPage, indicator = { tabPositions ->
|
TabRow(selectedTabIndex = pagerState.currentPage, indicator = { tabPositions ->
|
||||||
TabRowDefaults.Indicator(
|
TabRowDefaults.SecondaryIndicator(
|
||||||
Modifier.pagerTabIndicatorOffset(
|
Modifier.pagerTabIndicatorOffset(
|
||||||
pagerState = pagerState,
|
pagerState = pagerState,
|
||||||
tabPositions = tabPositions
|
tabPositions = tabPositions
|
||||||
|
@ -9,7 +9,7 @@ import androidx.compose.animation.core.animateFloatAsState
|
|||||||
import androidx.compose.foundation.background
|
import androidx.compose.foundation.background
|
||||||
import androidx.compose.foundation.layout.*
|
import androidx.compose.foundation.layout.*
|
||||||
import androidx.compose.material.icons.Icons
|
import androidx.compose.material.icons.Icons
|
||||||
import androidx.compose.material.icons.filled.ArrowForwardIos
|
import androidx.compose.material.icons.automirrored.filled.ArrowForwardIos
|
||||||
import androidx.compose.material.icons.filled.Check
|
import androidx.compose.material.icons.filled.Check
|
||||||
import androidx.compose.material3.FilledIconButton
|
import androidx.compose.material3.FilledIconButton
|
||||||
import androidx.compose.material3.Icon
|
import androidx.compose.material3.Icon
|
||||||
@ -122,7 +122,7 @@ class SetupActivity : ComponentActivity() {
|
|||||||
imageVector = if (requiredScreens.size <= 1 && canGoNext) {
|
imageVector = if (requiredScreens.size <= 1 && canGoNext) {
|
||||||
Icons.Default.Check
|
Icons.Default.Check
|
||||||
} else {
|
} else {
|
||||||
Icons.Default.ArrowForwardIos
|
Icons.AutoMirrored.Default.ArrowForwardIos
|
||||||
},
|
},
|
||||||
contentDescription = null
|
contentDescription = null
|
||||||
)
|
)
|
||||||
|
@ -28,7 +28,11 @@
|
|||||||
"home_logs": "Kayıtlar",
|
"home_logs": "Kayıtlar",
|
||||||
"social": "Sosyal",
|
"social": "Sosyal",
|
||||||
"scripts": "Scriptler",
|
"scripts": "Scriptler",
|
||||||
"tasks": "Görevler"
|
"tasks": "Görevler",
|
||||||
|
"logger_history": "Kaydedici Geçmişi",
|
||||||
|
"logged_stories": "Kaydedilen Hikayeler",
|
||||||
|
"manage_scope": "Kapsamı Yönet",
|
||||||
|
"messaging_preview": "Önizleme"
|
||||||
},
|
},
|
||||||
"sections": {
|
"sections": {
|
||||||
"home": {
|
"home": {
|
||||||
@ -521,6 +525,22 @@
|
|||||||
"disable_memories_snap_feed": {
|
"disable_memories_snap_feed": {
|
||||||
"description": "Kamerada yukarı kaydırdığınızda Snapchat'in son anıları göstermesini engeller",
|
"description": "Kamerada yukarı kaydırdığınızda Snapchat'in son anıları göstermesini engeller",
|
||||||
"name": "Anılar Snap Feed'ini Devre Dışı Bırak"
|
"name": "Anılar Snap Feed'ini Devre Dışı Bırak"
|
||||||
|
},
|
||||||
|
"default_video_playback_rate": {
|
||||||
|
"name": "Varsayılan Video Oynatma Hızı",
|
||||||
|
"description": "Videoların oynatılması için varsayılan hızı ayarlar\nDeğer 0.1 ile 4.0 arasında olmalıdır"
|
||||||
|
},
|
||||||
|
"video_playback_rate_slider": {
|
||||||
|
"name": "Video Oynatma Hızı Kaydırıcısı",
|
||||||
|
"description": "Video oynatma hızını değiştirmek için opera içerik menüsüne bir kaydırıcı ekler\nNot: Değişiklikler yalnızca sonraki videolar için geçerlidir"
|
||||||
|
},
|
||||||
|
"default_volume_controls": {
|
||||||
|
"name": "Varsayılan Ses Kontrolleri",
|
||||||
|
"description": "Snapchat'i sistem ses kontrollerini kullanmaya zorlar"
|
||||||
|
},
|
||||||
|
"disable_permission_requests": {
|
||||||
|
"name": "İzin İsteklerini Devre Dışı Bırak",
|
||||||
|
"description": "Snapchat'in belirli izinleri istemesini engeller"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@ -693,6 +713,20 @@
|
|||||||
"story_logger": {
|
"story_logger": {
|
||||||
"description": "Arkadaş hikayelerinin bir tarihçesini sunar",
|
"description": "Arkadaş hikayelerinin bir tarihçesini sunar",
|
||||||
"name": "Hikaye Kaydedici"
|
"name": "Hikaye Kaydedici"
|
||||||
|
},
|
||||||
|
"session_events": {
|
||||||
|
"name": "Oturum Etkinlikleri",
|
||||||
|
"description": "Oturum olaylarını kaydeder",
|
||||||
|
"properties": {
|
||||||
|
"capture_duplex_events": {
|
||||||
|
"name": "Çift Yönlü Olayları Yakalama",
|
||||||
|
"description": "Bir oturum aktifken varlık ve mesajlaşma olaylarını yakalama"
|
||||||
|
},
|
||||||
|
"allow_running_in_background": {
|
||||||
|
"name": "Arka Planda Çalışmaya İzin Ver",
|
||||||
|
"description": "Oturumun arka planda çalışmasına izin verir"
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@ -870,6 +904,17 @@
|
|||||||
"disable_cameras": {
|
"disable_cameras": {
|
||||||
"front": "Ön Kamera",
|
"front": "Ön Kamera",
|
||||||
"back": "Arka Kamera"
|
"back": "Arka Kamera"
|
||||||
|
},
|
||||||
|
"disable_permission_requests": {
|
||||||
|
"read_media_images": "Medya Görsellerini Oku",
|
||||||
|
"microphone": "Mikrofon",
|
||||||
|
"read_contacts": "Kişileri Oku",
|
||||||
|
"nearby_devices": "Yakındaki Cihazlar",
|
||||||
|
"phone_calls": "Telefon Çağrıları",
|
||||||
|
"notifications": "Bildirimler",
|
||||||
|
"read_media_video": "Medya Videosunu Oku",
|
||||||
|
"camera": "Kamera",
|
||||||
|
"location": "Konum"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@ -1061,7 +1106,8 @@
|
|||||||
"none": "Hiçbiri",
|
"none": "Hiçbiri",
|
||||||
"profile_picture": "Profil Fotoğrafı",
|
"profile_picture": "Profil Fotoğrafı",
|
||||||
"story": "Hikaye",
|
"story": "Hikaye",
|
||||||
"chat_media": "Sohbet Medyası"
|
"chat_media": "Sohbet Medyası",
|
||||||
|
"message_logger": "Mesaj Kaydedici"
|
||||||
},
|
},
|
||||||
"material3_strings": {
|
"material3_strings": {
|
||||||
"date_input_invalid_not_allowed": "Geçersiz tarih",
|
"date_input_invalid_not_allowed": "Geçersiz tarih",
|
||||||
@ -1077,5 +1123,12 @@
|
|||||||
"date_range_picker_scroll_to_next_month": "Sonraki ay",
|
"date_range_picker_scroll_to_next_month": "Sonraki ay",
|
||||||
"date_range_picker_title": "Tarih aralığı seçin",
|
"date_range_picker_title": "Tarih aralığı seçin",
|
||||||
"date_input_invalid_year_range": "Geçersiz yıl"
|
"date_input_invalid_year_range": "Geçersiz yıl"
|
||||||
|
},
|
||||||
|
"mark_as_seen": {
|
||||||
|
"unseen_toast": "Görülmedi olarak işaretlendi!",
|
||||||
|
"already_seen_toast": "Zaten görüldü olarak işaretlendi!",
|
||||||
|
"already_unseen_toast": "Zaten görülmemiş olarak işaretlendi!",
|
||||||
|
"no_unseen_snaps_toast": "Görülmeyen Snap bulunamadı!",
|
||||||
|
"seen_toast": "Görüldü olarak işaretlendi!"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -245,7 +245,10 @@ class ExportMemories : AbstractAction() {
|
|||||||
|
|
||||||
if (exportJob != null) {
|
if (exportJob != null) {
|
||||||
Text(text = "Exporting memories... (${exportProgress.second} failed)", modifier = Modifier.fillMaxWidth(), textAlign = TextAlign.Center)
|
Text(text = "Exporting memories... (${exportProgress.second} failed)", modifier = Modifier.fillMaxWidth(), textAlign = TextAlign.Center)
|
||||||
LinearProgressIndicator(progress = exportProgress.first / 100f, Modifier.fillMaxWidth())
|
LinearProgressIndicator(
|
||||||
|
progress = { exportProgress.first / 100f },
|
||||||
|
modifier = Modifier.fillMaxWidth(),
|
||||||
|
)
|
||||||
Row(
|
Row(
|
||||||
modifier = Modifier.fillMaxWidth(),
|
modifier = Modifier.fillMaxWidth(),
|
||||||
horizontalArrangement = Arrangement.SpaceEvenly,
|
horizontalArrangement = Arrangement.SpaceEvenly,
|
||||||
|
@ -1,27 +1,27 @@
|
|||||||
[versions]
|
[versions]
|
||||||
agp = "8.2.1"
|
agp = "8.2.2"
|
||||||
apksig = "8.2.1"
|
apksig = "8.2.2"
|
||||||
libsu = "5.2.2"
|
libsu = "5.2.2"
|
||||||
guava = "33.0.0-jre"
|
guava = "33.0.0-jre"
|
||||||
jsoup = "1.17.2"
|
jsoup = "1.17.2"
|
||||||
kotlin = "1.9.22"
|
kotlin = "1.9.22"
|
||||||
kotlinx-coroutines-android = "1.7.3"
|
kotlinx-coroutines-android = "1.8.0"
|
||||||
compose-compiler = "1.5.8"
|
compose-compiler = "1.5.9"
|
||||||
|
|
||||||
activity-ktx = "1.8.2"
|
activity-ktx = "1.8.2"
|
||||||
androidx-documentfile = "1.1.0-alpha01"
|
androidx-documentfile = "1.1.0-alpha01"
|
||||||
coil-compose = "2.5.0"
|
coil-compose = "2.5.0"
|
||||||
navigation-compose = "2.7.6"
|
navigation-compose = "2.7.7"
|
||||||
osmdroid-android = "6.1.18"
|
osmdroid-android = "6.1.18"
|
||||||
recyclerview = "1.3.2"
|
recyclerview = "1.3.2"
|
||||||
|
|
||||||
compose-bom = "2023.10.01"
|
compose-bom = "2024.02.01"
|
||||||
bcprov-jdk18on = "1.77"
|
bcprov-jdk18on = "1.77"
|
||||||
dexlib2 = "3.0.3"
|
dexlib2 = "3.0.5"
|
||||||
ffmpeg-kit = "5.1.LTS" # DO NOT UPDATE FFMPEG-KIT TO "5.1" it breaks stuff :3
|
ffmpeg-kit = "5.1.LTS" # DO NOT UPDATE FFMPEG-KIT TO "5.1" it breaks stuff :3
|
||||||
gson = "2.10.1"
|
gson = "2.10.1"
|
||||||
junit = "4.13.2"
|
junit = "5.10.2"
|
||||||
material3 = "1.1.2"
|
material3 = "1.2.0"
|
||||||
okhttp = "5.0.0-alpha.12"
|
okhttp = "5.0.0-alpha.12"
|
||||||
rhino = "1.7.14"
|
rhino = "1.7.14"
|
||||||
|
|
||||||
@ -48,7 +48,7 @@ ffmpeg-kit = { group = "com.arthenica", name = "ffmpeg-kit-full-gpl", version.re
|
|||||||
gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" }
|
gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" }
|
||||||
guava = { module = "com.google.guava:guava", version.ref = "guava" }
|
guava = { module = "com.google.guava:guava", version.ref = "guava" }
|
||||||
jsoup = { module = "org.jsoup:jsoup", version.ref = "jsoup" }
|
jsoup = { module = "org.jsoup:jsoup", version.ref = "jsoup" }
|
||||||
junit = { module = "junit:junit", version.ref = "junit" }
|
junit = { group = "org.junit.vintage", name = "junit-vintage-engine", version.ref = "junit" }
|
||||||
okhttp = { group = "com.squareup.okhttp3", name = "okhttp", version.ref = "okhttp" }
|
okhttp = { group = "com.squareup.okhttp3", name = "okhttp", version.ref = "okhttp" }
|
||||||
osmdroid-android = { group = "org.osmdroid", name = "osmdroid-android", version.ref = "osmdroid-android" }
|
osmdroid-android = { group = "org.osmdroid", name = "osmdroid-android", version.ref = "osmdroid-android" }
|
||||||
recyclerview = { group = "androidx.recyclerview", name = "recyclerview", version.ref = "recyclerview" }
|
recyclerview = { group = "androidx.recyclerview", name = "recyclerview", version.ref = "recyclerview" }
|
||||||
|
3
gradle/wrapper/gradle-wrapper.properties
vendored
3
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,7 +1,6 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionSha256Sum=9d926787066a081739e8200858338b4a69e837c3a821a33aca9db09dd4a41026
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
|
|
||||||
networkTimeout=10000
|
networkTimeout=10000
|
||||||
validateDistributionUrl=true
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
20
gradlew.bat
vendored
20
gradlew.bat
vendored
@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
|
|||||||
%JAVA_EXE% -version >NUL 2>&1
|
%JAVA_EXE% -version >NUL 2>&1
|
||||||
if %ERRORLEVEL% equ 0 goto execute
|
if %ERRORLEVEL% equ 0 goto execute
|
||||||
|
|
||||||
echo.
|
echo. 1>&2
|
||||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
|
||||||
echo.
|
echo. 1>&2
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the
|
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||||
echo location of your Java installation.
|
echo location of your Java installation. 1>&2
|
||||||
|
|
||||||
goto fail
|
goto fail
|
||||||
|
|
||||||
@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
|||||||
|
|
||||||
if exist "%JAVA_EXE%" goto execute
|
if exist "%JAVA_EXE%" goto execute
|
||||||
|
|
||||||
echo.
|
echo. 1>&2
|
||||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
|
||||||
echo.
|
echo. 1>&2
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the
|
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||||
echo location of your Java installation.
|
echo location of your Java installation. 1>&2
|
||||||
|
|
||||||
goto fail
|
goto fail
|
||||||
|
|
||||||
|
@ -5,7 +5,6 @@ import androidx.compose.animation.core.tween
|
|||||||
import androidx.compose.animation.fadeIn
|
import androidx.compose.animation.fadeIn
|
||||||
import androidx.compose.animation.fadeOut
|
import androidx.compose.animation.fadeOut
|
||||||
import androidx.compose.foundation.layout.PaddingValues
|
import androidx.compose.foundation.layout.PaddingValues
|
||||||
import androidx.compose.foundation.layout.fillMaxHeight
|
|
||||||
import androidx.compose.foundation.layout.padding
|
import androidx.compose.foundation.layout.padding
|
||||||
import androidx.compose.foundation.layout.wrapContentWidth
|
import androidx.compose.foundation.layout.wrapContentWidth
|
||||||
import androidx.compose.material3.*
|
import androidx.compose.material3.*
|
||||||
@ -97,7 +96,6 @@ class Navigation(
|
|||||||
NavigationBarItem(
|
NavigationBarItem(
|
||||||
selected = navBackStackEntry?.destination?.hierarchy?.any { it.route == tab.route || tabSubRoutes.contains(it.route) } == true,
|
selected = navBackStackEntry?.destination?.hierarchy?.any { it.route == tab.route || tabSubRoutes.contains(it.route) } == true,
|
||||||
alwaysShowLabel = false,
|
alwaysShowLabel = false,
|
||||||
modifier = Modifier.fillMaxHeight(),
|
|
||||||
icon = {
|
icon = {
|
||||||
Icon(imageVector = tab.icon!!, contentDescription = null)
|
Icon(imageVector = tab.icon!!, contentDescription = null)
|
||||||
},
|
},
|
||||||
|
Loading…
x
Reference in New Issue
Block a user