Remove resource plurals

w2sv · w2sv · commit 1f8c32908d47 · 2023-01-02T09:03:38.000+01:00
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -36,7 +36,7 @@
         android:appCategory="image"
 
         android:icon="@mipmap/logo"
-        android:label="@string/app_title"
+        android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
         android:roundIcon="@mipmap/logo_round"
         android:supportsRtl="true"
diff --git a/app/src/main/kotlin/com/w2sv/autocrop/activities/cropexamination/fragments/croppager/CropPagerFragment.kt b/app/src/main/kotlin/com/w2sv/autocrop/activities/cropexamination/fragments/croppager/CropPagerFragment.kt
@@ -104,7 +104,7 @@ class CropPagerFragment :
                                         append(" $nUncroppedScreenshots")
                                     }
                                 }
-                                append(context.resources.getQuantityString(R.plurals.image, nUncroppedScreenshots))
+                                append(" screenshot(s)")
                             }
                         }
 
@@ -114,23 +114,13 @@ class CropPagerFragment :
                                 nNotOpenableUris == 0 -> Unit
                                 isEmpty() -> {
                                     append(
-                                        "Couldn't open $nNotOpenableUris ${
-                                            context.resources.getQuantityString(
-                                                R.plurals.image,
-                                                nNotOpenableUris
-                                            )
-                                        }"
+                                        "Couldn't open $nNotOpenableUris image(s)"
                                     )
                                 }
 
                                 else -> {
                                     append(
-                                        "& couldn't open $nNotOpenableUris ${
-                                            context.resources.getQuantityString(
-                                                R.plurals.image,
-                                                nNotOpenableUris
-                                            )
-                                        }"
+                                        "& couldn't open $nNotOpenableUris image(s)"
                                     )
                                 }
                             }
diff --git a/app/src/main/kotlin/com/w2sv/autocrop/activities/main/fragments/flowfield/FlowFieldFragment.kt b/app/src/main/kotlin/com/w2sv/autocrop/activities/main/fragments/flowfield/FlowFieldFragment.kt
@@ -151,12 +151,7 @@ class FlowFieldFragment :
                         SpannableStringBuilder()
                             .apply {
                                 append(
-                                    "Saved ${it.nSavedCrops} ${
-                                        resources.getQuantityString(
-                                            R.plurals.crop,
-                                            it.nSavedCrops
-                                        )
-                                    } to "
+                                    "Saved ${it.nSavedCrops} crop(s) to "
                                 )
                                 color(getThemedColor(R.color.success)) {
                                     append(it.saveDirName)
@@ -168,7 +163,7 @@ class FlowFieldFragment :
                                                 "corresponding"
                                             else
                                                 it.nDeletedScreenshots
-                                        } ${resources.getQuantityString(R.plurals.screenshot, it.nDeletedScreenshots)}"
+                                        } screenshot(s)"
                                     )
                             }
                     )
diff --git a/app/src/main/res/layout/fragment_crop.xml b/app/src/main/res/layout/fragment_crop.xml
@@ -12,7 +12,7 @@
         android:layout_centerHorizontal="true"
         android:layout_marginTop="@dimen/margin_crop_progress_bar"
 
-        android:text="@string/cropping_in_progress"
+        android:text="@string/cropping"
         android:textColor="@color/highlight"
         android:textSize="22sp" />
 
diff --git a/app/src/main/res/layout/fragment_saveall.xml b/app/src/main/res/layout/fragment_saveall.xml
@@ -14,7 +14,7 @@
         android:layout_centerHorizontal="true"
         android:layout_marginTop="-70dp"
 
-        android:text="@string/crops_processing_in_progress"
+        android:text="@string/processing_crops"
         android:textColor="@color/magenta_saturated"
         android:textSize="30sp"
         android:textStyle="bold" />
diff --git a/app/src/main/res/values/plurals.xml b/app/src/main/res/values/plurals.xml
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,37 +1,25 @@
 <resources>
-    <string name="app_title">AutoCrop</string>
-
+    <string name="app_name">AutoCrop</string>
     <string name="select_images">SELECT IMAGES</string>
-    <string name="menu_inflation_button_description">Inflate settings menu</string>
-    <string name="screenshot_button_description">Capture Flow Field image</string>
-    <string name="crop_sharing_button_description">Share saved crops</string>
-
     <string name="menu_item_divider_examination">Examination</string>
     <string name="menu_item_divider_crop_saving">Crop Saving</string>
     <string name="menu_item_divider_other">Other</string>
-
     <string name="menu_item_auto_scroll">AutoScroll</string>
     <string name="menu_item_rate_the_app">Rate the app</string>
     <string name="menu_item_about">About</string>
     <string name="menu_item_change_directory">Change Directory</string>
-
-    <string name="cropping_in_progress">Cropping…</string>
+    <string name="cropping">Cropping…</string>
     <string name="fraction">%1$d/%2$d</string>
-    <string name="crops_processing_in_progress">Processing crops…</string>
+    <string name="processing_crops">Processing crops…</string>
     <string name="cropping_failure">No cropping borders found</string>
     <string name="cancel_autoscroll">Cancel Scroll</string>
     <string name="remove">Removed</string>
     <string name="cropping_failure_instruction_text_view">Make sure the selected screenshots comprise a continuous monochromatic border both above and below the core image area</string>
     <string name="version">Version: %1$s</string>
     <string name="copyright">© 2021-%1$d | Janek Zangenberg</string>
     <string name="got_it">Got it</string>
-    <string name="compare">Compare</string>
     <string name="crop_transition_name">CROP_TRANSITION</string>
     <string name="compare_crop_with_original_screenshot">Compare crop with original screenshot</string>
-    <string name="original">Original</string>
-    <string name="cropped">Cropped</string>
-    <string name="inflate_options_popup_menu">Inflate options popup menu</string>
-    <string name="adjust">Adjust</string>
     <string name="all_crops">All Crops</string>
     <string name="current_crop">Current Crop</string>
     <string name="save">Save</string>
@@ -42,7 +30,6 @@
     <string name="compare_crop_and_original_screenshot">Compare crop and original screenshot</string>
     <string name="manually_adjust_the_crop">Manually adjust the crop</string>
     <string name="screenshot_listener">Screenshot Listener</string>
-    <string name="height">Height</string>
     <string name="reset">Reset</string>
     <string name="go_back_to_crop_pager">Go back to crop pager</string>
     <string name="screenshot">Screenshot</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -44,7 +44,7 @@
     <!--    App Title TextView-->
 
     <style name="AutoCropTV" parent="Shadow">
-        <item name="android:text">@string/app_title</item>
+        <item name="android:text">@string/app_name</item>
         <item name="android:textColor">@color/magenta_saturated</item>
         <item name="android:fontFamily">@font/london</item>
     </style>
diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,5 @@
 # For more details on how to configure your build environment visit
 # http://www.gradle.org/docs/current/userguide/build_environment.html
-
 kotlin.code.style=official
 org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"
 org.gradle.unsafe.configuration-cache=false
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -24,8 +24,8 @@ androidx-splashscreen = 'androidx.core:core-splashscreen:1.0.0'
 # google
 google-guava = 'com.google.guava:guava:31.1-jre'
 google-material = 'com.google.android.material:material:1.7.0'
-google-hilt = {module = 'com.google.dagger:hilt-android', version.ref = 'hilt'}
-google-hilt-kapt = {module = 'com.google.dagger:hilt-android-compiler', version.ref = 'hilt'}
+google-hilt = { module = 'com.google.dagger:hilt-android', version.ref = 'hilt' }
+google-hilt-kapt = { module = 'com.google.dagger:hilt-android-compiler', version.ref = 'hilt' }
 
 # other
 slimber = 'com.github.PaulWoitaschek:Slimber:2.0.0'

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ class CropPagerFragment :`
`104`	`104`	`append(" $nUncroppedScreenshots")`
`105`	`105`	`}`
`106`	`106`	`}`
`107`		`- append(context.resources.getQuantityString(R.plurals.image, nUncroppedScreenshots))`
	`107`	`+ append(" screenshot(s)")`
`108`	`108`	`}`
`109`	`109`	`}`
`110`	`110`
`@@ -114,23 +114,13 @@ class CropPagerFragment :`
`114`	`114`	`nNotOpenableUris == 0 -> Unit`
`115`	`115`	`isEmpty() -> {`
`116`	`116`	`append(`
`117`		`- "Couldn't open $nNotOpenableUris ${`
`118`		`- context.resources.getQuantityString(`
`119`		`- R.plurals.image,`
`120`		`- nNotOpenableUris`
`121`		`- )`
`122`		`- }"`
	`117`	`+ "Couldn't open $nNotOpenableUris image(s)"`
`123`	`118`	`)`
`124`	`119`	`}`
`125`	`120`
`126`	`121`	`else -> {`
`127`	`122`	`append(`
`128`		`- "& couldn't open $nNotOpenableUris ${`
`129`		`- context.resources.getQuantityString(`
`130`		`- R.plurals.image,`
`131`		`- nNotOpenableUris`
`132`		`- )`
`133`		`- }"`
	`123`	`+ "& couldn't open $nNotOpenableUris image(s)"`
`134`	`124`	`)`
`135`	`125`	`}`
`136`	`126`	`}`
Original file line number	Diff line number	Diff line change
`@@ -151,12 +151,7 @@ class FlowFieldFragment :`
`151`	`151`	`SpannableStringBuilder()`
`152`	`152`	`.apply {`
`153`	`153`	`append(`
`154`		`- "Saved ${it.nSavedCrops} ${`
`155`		`- resources.getQuantityString(`
`156`		`- R.plurals.crop,`
`157`		`- it.nSavedCrops`
`158`		`- )`
`159`		`- } to "`
	`154`	`+ "Saved ${it.nSavedCrops} crop(s) to "`
`160`	`155`	`)`
`161`	`156`	`color(getThemedColor(R.color.success)) {`
`162`	`157`	`append(it.saveDirName)`
`@@ -168,7 +163,7 @@ class FlowFieldFragment :`
`168`	`163`	`"corresponding"`
`169`	`164`	`else`
`170`	`165`	`it.nDeletedScreenshots`
`171`		`- } ${resources.getQuantityString(R.plurals.screenshot, it.nDeletedScreenshots)}"`
	`166`	`+ } screenshot(s)"`
`172`	`167`	`)`
`173`	`168`	`}`
`174`	`169`	`)`