Compare commits

10 Commits

Author SHA1 Message Date
乌堆小透明
95aea35865 New translations strings.xml (Japanese)
[ci skip] New translations from Crowdin
2022-03-21 17:30:51 +08:00
乌堆小透明
81407c0287 New translations strings.xml (French)
[ci skip] New translations from Crowdin
2022-03-21 17:30:50 +08:00
乌堆小透明
e04c699572 New translations strings.xml (Romanian)
[ci skip] New translations from Crowdin
2022-03-21 16:21:47 +08:00
乌堆小透明
bebda7c08f New translations strings.xml (Russian)
[ci skip] New translations from Crowdin
2022-03-21 16:08:29 +08:00
乌堆小透明
f2df033393 Merge remote-tracking branch 'origin/main' 2022-03-21 15:52:46 +08:00
乌堆小透明
ab41dea173 Update version to 1.5.1 2022-03-21 15:52:37 +08:00
乌堆小透明
7d9f45b92f New Crowdin updates (#100)
* New translations strings.xml (Spanish)
[ci skip] New translations from Crowdin

* New translations strings.xml (Spanish)
[ci skip] New translations from Crowdin

* New translations strings.xml (French)
[ci skip] New translations from Crowdin

* New translations strings.xml (French)
[ci skip] New translations from Crowdin

* New translations strings.xml (Chinese Simplified)
[ci skip] New translations from Crowdin
2022-03-21 15:52:25 +08:00
乌堆小透明
8c08466ed6 修复网速单位KB/MB显示错误 2022-03-21 15:47:51 +08:00
乌堆小透明
801ade5859 优化双排网速,使用主题提供单位 2022-03-21 15:41:28 +08:00
乌堆小透明
984b909197 新增双排网速对齐切换 2022-03-21 15:31:25 +08:00
10 changed files with 112 additions and 14 deletions

View File

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

View File

@@ -768,6 +768,40 @@ 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( add(
TextWithSpinnerV( TextWithSpinnerV(
TextV(resId = R.string.status_bar_network_speed_dual_row_icon), TextV(resId = R.string.status_bar_network_speed_dual_row_icon),

View File

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

View File

@@ -167,4 +167,10 @@
<string name="qs_custom_rows">Filas</string> <string name="qs_custom_rows">Filas</string>
<string name="qs_custom_columns">Columnas</string> <string name="qs_custom_columns">Columnas</string>
<string name="qs_custom_rows_horizontal">Filas (horizontal)</string> <string name="qs_custom_rows_horizontal">Filas (horizontal)</string>
<string name="status_bar_dual_row_network_speed">Velocidad de red en fila dual</string>
<string name="status_bar_dual_row_network_speed_summary">Mostrar velocidad de subida y bajada</string>
<string name="status_bar_network_speed">Velocidad de red en barra de estado</string>
<string name="status_bar_network_speed_dual_row_size">Tamaño de fila dual (0: no cambiar)</string>
<string name="status_bar_network_speed_dual_row_icon">Icono de fila dual</string>
<string name="none">Ninguno</string>
</resources> </resources>

View File

@@ -161,4 +161,19 @@
<string name="hide_icon">Masquer l\'icône</string> <string name="hide_icon">Masquer l\'icône</string>
<string name="double_tap_to_sleep">Double tapper pour veille</string> <string name="double_tap_to_sleep">Double tapper pour veille</string>
<string name="home_double_tap_to_sleep_summary">Double-tapez l\'espace vide pour mettre en veille</string> <string name="home_double_tap_to_sleep_summary">Double-tapez l\'espace vide pour mettre en veille</string>
<string name="old_quick_settings_panel">Vieux panneau de réglages rapide</string>
<string name="old_qs_custom_switch">Lignes et colonnes personnalisés</string>
<string name="qs_custom_columns_unexpanded">Colonnes (Inexpansé)</string>
<string name="qs_custom_rows">Lignes</string>
<string name="qs_custom_columns">Colonnes</string>
<string name="qs_custom_rows_horizontal">Lignes (horizontal)</string>
<string name="status_bar_dual_row_network_speed">Vitesse du réseau à double ligne</string>
<string name="status_bar_dual_row_network_speed_summary">Affichage de download et upload en vitesse de réseau</string>
<string name="status_bar_network_speed">Vitesse du réseau en barre d\'état</string>
<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> </resources>

View File

@@ -25,6 +25,7 @@
<string name="hide_alarm_icon">アラームアイコンを隠す</string> <string name="hide_alarm_icon">アラームアイコンを隠す</string>
<string name="hide_hotspot_icon">ポータブルホットスポットアイコンを隠す</string> <string name="hide_hotspot_icon">ポータブルホットスポットアイコンを隠す</string>
<string name="hide_headset_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_big_hd_icon">大きなHDアイコンを隠す</string>
<string name="hide_small_hd_icon">小さいHDアイコンを隠す</string> <string name="hide_small_hd_icon">小さいHDアイコンを隠す</string>
<string name="hide_hd_no_service_icon">HD サービスなしアイコンを隠す</string> <string name="hide_hd_no_service_icon">HD サービスなしアイコンを隠す</string>
@@ -40,13 +41,14 @@
<string name="statusbar">ステータスバー</string> <string name="statusbar">ステータスバー</string>
<string name="status_bar_time_seconds">秒を表示する</string> <string name="status_bar_time_seconds">秒を表示する</string>
<string name="status_bar_network_speed_refresh_speed">ネットワーク速度を秒単位で更新</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="main_switch">モジュールのメインスイッチ</string>
<string name="hide_gps_icon">GPS アイコンを隠す</string> <string name="hide_gps_icon">GPS アイコンを隠す</string>
<string name="hide_status_bar_network_speed_second">ネットワーク速度の単位(/s)を隠す</string> <string name="hide_status_bar_network_speed_second">ネットワーク速度の単位(/s)を隠す</string>
<string name="menu">メニュー</string> <string name="menu">メニュー</string>
<string name="Tips">注意事項</string> <string name="Tips">注意事項</string>
<string name="skip_waiting_time">5/10秒間の警告時間をスキップ</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="hide_slave_wifi_icon">Wi-Fiセカンダリアイコンを隠す</string>
<string name="HideLauncherIcon">ランチャーアイコンを隠す</string> <string name="HideLauncherIcon">ランチャーアイコンを隠す</string>
<string name="hide_battery_percentage_icon">バッテリー (%) を隠す</string> <string name="hide_battery_percentage_icon">バッテリー (%) を隠す</string>
@@ -156,4 +158,22 @@
<string name="remove_open_app_confirmation_popup_summary">「外部アプリを開く」ポップアップを削除します</string> <string name="remove_open_app_confirmation_popup_summary">「外部アプリを開く」ポップアップを削除します</string>
<string name="hide_volume_icon">音量アイコンを非表示</string> <string name="hide_volume_icon">音量アイコンを非表示</string>
<string name="hide_zen_icon">ZENアイコンを隠す</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> </resources>

View File

@@ -173,4 +173,7 @@
<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_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="status_bar_network_speed_dual_row_icon">Pictogramă rând dublu</string>
<string name="none">Nimic</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> </resources>

View File

@@ -177,4 +177,7 @@
<string name="status_bar_network_speed_dual_row_size">Размер скорости сети в 2 строки (0: не изменять)</string> <string name="status_bar_network_speed_dual_row_size">Размер скорости сети в 2 строки (0: не изменять)</string>
<string name="status_bar_network_speed_dual_row_icon">Иконка двойной скорости сети</string> <string name="status_bar_network_speed_dual_row_icon">Иконка двойной скорости сети</string>
<string name="none">Нет</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> </resources>

View File

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

View File

@@ -177,4 +177,7 @@
<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_size">Dual row size (0: do not change)</string>
<string name="status_bar_network_speed_dual_row_icon">Dual row icon</string> <string name="status_bar_network_speed_dual_row_icon">Dual row icon</string>
<string name="none">None</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> </resources>