New translations strings.xml (French)

[ci skip] New translations from Crowdin

app/build.gradle.kts

@@ -12,8 +12,8 @@ android {
         applicationId = "com.lt2333.simplicitytools"
         minSdk = 31
         targetSdk = 32
-        versionCode = 52
+        versionCode = 51
-        versionName = "1.5.1"
+        versionName = "1.5.0"
     }
 
     buildTypes {

app/src/main/java/com/lt2333/simplicitytools/activity/SettingsActivity.kt

@@ -768,40 +768,6 @@ class SettingsActivity : MIUIActivity() {
                     )
                 )
             )
-            val align: HashMap<Int, String> = hashMapOf()
-            align[0] = getString(R.string.left)
-            align[1] = getString(R.string.right)
-            add(
-                TextWithSpinnerV(
-                    TextV(resId = R.string.status_bar_network_speed_dual_row_gravity),
-                    SpinnerV(
-                        arrayListOf<MIUIPopupData>().apply {
-                            add(MIUIPopupData(getString(R.string.left)) {
-                                OwnSP.ownSP.edit().run {
-                                    putInt(
-                                        "status_bar_network_speed_dual_row_gravity",
-                                        0
-                                    )
-                                    apply()
-                                }
-                            })
-                            add(MIUIPopupData(getString(R.string.right)) {
-                                OwnSP.ownSP.edit().run {
-                                    putInt(
-                                        "status_bar_network_speed_dual_row_gravity",
-                                        1
-                                    )
-                                    apply()
-                                }
-                            })
-                        }, currentValue = align[OwnSP.ownSP.getInt(
-                            "status_bar_network_speed_dual_row_gravity",
-                            0
-                        )].toString()
-                    ),
-                    dataBindingRecv = status_bar_dual_row_network_speed_binding.binding.getRecv(2)
-                )
-            )
             add(
                 TextWithSpinnerV(
                     TextV(resId = R.string.status_bar_network_speed_dual_row_icon),

app/src/main/java/com/lt2333/simplicitytools/hook/app/systemui/DoubleLineNetworkSpeed.kt

@@ -25,7 +25,6 @@ class DoubleLineNetworkSpeed : IXposedHookLoadPackage {
     private var downIcon = ""
 
     private val getDualSize = XSPUtils.getInt("status_bar_network_speed_dual_row_size", 0)
-    private val getDualAlign = XSPUtils.getInt("status_bar_network_speed_dual_row_gravity", 0)
 
     override fun handleLoadPackage(lpparam: XC_LoadPackage.LoadPackageParam) {
 
@@ -33,9 +32,9 @@ class DoubleLineNetworkSpeed : IXposedHookLoadPackage {
 
         if (XSPUtils.getString("status_bar_network_speed_dual_row_icon", none) != none) {
             upIcon = XSPUtils.getString("status_bar_network_speed_dual_row_icon", none)
-                ?.firstOrNull().toString()
+                ?.firstOrNull()?.plus(" ") ?: String()
             downIcon = XSPUtils.getString("status_bar_network_speed_dual_row_icon", none)
-                ?.lastOrNull().toString()
+                ?.lastOrNull()?.plus(" ") ?: String()
         }
 
         hasEnable("status_bar_dual_row_network_speed") {
@@ -43,16 +42,12 @@ class DoubleLineNetworkSpeed : IXposedHookLoadPackage {
                 .hookAfterConstructor(Context::class.java, AttributeSet::class.java) {
                     val mView = it.thisObject as TextView
                     mView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 7f)
-                    if (getDualSize != 0) {
+                    if (getDualSize!=0){
                         mView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, getDualSize.toFloat())
                     }
                     mView.isSingleLine = false
                     mView.setLineSpacing(0F, 0.8F)
-                    if (getDualAlign == 0) {
                     mView.gravity = Gravity.LEFT or Gravity.CENTER_VERTICAL
-                    } else {
-                        mView.gravity = Gravity.RIGHT or Gravity.CENTER_VERTICAL
-                    }
                 }
 
             "com.android.systemui.statusbar.policy.NetworkSpeedController".hookBeforeMethod(
@@ -61,19 +56,13 @@ class DoubleLineNetworkSpeed : IXposedHookLoadPackage {
                 Context::class.java,
                 Long::class.java
             ) {
-                if (getDualAlign == 0) {
+                it.result = "${upIcon}${getTotalUpSpeed()}\n${downIcon}${getTotalDownloadSpeed()}"
-                    it.result =
-                        "${upIcon} ${getTotalUpSpeed(it.args[0]as Context)}\n${downIcon} ${getTotalDownloadSpeed(it.args[0]as Context)}"
-                } else {
-                    it.result =
-                        "${getTotalUpSpeed(it.args[0]as Context)} ${upIcon}\n${getTotalDownloadSpeed(it.args[0]as Context)} ${downIcon}"
-                }
             }
         }
     }
 
     //获取总的上行速度
-    fun getTotalUpSpeed(context: Context): String {
+    fun getTotalUpSpeed(): String {
         var totalUpSpeed = 0F
 
         val currentTotalTxBytes = TrafficStats.getTotalTxBytes()
@@ -87,11 +76,11 @@ class DoubleLineNetworkSpeed : IXposedHookLoadPackage {
         if (bytes >= 1048576) {
             totalUpSpeed =
                 DecimalFormat("0.0").format(bytes / 1048576).toFloat()
-            unit = context.resources.getString(context.resources.getIdentifier("megabyte_per_second","string",context.packageName))
+            unit = "MB/s"
         } else {
             totalUpSpeed =
                 DecimalFormat("0.0").format(bytes / 1024).toFloat()
-            unit = context.resources.getString(context.resources.getIdentifier("kilobyte_per_second","string",context.packageName))
+            unit = "KB/s"
         }
 
         //保存当前的流量总和和上次的时间戳
@@ -106,7 +95,7 @@ class DoubleLineNetworkSpeed : IXposedHookLoadPackage {
     }
 
     //获取总的下行速度
-    fun getTotalDownloadSpeed(context: Context): String {
+    fun getTotalDownloadSpeed(): String {
         var totalDownSpeed = 0F
         val currentTotalRxBytes = TrafficStats.getTotalRxBytes()
         val nowTimeStampTotalDown = System.currentTimeMillis()
@@ -120,11 +109,11 @@ class DoubleLineNetworkSpeed : IXposedHookLoadPackage {
         if (bytes >= 1048576) {
             totalDownSpeed =
                 DecimalFormat("0.0").format(bytes / 1048576).toFloat()
-            unit = context.resources.getString(context.resources.getIdentifier("megabyte_per_second","string",context.packageName))
+            unit = "MB/s"
         } else {
             totalDownSpeed =
                 DecimalFormat("0.0").format(bytes / 1024).toFloat()
-            unit = context.resources.getString(context.resources.getIdentifier("kilobyte_per_second","string",context.packageName))
+            unit = "KB/s"
         }
         //保存当前的流量总和和上次的时间戳
         mLastTotalDown = currentTotalRxBytes

app/src/main/res/values-fr/strings.xml

@@ -173,7 +173,4 @@
     <string name="status_bar_network_speed_dual_row_size">Taille de double ligne (0: ne pas changer)</string>
     <string name="status_bar_network_speed_dual_row_icon">Icône de double ligne</string>
     <string name="none">Aucune</string>
-    <string name="status_bar_network_speed_dual_row_gravity">Alignement double ligne</string>
-    <string name="left">Gauche</string>
-    <string name="right">Droite</string>
 </resources>

app/src/main/res/values-ja/strings.xml

@@ -25,7 +25,6 @@
     <string name="hide_alarm_icon">アラームアイコンを隠す</string>
     <string name="hide_hotspot_icon">ポータブルホットスポットアイコンを隠す</string>
     <string name="hide_headset_icon">ヘッドセットアイコンを隠す</string>
-    <string name="hide_bluetooth_battery_icon">Bluetooth機器のバッテリーアイコンを非表示</string>
     <string name="hide_big_hd_icon">大きなHDアイコンを隠す</string>
     <string name="hide_small_hd_icon">小さいHDアイコンを隠す</string>
     <string name="hide_hd_no_service_icon">HD サービスなしアイコンを隠す</string>
@@ -41,14 +40,13 @@
     <string name="statusbar">ステータスバー</string>
     <string name="status_bar_time_seconds">秒を表示する</string>
     <string name="status_bar_network_speed_refresh_speed">ネットワーク速度を秒単位で更新</string>
-    <string name="remove_the_maximum_number_of_notification_icons">通知アイコン数の上限を削除する</string>
+    <string name="remove_the_maximum_number_of_notification_icons">通知アイコンの最大数を削除する</string>
     <string name="main_switch">モジュールのメインスイッチ</string>
     <string name="hide_gps_icon">GPS アイコンを隠す</string>
     <string name="hide_status_bar_network_speed_second">ネットワーク速度の単位(/s)を隠す</string>
     <string name="menu">メニュー</string>
     <string name="Tips">注意事項</string>
     <string name="skip_waiting_time">5/10秒間の警告時間をスキップ</string>
-    <string name="unlock_unlimited_cropping">写真・スクリーンショットをトリミングする際の制限を解除する</string>
     <string name="hide_slave_wifi_icon">Wi-Fiセカンダリアイコンを隠す</string>
     <string name="HideLauncherIcon">ランチャーアイコンを隠す</string>
     <string name="hide_battery_percentage_icon">バッテリー (%) を隠す</string>
@@ -158,22 +156,4 @@
     <string name="remove_open_app_confirmation_popup_summary">「外部アプリを開く」ポップアップを削除します</string>
     <string name="hide_volume_icon">音量アイコンを非表示</string>
     <string name="hide_zen_icon">ZENアイコンを隠す</string>
-    <string name="hide_icon">アイコンを隠す</string>
-    <string name="double_tap_to_sleep">2回タップでスリープ</string>
-    <string name="home_double_tap_to_sleep_summary">ホーム画面の空白を2回タップしてスリープする</string>
-    <string name="old_quick_settings_panel">古いクイック設定パネル</string>
-    <string name="old_qs_custom_switch">クイック設定の行数と列数をカスタマイズ</string>
-    <string name="qs_custom_columns_unexpanded">縦（未展開時）</string>
-    <string name="qs_custom_rows">横</string>
-    <string name="qs_custom_columns">縦</string>
-    <string name="qs_custom_rows_horizontal">横（横持ち時）</string>
-    <string name="status_bar_dual_row_network_speed">ネットワーク速度の2行表示</string>
-    <string name="status_bar_dual_row_network_speed_summary">ネットワーク速度を上下に表示する</string>
-    <string name="status_bar_network_speed">ステータスバーのネットワーク速度</string>
-    <string name="status_bar_network_speed_dual_row_size">2行のサイズ（0：変更なし）</string>
-    <string name="status_bar_network_speed_dual_row_icon">2行アイコン</string>
-    <string name="none">なし</string>
-    <string name="status_bar_network_speed_dual_row_gravity">2行の配置</string>
-    <string name="left">左</string>
-    <string name="right">右</string>
 </resources>

app/src/main/res/values-ro/strings.xml

@@ -173,7 +173,4 @@
     <string name="status_bar_network_speed_dual_row_size">Dimensiune rând dublu (0: nu se modifică)</string>
     <string name="status_bar_network_speed_dual_row_icon">Pictogramă rând dublu</string>
     <string name="none">Nimic</string>
-    <string name="status_bar_network_speed_dual_row_gravity">Aliniere rândul dublu</string>
-    <string name="left">Stânga</string>
-    <string name="right">Dreapta</string>
 </resources>

app/src/main/res/values-ru/strings.xml

@@ -177,7 +177,4 @@
     <string name="status_bar_network_speed_dual_row_size">Размер скорости сети в 2 строки (0: не изменять)</string>
     <string name="status_bar_network_speed_dual_row_icon">Иконка двойной скорости сети</string>
     <string name="none">Нет</string>
-    <string name="status_bar_network_speed_dual_row_gravity">Выравнивание скорости сети в 2 ряда</string>
-    <string name="left">Влево</string>
-    <string name="right">Вправо</string>
 </resources>

app/src/main/res/values-zh-rCN/strings.xml

@@ -173,7 +173,4 @@
     <string name="status_bar_network_speed_dual_row_size">双排大小（0：不更改）</string>
     <string name="status_bar_network_speed_dual_row_icon">双排图标</string>
     <string name="none">无</string>
-    <string name="status_bar_network_speed_dual_row_gravity">双排对齐</string>
-    <string name="left">左边</string>
-    <string name="right">右边</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -177,7 +177,4 @@
     <string name="status_bar_network_speed_dual_row_size">Dual row size (0: do not change)</string>
     <string name="status_bar_network_speed_dual_row_icon">Dual row icon</string>
     <string name="none">None</string>
-    <string name="status_bar_network_speed_dual_row_gravity">Dual row align</string>
-    <string name="left">Left</string>
-    <string name="right">Right</string>
 </resources>