diff --git a/docs/EN/SettingUpAaps/BrowserBuild.md b/docs/EN/SettingUpAaps/BrowserBuild.md index ca18dc95c107..a42d9a2c91d9 100644 --- a/docs/EN/SettingUpAaps/BrowserBuild.md +++ b/docs/EN/SettingUpAaps/BrowserBuild.md @@ -63,14 +63,17 @@ GitHub now displays your personal copy of AndroidAPS. Leave this web browser tab ## 2. Preparation Steps - If you are building from an Android device, install [File Manager Plus](https://play.google.com/store/apps/details?id=com.alphainventor.filemanager) from the Google Play store. +- Download the preparation file from here: + ```{eval-rst} .. raw:: html -
-      • Download the preparation file from here
-    
+       aaps-ci-preparation.html ```
+
+
+ AndroidAPS build requires private keys, that are stored in a Java KeyStore (JKS): @@ -88,8 +91,10 @@ The AAPS app will be saved in your Google Cloud drive once built: (aaps-ci-option1)= ### AAPS-CI Option 1 – Generate JKS - Suitable for first-time users, or those without a JKS, or who have forgotten the password or alias. +- Here are examples using multiple platforms below. - Compatible with Android +(aaps-ci-option1-android)= + - Compatible with Android(The simplest, recommended as the first choice) ```{eval-rst} .. raw:: html @@ -106,7 +111,8 @@ The AAPS app will be saved in your Google Cloud drive once built: ``` - Compatible with iOS (using iPad as an example) +(aaps-ci-ios-ipad)= + - Compatible with iOS (using iPad as an example) ```{eval-rst} .. raw:: html @@ -123,6 +129,55 @@ The AAPS app will be saved in your Google Cloud drive once built: ``` +(aaps-ci-option1-computer)= +- Use a computer (supports Windows/Mac/Linux) + + Open the webpage + https://simplewebserver.org/download.html + + Install Simple HTTP Server + If you are a Windows/Mac user, you can install it from the store. + After clicking the link, you will be asked whether to allow opening it. Please choose Open Link. + ![simple_http_server](../images/Building-the-App/CI/aaps_ci_simple_http_server_store.png) + + Example on Mac: + + - get → install → open + ![simple_http_server](../images/Building-the-App/CI/aaps_ci_simple_http_server.png) + + - Click Get Started + ![simple_http_server](../images/Building-the-App/CI/aaps_ci_simple_http_server_step1.png) + + - Click Get Server + ![simple_http_server](../images/Building-the-App/CI/aaps_ci_simple_http_server_step2.png) + + - In Folder Path, select the folder where aaps-ci-preparation.html is located, and then click Create Server. + ![simple_http_server](../images/Building-the-App/CI/aaps_ci_simple_http_server_step3.png) + + - Seeing this screen means the server has been started. + ![simple_http_server](../images/Building-the-App/CI/aaps_ci_simple_http_server_step4.png) + + - Do not close Simple HTTP Server. Please switch to your browser and open + [http://127.0.0.1:8080/aaps-ci-preparation.html](http://127.0.0.1:8080/aaps-ci-preparation.html) + + - For the subsequent steps, please refer to the video below, starting from 1 minute 37 seconds. + +```{eval-rst} +.. raw:: html + + +
+
+ +
+
+``` + - As described in the video, please copy it to the corresponding field. ![aaps_ci_pr_ci](../images/Building-the-App/CI/aaps_ci_option1.png) @@ -130,6 +185,10 @@ The AAPS app will be saved in your Google Cloud drive once built: (aaps-ci-option2)= ### AAPS-CI Option 2 – Upload Existing JKS - Suitable for users who already have a JKS and know the JKS password and alias. + - Here are examples using multiple platforms below. + +(aaps-ci-option2-android)= + - Compatible with Android(The simplest, recommended as the first choice) ```{eval-rst} .. raw:: html @@ -146,6 +205,55 @@ The AAPS app will be saved in your Google Cloud drive once built: ``` +(aaps-ci-option2-computer)= +- Use a computer (supports Windows/Mac/Linux) + + Open the webpage + https://simplewebserver.org/download.html + + Install Simple HTTP Server + If you are a Windows/Mac user, you can install it from the store. + After clicking the link, you will be asked whether to allow opening it. Please choose Open Link. + ![simple_http_server](../images/Building-the-App/CI/aaps_ci_simple_http_server_store.png) + + Example on Mac: + + - get → install → open + ![simple_http_server](../images/Building-the-App/CI/aaps_ci_simple_http_server.png) + + - Click Get Started + ![simple_http_server](../images/Building-the-App/CI/aaps_ci_simple_http_server_step1.png) + + - Click Get Server + ![simple_http_server](../images/Building-the-App/CI/aaps_ci_simple_http_server_step2.png) + + - In Folder Path, select the folder where aaps-ci-preparation.html is located, and then click Create Server. + ![simple_http_server](../images/Building-the-App/CI/aaps_ci_simple_http_server_step3.png) + + - Seeing this screen means the server has been started. + ![simple_http_server](../images/Building-the-App/CI/aaps_ci_simple_http_server_step4.png) + + - Do not close Simple HTTP Server. Please switch to your browser and open + [http://127.0.0.1:8080/aaps-ci-preparation.html](http://127.0.0.1:8080/aaps-ci-preparation.html) + + - For the subsequent steps, please refer to the video below, starting from 2 minute 18 seconds. + +```{eval-rst} +.. raw:: html + + +
+
+ +
+
+``` + - As described in the video, please copy it to the corresponding field. ![aaps_ci_option2](../images/Building-the-App/CI/aaps_ci_option2.png) @@ -164,6 +272,10 @@ The AAPS app will be saved in your Google Cloud drive once built: ![aaps_ci_gdrive_auth](../images/Building-the-App/CI/aaps_ci_gdrive_auth.png) +```{warning} +Customizations are usually not necessary. This is for your information ony. +``` + (github-build-apk)= ## AAPS-CI GitHub Actions to Build the AAPS APK - Suitable for general users. @@ -216,10 +328,6 @@ The AAPS app will be saved in your Google Cloud drive once built: -------- -```{warning} -Customizations are usually not necessary. This is for your information ony. -``` - (github-cherry-pick)= ## If you want to add a specific commit to your branch, please use cherry-pick. diff --git a/docs/EN/images/Building-the-App/CI/aaps_ci_simple_http_server.png b/docs/EN/images/Building-the-App/CI/aaps_ci_simple_http_server.png new file mode 100644 index 000000000000..95ac2d4eb443 Binary files /dev/null and b/docs/EN/images/Building-the-App/CI/aaps_ci_simple_http_server.png differ diff --git a/docs/EN/images/Building-the-App/CI/aaps_ci_simple_http_server_step1.png b/docs/EN/images/Building-the-App/CI/aaps_ci_simple_http_server_step1.png new file mode 100644 index 000000000000..78f52682b58d Binary files /dev/null and b/docs/EN/images/Building-the-App/CI/aaps_ci_simple_http_server_step1.png differ diff --git a/docs/EN/images/Building-the-App/CI/aaps_ci_simple_http_server_step2.png b/docs/EN/images/Building-the-App/CI/aaps_ci_simple_http_server_step2.png new file mode 100644 index 000000000000..c292ac667f63 Binary files /dev/null and b/docs/EN/images/Building-the-App/CI/aaps_ci_simple_http_server_step2.png differ diff --git a/docs/EN/images/Building-the-App/CI/aaps_ci_simple_http_server_step3.png b/docs/EN/images/Building-the-App/CI/aaps_ci_simple_http_server_step3.png new file mode 100644 index 000000000000..bd31cd0ffb3d Binary files /dev/null and b/docs/EN/images/Building-the-App/CI/aaps_ci_simple_http_server_step3.png differ diff --git a/docs/EN/images/Building-the-App/CI/aaps_ci_simple_http_server_step4.png b/docs/EN/images/Building-the-App/CI/aaps_ci_simple_http_server_step4.png new file mode 100644 index 000000000000..cc187ec72a14 Binary files /dev/null and b/docs/EN/images/Building-the-App/CI/aaps_ci_simple_http_server_step4.png differ diff --git a/docs/EN/images/Building-the-App/CI/aaps_ci_simple_http_server_store.png b/docs/EN/images/Building-the-App/CI/aaps_ci_simple_http_server_store.png new file mode 100644 index 000000000000..4b157ca8d3d8 Binary files /dev/null and b/docs/EN/images/Building-the-App/CI/aaps_ci_simple_http_server_store.png differ