From 6b58f112c3e5b6fc266a094c7afe8fb31834767c Mon Sep 17 00:00:00 2001
From: Sad Ellie <openthiswhitedoor@gmail.com>
Date: Thu, 23 Mar 2023 13:47:41 +0300
Subject: [PATCH] Clean up

- "/" instead of "per" in unit names (only EN (US))
- Code improvements
---
 core/base/src/main/res/values/strings.xml     | 106 +++++++++---------
 .../unitto/data/units/AllUnitsRepository.kt   |  10 +-
 .../unitto/data/units/collections/Prefix.kt   |   2 +-
 3 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/core/base/src/main/res/values/strings.xml b/core/base/src/main/res/values/strings.xml
index ad211742..11b31333 100644
--- a/core/base/src/main/res/values/strings.xml
+++ b/core/base/src/main/res/values/strings.xml
@@ -122,47 +122,47 @@
     <string name="kelvin_short" translatable="false">K</string>
 
     <!--Speed-->
-    <string name="millimeter_per_hour">Millimeter per hour</string>
+    <string name="millimeter_per_hour">Millimeter/hour</string>
     <string name="millimeter_per_hour_short">mm/h</string>
-    <string name="millimeter_per_minute">Millimeter per minute</string>
+    <string name="millimeter_per_minute">Millimeter/minute</string>
     <string name="millimeter_per_minute_short">mm/m</string>
-    <string name="millimeter_per_second">Millimeter per second</string>
+    <string name="millimeter_per_second">Millimeter/second</string>
     <string name="millimeter_per_second_short">mm/s</string>
-    <string name="centimeter_per_hour">Centimeter per hour</string>
+    <string name="centimeter_per_hour">Centimeter/hour</string>
     <string name="centimeter_per_hour_short">cm/h</string>
-    <string name="centimeter_per_minute">Centimeter per minute</string>
+    <string name="centimeter_per_minute">Centimeter/minute</string>
     <string name="centimeter_per_minute_short">cm/m</string>
-    <string name="centimeter_per_second">Centimeter per second</string>
+    <string name="centimeter_per_second">Centimeter/second</string>
     <string name="centimeter_per_second_short">cm/s</string>
-    <string name="meter_per_hour">Meter per hour</string>
+    <string name="meter_per_hour">Meter/hour</string>
     <string name="meter_per_hour_short">m/h</string>
-    <string name="meter_per_minute">Meter per minute</string>
+    <string name="meter_per_minute">Meter/minute</string>
     <string name="meter_per_minute_short">m/m</string>
-    <string name="meter_per_second">Meter per second</string>
+    <string name="meter_per_second">Meter/second</string>
     <string name="meter_per_second_short">m/s</string>
-    <string name="kilometer_per_hour">Kilometer per hour</string>
+    <string name="kilometer_per_hour">Kilometer/hour</string>
     <string name="kilometer_per_hour_short">km/h</string>
-    <string name="kilometer_per_minute">Kilometer per minute</string>
+    <string name="kilometer_per_minute">Kilometer/minute</string>
     <string name="kilometer_per_minute_short">km/m</string>
-    <string name="kilometer_per_second">Kilometer per second</string>
+    <string name="kilometer_per_second">Kilometer/second</string>
     <string name="kilometer_per_second_short">km/s</string>
-    <string name="foot_per_hour">Foot per hour</string>
+    <string name="foot_per_hour">Foot/hour</string>
     <string name="foot_per_hour_short">ft/h</string>
-    <string name="foot_per_minute">Foot per minute</string>
+    <string name="foot_per_minute">Foot/minute</string>
     <string name="foot_per_minute_short">ft/m</string>
-    <string name="foot_per_second">Foot per second</string>
+    <string name="foot_per_second">Foot/second</string>
     <string name="foot_per_second_short">ft/s</string>
-    <string name="yard_per_hour">Yard per hour</string>
+    <string name="yard_per_hour">Yard/hour</string>
     <string name="yard_per_hour_short">yd/h</string>
