Small fixes

B1ays · Jun 24, 2024 · 0e62c3f · 0e62c3f
1 parent 05ec144
commit 0e62c3f
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 24 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -18,7 +18,6 @@ android {
  targetSdk = 34
  versionCode = libs.versions.projectVersionCode.get().toInt()
  versionName = libs.versions.projectVersionName.get()
- //versionNameSuffix = libs.versions.projectVersionNameSuffix.get()
 
  resourceConfigurations += listOf("en", "ru")
  }

diff --git a/core/data/src/main/assets/databases/app.db b/core/data/src/main/assets/databases/app.db
diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts
@@ -39,7 +39,7 @@ android {
  it.buildConfigField(
  "String",
  "VERSION_NAME",
- "\"${libs.versions.projectVersionName.get()}${libs.versions.projectVersionNameSuffix.get()}\""
+ "\"${libs.versions.projectVersionName.get()}\""
  )
  }
  compileOptions {

diff --git a/core/ui/src/main/kotlin/ru/blays/hub/core/ui/screens/aboutContent/AboutContent.kt b/core/ui/src/main/kotlin/ru/blays/hub/core/ui/screens/aboutContent/AboutContent.kt
@@ -81,7 +81,7 @@ private fun Info() {
  )
  VerticalSpacer(10.dp)
  Text(
- text = stringResource(R.string.app_name),
+ text = stringResource(R.string.app_name_full),
  style = MaterialTheme.typography.titleLarge,
  fontWeight = FontWeight.SemiBold
  )

diff --git a/core/ui/src/main/kotlin/ru/blays/hub/core/ui/screens/appsContent/AppsContent.kt b/core/ui/src/main/kotlin/ru/blays/hub/core/ui/screens/appsContent/AppsContent.kt
@@ -73,8 +73,11 @@ fun AppsContent(component: AppsComponent) {
  Scaffold(
  topBar = {
  CollapsingToolbar(
- collapsingTitle = CollapsingTitle.large(
- titleText = stringResource(id = R.string.app_name)
+ collapsingTitle = CollapsingTitle(
+ stringResource(id = R.string.app_name_full),
+ MaterialTheme.typography.headlineLarge.copy(
+ fontWeight = FontWeight.SemiBold
+ )
  ),
  )
  },

diff --git a/core/ui/src/main/kotlin/ru/blays/hub/core/ui/screens/rootContent/TabsContent.kt b/core/ui/src/main/kotlin/ru/blays/hub/core/ui/screens/rootContent/TabsContent.kt
@@ -192,18 +192,6 @@ fun TabsContent(
  Text(text = stringResource(id = R.string.action_ok))
  }
  },
- dismissButton = {
- /*TextButton(
- onClick = {
- dialogComponent.sendIntent(TabsComponent.ModuleInstallDialogActions.Reboot)
- },
- colors = ButtonDefaults.textButtonColors(
- contentColor = MaterialTheme.colorScheme.onSurfaceVariant
- )
- ) {
- Text(text = stringResource(id = R.string.action_reboot))
- }*/
- },
  icon = {
  Icon(
  painter = painterResource(id = R.drawable.ic_boxes),

diff --git a/.../ui/src/main/kotlin/ru/blays/hub/core/ui/screens/settingsContent/CatalogsSettingScreen.kt b/.../ui/src/main/kotlin/ru/blays/hub/core/ui/screens/settingsContent/CatalogsSettingScreen.kt
@@ -1,8 +1,6 @@
 package ru.blays.hub.core.ui.screens.settingsContent
 
 import androidx.compose.animation.AnimatedContent
-import androidx.compose.animation.animateContentSize
-import androidx.compose.animation.core.spring
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.animation.scaleIn
@@ -171,8 +169,7 @@ fun CatalogsSettingScreen(
  onDismissRequest = dialogComponent::close,
  properties = DialogProperties(
  dismissOnClickOutside = false
- ),
- modifier = Modifier.animateContentSize(spring())
+ )
  ) {
  AddCatalogDialog(component = dialogComponent)
  }

diff --git a/core/ui/src/main/res/values/strings.xml b/core/ui/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <resources>
- <string name="app_name" translatable="false">BHub</string>
+ <string name="app_name_full" translatable="false">Blays Hub</string>
 
  <!-- Simple -->
  <string name="files">Files</string>
@@ -109,7 +109,7 @@
 
  <!-- Links -->
  <string name="link_tg_group" translatable="false">https://t.me/BHub_app</string>
- <string name="link_github_repo" translatable="false">null</string>
+ <string name="link_github_repo" translatable="false">https://github.com/B1ays/BHub</string>
  <string name="link_developer_tg" translatable="false">https://t.me/B1ays</string>
  <string name="link_developer_4pda" translatable="false">https://4pda.to/forum/index.php?showuser=7576426</string>
  <string name="link_developer_github" translatable="false">https://github.com/B1ays</string>

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,7 +1,6 @@
 [versions]
 #Project versions
 projectVersionName = "1.0"
-projectVersionNameSuffix = "-alpha1"
 projectVersionCode = "1"
 
 #Dependencies versions