From 7a00f663a93289ccb83e6c98fcbd770355018095 Mon Sep 17 00:00:00 2001
From: aiselp <aiselpk@gmail.com>
Date: Thu, 7 Aug 2025 19:29:18 +0800
Subject: [PATCH] ui fix,add ariaNg

---
 app/.gitignore                                |   1 +
 app/build.gradle                              |  25 ++-
 app/src/main/AndroidManifest.xml              |   9 +-
 .../gianlu/aria2android/AriaNgActivity.java   |  70 ++++++
 .../com/gianlu/aria2android/BastActivity.java |   6 +
 .../aria2android/ConfigEditorActivity.java    | 205 ++++++++++++++++++
 .../com/gianlu/aria2android/MainActivity.java |   7 +-
 .../main/res/drawable-anydpi/ic_ariang.xml    |  21 ++
 app/src/main/res/drawable-hdpi/ic_ariang.png  | Bin 0 -> 557 bytes
 app/src/main/res/drawable-mdpi/ic_ariang.png  | Bin 0 -> 392 bytes
 app/src/main/res/drawable-xhdpi/ic_ariang.png | Bin 0 -> 758 bytes
 .../main/res/drawable-xxhdpi/ic_ariang.png    | Bin 0 -> 1145 bytes
 app/src/main/res/layout/ariang_layout.xml     |  13 ++
 app/src/main/res/layout/config_editor.xml     |  20 ++
 app/src/main/res/menu/main.xml                |   5 +
 app/src/main/res/values-night/styles.xml      |   3 +-
 app/src/main/res/values/strings.xml           |   1 +
 app/src/main/res/values/styles.xml            |  12 +-
 18 files changed, 390 insertions(+), 8 deletions(-)
 create mode 100644 app/src/main/java/com/gianlu/aria2android/AriaNgActivity.java
 create mode 100644 app/src/main/java/com/gianlu/aria2android/BastActivity.java
 create mode 100644 app/src/main/java/com/gianlu/aria2android/ConfigEditorActivity.java
 create mode 100644 app/src/main/res/drawable-anydpi/ic_ariang.xml
 create mode 100644 app/src/main/res/drawable-hdpi/ic_ariang.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_ariang.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_ariang.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_ariang.png
 create mode 100644 app/src/main/res/layout/ariang_layout.xml
 create mode 100644 app/src/main/res/layout/config_editor.xml

diff --git a/app/.gitignore b/app/.gitignore
index 796b96d1..e8d6c3ff 100644
--- a/app/.gitignore
+++ b/app/.gitignore
@@ -1 +1,2 @@
 /build
+src/main/assets/ariang
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 4f011098..1bc38d60 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,6 +2,7 @@ import com.github.triplet.gradle.androidpublisher.ReleaseStatus
 
 plugins {
     id 'com.github.triplet.play' version '3.12.1'
+    id 'de.undercouch.download' version '5.6.0'
 }
 
 apply plugin: 'com.android.application'
@@ -21,6 +22,9 @@ android {
         versionCode 77
         versionName "2.7.0"
     }
+    buildFeatures {
+        viewBinding true
+    }
 
     if (isCi) {
         signingConfigs {
@@ -88,6 +92,7 @@ android {
             useLegacyPackaging = true
         }
     }
+    compileSdk 36
 }
 
 play {
@@ -108,4 +113,22 @@ dependencies {
     }
 }
 
-apply plugin: 'com.google.gms.google-services'
\ No newline at end of file
+apply plugin: 'com.google.gms.google-services'
+
+tasks.register('downloadAriaNg', Download) {
+    src 'https://github.com/mayswind/AriaNg/releases/download/1.3.11/AriaNg-1.3.11-AllInOne.zip'
+    dest layout.buildDirectory.file('AriaNg-1.3.11-AllInOne.zip')
+    overwrite false
+}
+
+tasks.register('installAriaNg', Copy) {
+    dependsOn downloadAriaNg
+    from zipTree(tasks.downloadAriaNg.dest)
+    into project.file('src/main/assets/ariang')
+}
+tasks.named("preBuild").configure {
+    dependsOn tasks.installAriaNg
+}
+tasks.named('clean').configure {
+    delete project.file('src/main/assets/ariang')
+}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index acaaf39f..87a4ff97 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -11,6 +11,7 @@
 
     <!-- You know... -->
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <!-- Import bin -->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <!-- Start service on boot -->
@@ -30,6 +31,7 @@
         android:label="@string/app_name"
         android:resizeableActivity="true"
         android:supportsRtl="true"