-    <string name="yard_per_minute">Yard per minute</string>
+    <string name="yard_per_minute">Yard/minute</string>
     <string name="yard_per_minute_short">yd/m</string>
-    <string name="yard_per_second">Yard per second</string>
+    <string name="yard_per_second">Yard/second</string>
     <string name="yard_per_second_short">yd/s</string>
-    <string name="mile_per_hour">Mile per hour</string>
+    <string name="mile_per_hour">Mile/hour</string>
     <string name="mile_per_hour_short">mi/h</string>
-    <string name="mile_per_minute">Mile per minute</string>
+    <string name="mile_per_minute">Mile/minute</string>
     <string name="mile_per_minute_short">mi/m</string>
-    <string name="mile_per_second">Mile per second</string>
+    <string name="mile_per_second">Mile/second</string>
     <string name="mile_per_second_short">mi/s</string>
     <string name="knot">Knot</string>
     <string name="knot_short">kt</string>
@@ -220,41 +220,41 @@
     <string name="exabyte_short">EB</string>
 
     <!--Data transfer-->
-    <string name="bit_per_second">Bit per second</string>
+    <string name="bit_per_second">Bit/second</string>
     <string name="bit_per_second_short">b/s</string>
-    <string name="kibibit_per_second">Kibibit per second</string>
+    <string name="kibibit_per_second">Kibibit/second</string>
     <string name="kibibit_per_second_short">Kib/s</string>
-    <string name="kilobit_per_second">Kilobit per second</string>
+    <string name="kilobit_per_second">Kilobit/second</string>
     <string name="kilobit_per_second_short">Kb/s</string>
-    <string name="megabit_per_second">Megabit per second</string>
+    <string name="megabit_per_second">Megabit/second</string>
     <string name="megabit_per_second_short">Mb/s</string>
-    <string name="mebibit_per_second">Mebibit per second</string>
+    <string name="mebibit_per_second">Mebibit/second</string>
     <string name="mebibit_per_second_short">Mib/s</string>
-    <string name="gigabit_per_second">Gigabit per second</string>
+    <string name="gigabit_per_second">Gigabit/second</string>
     <string name="gigabit_per_second_short">Gb/s</string>
-    <string name="terabit_per_second">Terabit per second</string>
+    <string name="terabit_per_second">Terabit/second</string>
     <string name="terabit_per_second_short">Tb/s</string>
-    <string name="petabit_per_second">Petabit per second</string>
+    <string name="petabit_per_second">Petabit/second</string>
     <string name="petabit_per_second_short">Pb/s</string>
-    <string name="exabit_per_second">Exabit per second</string>
+    <string name="exabit_per_second">Exabit/second</string>
     <string name="exabit_per_second_short">Eb/s</string>
-    <string name="byte_per_second">Byte per second</string>
+    <string name="byte_per_second">Byte/second</string>
     <string name="byte_per_second_short">B/s</string>
-    <string name="kibibyte_per_second">Kibibyte per second</string>
+    <string name="kibibyte_per_second">Kibibyte/second</string>
     <string name="kibibyte_per_second_short">KiB/s</string>
-    <string name="kilobyte_per_second">Kilobyte per second</string>
+    <string name="kilobyte_per_second">Kilobyte/second</string>
     <string name="kilobyte_per_second_short">KB/s</string>
-    <string name="megabyte_per_second">Megabyte per second</string>
+    <string name="megabyte_per_second">Megabyte/second</string>
     <string name="megabyte_per_second_short">MB/s</string>
-    <string name="mebibyte_per_second">Mebibyte per second</string>
+    <string name="mebibyte_per_second">Mebibyte/second</string>
     <string name="mebibyte_per_second_short">MiB/s</string>
-    <string name="gigabyte_per_second">Gigabyte per second</string>
+    <string name="gigabyte_per_second">Gigabyte/second</string>
     <string name="gigabyte_per_second_short">GB/s</string>
