From 4bdc9705af8140826d4d38ec8dbea44c701960ba Mon Sep 17 00:00:00 2001 From: Simon Marquis Date: Sat, 29 Jul 2023 14:13:20 +0200 Subject: [PATCH] Fix miscellaneous warnings - Remove unused namespace declaration - Collapse empty manifest tags - Remove redundant qualifier name - Remove redundant suppression --- benchmarks/src/main/AndroidManifest.xml | 2 +- .../com/google/samples/apps/nowinandroid/NiaBuildType.kt | 1 - core/common/src/main/AndroidManifest.xml | 4 +--- core/data-test/src/main/AndroidManifest.xml | 4 +--- core/database/src/main/AndroidManifest.xml | 4 +--- core/datastore-test/src/main/AndroidManifest.xml | 4 +--- core/datastore/src/main/AndroidManifest.xml | 4 +--- core/designsystem/src/main/AndroidManifest.xml | 4 +--- core/testing/src/main/AndroidManifest.xml | 4 +--- core/ui/src/main/AndroidManifest.xml | 4 +--- feature/bookmarks/src/main/AndroidManifest.xml | 4 +--- feature/foryou/src/main/AndroidManifest.xml | 4 +--- .../samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt | 2 -- feature/interests/src/main/AndroidManifest.xml | 4 +--- feature/search/src/main/AndroidManifest.xml | 2 +- .../apps/nowinandroid/feature/settings/SettingsDialog.kt | 4 ++-- feature/topic/src/main/AndroidManifest.xml | 4 +--- sync/sync-test/src/main/AndroidManifest.xml | 4 +--- sync/work/src/main/AndroidManifest.xml | 3 +-- 19 files changed, 18 insertions(+), 48 deletions(-) diff --git a/benchmarks/src/main/AndroidManifest.xml b/benchmarks/src/main/AndroidManifest.xml index 1cf255471..51d0cfc2e 100644 --- a/benchmarks/src/main/AndroidManifest.xml +++ b/benchmarks/src/main/AndroidManifest.xml @@ -14,4 +14,4 @@ See the License for the specific language governing permissions and limitations under the License. --> - \ No newline at end of file + \ No newline at end of file diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/NiaBuildType.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/NiaBuildType.kt index 454036782..653506f51 100644 --- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/NiaBuildType.kt +++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/NiaBuildType.kt @@ -19,7 +19,6 @@ package com.google.samples.apps.nowinandroid /** * This is shared between :app and :benchmarks module to provide configurations type safety. */ -@Suppress("unused") enum class NiaBuildType(val applicationIdSuffix: String? = null) { DEBUG(".debug"), RELEASE, diff --git a/core/common/src/main/AndroidManifest.xml b/core/common/src/main/AndroidManifest.xml index ec921f928..51d0cfc2e 100644 --- a/core/common/src/main/AndroidManifest.xml +++ b/core/common/src/main/AndroidManifest.xml @@ -14,6 +14,4 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - \ No newline at end of file + \ No newline at end of file diff --git a/core/data-test/src/main/AndroidManifest.xml b/core/data-test/src/main/AndroidManifest.xml index 547d48054..27a3ea8b0 100644 --- a/core/data-test/src/main/AndroidManifest.xml +++ b/core/data-test/src/main/AndroidManifest.xml @@ -14,6 +14,4 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - + diff --git a/core/database/src/main/AndroidManifest.xml b/core/database/src/main/AndroidManifest.xml index ec921f928..51d0cfc2e 100644 --- a/core/database/src/main/AndroidManifest.xml +++ b/core/database/src/main/AndroidManifest.xml @@ -14,6 +14,4 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - \ No newline at end of file + \ No newline at end of file diff --git a/core/datastore-test/src/main/AndroidManifest.xml b/core/datastore-test/src/main/AndroidManifest.xml index ec921f928..51d0cfc2e 100644 --- a/core/datastore-test/src/main/AndroidManifest.xml +++ b/core/datastore-test/src/main/AndroidManifest.xml @@ -14,6 +14,4 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - \ No newline at end of file + \ No newline at end of file diff --git a/core/datastore/src/main/AndroidManifest.xml b/core/datastore/src/main/AndroidManifest.xml index ec921f928..51d0cfc2e 100644 --- a/core/datastore/src/main/AndroidManifest.xml +++ b/core/datastore/src/main/AndroidManifest.xml @@ -14,6 +14,4 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - \ No newline at end of file + \ No newline at end of file diff --git a/core/designsystem/src/main/AndroidManifest.xml b/core/designsystem/src/main/AndroidManifest.xml index ec921f928..51d0cfc2e 100644 --- a/core/designsystem/src/main/AndroidManifest.xml +++ b/core/designsystem/src/main/AndroidManifest.xml @@ -14,6 +14,4 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - \ No newline at end of file + \ No newline at end of file diff --git a/core/testing/src/main/AndroidManifest.xml b/core/testing/src/main/AndroidManifest.xml index ec921f928..51d0cfc2e 100644 --- a/core/testing/src/main/AndroidManifest.xml +++ b/core/testing/src/main/AndroidManifest.xml @@ -14,6 +14,4 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - \ No newline at end of file + \ No newline at end of file diff --git a/core/ui/src/main/AndroidManifest.xml b/core/ui/src/main/AndroidManifest.xml index ec921f928..51d0cfc2e 100644 --- a/core/ui/src/main/AndroidManifest.xml +++ b/core/ui/src/main/AndroidManifest.xml @@ -14,6 +14,4 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - \ No newline at end of file + \ No newline at end of file diff --git a/feature/bookmarks/src/main/AndroidManifest.xml b/feature/bookmarks/src/main/AndroidManifest.xml index ec921f928..51d0cfc2e 100644 --- a/feature/bookmarks/src/main/AndroidManifest.xml +++ b/feature/bookmarks/src/main/AndroidManifest.xml @@ -14,6 +14,4 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - \ No newline at end of file + \ No newline at end of file diff --git a/feature/foryou/src/main/AndroidManifest.xml b/feature/foryou/src/main/AndroidManifest.xml index ec921f928..51d0cfc2e 100644 --- a/feature/foryou/src/main/AndroidManifest.xml +++ b/feature/foryou/src/main/AndroidManifest.xml @@ -14,6 +14,4 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - \ No newline at end of file + \ No newline at end of file diff --git a/feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt b/feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt index eaa0c58fa..fb0309a1b 100644 --- a/feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt +++ b/feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt @@ -54,7 +54,6 @@ import androidx.compose.foundation.lazy.grid.items import androidx.compose.foundation.lazy.grid.rememberLazyGridState import androidx.compose.foundation.shape.CornerSize import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Surface @@ -333,7 +332,6 @@ private fun TopicSelection( } } -@OptIn(ExperimentalMaterial3Api::class) @Composable private fun SingleTopicButton( name: String, diff --git a/feature/interests/src/main/AndroidManifest.xml b/feature/interests/src/main/AndroidManifest.xml index ec921f928..51d0cfc2e 100644 --- a/feature/interests/src/main/AndroidManifest.xml +++ b/feature/interests/src/main/AndroidManifest.xml @@ -14,6 +14,4 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - \ No newline at end of file + \ No newline at end of file diff --git a/feature/search/src/main/AndroidManifest.xml b/feature/search/src/main/AndroidManifest.xml index 70c188dd8..312b22fd3 100644 --- a/feature/search/src/main/AndroidManifest.xml +++ b/feature/search/src/main/AndroidManifest.xml @@ -14,4 +14,4 @@ See the License for the specific language governing permissions and limitations under the License. --> - + diff --git a/feature/settings/src/main/java/com/google/samples/apps/nowinandroid/feature/settings/SettingsDialog.kt b/feature/settings/src/main/java/com/google/samples/apps/nowinandroid/feature/settings/SettingsDialog.kt index 7fff6feaf..01ec30e74 100644 --- a/feature/settings/src/main/java/com/google/samples/apps/nowinandroid/feature/settings/SettingsDialog.kt +++ b/feature/settings/src/main/java/com/google/samples/apps/nowinandroid/feature/settings/SettingsDialog.kt @@ -175,7 +175,7 @@ private fun ColumnScope.SettingsPanel( } AnimatedVisibility(visible = settings.brand == DEFAULT && supportDynamicColor) { Column { - SettingsDialogSectionTitle(text = stringResource(R.string.dynamic_color_preference)) + SettingsDialogSectionTitle(text = stringResource(string.dynamic_color_preference)) Column(Modifier.selectableGroup()) { SettingsDialogThemeChooserRow( text = stringResource(string.dynamic_color_yes), @@ -190,7 +190,7 @@ private fun ColumnScope.SettingsPanel( } } } - SettingsDialogSectionTitle(text = stringResource(R.string.dark_mode_preference)) + SettingsDialogSectionTitle(text = stringResource(string.dark_mode_preference)) Column(Modifier.selectableGroup()) { SettingsDialogThemeChooserRow( text = stringResource(string.dark_mode_config_system_default), diff --git a/feature/topic/src/main/AndroidManifest.xml b/feature/topic/src/main/AndroidManifest.xml index 547d48054..27a3ea8b0 100644 --- a/feature/topic/src/main/AndroidManifest.xml +++ b/feature/topic/src/main/AndroidManifest.xml @@ -14,6 +14,4 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - + diff --git a/sync/sync-test/src/main/AndroidManifest.xml b/sync/sync-test/src/main/AndroidManifest.xml index 547d48054..27a3ea8b0 100644 --- a/sync/sync-test/src/main/AndroidManifest.xml +++ b/sync/sync-test/src/main/AndroidManifest.xml @@ -14,6 +14,4 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - + diff --git a/sync/work/src/main/AndroidManifest.xml b/sync/work/src/main/AndroidManifest.xml index fed519807..403ea9bd8 100644 --- a/sync/work/src/main/AndroidManifest.xml +++ b/sync/work/src/main/AndroidManifest.xml @@ -14,8 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - +