diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 158dad45..fdbee4eb 100644
--- 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
index 54ab5ff8..c6642f97 100644
--- 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
index e0109e30..748fe9fa 100644
--- 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
index adec4f6a..f9246d31 100644
--- 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
index 78968d28..d1018c97 100644
--- 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
deleted file mode 100644
index b7325b71..00000000
--- a/app/src/main/res/values/plurals.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- - image
- - images
-
-
- - crop
- - crops
-
-
- - screenshot
- - screenshots
-
-
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 456310ce..975ba9ed 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,23 +1,16 @@
- AutoCrop
-
+ AutoCrop
SELECT IMAGES
- Inflate settings menu
- Capture Flow Field image
- Share saved crops
-
Examination
Crop Saving
Other
-
AutoScroll
Rate the app
About
Change Directory
-
- Cropping…
+ Cropping…
%1$d/%2$d
- Processing crops…
+ Processing crops…
No cropping borders found
Cancel Scroll
Removed
@@ -25,13 +18,8 @@
Version: %1$s
© 2021-%1$d | Janek Zangenberg
Got it
- Compare
CROP_TRANSITION
Compare crop with original screenshot
- Original
- Cropped
- Inflate options popup menu
- Adjust
All Crops
Current Crop
Save
@@ -42,7 +30,6 @@
Compare crop and original screenshot
Manually adjust the crop
Screenshot Listener
- Height
Reset
Go back to crop pager
Screenshot
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 22b1cae8..389cf946 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -44,7 +44,7 @@
diff --git a/gradle.properties b/gradle.properties
index 959ade4c..91b74614 100644
--- 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
index ae893149..55e22a3c 100644
--- 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'