-    <string name="terabyte_per_second">Terabyte per second</string>
+    <string name="terabyte_per_second">Terabyte/second</string>
     <string name="terabyte_per_second_short">TB/s</string>
-    <string name="petabyte_per_second">Petabyte per second</string>
+    <string name="petabyte_per_second">Petabyte/second</string>
     <string name="petabyte_per_second_short">PB/s</string>
-    <string name="exabyte_per_second">Exabyte per second</string>
+    <string name="exabyte_per_second">Exabyte/second</string>
     <string name="exabyte_per_second_short">EB/s</string>
 
     <!--Volume-->
@@ -446,9 +446,9 @@
     <string name="petapascal_short">PPa</string>
     <string name="exapascal">Exapascal</string>
     <string name="exapascal_short">EPa</string>
-    <string name="psi">Pound per square inch</string>
+    <string name="psi">Pound/square inch</string>
     <string name="psi_short" translatable="false">psi</string>
-    <string name="ksi">Kilopound per square inch</string>
+    <string name="ksi">Kilopound/square inch</string>
     <string name="ksi_short" translatable="false">ksi</string>
     <string name="standard_atmosphere">Standard atmosphere</string>
     <string name="standard_atmosphere_short">atm</string>
@@ -460,29 +460,29 @@
     <string name="millimeter_of_mercury_short">mm Hg</string>
 
     <!--Acceleration-->
-    <string name="attometer_per_square_second">Attometer per square second</string>
+    <string name="attometer_per_square_second">Attometer/square second</string>
     <string name="attometer_per_square_second_short">am/s^2</string>
-    <string name="femtometer_per_square_second">Femtometer per square second</string>
+    <string name="femtometer_per_square_second">Femtometer/square second</string>
     <string name="femtometer_per_square_second_short">fm/s^2</string>
-    <string name="picometer_per_square_second">Picometer per square second</string>
+    <string name="picometer_per_square_second">Picometer/square second</string>
     <string name="picometer_per_square_second_short">pm/s^2</string>
-    <string name="nanometer_per_square_second">Nanometer per square second</string>
+    <string name="nanometer_per_square_second">Nanometer/square second</string>
     <string name="nanometer_per_square_second_short">nm/s^2</string>
-    <string name="micrometer_per_square_second">Micrometer per square second</string>
+    <string name="micrometer_per_square_second">Micrometer/square second</string>
     <string name="micrometer_per_square_second_short">µm/s^2</string>
-    <string name="millimeter_per_square_second">Millimeter per square second</string>
+    <string name="millimeter_per_square_second">Millimeter/square second</string>
     <string name="millimeter_per_square_second_short">mm/s^2</string>
-    <string name="centimeter_per_square_second">Centimeter per square second</string>
+    <string name="centimeter_per_square_second">Centimeter/square second</string>
     <string name="centimeter_per_square_second_short">cm/s^2</string>
-    <string name="decimeter_per_square_second">Decimeter per square second</string>
+    <string name="decimeter_per_square_second">Decimeter/square second</string>
     <string name="decimeter_per_square_second_short">dm/s^2</string>
-    <string name="meter_per_square_second">Meter per square second</string>
+    <string name="meter_per_square_second">Meter/square second</string>
     <string name="meter_per_square_second_short">m/s^2</string>
-    <string name="kilometer_per_square_second">Kilometer per square second</string>
+    <string name="kilometer_per_square_second">Kilometer/square second</string>
     <string name="kilometer_per_square_second_short">km/s^2</string>
-    <string name="dekameter_per_square_second">Dekameter per square second</string>
+    <string name="dekameter_per_square_second">Dekameter/square second</string>
     <string name="dekameter_per_square_second_short">dam/s^2</string>
