lun_admin/NeoLaunch_From_Kvaesitso
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Re-organize strings

Browse Source 
Add comments, rename some strings, remove unused strings
This commit is contained in:
MM20
2022-02-19 13:16:36 +01:00
parent 07573fe72f
commit 0550e6fe3b
29 changed files with 655 additions and 538 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/src/main/AndroidManifest.xml
+1 -2
View File
@@ -33,7 +33,7 @@
<activity
android:name=".settings.SettingsActivity"
android:exported="true"
android:label="@string/title_activity_settings"
android:label="@string/settings"
android:launchMode="singleTask"
android:parentActivityName=".launcher.LauncherActivity"
android:screenOrientation="portrait"
@@ -51,7 +51,6 @@
<activity
android:name=".launcher.widgets.picker.PickAppWidgetActivity"
android:exported="true"
android:label="@string/title_activity_settings"
android:launchMode="singleTask"
android:parentActivityName=".launcher.LauncherActivity"
android:screenOrientation="portrait"
ui/src/main/java/de/mm20/launcher2/ui/launcher/modals/EditFavoritesView.kt
+5 -5
View File
@@ -39,21 +39,21 @@ class EditFavoritesView @JvmOverloads constructor(
viewModel.getFavorites().toMutableList()
}
binding.progressBar.visibility = View.GONE
binding.itemList.addView(getLabel(R.string.edit_favorites_dialog_stage0))
binding.itemList.addView(getLabel(R.string.edit_favorites_dialog_pinned_sorted))
binding.itemList.setContainerScrollView(binding.scrollView)
var stage = 0
for (favorite in favorites) {
if (favorite.pinPosition <= 1 && stage == 0) {
getLabel(R.string.edit_favorites_dialog_stage1).let {
getLabel(R.string.edit_favorites_dialog_pinned_unsorted).let {
it.tag = "stage1"
binding.itemList.addDragView(it, it.getChildAt(1))
}
stage++
}
if (favorite.pinPosition == 0 && stage == 1) {
getLabel(R.string.edit_favorites_dialog_stage2).let {
getLabel(R.string.edit_favorites_dialog_unpinned).let {
it.tag = "stage2"
binding.itemList.addDragView(it, it.getChildAt(1))
}
@@ -63,14 +63,14 @@ class EditFavoritesView @JvmOverloads constructor(
binding.itemList.addDragView(view, view.getDragHandle())
}
if (stage == 0) {
getLabel(R.string.edit_favorites_dialog_stage1).let {
getLabel(R.string.edit_favorites_dialog_pinned_unsorted).let {
it.tag = "stage1"
binding.itemList.addDragView(it, it.getChildAt(1))
}
stage++
}
if (stage == 1) {
getLabel(R.string.edit_favorites_dialog_stage2).let {
getLabel(R.string.edit_favorites_dialog_unpinned).let {
it.tag = "stage2"
binding.itemList.addDragView(it, it.getChildAt(1))
}
ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchBar.kt
+1 -1
View File
@@ -251,7 +251,7 @@ fun SearchBar(
) {
if (value.isEmpty()) {
Text(
text = stringResource(R.string.edit_text_search_hint),
text = stringResource(R.string.search_bar_placeholder),
style = MaterialTheme.typography.bodyLarge,
color = contentColor
)
ui/src/main/java/de/mm20/launcher2/ui/launcher/search/apps/AppItem.kt
+4 -5
View File
@@ -1,6 +1,5 @@
package de.mm20.launcher2.ui.launcher.search.apps
import androidx.appcompat.app.AppCompatActivity
import androidx.compose.animation.*
import androidx.compose.animation.core.snap
import androidx.compose.animation.core.tween
@@ -174,7 +173,7 @@ fun AppItem(
val isPinned by viewModel.isPinned.collectAsState(false)
val favAction = if (isPinned) {
DefaultToolbarAction(
label = stringResource(R.string.favorites_menu_unpin),
label = stringResource(R.string.menu_favorites_unpin),
icon = Icons.Rounded.Star,
action = {
viewModel.unpin()
@@ -182,7 +181,7 @@ fun AppItem(
)
} else {
DefaultToolbarAction(
label = stringResource(R.string.favorites_menu_pin),
label = stringResource(R.string.menu_favorites_pin),
icon = Icons.Rounded.StarOutline,
action = {
viewModel.pin()
@@ -225,14 +224,14 @@ fun AppItem(
icon = Icons.Rounded.Share,
children = listOf(
DefaultToolbarAction(
label = stringResource(R.string.share_menu_store_link, storeDetails.label),
label = stringResource(R.string.menu_share_store_link, storeDetails.label),
icon = Icons.Rounded.Share,
action = {
viewModel.shareStoreLink(context, storeDetails.url)
}
),
DefaultToolbarAction(
label = stringResource(R.string.share_menu_apk_file),
label = stringResource(R.string.menu_share_apk_file),
icon = Icons.Rounded.Share
) {
scope.launch {
ui/src/main/java/de/mm20/launcher2/ui/launcher/search/calendar/CalendarItem.kt
+3 -4
View File
@@ -1,6 +1,5 @@
package de.mm20.launcher2.ui.launcher.search.calendar
import androidx.appcompat.app.AppCompatActivity
import androidx.compose.animation.*
import androidx.compose.animation.core.animateDpAsState
import androidx.compose.animation.core.snap
@@ -156,7 +155,7 @@ fun CalendarItem(
val isPinned by viewModel.isPinned.collectAsState(false)
val favAction = if (isPinned) {
DefaultToolbarAction(
label = stringResource(R.string.favorites_menu_unpin),
label = stringResource(R.string.menu_favorites_unpin),
icon = Icons.Rounded.Star,
action = {
viewModel.unpin()
@@ -164,7 +163,7 @@ fun CalendarItem(
)
} else {
DefaultToolbarAction(
label = stringResource(R.string.favorites_menu_pin),
label = stringResource(R.string.menu_favorites_pin),
icon = Icons.Rounded.StarOutline,
action = {
viewModel.pin()
@@ -196,7 +195,7 @@ fun CalendarItem(
toolbarActions.add(
DefaultToolbarAction(
label = stringResource(R.string.calendar_menu_open_externally),
label = stringResource(R.string.menu_calendar_open_externally),
icon = Icons.Rounded.OpenInNew,
action = {
viewModel.launch(context)
ui/src/main/java/de/mm20/launcher2/ui/launcher/search/contacts/ContactItem.kt
+3 -4
View File
@@ -1,6 +1,5 @@
package de.mm20.launcher2.ui.launcher.search.contacts
import androidx.appcompat.app.AppCompatActivity
import androidx.compose.animation.*
import androidx.compose.animation.core.animateDp
import androidx.compose.animation.core.snap
@@ -220,7 +219,7 @@ fun ContactItem(
val isPinned by viewModel.isPinned.collectAsState(false)
val favAction = if (isPinned) {
DefaultToolbarAction(
label = stringResource(R.string.favorites_menu_unpin),
label = stringResource(R.string.menu_favorites_unpin),
icon = Icons.Rounded.Star,
action = {
viewModel.unpin()
@@ -228,7 +227,7 @@ fun ContactItem(
)
} else {
DefaultToolbarAction(
label = stringResource(R.string.favorites_menu_pin),
label = stringResource(R.string.menu_favorites_pin),
icon = Icons.Rounded.StarOutline,
action = {
viewModel.pin()
@@ -260,7 +259,7 @@ fun ContactItem(
toolbarActions.add(
DefaultToolbarAction(
label = stringResource(R.string.calendar_menu_open_externally),
label = stringResource(R.string.menu_calendar_open_externally),
icon = Icons.Rounded.OpenInNew,
action = {
viewModel.launch(context)
ui/src/main/java/de/mm20/launcher2/ui/launcher/search/files/FileItem.kt
+2 -4
View File
@@ -1,6 +1,5 @@
package de.mm20.launcher2.ui.launcher.search.files
import androidx.appcompat.app.AppCompatActivity
import androidx.compose.animation.*
import androidx.compose.animation.core.animateDp
import androidx.compose.animation.core.snap
@@ -23,7 +22,6 @@ import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.ExperimentalUnitApi
import androidx.compose.ui.unit.dp
import de.mm20.launcher2.search.data.File
import de.mm20.launcher2.search.data.LocalFile
import de.mm20.launcher2.ui.R
import de.mm20.launcher2.ui.animation.animateTextStyleAsState
import de.mm20.launcher2.ui.component.DefaultToolbarAction
@@ -142,7 +140,7 @@ fun FileItem(
val isPinned by viewModel.isPinned.collectAsState(false)
val favAction = if (isPinned) {
DefaultToolbarAction(
label = stringResource(R.string.favorites_menu_unpin),
label = stringResource(R.string.menu_favorites_unpin),
icon = Icons.Rounded.Star,
action = {
viewModel.unpin()
@@ -150,7 +148,7 @@ fun FileItem(
)
} else {
DefaultToolbarAction(
label = stringResource(R.string.favorites_menu_pin),
label = stringResource(R.string.menu_favorites_pin),
icon = Icons.Rounded.StarOutline,
action = {
viewModel.pin()
ui/src/main/java/de/mm20/launcher2/ui/launcher/search/shortcut/ShortcutItem.kt
+2 -4
View File
@@ -1,7 +1,6 @@
package de.mm20.launcher2.ui.launcher.search.shortcut
import androidx.appcompat.app.AppCompatActivity
import androidx.compose.animation.*
import androidx.compose.animation.core.snap
import androidx.compose.animation.core.tween
@@ -26,7 +25,6 @@ import de.mm20.launcher2.ui.ktx.toDp
import de.mm20.launcher2.ui.ktx.toPixels
import de.mm20.launcher2.ui.locals.LocalFavoritesEnabled
import de.mm20.launcher2.ui.modifier.scale
import kotlinx.coroutines.launch
import kotlin.math.pow
import kotlin.math.roundToInt
@@ -76,7 +74,7 @@ fun AppItem(
val isPinned by viewModel.isPinned.collectAsState(false)
val favAction = if (isPinned) {
DefaultToolbarAction(
label = stringResource(R.string.favorites_menu_unpin),
label = stringResource(R.string.menu_favorites_unpin),
icon = Icons.Rounded.Star,
action = {
viewModel.unpin()
@@ -84,7 +82,7 @@ fun AppItem(
)
} else {
DefaultToolbarAction(
label = stringResource(R.string.favorites_menu_pin),
label = stringResource(R.string.menu_favorites_pin),
icon = Icons.Rounded.StarOutline,
action = {
viewModel.pin()
ui/src/main/java/de/mm20/launcher2/ui/launcher/search/website/WebsiteItem.kt
+2 -6
View File
@@ -1,8 +1,6 @@
package de.mm20.launcher2.ui.launcher.search.website
import androidx.appcompat.app.AppCompatActivity
import androidx.compose.animation.*
import androidx.compose.animation.core.snap
import androidx.compose.animation.core.tween
import androidx.compose.foundation.Image
import androidx.compose.foundation.background
@@ -26,14 +24,12 @@ import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import coil.compose.rememberImagePainter
import de.mm20.launcher2.search.data.Application
import de.mm20.launcher2.search.data.Website
import de.mm20.launcher2.ui.component.DefaultToolbarAction
import de.mm20.launcher2.ui.component.Toolbar
import de.mm20.launcher2.ui.component.ToolbarAction
import de.mm20.launcher2.ui.R
import de.mm20.launcher2.ui.ktx.toDp
import de.mm20.launcher2.ui.launcher.search.apps.AppItem
import de.mm20.launcher2.ui.locals.LocalFavoritesEnabled
@Composable
@@ -80,7 +76,7 @@ fun WebsiteItem(
val isPinned by viewModel.isPinned.collectAsState(false)
val favAction = if (isPinned) {
DefaultToolbarAction(
label = stringResource(R.string.favorites_menu_unpin),
label = stringResource(R.string.menu_favorites_unpin),
icon = Icons.Rounded.Star,
action = {
viewModel.unpin()
@@ -89,7 +85,7 @@ fun WebsiteItem(
)
} else {
DefaultToolbarAction(
label = stringResource(R.string.favorites_menu_pin),
label = stringResource(R.string.menu_favorites_pin),
icon = Icons.Rounded.StarOutline,
action = {
viewModel.pin()
ui/src/main/java/de/mm20/launcher2/ui/launcher/search/wikipedia/WikipediaItem.kt
+2 -5
View File
@@ -1,6 +1,5 @@
package de.mm20.launcher2.ui.launcher.search.wikipedia
import androidx.appcompat.app.AppCompatActivity
import androidx.compose.animation.*
import androidx.compose.animation.core.tween
import androidx.compose.foundation.Image
@@ -25,14 +24,12 @@ import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import coil.compose.rememberImagePainter
import de.mm20.launcher2.search.data.Website
import de.mm20.launcher2.search.data.Wikipedia
import de.mm20.launcher2.ui.R
import de.mm20.launcher2.ui.component.DefaultToolbarAction
import de.mm20.launcher2.ui.component.Toolbar
import de.mm20.launcher2.ui.component.ToolbarAction
import de.mm20.launcher2.ui.ktx.toDp
import de.mm20.launcher2.ui.launcher.search.website.WebsiteItem
import de.mm20.launcher2.ui.locals.LocalFavoritesEnabled
import de.mm20.launcher2.ui.utils.htmlToAnnotatedString
@@ -86,7 +83,7 @@ fun WikipediaItem(
val isPinned by viewModel.isPinned.collectAsState(false)
val favAction = if (isPinned) {
DefaultToolbarAction(
label = stringResource(R.string.favorites_menu_unpin),
label = stringResource(R.string.menu_favorites_unpin),
icon = Icons.Rounded.Star,
action = {
viewModel.unpin()
@@ -95,7 +92,7 @@ fun WikipediaItem(
)
} else {
DefaultToolbarAction(
label = stringResource(R.string.favorites_menu_pin),
label = stringResource(R.string.menu_favorites_pin),
icon = Icons.Rounded.StarOutline,
action = {
viewModel.pin()
ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/calendar/CalendarWidget.kt
+1 -1
View File
@@ -104,7 +104,7 @@ fun CalendarWidget() {
modifier = Modifier
.fillMaxWidth()
.padding(4.dp),
text = stringResource(R.string.permission_calendar_widget),
text = stringResource(R.string.missing_permission_calendar_widget),
onClick = { viewModel.requestCalendarPermission(context as AppCompatActivity) }
)
}
ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/weather/WeatherWidget.kt
+10 -10
View File
@@ -161,20 +161,20 @@ fun CurrentWeather(forecast: Forecast, imperialUnits: Boolean) {
modifier = Modifier.fillMaxWidth()
) {
if (forecast.humidity >= 0) {
WeatherDetailRow(
title = stringResource(id = R.string.weather_humidity),
value = "${forecast.humidity.roundToInt()} %"
Text(
stringResource(id = R.string.weather_details_humidity, "${forecast.humidity.roundToInt()} %"),
style = MaterialTheme.typography.bodySmall,
)
}
WeatherDetailRow(
title = stringResource(id = R.string.weather_wind),
value = formatWindSpeed(imperialUnits, forecast)
Text(
stringResource(id = R.string.weather_details_wind, formatWindSpeed(imperialUnits, forecast)),
style = MaterialTheme.typography.bodySmall,
)
val precipitation = formatPrecipitation(imperialUnits, forecast)
if (precipitation != null) {
WeatherDetailRow(
title = stringResource(id = R.string.weather_precipitation),
value = precipitation
Text(
stringResource(id = R.string.weather_details_precipitation, precipitation),
style = MaterialTheme.typography.bodySmall,
)
}
}
@@ -228,7 +228,7 @@ fun WeatherDetailRow(title: String, value: String) {
Row {
Text(
text = title,
modifier = Modifier.padding(end = 8.dp),
modifier = Modifier,//.padding(end = 8.dp),
style = MaterialTheme.typography.bodySmall,
)
Text(
ui/src/main/java/de/mm20/launcher2/ui/legacy/view/ToolbarView.kt
+3 -3
View File
@@ -224,7 +224,7 @@ open class ToolbarSubaction(val title: String, var clickAction: (() -> Unit)) {
class FavoriteToolbarAction(val context: Context, val item: Searchable) : ToolbarAction(
R.drawable.ic_star_outline,
context.getString(R.string.favorites_menu_pin)
context.getString(R.string.menu_favorites_pin)
), KoinComponent {
private val repository: FavoritesRepository by inject()
@@ -232,10 +232,10 @@ class FavoriteToolbarAction(val context: Context, val item: Searchable) : Toolba
set(value) {
field = value
if (value) {
title = context.getString(R.string.favorites_menu_unpin)
title = context.getString(R.string.menu_favorites_unpin)
icon = R.drawable.ic_star_solid
} else {
title = context.getString(R.string.favorites_menu_pin)
title = context.getString(R.string.menu_favorites_pin)
icon = R.drawable.ic_star_outline
}
}
ui/src/main/java/de/mm20/launcher2/ui/settings/filesearch/FileSearchSettingsScreen.kt
+1 -1
View File
@@ -58,7 +58,7 @@ fun FileSearchSettingsScreen() {
AnimatedVisibility(hasFilePermission == false) {
MissingPermissionBanner(
text = stringResource(
if (isAtLeastApiLevel(29)) R.string.missing_permission_file_search_android10 else R.string.missing_permission_file_search
if (isAtLeastApiLevel(29)) R.string.missing_permission_file_search_settings_android10 else R.string.missing_permission_file_search_settings
), onClick = {
viewModel.requestFilePermission(context as AppCompatActivity)
},
ui/src/main/java/de/mm20/launcher2/ui/settings/search/SearchSettingsScreen.kt
+2 -2
View File
@@ -53,7 +53,7 @@ fun SearchSettingsScreen() {
val hasContactsPermission by viewModel.hasContactsPermission.observeAsState()
AnimatedVisibility(hasContactsPermission == false) {
MissingPermissionBanner(
text = stringResource(R.string.missing_permission_contact_search),
text = stringResource(R.string.missing_permission_contact_search_settings),
onClick = {
viewModel.requestContactsPermission(context as AppCompatActivity)
},
@@ -75,7 +75,7 @@ fun SearchSettingsScreen() {
val hasCalendarPermission by viewModel.hasCalendarPermission.observeAsState()
AnimatedVisibility(hasCalendarPermission == false) {
MissingPermissionBanner(
text = stringResource(R.string.missing_permission_calendar_search),
text = stringResource(R.string.missing_permission_calendar_search_settings),
onClick = {
viewModel.requestCalendarPermission(context as AppCompatActivity)
},
ui/src/main/java/de/mm20/launcher2/ui/settings/websearch/WebSearchSettingsScreen.kt
+3 -3
View File
@@ -299,7 +299,7 @@ fun EditWebsearchDialog(
.align(Alignment.End)
) {
Text(
stringResource(R.string.custom_icon),
stringResource(R.string.websearch_dialog_custom_icon),
style = MaterialTheme.typography.labelLarge
)
}
@@ -315,7 +315,7 @@ fun EditWebsearchDialog(
label = it
},
label = {
Text(text = stringResource(R.string.websearch_dialog_name_hint))
Text(text = stringResource(R.string.websearch_dialog_name))
}
)
OutlinedTextField(
@@ -327,7 +327,7 @@ fun EditWebsearchDialog(
urlTemplate = it
},
label = {
Text(text = stringResource(R.string.websearch_dialog_url_hint))
Text(text = stringResource(R.string.websearch_dialog_url))
},
)
AnimatedVisibility(showError) {