This commit is contained in:
Neo 2022-10-17 06:45:35 +01:00
parent 827660d4c6
commit 2f0380d8f0
8 changed files with 42 additions and 31 deletions

View File

@ -53,12 +53,12 @@ call python3 buildassets.py
:build :build
echo Copying new smali files... echo Copying new smali files...
call copy /Y "%~dp0\smali\loader\*.smali" "%~dp0\build\app\smali\com\loadLib\" call copy /Y "%~dp0\smali\loader\*.smali" "%~dp0\build\app\smali\com\loadLib\"
mkdir %~dp0\build\app\smali_classes2\io\kamihama\magianative\ mkdir %~dp0\build\app\smali\io\kamihama\magianative\
echo Copying magianative... echo Copying magianative...
call copy /Y "%~dp0\smali\MagiaNative\app\src\main\java\io\kamihama\magianative\*.smali" "%~dp0\build\app\smali_classes2\io\kamihama\magianative\" call copy /Y "%~dp0\smali\MagiaNative\app\src\main\java\io\kamihama\magianative\*.smali" "%~dp0\build\app\smali\io\kamihama\magianative\"
echo Copying libraries... echo Copying libraries...
call robocopy /NFL /NDL /NJH /NJS /nc /ns /e %~dp0\smali\okhttp-smali\okhttp3\ %~dp0\build\app\smali_classes2\okhttp3\ call robocopy /NFL /NDL /NJH /NJS /nc /ns /e %~dp0\smali\okhttp-smali\okhttp3\ %~dp0\build\app\smali\okhttp3\
call robocopy /NFL /NDL /NJH /NJS /nc /ns /e %~dp0\smali\okhttp-smali\okio\ %~dp0\build\app\smali_classes2\okio\ call robocopy /NFL /NDL /NJH /NJS /nc /ns /e %~dp0\smali\okhttp-smali\okio\ %~dp0\build\app\smali\okio\
echo Copying unknown... echo Copying unknown...
call robocopy /NFL /NDL /NJH /NJS /nc /ns /e %~dp0\patches\unknown\ %~dp0\build\app\unknown\ call robocopy /NFL /NDL /NJH /NJS /nc /ns /e %~dp0\patches\unknown\ %~dp0\build\app\unknown\
call copy /Y "%~dp0\patches\strings.xml" "%~dp0\build\app\res\values\strings.xml" call copy /Y "%~dp0\patches\strings.xml" "%~dp0\build\app\res\values\strings.xml"

View File

@ -53,12 +53,12 @@ call python3 buildassets.py
:build :build
echo Copying new smali files... echo Copying new smali files...
call copy /Y "%~dp0\smali\loader\*.smali" "%~dp0\build\app\smali\com\loadLib\" call copy /Y "%~dp0\smali\loader\*.smali" "%~dp0\build\app\smali\com\loadLib\"
mkdir %~dp0\build\app\smali_classes2\io\kamihama\magianative\ mkdir %~dp0\build\app\smali\io\kamihama\magianative\
echo Copying magianative... echo Copying magianative...
call copy /Y "%~dp0\smali\MagiaNative\app\src\main\java\io\kamihama\magianative\*.smali" "%~dp0\build\app\smali_classes2\io\kamihama\magianative\" call copy /Y "%~dp0\smali\MagiaNative\app\src\main\java\io\kamihama\magianative\*.smali" "%~dp0\build\app\smali\io\kamihama\magianative\"
echo Copying libraries... echo Copying libraries...
call robocopy /NFL /NDL /NJH /NJS /nc /ns /e %~dp0\smali\okhttp-smali\okhttp3\ %~dp0\build\app\smali_classes2\okhttp3\ call robocopy /NFL /NDL /NJH /NJS /nc /ns /e %~dp0\smali\okhttp-smali\okhttp3\ %~dp0\build\app\smali\okhttp3\
call robocopy /NFL /NDL /NJH /NJS /nc /ns /e %~dp0\smali\okhttp-smali\okio\ %~dp0\build\app\smali_classes2\okio\ call robocopy /NFL /NDL /NJH /NJS /nc /ns /e %~dp0\smali\okhttp-smali\okio\ %~dp0\build\app\smali\okio\
echo Copying unknown... echo Copying unknown...
call robocopy /NFL /NDL /NJH /NJS /nc /ns /e %~dp0\patches\unknown\ %~dp0\build\app\unknown\ call robocopy /NFL /NDL /NJH /NJS /nc /ns /e %~dp0\patches\unknown\ %~dp0\build\app\unknown\
call copy /Y "%~dp0\patches\strings.xml" "%~dp0\build\app\res\values\strings.xml" call copy /Y "%~dp0\patches\strings.xml" "%~dp0\build\app\res\values\strings.xml"