-    <string name="hectometer_per_square_second">Hectometer per square second</string>
+    <string name="hectometer_per_square_second">Hectometer/square second</string>
     <string name="hectometer_per_square_second_short">hm/s^2</string>
     <string name="gal">Gal</string>
     <string name="gal_short">Gal</string>
diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/AllUnitsRepository.kt b/data/units/src/main/java/com/sadellie/unitto/data/units/AllUnitsRepository.kt
index a81c6500..20a3c9cd 100644
--- a/data/units/src/main/java/com/sadellie/unitto/data/units/AllUnitsRepository.kt
+++ b/data/units/src/main/java/com/sadellie/unitto/data/units/AllUnitsRepository.kt
@@ -20,6 +20,7 @@ package com.sadellie.unitto.data.units
 
 import android.content.Context
 import com.sadellie.unitto.core.base.MAX_PRECISION
+import com.sadellie.unitto.data.database.UnitsEntity
 import com.sadellie.unitto.data.model.AbstractUnit
 import com.sadellie.unitto.data.model.UnitGroup
 import com.sadellie.unitto.data.model.sortByLev
@@ -29,21 +30,20 @@ import com.sadellie.unitto.data.units.collections.areaCollection
 import com.sadellie.unitto.data.units.collections.currencyCollection
 import com.sadellie.unitto.data.units.collections.dataCollection
 import com.sadellie.unitto.data.units.collections.dataTransferCollection
+import com.sadellie.unitto.data.units.collections.electrostaticCapacitance
 import com.sadellie.unitto.data.units.collections.energyCollection
 import com.sadellie.unitto.data.units.collections.fluxCollection
+import com.sadellie.unitto.data.units.collections.forceCollection
 import com.sadellie.unitto.data.units.collections.lengthCollection
 import com.sadellie.unitto.data.units.collections.massCollection
 import com.sadellie.unitto.data.units.collections.numberBaseCollection
 import com.sadellie.unitto.data.units.collections.powerCollection
+import com.sadellie.unitto.data.units.collections.prefixCollection
 import com.sadellie.unitto.data.units.collections.pressureCollection
 import com.sadellie.unitto.data.units.collections.speedCollection
 import com.sadellie.unitto.data.units.collections.temperatureCollection
 import com.sadellie.unitto.data.units.collections.timeCollection
 import com.sadellie.unitto.data.units.collections.volumeCollection
-import com.sadellie.unitto.data.database.UnitsEntity
-import com.sadellie.unitto.data.units.collections.electrostaticCapacitance
-import com.sadellie.unitto.data.units.collections.forceCollection
-import com.sadellie.unitto.data.units.collections.prefix
 import java.math.BigDecimal
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -83,7 +83,7 @@ class AllUnitsRepository @Inject constructor() {
             UnitGroup.FLUX to fluxCollection,
             UnitGroup.NUMBER_BASE to numberBaseCollection,
             UnitGroup.ELECTROSTATIC_CAPACITANCE to electrostaticCapacitance,
-            UnitGroup.PREFIX to prefix,
+            UnitGroup.PREFIX to prefixCollection,
             UnitGroup.FORCE to forceCollection,
         )
     }
diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Prefix.kt b/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Prefix.kt
index bbe3f6b7..45541d76 100644
--- a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Prefix.kt
+++ b/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Prefix.kt
@@ -25,7 +25,7 @@ import com.sadellie.unitto.data.units.MyUnitIDS
 import com.sadellie.unitto.data.units.R
 import java.math.BigDecimal
 
-val prefix: List<AbstractUnit> by lazy {
+val prefixCollection: List<AbstractUnit> by lazy {
     listOf(
         MyUnit(MyUnitIDS.prefix_quetta, BigDecimal.valueOf(1E+30),  UnitGroup.PREFIX, R.string.prefix_quetta,   R.string.prefix_quetta_short),
         MyUnit(MyUnitIDS.prefix_ronna,  BigDecimal.valueOf(1E+27),  UnitGroup.PREFIX, R.string.prefix_ronna,    R.string.prefix_ronna_short),