From c61e6be324c3a2492e5bcb6185b00a9306d8e68f Mon Sep 17 00:00:00 2001 From: German Proshunin Date: Sat, 4 Jul 2020 15:02:19 +0500 Subject: [PATCH 1/6] refactor xml files optimization --- app/src/main/res/drawable-night/ic_dmg.xml | 42 +++++--- app/src/main/res/drawable-night/ic_raw.xml | 40 ++++--- .../main/res/drawable-night/ic_usb_200dp.xml | 13 ++- .../drawable-v24/ic_launcher_foreground.xml | 102 ++++++++---------- app/src/main/res/drawable/ic_beta.xml | 36 ++----- app/src/main/res/drawable/ic_dmg.xml | 42 +++++--- .../main/res/drawable/ic_fdroid_logo_24dp.xml | 23 ++-- app/src/main/res/drawable/ic_raw.xml | 40 ++++--- .../res/drawable/ic_twotone_save_alt_24px.xml | 6 +- app/src/main/res/drawable/ic_usb_200dp.xml | 13 ++- .../main/res/drawable/ic_usb_white_24dp.xml | 12 +-- 11 files changed, 199 insertions(+), 170 deletions(-) diff --git a/app/src/main/res/drawable-night/ic_dmg.xml b/app/src/main/res/drawable-night/ic_dmg.xml index b185083..ea3cb25 100644 --- a/app/src/main/res/drawable-night/ic_dmg.xml +++ b/app/src/main/res/drawable-night/ic_dmg.xml @@ -1,16 +1,28 @@ - - - - - - - + + + + + + diff --git a/app/src/main/res/drawable-night/ic_raw.xml b/app/src/main/res/drawable-night/ic_raw.xml index 1812526..15d7846 100644 --- a/app/src/main/res/drawable-night/ic_raw.xml +++ b/app/src/main/res/drawable-night/ic_raw.xml @@ -1,13 +1,29 @@ - - - - - - - + + + + + + + diff --git a/app/src/main/res/drawable-night/ic_usb_200dp.xml b/app/src/main/res/drawable-night/ic_usb_200dp.xml index 44e2387..3b38c0f 100644 --- a/app/src/main/res/drawable-night/ic_usb_200dp.xml +++ b/app/src/main/res/drawable-night/ic_usb_200dp.xml @@ -1,5 +1,10 @@ - - + + diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml index 063b1cc..4a7a157 100644 --- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -1,62 +1,48 @@ - - - - - - - - - - - + xmlns:aapt="http://schemas.android.com/aapt" + android:width="108dp" + android:height="108dp" + android:viewportWidth="151.04895" + android:viewportHeight="151.04895"> + + + + + + + - - - - + + + + - - + diff --git a/app/src/main/res/drawable/ic_beta.xml b/app/src/main/res/drawable/ic_beta.xml index 9dc7684..aaa48e2 100644 --- a/app/src/main/res/drawable/ic_beta.xml +++ b/app/src/main/res/drawable/ic_beta.xml @@ -3,32 +3,12 @@ android:height="64dp" android:viewportWidth="64" android:viewportHeight="64"> - - - - - + + diff --git a/app/src/main/res/drawable/ic_dmg.xml b/app/src/main/res/drawable/ic_dmg.xml index 48e4688..ab8791d 100644 --- a/app/src/main/res/drawable/ic_dmg.xml +++ b/app/src/main/res/drawable/ic_dmg.xml @@ -1,16 +1,28 @@ - - - - - - - + + + + + + diff --git a/app/src/main/res/drawable/ic_fdroid_logo_24dp.xml b/app/src/main/res/drawable/ic_fdroid_logo_24dp.xml index 4d8b403..3cf7a4d 100644 --- a/app/src/main/res/drawable/ic_fdroid_logo_24dp.xml +++ b/app/src/main/res/drawable/ic_fdroid_logo_24dp.xml @@ -1,14 +1,11 @@ - - - + + diff --git a/app/src/main/res/drawable/ic_raw.xml b/app/src/main/res/drawable/ic_raw.xml index 41fcb79..830ef9e 100644 --- a/app/src/main/res/drawable/ic_raw.xml +++ b/app/src/main/res/drawable/ic_raw.xml @@ -1,13 +1,29 @@ - - - - - - - + + + + + + + diff --git a/app/src/main/res/drawable/ic_twotone_save_alt_24px.xml b/app/src/main/res/drawable/ic_twotone_save_alt_24px.xml index 28a36b9..6dc88fe 100644 --- a/app/src/main/res/drawable/ic_twotone_save_alt_24px.xml +++ b/app/src/main/res/drawable/ic_twotone_save_alt_24px.xml @@ -3,7 +3,7 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - + diff --git a/app/src/main/res/drawable/ic_usb_200dp.xml b/app/src/main/res/drawable/ic_usb_200dp.xml index 248fd72..478be55 100644 --- a/app/src/main/res/drawable/ic_usb_200dp.xml +++ b/app/src/main/res/drawable/ic_usb_200dp.xml @@ -1,5 +1,10 @@ - - + + diff --git a/app/src/main/res/drawable/ic_usb_white_24dp.xml b/app/src/main/res/drawable/ic_usb_white_24dp.xml index e635a86..5c70c46 100644 --- a/app/src/main/res/drawable/ic_usb_white_24dp.xml +++ b/app/src/main/res/drawable/ic_usb_white_24dp.xml @@ -1,10 +1,10 @@ + android:width="24dp" + android:height="24dp" + android:tint="#FFFFFF" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:pathData="M15 7v4h1v2h-3V5h2l-3-4-3 4h2v8H8v-2.07C8.7 10.56 9.2 9.85 9.2 9c0-1.21-0.99-2.2-2.2-2.2-1.21 0-2.2 0.99-2.2 2.2 0 0.85 0.5 1.56 1.2 1.93V13c0 1.11 0.89 2 2 2h3v3.05c-0.71 0.37-1.2 1.1-1.2 1.95 0 1.22 0.99 2.2 2.2 2.2 1.21 0 2.2-0.98 2.2-2.2 0-0.85-0.49-1.58-1.2-1.95V15h3c1.11 0 2-0.89 2-2v-2h1V7h-4z" /> From cd9c94e82334e55c65bca94c58eac7e29f62b658 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Sat, 18 Jul 2020 20:44:54 +0200 Subject: [PATCH 2/6] Use CI workflow to fetch full remote repo --- .github/workflows/validate_pr.yml | 1 + ci-scripts/clone_base_ref.sh | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/validate_pr.yml b/.github/workflows/validate_pr.yml index 94c5440..2b178f3 100644 --- a/.github/workflows/validate_pr.yml +++ b/.github/workflows/validate_pr.yml @@ -14,6 +14,7 @@ jobs: - name: Checkout repo uses: actions/checkout@v2 with: + fetch-depth: 0 submodules: true - name: Checkout pull request base reference diff --git a/ci-scripts/clone_base_ref.sh b/ci-scripts/clone_base_ref.sh index 3ff895c..f25b731 100755 --- a/ci-scripts/clone_base_ref.sh +++ b/ci-scripts/clone_base_ref.sh @@ -3,9 +3,6 @@ set -e -echo "Fetch remote repo" -git fetch origin - repodir="$(basename "$PWD")" cd .. From 7b4cf339d8ab64d7e3dbaf6259eedd4e18c1517d Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Sat, 18 Jul 2020 20:49:35 +0200 Subject: [PATCH 3/6] Install full SDK in lint workflow --- .github/workflows/lint.yml | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index c4c2220..d03eded 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -22,15 +22,38 @@ jobs: android_lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - name: Checkout repo + uses: actions/checkout@v2 + with: + submodules: true - - name: 'Checkout repo' + - name: Prepare caches + uses: actions/cache@v2 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + ~/.android/build-cache + !~/.gradle/caches/modules-2/modules-2.lock + !~/.gradle/caches/*/plugin-resolution/ + /opt/android + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }} + restore-keys: | + ${{ runner.os }}-gradle- + + - name: Set up Java uses: actions/setup-java@v1 with: java-version: 1.8 - + + - name: Install Android SDK + run: | + ./ci-scripts/setup_sdk.sh + - name: 'Run lint' - run: ./gradlew lint + run: | + source ./ci-scripts/vars.sh + ./gradlew lint - uses: yutailang0119/action-android-lint@v1.0.2 with: From 9c9939ef482d5d720b9ba23170bfab7e22d51ac7 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Sat, 18 Jul 2020 20:57:27 +0200 Subject: [PATCH 4/6] Fix lint results path --- .github/workflows/lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index d03eded..6455429 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -57,4 +57,4 @@ jobs: - uses: yutailang0119/action-android-lint@v1.0.2 with: - xml_path: build/reports/lint-results.xml + xml_path: app/build/reports/lint-results.html From 3c42386f946386ff36a92745d42f2d1be4decac1 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Sat, 18 Jul 2020 21:16:00 +0200 Subject: [PATCH 5/6] Try to fetch the remote repo as best as we can --- ci-scripts/clone_base_ref.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ci-scripts/clone_base_ref.sh b/ci-scripts/clone_base_ref.sh index f25b731..fca8312 100755 --- a/ci-scripts/clone_base_ref.sh +++ b/ci-scripts/clone_base_ref.sh @@ -1,6 +1,14 @@ #!/bin/bash # Checkout pull request base commit for use in validate_pr_changes.py +set +e + +echo "Trying to fetch remote repo" +# Try to pull as much of the repo as we can +git fetch origin --unshallow +git fetch origin --recurse-submodules=no +git fetch origin + set -e repodir="$(basename "$PWD")" From 20cf85f5bab2efd1b6a07227ea8318e984ef1549 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Sat, 18 Jul 2020 21:30:03 +0200 Subject: [PATCH 6/6] Properly checkout base reference in CI validator --- ci-scripts/clone_base_ref.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ci-scripts/clone_base_ref.sh b/ci-scripts/clone_base_ref.sh index fca8312..9b820c4 100755 --- a/ci-scripts/clone_base_ref.sh +++ b/ci-scripts/clone_base_ref.sh @@ -5,7 +5,6 @@ set +e echo "Trying to fetch remote repo" # Try to pull as much of the repo as we can -git fetch origin --unshallow git fetch origin --recurse-submodules=no git fetch origin @@ -19,6 +18,6 @@ cp -a "$repodir" "base" echo "Checkout base reference: $GITHUB_BASE_REF" cd base -git checkout -b "origin/$GITHUB_BASE_REF" +git checkout "origin/$GITHUB_BASE_REF" cd "../$repodir"