View File

@ -86,12 +86,12 @@ _create() {
_build() { _build() {
echo "Copying new smali files..." echo "Copying new smali files..."
cp "${BASEDIR}"/smali/loader/*.smali "${BASEDIR}/build/app/smali/com/loadLib/" cp "${BASEDIR}"/smali/loader/*.smali "${BASEDIR}/build/app/smali/com/loadLib/"
mkdir -p "${BASEDIR}/build/app/smali_classes2/io/kamihama/magianative" mkdir -p "${BASEDIR}/build/app/smali/io/kamihama/magianative"
echo "Copying magianative..." echo "Copying magianative..."
cp "${BASEDIR}"/smali/MagiaNative/app/src/main/java/io/kamihama/magianative/*.smali "${BASEDIR}/build/app/smali_classes2/io/kamihama/magianative/" cp "${BASEDIR}"/smali/MagiaNative/app/src/main/java/io/kamihama/magianative/*.smali "${BASEDIR}/build/app/smali/io/kamihama/magianative/"
echo "Copying libraries..." echo "Copying libraries..."
cp -r "${BASEDIR}/smali/okhttp-smali/okhttp3/" "${BASEDIR}/build/app/smali_classes2/okhttp3/" cp -r "${BASEDIR}/smali/okhttp-smali/okhttp3/" "${BASEDIR}/build/app/smali/okhttp3/"
cp -r "${BASEDIR}/smali/okhttp-smali/okio/" "${BASEDIR}/build/app/smali_classes2/okio/" cp -r "${BASEDIR}/smali/okhttp-smali/okio/" "${BASEDIR}/build/app/smali/okio/"
echo "Copying unknown..." echo "Copying unknown..."
cp -r "${BASEDIR}/patches/unknown/" "${BASEDIR}/build/app/unknown/" cp -r "${BASEDIR}/patches/unknown/" "${BASEDIR}/build/app/unknown/"
cp "${BASEDIR}/patches/strings.xml" "${BASEDIR}/build/app/res/values/strings.xml" cp "${BASEDIR}/patches/strings.xml" "${BASEDIR}/build/app/res/values/strings.xml"

View File

@ -1,7 +1,7 @@
diff --git a/build/app/smali_classes2/jp/f4samurai/backtrace/BacktraceHandler.smali b/build/app/smali_classes2/jp/f4samurai/backtrace/BacktraceHandler.smali diff --git a/build/app/smali/jp/f4samurai/backtrace/BacktraceHandler.smali b/build/app/smali/jp/f4samurai/backtrace/BacktraceHandler.smali
index 6bc2d4d..67e0489 100644 index 6bc2d4d..67e0489 100644
--- a/build/app/smali_classes2/jp/f4samurai/backtrace/BacktraceHandler.smali --- a/build/app/smali/jp/f4samurai/backtrace/BacktraceHandler.smali
+++ b/build/app/smali_classes2/jp/f4samurai/backtrace/BacktraceHandler.smali +++ b/build/app/smali/jp/f4samurai/backtrace/BacktraceHandler.smali
@@ -6,9 +6,9 @@ @@ -6,9 +6,9 @@
# static fields # static fields
.field private static final ANR_TIMEOUT:I = 0xbb8 .field private static final ANR_TIMEOUT:I = 0xbb8

View File

@ -1,7 +1,7 @@
diff --git a/build/app/smali_classes2/jp/f4samurai/MyApplication.smali b/build/app/smali_classes2/jp/f4samurai/MyApplication.smali diff --git a/build/app/smali/jp/f4samurai/MyApplication.smali b/build/app/smali/jp/f4samurai/MyApplication.smali
index 2a83c1d..c18fa78 100644 index 2a83c1d..c18fa78 100644
--- "a/build/app/smali_classes2/jp/f4samurai/MyApplication.smali" --- "a/build/app/smali/jp/f4samurai/MyApplication.smali"
+++ "b/build/app/smali_classes2/jp/f4samurai/MyApplication.smali" +++ "b/build/app/smali/jp/f4samurai/MyApplication.smali"
@@ -6,6 +6,7 @@ @@ -6,6 +6,7 @@
# direct methods # direct methods
.method public constructor <init>()V .method public constructor <init>()V

View File

@ -1,7 +1,7 @@
diff --git a/build/app/smali_classes2/jp/f4samurai/bridge/NativeBridge.smali b/build/app/smali_classes2/jp/f4samurai/bridge/NativeBridge.smali diff --git a/build/app/smali/jp/f4samurai/bridge/NativeBridge.smali b/build/app/smali/jp/f4samurai/bridge/NativeBridge.smali
index 6012fad..681a112 100644 index 6012fad..681a112 100644
--- a/build/app/smali_classes2/jp/f4samurai/bridge/NativeBridge.smali --- a/build/app/smali/jp/f4samurai/bridge/NativeBridge.smali
+++ b/build/app/smali_classes2/jp/f4samurai/bridge/NativeBridge.smali +++ b/build/app/smali/jp/f4samurai/bridge/NativeBridge.smali
@@ -8,8 +8,6 @@ @@ -8,8 +8,6 @@
.field private static sAppActivity:Ljp/f4samurai/AppActivity; .field private static sAppActivity:Ljp/f4samurai/AppActivity;
@ -11,26 +11,26 @@ index 6012fad..681a112 100644
.field private static sClipboardManager:Landroid/content/ClipboardManager; .field private static sClipboardManager:Landroid/content/ClipboardManager;
@@ -36,13 +34,6 @@ @@ -36,13 +34,7 @@
sput-object v0, Ljp/f4samurai/bridge/NativeBridge;->sAppActivity:Ljp/f4samurai/AppActivity; sput-object v0, Ljp/f4samurai/bridge/NativeBridge;->sAppActivity:Ljp/f4samurai/AppActivity;
.line 37 .line 37
- new-instance v0, Ljp/f4samurai/bridge/CheatHandler; - new-instance v0, Ljp/f4samurai/bridge/CheatHandler;
- -
- sget-object v1, Ljp/f4samurai/bridge/NativeBridge;->sAppActivity:Ljp/f4samurai/AppActivity; - sget-object v1, Ljp/f4samurai/bridge/NativeBridge;->sAppActivity:Ljp/f4samurai/AppActivity;
-
- invoke-direct {v0, v1}, Ljp/f4samurai/bridge/CheatHandler;-><init>(Landroid/content/Context;)V - invoke-direct {v0, v1}, Ljp/f4samurai/bridge/CheatHandler;-><init>(Landroid/content/Context;)V
- -
- sput-object v0, Ljp/f4samurai/bridge/NativeBridge;->sCheatHandler:Ljp/f4samurai/bridge/CheatHandler; - sput-object v0, Ljp/f4samurai/bridge/NativeBridge;->sCheatHandler:Ljp/f4samurai/bridge/CheatHandler;
.line 38 .line 38
sget-object v0, Ljp/f4samurai/bridge/NativeBridge;->sAppActivity:Ljp/f4samurai/AppActivity; invoke-static {}, Ljp/f4samurai/AppActivity;->getContext()Landroid/content/Context;
@@ -535,11 +526,7 @@ @@ -531,11 +523,8 @@
.locals 1 .locals 1
.line 181 .line 181
- sget-object v0, Ljp/f4samurai/bridge/NativeBridge;->sCheatHandler:Ljp/f4samurai/bridge/CheatHandler; - sget-object v0, Ljp/f4samurai/bridge/NativeBridge;->sCheatHandler:Ljp/f4samurai/bridge/CheatHandler;
-
- invoke-virtual {v0}, Ljp/f4samurai/bridge/CheatHandler;->isUnauthorizedUser()Z - invoke-virtual {v0}, Ljp/f4samurai/bridge/CheatHandler;->isUnauthorizedUser()Z
- -
- move-result v0 - move-result v0
@ -38,7 +38,7 @@ index 6012fad..681a112 100644
return v0 return v0
.end method .end method
@@ -630,13 +617,6 @@ @@ -626,13 +615,6 @@
.locals 2 .locals 2
.line 121 .line 121
@ -52,7 +52,7 @@ index 6012fad..681a112 100644
return-void return-void
.end method .end method
@@ -645,13 +625,6 @@ @@ -641,13 +623,6 @@
.locals 2 .locals 2
.line 130 .line 130
@ -66,7 +66,7 @@ index 6012fad..681a112 100644
return-void return-void
.end method .end method
@@ -660,13 +633,6 @@ @@ -656,13 +631,6 @@
.locals 2 .locals 2
.line 112 .line 112

View File

@ -20,6 +20,16 @@
<string name="abc_font_family_menu_material">sans-serif</string> <string name="abc_font_family_menu_material">sans-serif</string>
<string name="abc_font_family_subhead_material">sans-serif</string> <string name="abc_font_family_subhead_material">sans-serif</string>
<string name="abc_font_family_title_material">sans-serif-medium</string> <string name="abc_font_family_title_material">sans-serif-medium</string>
<string name="abc_menu_alt_shortcut_label">Alt+</string>
<string name="abc_menu_ctrl_shortcut_label">Ctrl+</string>
<string name="abc_menu_delete_shortcut_label">delete</string>
<string name="abc_menu_enter_shortcut_label">enter</string>
<string name="abc_menu_function_shortcut_label">Function+</string>
<string name="abc_menu_meta_shortcut_label">Meta+</string>
<string name="abc_menu_shift_shortcut_label">Shift+</string>
<string name="abc_menu_space_shortcut_label">space</string>
<string name="abc_menu_sym_shortcut_label">Sym+</string>
<string name="abc_prepend_shortcut_label">Menu+</string>
<string name="abc_search_hint">Search…</string> <string name="abc_search_hint">Search…</string>
<string name="abc_searchview_description_clear">Clear query</string> <string name="abc_searchview_description_clear">Clear query</string>
<string name="abc_searchview_description_query">Search query</string> <string name="abc_searchview_description_query">Search query</string>
@ -139,4 +149,5 @@
<string name="tagmanager_preview_dialog_message">Preview mode updated.</string> <string name="tagmanager_preview_dialog_message">Preview mode updated.</string>
<string name="tagmanager_preview_dialog_title">Preview</string> <string name="tagmanager_preview_dialog_title">Preview</string>
<string name="wallet_buy_button_place_holder">Buy with Google</string> <string name="wallet_buy_button_place_holder">Buy with Google</string>
<string name="androidx_startup">androidx.startup</string>
</resources> </resources>

View File

@ -7,6 +7,6 @@
/************************** /**************************
* Magia Translate Ver * * Magia Translate Ver *
**************************/ **************************/
#define MT_VERSION 117 #define MT_VERSION 118
#endif #endif