Skip to content

Commit 47d555f

Browse files
committed
Upload file
1 parent 93a41d1 commit 47d555f

File tree

14 files changed

+68
-99
lines changed

14 files changed

+68
-99
lines changed

Version.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
**Dev**
44

5+
+ Change the add-on menu structure
56
+ Fix addon error creating dex2oat
67
+ Adjust the icon size
78
+ Fix the auto-delete zstd during decoding

pio/src/main/assets/home/etc/lang/default.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ alignment_text="Alignment"
4141
synthetic_text="Synthetic"
4242
config_text="Configuration"
4343
time_text="Time"
44+
pin_text="Pin add-on"
4445

4546
# Home
4647
home_text_1="App information and features"

pio/src/main/assets/home/etc/lang/hu.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ alignment_text="Igazítás"
4141
synthetic_text="Szintetikus"
4242
config_text="Konfiguráció"
4343
time_text="Idő"
44+
pin_text="Bővítmény rögzítése"
4445

4546
# Home
4647
home_text_1="Alkalmazásinformációk és funkciók"

pio/src/main/assets/home/etc/lang/ru.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ alignment_text="Выравнивание"
4141
synthetic_text="Синтетический"
4242
config_text="Конфигурация"
4343
time_text="Время"
44+
pin_text="Закрепить дополнение"
4445

4546
# Home
4647
home_text_1="Информация и функции приложения"

pio/src/main/assets/home/etc/lang/vi.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ alignment_text="Căn chỉnh"
4141
synthetic_text="Tổng hợp phân vùng"
4242
config_text="Cấu hình"
4343
time_text="Thời gian"
44+
pin_text="Ghim add-on"
4445

4546
# Home
4647
home_text_1="Thông tin và tính năng ứng dụng"

pio/src/main/assets/home/etc/lang/zh.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ alignment_text="结盟"
4141
synthetic_text="合成的"
4242
config_text="配置"
4343
time_text="时间"
44+
pin_text="固定插件"
4445

4546
# Home
4647
home_text_1="应用信息与功能"

pio/src/main/assets/home/etc/tool-tree.rc

Lines changed: 53 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ fi
99

