From 2f626e44f9d1a3364c66c6e7bcd951321780a160 Mon Sep 17 00:00:00 2001 From: Amit Kumar Date: Thu, 10 Sep 2020 10:53:21 +0530 Subject: [PATCH 1/5] Initial changes for e-ui-sdk Change-Id: Ibc40fda5d285701f32273effa92ed1df356e6ab8 --- Android.bp | 1 + Android.mk | 26 +++++++++++++++ .../{res => res-symbol}/values/symbols.xml | 0 lineage/res/res/values/colors.xml | 3 ++ lineage/res/res/values/public.xml | 6 ++++ lineage/res/res/values/styles.xml | 32 +++++++++++++++++++ sdk/res/res/values/public.xml | 1 - 7 files changed, 68 insertions(+), 1 deletion(-) rename lineage/res/{res => res-symbol}/values/symbols.xml (100%) create mode 100644 lineage/res/res/values/public.xml create mode 100644 lineage/res/res/values/styles.xml diff --git a/Android.bp b/Android.bp index c79de214..687d0137 100644 --- a/Android.bp +++ b/Android.bp @@ -38,6 +38,7 @@ android_app { resource_dirs: [ "lineage/res/res", + "lineage/res/res-symbol", "sdk/res/res" ], diff --git a/Android.mk b/Android.mk index f8e5264c..22f2ca5d 100644 --- a/Android.mk +++ b/Android.mk @@ -62,6 +62,32 @@ LOCAL_JAVA_LIBRARIES := \ LOCAL_STATIC_JAVA_LIBRARIES := org.lineageos.platform.sdk +include $(BUILD_STATIC_JAVA_LIBRARY) +$(LOCAL_MODULE) : $(built_aar) + +# =========================================================== + +# e sdk +# ============================================================ +include $(CLEAR_VARS) + +LOCAL_MODULE := e-sdk.aar + +LOCAL_JACK_ENABLED := disabled + +LOCAL_CONSUMER_PROGUARD_FILE := $(LOCAL_PATH)/sdk/proguard.txt + +LOCAL_RESOURCE_DIR += $(addprefix $(LOCAL_PATH)/, lineage/res/res) +LOCAL_MANIFEST_FILE := lineage/res/AndroidManifest.xml + +lineage_sdk_exclude_files := 'lineageos/' +LOCAL_JAR_EXCLUDE_PACKAGES := $(lineage_sdk_exclude_files) +LOCAL_JAR_EXCLUDE_FILES := none + +LOCAL_JAVA_LIBRARIES := \ + $(lineage_sdk_LOCAL_JAVA_LIBRARIES) + + include $(BUILD_STATIC_JAVA_LIBRARY) $(LOCAL_MODULE) : $(built_aar) diff --git a/lineage/res/res/values/symbols.xml b/lineage/res/res-symbol/values/symbols.xml similarity index 100% rename from lineage/res/res/values/symbols.xml rename to lineage/res/res-symbol/values/symbols.xml diff --git a/lineage/res/res/values/colors.xml b/lineage/res/res/values/colors.xml index 8ff675b2..2be0695f 100644 --- a/lineage/res/res/values/colors.xml +++ b/lineage/res/res/values/colors.xml @@ -17,4 +17,7 @@ #FF5630 + #077fff + #1059b3 + #077fff diff --git a/lineage/res/res/values/public.xml b/lineage/res/res/values/public.xml new file mode 100644 index 00000000..dc578b79 --- /dev/null +++ b/lineage/res/res/values/public.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/lineage/res/res/values/styles.xml b/lineage/res/res/values/styles.xml new file mode 100644 index 00000000..e8f7b0a6 --- /dev/null +++ b/lineage/res/res/values/styles.xml @@ -0,0 +1,32 @@ + + + + + + + + + diff --git a/sdk/res/res/values/public.xml b/sdk/res/res/values/public.xml index d300492a..9bd75bed 100644 --- a/sdk/res/res/values/public.xml +++ b/sdk/res/res/values/public.xml @@ -10,5 +10,4 @@ - -- GitLab From e8d8ddcf9e0c96481010cb4f508865cad666257c Mon Sep 17 00:00:00 2001 From: Amit Kumar Date: Mon, 14 Sep 2020 15:44:56 +0530 Subject: [PATCH 2/5] Modify /e/ colors to use system-accent colors Change-Id: Icfe74f55e9923a3620ca05646751e4eee1584196 --- lineage/res/res/values-night/colors.xml | 23 ++++++++++++++++++ lineage/res/res/values/colors.xml | 6 ++--- lineage/res/res/values/styles.xml | 32 ------------------------- 3 files changed, 26 insertions(+), 35 deletions(-) create mode 100644 lineage/res/res/values-night/colors.xml delete mode 100644 lineage/res/res/values/styles.xml diff --git a/lineage/res/res/values-night/colors.xml b/lineage/res/res/values-night/colors.xml new file mode 100644 index 00000000..68d74d62 --- /dev/null +++ b/lineage/res/res/values-night/colors.xml @@ -0,0 +1,23 @@ + + + + + #FF5630 + @*android:color/accent_device_default_dark + @*android:color/accent_device_default_dark + @*android:color/accent_device_default_dark + diff --git a/lineage/res/res/values/colors.xml b/lineage/res/res/values/colors.xml index 2be0695f..b1e1d6f4 100644 --- a/lineage/res/res/values/colors.xml +++ b/lineage/res/res/values/colors.xml @@ -17,7 +17,7 @@ #FF5630 - #077fff - #1059b3 - #077fff + @*android:color/accent_device_default_light + @*android:color/accent_device_default_light + @*android:color/accent_device_default_light diff --git a/lineage/res/res/values/styles.xml b/lineage/res/res/values/styles.xml deleted file mode 100644 index e8f7b0a6..00000000 --- a/lineage/res/res/values/styles.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - -- GitLab From 8b919ebc74022a7ab8956cfc2e757a9344c63f9a Mon Sep 17 00:00:00 2001 From: Amit Kumar Date: Tue, 15 Sep 2020 17:57:59 +0530 Subject: [PATCH 3/5] Following changes: 1. Remove colors from night variant as of now. 2. Add more /e/ colors. Change-Id: I3ff5b30646bd9c532b327a52dc2432363e0365c8 --- lineage/res/res/values-night/colors.xml | 3 --- lineage/res/res/values/colors.xml | 25 ++++++++++++++++++++++--- lineage/res/res/values/public.xml | 24 +++++++++++++++++++++--- 3 files changed, 43 insertions(+), 9 deletions(-) diff --git a/lineage/res/res/values-night/colors.xml b/lineage/res/res/values-night/colors.xml index 68d74d62..8ff675b2 100644 --- a/lineage/res/res/values-night/colors.xml +++ b/lineage/res/res/values-night/colors.xml @@ -17,7 +17,4 @@ #FF5630 - @*android:color/accent_device_default_dark - @*android:color/accent_device_default_dark - @*android:color/accent_device_default_dark diff --git a/lineage/res/res/values/colors.xml b/lineage/res/res/values/colors.xml index b1e1d6f4..517f9880 100644 --- a/lineage/res/res/values/colors.xml +++ b/lineage/res/res/values/colors.xml @@ -17,7 +17,26 @@ #FF5630 - @*android:color/accent_device_default_light - @*android:color/accent_device_default_light - @*android:color/accent_device_default_light + + + + #FB3846FF + #007FFFFF + #24527EFF + #FC7222FF + #C8CED0FF + #848484FF + #38D874FF + + + @color/color_default_blue1 + @color/color_default_blue2 + @color/color_default_green1 + #CC000000 + #8C000000 + @color/gray1 + @android:color/white + diff --git a/lineage/res/res/values/public.xml b/lineage/res/res/values/public.xml index dc578b79..35c3e494 100644 --- a/lineage/res/res/values/public.xml +++ b/lineage/res/res/values/public.xml @@ -1,6 +1,24 @@ - - - + + + + + + + + + + + + + + + + + -- GitLab From d895a3c3990b4336a2e2cea075cb14a6fe0bff44 Mon Sep 17 00:00:00 2001 From: Amit Kumar Date: Tue, 15 Sep 2020 21:58:10 +0530 Subject: [PATCH 4/5] Fix incorrect value for color_default_background Change-Id: I3c2fe056325fcb9c512c87f2f6b94f5ac8905e71 --- lineage/res/res/values/colors.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lineage/res/res/values/colors.xml b/lineage/res/res/values/colors.xml index 517f9880..244fb574 100644 --- a/lineage/res/res/values/colors.xml +++ b/lineage/res/res/values/colors.xml @@ -36,7 +36,7 @@ @color/color_default_green1 #CC000000 #8C000000 - @color/gray1 + @color/color_default_gray1 @android:color/white -- GitLab From 8313d160bed62a6405bde68220f939cae865a434 Mon Sep 17 00:00:00 2001 From: Amit Kumar Date: Mon, 21 Sep 2020 18:08:47 +0530 Subject: [PATCH 5/5] Following changes: 1. Fix color code for default colors 2. Add script to generate e-ui-sdk.jar Change-Id: I598290a37912eb2fa801a9731d53c33ba5ea8b15 --- .gitignore | 1 + .gitlab-ci.yml | 14 ++++++++++ buildSdk.sh | 46 +++++++++++++++++++++++++++++++ lineage/res/res/values/colors.xml | 16 +++++------ lineage/res/res/values/public.xml | 1 + 5 files changed, 70 insertions(+), 8 deletions(-) create mode 100755 buildSdk.sh diff --git a/.gitignore b/.gitignore index 2b816b58..3a8dd966 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ # Ignore the samples directory, since they should be separate git projects samples/ +e-ui-sdk.jar \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7ec2279a..2c7db0f1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,21 @@ stages: - update-from-upstream + - build-sdk include: - project: 'e/priv/os/build' ref: master file: '/templates/.gitlab-ci-update-from-upstream.yml' + +image: "registry.gitlab.e.foundation:5000/e/apps/docker-android-apps-cicd:latest" + +before_script: +- chmod a+x buildSdk.sh + +build-sdk: + stage: build-sdk + script: + - ./buildSdk.sh + artifacts: + paths: + - e-ui-sdk.jar \ No newline at end of file diff --git a/buildSdk.sh b/buildSdk.sh new file mode 100755 index 00000000..ae264069 --- /dev/null +++ b/buildSdk.sh @@ -0,0 +1,46 @@ +#!/bin/bash + +echo "Clearing intermediates" +rm -rf intermediates +mkdir intermediates + +if [[ -z "${ANDROID_HOME}" ]]; then + echo "{ANDROID_HOME} path variable is not set. Set it to point Android SDK." + exit 1 +else + build_tools_dir=$ANDROID_HOME/build-tools/29.0.2/ +fi + +aapt2="${build_tools_dir}/aapt2" + +echo "Compiling resources" +$aapt2 compile --dir lineage/res/res -o intermediates/resources.zip + +platform_dir=$ANDROID_HOME/platforms/android-28 + +echo "Linking resources" +$aapt2 link intermediates/resources.zip -I $platform_dir/android.jar \ + --private-symbols org.lineageos.platform.internal \ + --allow-reserved-package-id \ + --package-id 63 \ + --manifest lineage/res/AndroidManifest.xml \ + --java intermediates \ + -o intermediates/res.apk + +echo "Unzipping temporary apk" +unzip -qo intermediates/res.apk -d intermediates/ + +# Creating obj directory +rm -rf obj +mkdir obj + +# Compiling R.java +echo "Compiling R.java" +javac -source 1.8 -target 1.8 $(find intermediates/lineageos -type f -name 'R.java') -d obj + +jar cvf e-ui-sdk.jar -C obj . -C intermediates resources.arsc + +echo "Clearing intermediate sources" +rm -rf intermediates +rm -rf obj +echo "e-ui-sdk.jar generated successully." \ No newline at end of file diff --git a/lineage/res/res/values/colors.xml b/lineage/res/res/values/colors.xml index 244fb574..f4136f19 100644 --- a/lineage/res/res/values/colors.xml +++ b/lineage/res/res/values/colors.xml @@ -20,13 +20,13 @@ - #FB3846FF - #007FFFFF - #24527EFF - #FC7222FF - #C8CED0FF - #848484FF - #38D874FF + #FB3846 + #007FFF + #24527E + #FC7222 + #C8CED0 + #848484 + #38D874 + -- GitLab