+        android:usesCleartextTraffic="true"
         android:theme="@style/AppTheme"
         tools:ignore="GoogleAppIndexingWarning">
 
@@ -64,11 +66,16 @@
             </intent-filter>
         </activity>
 
+        <activity android:name=".AriaNgActivity"
+            android:theme="@style/AppTheme.NoActionBar"/>
         <!-- Preferences activity -->
         <activity
             android:name=".PreferenceActivity"
             android:configChanges="uiMode" />
-
+        <activity
+            android:name=".ConfigEditorActivity"
+            android:theme="@style/Theme.MaterialComponents.DayNight.NoActionBar"
+            android:configChanges="uiMode" />
         <!-- Boot completed receiver -->
         <receiver
             android:name=".BootCompletedReceiver"
diff --git a/app/src/main/java/com/gianlu/aria2android/AriaNgActivity.java b/app/src/main/java/com/gianlu/aria2android/AriaNgActivity.java
new file mode 100644
index 00000000..b64878e8
--- /dev/null
+++ b/app/src/main/java/com/gianlu/aria2android/AriaNgActivity.java
@@ -0,0 +1,70 @@
+package com.gianlu.aria2android;
+
+import android.os.Bundle;
+import android.util.Base64;
+import android.webkit.WebResourceRequest;
+import android.webkit.WebResourceResponse;
+import android.webkit.WebSettings;
+import android.webkit.WebView;
+
+import androidx.annotation.Nullable;
+
+import com.gianlu.aria2android.databinding.AriangLayoutBinding;
+import com.gianlu.aria2lib.Aria2PK;
+
+import java.io.IOException;
+import java.util.Objects;
+
+public class AriaNgActivity extends BastActivity {
+    WebView webView;
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        AriangLayoutBinding binding = AriangLayoutBinding.inflate(getLayoutInflater());
+        setContentView(binding.getRoot());
+        webView = binding.ariangWebview;
+        setupWebView();
+    }
+
+    void setupWebView() {
+        WebSettings settings = webView.getSettings();
+        webView.setWebViewClient(new WebViewClient());
+        settings.setJavaScriptEnabled(true);
+        settings.setDomStorageEnabled(true);
+        webView.loadUrl(getUri());
+    }
+
+    private String getUri() {
+        String secret = Base64.encodeToString(Aria2PK.RPC_TOKEN.fallback().getBytes(), Base64.DEFAULT);
+        return "http://ariang.local/index.html" +
+                "#!/settings/rpc/set?" +
+                "protocol=ws&" +
+                "host=127.0.0.1&" +
+                "port=" + Aria2PK.RPC_PORT.fallback() + "&" +
+                "interface=jsonrpc&" +
+                "secret=" + secret;
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        if (webView != null) webView.destroy();
+    }
+
+    static class WebViewClient extends android.webkit.WebViewClient {
+        @Nullable
+        @Override
+        public WebResourceResponse shouldInterceptRequest(WebView view, WebResourceRequest request) {
+            if (Objects.equals(request.getUrl().getPath(), "/index.html")) {
+                try {
+                    return new WebResourceResponse("text/html", "utf-8",
+                            view.getContext().getAssets().open("ariang/index.html"));
+                } catch (IOException e) {
+                    return null;
+                }
+            }
+            return super.shouldInterceptRequest(view, request);
+        }
+    }
+}
diff --git a/app/src/main/java/com/gianlu/aria2android/BastActivity.java b/app/src/main/java/com/gianlu/aria2android/BastActivity.java
new file mode 100644
index 00000000..9293e9b5
--- /dev/null
+++ b/app/src/main/java/com/gianlu/aria2android/BastActivity.java
@@ -0,0 +1,6 @@
+package com.gianlu.aria2android;
+
+import com.gianlu.commonutils.dialogs.ActivityWithDialog;
+
+public class BastActivity extends ActivityWithDialog {
+}
diff --git a/app/src/main/java/com/gianlu/aria2android/ConfigEditorActivity.java b/app/src/main/java/com/gianlu/aria2android/ConfigEditorActivity.java
new file mode 100644
index 00000000..18bcdf35
--- /dev/null
+++ b/app/src/main/java/com/gianlu/aria2android/ConfigEditorActivity.java
@@ -0,0 +1,205 @@
+package com.gianlu.aria2android;
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.content.ActivityNotFoundException;
+import android.content.Intent;
+import android.os.Build;
+import android.os.Bundle;
+import android.util.Log;
+import android.util.Pair;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.gianlu.aria2android.databinding.ConfigEditorBinding;
+import com.gianlu.aria2lib.Aria2PK;
+import com.gianlu.aria2lib.R;
+import com.gianlu.aria2lib.ui.ImportExportUtils;
+import com.gianlu.aria2lib.ui.SimpleOptionsAdapter;
+import com.gianlu.commonutils.CommonUtils;
+import com.gianlu.commonutils.misc.RecyclerMessageView;
+import com.gianlu.commonutils.preferences.CommonPK;
+import com.gianlu.commonutils.preferences.Prefs;
+import com.gianlu.commonutils.preferences.json.JsonStoring;
+import com.gianlu.commonutils.ui.Toaster;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.google.android.material.textfield.TextInputLayout;
+
+import org.json.JSONException;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+
+public class ConfigEditorActivity extends BastActivity implements SimpleOptionsAdapter.Listener {
+    private static final int IMPORT_CODE = 1;
+    private static final String TAG = "ConfigEditorActivity";
+    private SimpleOptionsAdapter adapter;
+    private RecyclerMessageView rmv;
+
+    private void load() throws JSONException {
+        adapter.load(JsonStoring.intoPrefs().getJsonObject(Aria2PK.CUSTOM_OPTIONS));
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        ConfigEditorBinding binding = ConfigEditorBinding.inflate(getLayoutInflater());
+        rmv = binding.content;
+        setContentView(binding.getRoot());
+        binding.toolbar.setTitle(R.string.customOptions);
+        binding.toolbar.setNavigationIcon(androidx.appcompat.R.drawable.abc_ic_ab_back_material);
+        binding.toolbar.setNavigationOnClickListener(view -> onBackPressed());
+
+        getMenuInflater().inflate(R.menu.aria2lib_config_editor, binding.toolbar.getMenu());
+        binding.toolbar.setOnMenuItemClickListener(this::onOptionsItemSelected);
+        setNight();
+
+        rmv.linearLayoutManager(RecyclerView.VERTICAL, false);
+        rmv.dividerDecoration(RecyclerView.VERTICAL);
+        adapter = new SimpleOptionsAdapter(this, this);
+        rmv.loadListData(adapter);
+
+        try {
+            load();
+        } catch (JSONException ex) {
+            Log.e(TAG, "Failed loading JSON.", ex);
+            Toaster.with(this).message(R.string.failedLoadingOptions).show();
+            onBackPressed();
+        }
+    }
+
+    private void setNight() {
+        boolean b = Prefs.getBoolean(CommonPK.NIGHT_MODE, false);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            View decor = getWindow().getDecorView();
+            int flags = decor.getSystemUiVisibility();
+            if (!b) {
+                flags |= View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR;
+            } else {
+                flags &= ~View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR;
+            }
+            decor.setSystemUiVisibility(flags);
+        }
+    }
+
+    private void save() {
+        try {
+            JsonStoring.intoPrefs().putJsonObject(Aria2PK.CUSTOM_OPTIONS, ImportExportUtils.toJson(adapter.get()));
+            adapter.saved();
+        } catch (JSONException ex) {
+            Log.e(TAG, "Failed saving JSON.", ex);
+            Toaster.with(this).message(R.string.failedSavingCustomOptions).show();
+        }
+    }
+
+    @SuppressLint("InflateParams")
+    private void showAddDialog() {
+        LinearLayout layout = (LinearLayout) getLayoutInflater().inflate(R.layout.aria2lib_dialog_new_option, null, false);
+        TextInputLayout key = layout.findViewById(R.id.editOptionDialog_key);
+        TextInputLayout value = layout.findViewById(R.id.editOptionDialog_value);
+
+        MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this);
+        builder.setTitle(R.string.newOption).setView(layout)
+                .setPositiveButton(R.string.apply, (dialogInterface, i) -> {
+                    String keyStr = CommonUtils.getText(key);
+                    if (keyStr.startsWith("--")) keyStr = keyStr.substring(2);
+                    adapter.add(new Pair<>(keyStr, CommonUtils.getText(value)));
+                }).setNegativeButton(android.R.string.cancel, null);
+
+        showDialog(builder);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == IMPORT_CODE) {
+            if (resultCode == Activity.RESULT_OK && data.getData() != null) {
+                try {
+                    InputStream in = getContentResolver().openInputStream(data.getData());
+                    if (in == null || adapter == null) return;
+
+                    try {
+                        adapter.add(ImportExportUtils.readConfigFromStream(in));
+                    } catch (IOException | OutOfMemoryError ex) {
+                        Toaster.with(this).message(R.string.cannotImport).show();
+                    }
+                } catch (FileNotFoundException ex) {
+                    Toaster.with(this).message(R.string.fileNotFound).show();
+                }
+            }
+        } else {
+            super.onActivityResult(requestCode, resultCode, data);
+        }
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(@NonNull MenuItem item) {
+        int id = item.getItemId();
+        if (id == R.id.configEditor_add) {
+            showAddDialog();
+            return true;
+        } else if (id == android.R.id.home) {
+            if (adapter.hasChanged()) {
+                AlertDialog.Builder builder = new AlertDialog.Builder(this);
+                builder.setTitle(R.string.unsavedChanges)
+                        .setMessage(R.string.unsavedChanges_message)
+                        .setPositiveButton(R.string.yes, (dialogInterface, i) -> {
+                            save();
+                            onBackPressed();
+                        })
+                        .setNegativeButton(R.string.no, (dialogInterface, i) -> onBackPressed())
+                        .setNeutralButton(android.R.string.cancel, null);
+
+                showDialog(builder);
+            } else {
+                onBackPressed();
+            }
+
+            return true;
+        } else if (id == R.id.configEditor_import) {
+            try {
+                startActivityForResult(Intent.createChooser(ImportExportUtils.createConfigImportIntent(), getString(R.string.importConfig)), IMPORT_CODE);
+            } catch (ActivityNotFoundException ex) {
+                Toaster.with(this).message(R.string.missingFileExplorer).show();
+            }
+            return true;
+        } else if (id == R.id.configEditor_done) {
+            save();
+            onBackPressed();
+            return true;
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    @SuppressLint("InflateParams")
+    public void onEditOption(@NonNull Pair<String, String> option) {
+        FrameLayout layout = (FrameLayout) getLayoutInflater().inflate(R.layout.aria2lib_dialog_edit_option, null, false);
+        TextInputLayout newValue = layout.findViewById(R.id.editOptionDialog_value);
+        CommonUtils.setText(newValue, option.second);
+
+        MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this);
+        builder.setTitle(option.first)
+                .setView(layout)
+                .setPositiveButton(R.string.apply, (dialogInterface, i) -> {
+                    String newValueStr = CommonUtils.getText(newValue);
+                    if (!newValueStr.equals(option.second))
+                        adapter.set(new Pair<>(option.first, newValueStr));
+                })
+                .setNegativeButton(android.R.string.cancel, null);
+
+        showDialog(builder);
+    }
+
+    @Override
+    public void onItemsCountChanged(int count) {
+        if (count <= 0) rmv.showInfo(R.string.noCustomOptions);
+        else rmv.showList();
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/gianlu/aria2android/MainActivity.java b/app/src/main/java/com/gianlu/aria2android/MainActivity.java
index 3eb0dba2..3b845a05 100644
--- a/app/src/main/java/com/gianlu/aria2android/MainActivity.java
+++ b/app/src/main/java/com/gianlu/aria2android/MainActivity.java
@@ -11,9 +11,7 @@
 
 import com.gianlu.aria2lib.BadEnvironmentException;
 import com.gianlu.aria2lib.ui.Aria2ConfigurationScreen;
-import com.gianlu.aria2lib.ui.ConfigEditorActivity;
 import com.gianlu.aria2lib.ui.ImportExportUtils;
-import com.gianlu.commonutils.dialogs.ActivityWithDialog;
 import com.gianlu.commonutils.preferences.Prefs;
 import com.google.android.material.bottomappbar.BottomAppBar;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
@@ -21,7 +19,7 @@
 
 import java.io.IOException;
 
-public class MainActivity extends ActivityWithDialog implements ControlActivityDelegate.UpdateToggle {
+public class MainActivity extends BastActivity implements ControlActivityDelegate.UpdateToggle {
     private static final String TAG = MainActivity.class.getSimpleName();
     private ControlActivityDelegate delegate;
     private FloatingActionButton toggleServer;
@@ -112,6 +110,9 @@ public boolean onCreateOptionsMenu(Menu menu) {
     @Override
     public boolean onOptionsItemSelected(@NonNull MenuItem item) {
         switch (item.getItemId()) {
+            case R.id.mainMenu_ariaNg:
+                startActivity(new Intent(this, AriaNgActivity.class));
+                return true;
             case R.id.mainMenu_preferences:
                 startActivity(new Intent(this, PreferenceActivity.class));
                 return true;
diff --git a/app/src/main/res/drawable-anydpi/ic_ariang.xml b/app/src/main/res/drawable-anydpi/ic_ariang.xml
new file mode 100644
index 00000000..40954fcd
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi/ic_ariang.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="216"
+    android:viewportHeight="203.0625"
+    android:tint="#333333">
+  <group android:scaleX="0.9917355"
+      android:scaleY="0.9323347"
+      android:translateX="0.892562"
+      android:translateY="-14.107389">
+    <group android:translateY="158.48438">
+      <path android:pathData="M10.765625,-103.078125L40.5,-103.078125L79.3125,-46.0625L79.3125,-103.078125L109.34375,-103.078125L109.34375,-0L79.3125,-0L40.71875,-56.609375L40.71875,-0L10.765625,-0L10.765625,-103.078125Z"
+          android:fillColor="#000000"
+          android:fillAlpha="0.6"/>
+      <path android:pathData="M180.60938,-74.671875L207.40625,-74.671875L207.40625,-4.15625L207.46875,-0.84375Q207.46875,6.1875,204.48438,12.546875Q201.5,18.921875,196.53125,22.859375Q191.57812,26.796875,183.95312,28.546875Q176.32812,30.3125,166.48438,30.3125Q143.98438,30.3125,135.57812,23.5625Q127.171875,16.8125,127.171875,5.484375Q127.171875,4.078125,127.3125,1.6875L155.09375,4.859375Q156.14062,8.71875,158.32812,10.203125Q161.48438,12.375,166.26562,12.375Q172.45312,12.375,175.51562,9.0625Q178.57812,5.765625,178.57812,-2.46875L178.57812,-13.78125Q174.35938,-8.796875,170.14062,-6.546875Q163.53125,-3.03125,155.85938,-3.03125Q140.89062,-3.03125,131.67188,-16.109375Q125.140625,-25.390625,125.140625,-40.640625Q125.140625,-58.078125,133.57812,-67.21875Q142.01562,-76.359375,155.65625,-76.359375Q164.375,-76.359375,170.03125,-73.40625Q175.6875,-70.453125,180.60938,-63.640625L180.60938,-74.671875ZM153.6875,-38.46875Q153.6875,-30.375,157.125,-26.46875Q160.57812,-22.578125,166.20312,-22.578125Q171.54688,-22.578125,175.15625,-26.609375Q178.78125,-30.65625,178.78125,-38.8125Q178.78125,-46.96875,174.98438,-51.296875Q171.1875,-55.625,165.70312,-55.625Q160.21875,-55.625,156.95312,-51.640625Q153.6875,-47.671875,153.6875,-38.46875Z"
+          android:fillColor="#000000"
+          android:fillAlpha="0.6"/>
+    </group>
+  </group>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-hdpi/ic_ariang.png b/app/src/main/res/drawable-hdpi/ic_ariang.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec11088d0dbc699e9b137c5f14f7f513c42ce46b
GIT binary patch
literal 557
zcmV+|0@D47P)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ0005>Nkl<ZcwX&S
zO-sW-6s#3LQ4r5XMIwbl#5M_th*rHRsNhKtMZ61wAVqo+sUWBoMAU!lJk09ruqJ66
zb1?%$+BdU#v)z|K3xymxa%6-R3)o}8J^{+Z>>CKa?|(3>)#@hu1nd*m>-BN=4Fql=
z^gQp)ah$Ov-b@08p&pWWGYb@k+KTgL8mLyQy~9$B^4bDnorBHX;@Sb9@cE`vsmzAj
zHNLkDF|U5tVs6014eq1790>kX_NaTU%6#e?pMtds6T8^?&8q{!H_v(;`wAq)D`$pl
zLLCUdzzgeW_>8r?xIVHL>hXbWJC&p3notK~Eu6t`*zS=ikkk>X$#ol}0-;&+r_<N4
zTRh1E32aBej0yxcj3#hhcac3k1;W`cu*QrEgblTgCP4Fb_Vg4;fTL@$uBij@BQ3<H
z0@3gunv$7fz2`tc5w#9`40RwhUt&Fu{RAqM%jIeI7+PM8SL{)2bFHsH0_^^feL@Z-
zK$AW8N#jIAjlw0f%b>tMA!cKgeFmbzGikotj@08oX+kx5#lvup<J;DH5Cm%+2%cr_
zNfiik#|=?Cfi!}E8=mDUgf_(YNeyT?#|@*1ko$a()PXrUu)S|IMMs!3Ui)VVhuKBb
vBbg<zg%B6G9?L(KQmHh-YjWhs@$c{n9RUP!{)z&(00000NkvXXu0mjfhHv}+

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/ic_ariang.png b/app/src/main/res/drawable-mdpi/ic_ariang.png
new file mode 100644
index 0000000000000000000000000000000000000000..9757980a05daf35289419176b2490d9ee1352ae2
GIT binary patch
literal 392
zcmV;30eAk1P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0003`Nkl<ZcwX&P
zJxc>o5KLkaRMLwcSRP(+-<5)em6qu(QlyI5i3E~P1Q9fdABq3g8F(w}yG^)+6e+T>
z+`FBbop<;4uF=@WMnsyXXJuJlGr9J0!I(Z)D~h5RLj1$b^L!Qr!JftiW9oYC&<0|H
za#QfN8#t4m;0p}e;GH77S(cqR?z!Y2%Q9d>bmT-817grkJ^t9@{xiV(UDnvy2jCq`
z1m2_4eBnCMyhR2BG=5X}_m)W4!Z7Tx2Hlm#tr(!x(nL#S)i`}t-7=7Gqn1GwMTe~6
z2`(+JY2cbX%`-r=TczP)PdMHdcdh|;w(AbCD#D2BfndVm#^hqW?ofDP>iK6RNs<Z1
z)R@DMp)a|H;l63GN}$;*noMwgj^j9B4MrEr;M3PE6=>YoyY<uhX)Yajoewbj)`!b8
mTT62<T6j$d{$F?-n-RZ3tl|^&khA&#0000<MNUMnLSTY^F1KC)

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_ariang.png b/app/src/main/res/drawable-xhdpi/ic_ariang.png
new file mode 100644
index 0000000000000000000000000000000000000000..1b1ee8bb22fb36803ab222fd962443b5e6775e3d
GIT binary patch
literal 758
zcmV<S0tx+zP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0008LNkl<ZcwX(7
z&1+LZ6vdO+78MmyQ4CSCh$M!5zlR$|#DyzC+!PfTc46JP6kJpkO8tPMsMN3j)^i`Z
z_Ii9Xee*(NQ|7>rgqbsU=FGgwBb7>2R8&+{)M3zMG8v?4`YVqlNglD^s^9N-c#JX_
z49>HEU*roQz_P+)R0|ORr|=E7DvuK_L;wMv$2?B7FaZRd#6=#vXaT-d=uw(AK)2gn
z>2x}0xjjfl1587_v|~#KSi+oZ>=)4fT>8bteG1hI3n0LMRmYYHP{k&EWv@m0;j3}G
z!Ucl^V1n;DHZVXH?K|wtLmpRdQ>bQm00Cp($k>noXuHOqGT54#khaez#r3RCX@>;x
z?JDM3mq!!a<vzyN%;Y-(`IV3t8MiA4;0(_JxL=uG+&^kG8pqgUvEEF+6F}dxub|uq
zZc~Z|upSlazF?ozzt;(fXFMK1;J&@E0i+K1E4wS%)o3)j#XhIMNB|Lb<umvDnB@dg
z&xL1i;Q-i`)A0UekBeCXV4f%JbNY)05TWfJdt4L^fRo*{KHr@atT$6g01+nqz`i^<
z0Ona`kAj*X(SN(hU9&Z{a8LlWonT)c9H3sW9}js1UD%qLLIa3!AFi{P;Q%7+aF=~~
zU`=niP2rlQ0*G+z@7Zt33n0RL341LF`EWQKj=5dodZhzEN7!$11(<3H8*m46Z;2P5
zJNSIo>-8>4XHWn<4p&g@RUYVGX1^77E9Ef?!k=M(QOSkog*yYxOIXx4_=Irpz-xS8
z!v@@JHk(Ityz9L1gAibY7b76dcE$WvZMWMe*`uJwswp{NVWBs8K_SRbFlu-o>3x+<
z4u0^$ih=-7x#rv@FSEq+|H8vx{~7+bYS_*DIg9)Ux$yGl=K=>xtyb$4e*Z6Ev6u1g
oXyEf4nrrNfii(PgiaJ#K4YtaD4~B%k7XSbN07*qoM6N<$f_6q;eE<Le

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_ariang.png b/app/src/main/res/drawable-xxhdpi/ic_ariang.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f4a0adce2f051ab30bbdd959d31f31280945470
GIT binary patch
literal 1145
zcmV-<1cv*GP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!000C)Nkl<ZcwX(A
z>uVE16vfk*4^XREAJr%^tVxq5t$9g7d{j^bQT(Ey1^pr@NJXJ)QNb@hYU=~Et@_`3
zuF1moWOjEp*<G{UIq;)t_TD=)Co{XVn`AOZMn*<PMn*<PMn*<PMuV<qv-w>I&ht~f
zUO&$@RLsuK&U5ZS37!0-$raA^QlrtBSJdbN23_Ucff9Gv3(K;0a=x2VX%Ggz#`$ha
zr9lD)ew}Nmlv;y?d_F(Uby%r32!sE^by%r3NT}6n_qmo+sW%AwoZqch>nPW=m3o5&
znDmqD*^0`bYPFh2?FV29?Y{@_@Olw{Z(vp*;&{}b_F`scrpP&4#2pR_I`)Wbio!PN
z48*xA(4UQRxxB~D<Kqna`PJD@mpGvp&`8%+Elh(@>m%oRf%spT8K)$dk1??rB%su=
zvu;=h1vSS;&XJ{3X_DV(Vl#-BS{MeQ<^souO>71U7?5Sx4Z)ycSt=YKHnAE6)=_d)
z>gpPVbFcC#0nEP4u~873LFn)^eoqA&d@FTz4RV`79Op%`SlpXwe=s9xcLHp3j2odD
zgwSDr&kbBb>Twx_cE&gt8j?L4$Epa^AlY;s=l4~}6-0N5sFoNyJ<f3|(8e{+wS~RV
z4vtq5szD+YT;gLYbf>w>Anb^bahwXYaguYLLd+`XFrgbH(w)9KsFs*q4LMGQWm)?;
z*D2I_!8uGM2H{iB@$p{i(;&}Bz!>}@=P;2NBtqeb9McObgLKbz&U-GEbWR7686;}9
zzq;v)4T8!b%+UQDr^4?XgySom!$fLOwOT#EaY0cTB;q&~7~DP1b7)kqrkuk>YLEz>
zxWlnQ=*J+zZJD88pE*`V<OYe*$PbR!#myiLaE@bD$Si5KTGP2)ZdW#&-HlD^VHq^X
zxe<#&(m9UT#m%5hfSr3k#A1*L4c+1#9Xt%`d->`Rn?WKBXr1%?@G?k*n%_7_mw`A*
zJ0*A3I-PRjXAlN31~xd)59BQWx1F??5POqzz3?;076$v0bKOAfLMLbN3=%aoHfT1w
z28lYiIO|-)28O(mE14ZXum;Ie<9s)Q8064MrBXS9OL_$+ShDlx0FjPCa*pG?EvnUO
z7j)n}KcUm7xrPc1GRwIg{d;uVk7P!%AqrMGFA=J@zcJmEC4ko-I)l9nQ=5K|Icy<!
zO<~9u8l6YPi4zQY&4XbO<NAXxx%zRu3e<SQxrtC+bCZare2H^2?XQfqZhs1e!UQKL
zLQ_*y2YE1Vz>H5=dXHh&ZT$aSmL|ujkT`BPNgC>9gBS$aHgKbf5(aRN2Nf2Waj&?&
zL`rtWJh*<r%zVo2BwF~i%ep6BFXWs9!{@mEc9EQuCc!cf+z;febbc>1#6`EY<Ut*7
zIZj|!lyJ*(7BlUl%n-b;fkK9Uvt(psWMpJyWMpJyWMpJyv>o*qDEYj+F1e+h00000
LNkvXXu0mjfs!tP~

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/ariang_layout.xml b/app/src/main/res/layout/ariang_layout.xml
new file mode 100644
index 00000000..9ff5a5a3
--- /dev/null
+++ b/app/src/main/res/layout/ariang_layout.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    android:orientation="vertical">
+
+    <WebView
+        android:id="@+id/ariang_webview"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/config_editor.xml b/app/src/main/res/layout/config_editor.xml
new file mode 100644
index 00000000..b12a02b4
--- /dev/null
+++ b/app/src/main/res/layout/config_editor.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    android:orientation="vertical">
+
+    <com.google.android.material.appbar.MaterialToolbar
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/toolbar" />
+
+    <com.gianlu.commonutils.misc.RecyclerMessageView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/content"
+        />
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml
index e798f23b..fcefa3bf 100644
--- a/app/src/main/res/menu/main.xml
+++ b/app/src/main/res/menu/main.xml
@@ -8,6 +8,11 @@
         android:title="@string/customOptions"
         app:showAsAction="ifRoom" />
 
+    <item
+        android:id="@+id/mainMenu_ariaNg"
+        android:icon="@drawable/ic_ariang"
+        android:title="@string/ariang" />
+
     <item
         android:id="@+id/mainMenu_importExport"
         android:icon="@drawable/baseline_import_export_24"
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index 1d0dfb34..58916538 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
 
     <style name="AppTheme" parent="BaseAppTheme">
         <item name="android:statusBarColor">?android:colorBackground</item>
+        <item name="android:windowLightStatusBar" tools:targetApi="23">false</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 802df219..a30db06b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -13,4 +13,5 @@
     <string name="useNewAria2AppInstead_message">Aria2App will not provide the same functionalities of this app, but all-in-one. You are encouraged to migrate to Aria2App only if you were using the service on this device only. This app will be kept updated and working as usual.</string>
     <string name="badEnvIssue">Missing executable</string>
     <string name="badEnvIssue_message">You have installed the app correctly, but it looks like Android didn\'t extract the native libraries for this app.</string>
+    <string name="ariang">AriaNg</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f37c744f..40ad813f 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,6 +1,14 @@
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
 
-    <style name="AppTheme" parent="BaseAppTheme" />
+    <style name="AppTheme" parent="BaseAppTheme">
+        <item name="android:fitsSystemWindows">true</item>
+        <item name="android:windowLightStatusBar" tools:targetApi="23">true</item>
+    </style>
+
+    <style name="AppTheme.NoActionBar" parent="AppTheme">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
 
     <style name="AppTheme.Main" parent="AppTheme.NoActionBar">
         <item name="android:statusBarColor">?android:colorBackground</item>