1010
iccpng(){
1111
if [ "$(glog Ticon)" != 1 ];then
12-
if [ -f "${vadd%/*}/$1.png" ];then
13-
echo "${vadd%/*}/$1.png"
14-
elif [ -f "${vadd%/*}/$1_$DARK_MODE.png" ];then
15-
echo "${vadd%/*}/$1_$DARK_MODE.png";
12+
if [ -f "$dirvad/$1.png" ];then
13+
echo "$dirvad/$1.png"
14+
elif [ -f "$dirvad/$1_$DARK_MODE.png" ];then
15+
echo "$dirvad/$1_$DARK_MODE.png";
1616
else
1717
echo "$ETC/icon/icon.png"
1818
fi
@@ -1269,8 +1269,8 @@ Features(){
12691269
xml_print '<group><switch icon="'`iccpng icon`'" shell="hidden" warn="'$addon_textxx'">
12701270
<title>'$(gprop name $vadd)'</title>
12711271
<desc>'$(gprop version $vadd)', '$(gprop author $vadd)' | '$(gprop description $vadd)'</desc>
1272-
<get>cat '${vadd%/*}'/'$1'</get>
1273-
<set>echo "$state" > '${vadd%/*}'/'$1'</set>
1272+
<get>cat '$dirvad'/'$1'</get>
1273+
<set>echo "$state" > '$dirvad'/'$1'</set>
12741274
</switch>
12751275
</group>'
12761276
}
@@ -1280,19 +1280,18 @@ Homeadd(){
12801280
unset pagesh code_menu farooot
12811281

12821282
# Load index
1283-
if [ -f "${vadd%/*}/index.sh" ];then
1284-
pagesh='config-sh="'${vadd%/*}'/index.sh home"'
1285-
elif [ -f "${vadd%/*}/index.xml" ];then
1286-
pagesh='config="'${vadd%/*}'/index.xml"'
1283+
if [ -f "$dirvad/index.sh" ];then
1284+
pagesh='config-sh="'$dirvad'/index.sh home"'
1285+
elif [ -f "$dirvad/index.xml" ];then
1286+
pagesh='config="'$dirvad'/index.xml"'
12871287
else
12881288
pagesh='config="'$ETC'/error.xml"'
12891289
fi
12901290

12911291
# Load menu
1292-
if [ -f "${vadd%/*}/menu.sh" ];then
1293-
code_menu="$(${vadd%/*}/menu.sh 2>/dev/null)"
1294-
elif [ -f "${vadd%/*}/menu.xml" ];then
1295-
code_menu="$(cat ${vadd%/*}/menu.xml 2>/dev/null)"
1292+
if [ -f "$dirvad/menu.sh" ];then
1293+
code_option="$($dirvad/menu.sh code_option 2>/dev/null)"
1294+
code_shell="$($dirvad/menu.sh code_shell 2>/dev/null)"
12961295
fi
12971296

12981297
# Phát hiện root
@@ -1312,32 +1311,63 @@ fi
13121311

13131312
# Load trang
13141313
if [ -n "$(gprop name $vadd)" ];then
1314+
# Xác nhận có google dịch
1315+
if [ "$(grep -cm1 trans_add "$dirvad/index.sh")" == 1 ];then
1316+
google_trankk='<option type="default" id="v1" auto-off="true" reload="true" interruptible="false" >'$google_translate_text'</option>'
1317+
google_tran_shellkk='elif [ "$menu_id" == "v1" ];then
1318+
[ "$(glog auto_trans_text_'${dirvad##*/}')" == 1 ] && slog auto_trans_text_'${dirvad##*/}' 0 || slog auto_trans_text_'${dirvad##*/}' 1'
1319+
fi
13151320
xml_print '<group>
13161321
<page icon="'`iccpng icon`'" '$pagesh'>
13171322
<title>'$(gprop name $vadd)'</title>
13181323
<desc>'$desc_tec'</desc>
13191324
'$summss'
13201325
'$farooot'
1321-
'"$code_menu"'
1326+
<option type="default" id="v2" auto-off="true" interruptible="false">'$pin_text'</option>
1327+
'"$google_trankk"'
1328+
<option type="refresh">'$refresh_text'</option>
1329+
'"$code_option"'
1330+
<handler>
1331+
if [ "$menu_id" == "v2" ];then
1332+
[ -f "'$dirvad'" ] && rm -f "'$dirvad'/pin" || echo > "'$dirvad'/pin"
1333+
'"$google_tran_shellkk"'
1334+
fi
1335+
'"$code_shell"'
1336+
</handler>
13221337
</page>
13231338
</group>'
13241339
fi
13251340
}
13261341

1327-
# Load trang add-on
1328-
for vadd in $(ls -1d $PATHADD/*/addon.prop 2>/dev/null); do
1329-
unset index_adds
1342+
Vips(){
1343+
index_adds=""; # Bỏ giá trị cũ tránh lưu
13301344
[ "$PATHADD" == "$AON" ] && index_adds="$(glog settadd)" || index_adds="$(glog settadd2)"
1331-
if [ "$(cat ${vadd%/*}/delete 2>/dev/null)" == 1 ];then
1332-
[ -f "${vadd%/*}/uninstall.sh" ] && ${vadd%/*}/uninstall.sh
1333-
rm -rf "${vadd%/*}"
1345+
if [ "$(cat $dirvad/delete 2>/dev/null)" == 1 ];then
1346+
[ -f "$dirvad/uninstall.sh" ] && $dirvad/uninstall.sh
1347+
rm -rf "$dirvad"
13341348
elif [ "$index_adds" == 1 ];then
13351349
Features status
13361350
elif [ "$index_adds" == 2 ];then
13371351
Features delete
13381352
else
1339-
[ "$(cat ${vadd%/*}/status 2>/dev/null)" == 1 ] || Homeadd
1340-
fi
1353+
[ "$(cat $dirvad/status 2>/dev/null)" == 1 ] || Homeadd
1354+
fi
1355+
}
1356+
1357+
# Load trang add-on có pin trước
1358+
for vadd in $PATHADD/*/addon.prop; do
1359+
[ -f "$vadd" ] || continue
1360+
dirvad="${vadd%/*}"
1361+
[ -f "$dirvad/pin" ] || continue
1362+
Vips
1363+
done
1364+
1365+
# load trang không có pin
1366+
for vadd in $PATHADD/*/addon.prop; do
1367+
[ -f "$vadd" ] || continue
1368+
dirvad="${vadd%/*}"
1369+
[ -f "$dirvad/pin" ] && continue
1370+
Vips
13411371
done
13421372
}
13431373

pio/src/main/assets/module/ZADD/add_features/menu.sh

Lines changed: 0 additions & 11 deletions
This file was deleted.

pio/src/main/assets/module/ZADD/payload_online/menu.sh

Lines changed: 0 additions & 15 deletions
This file was deleted.

pio/src/main/assets/module/ZADD/upload_file/menu.sh

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)