From e62f2f1431d144e987753b234bae4054a16e152f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 25 Jul 2019 03:48:25 +0530 Subject: [PATCH 01/13] chore(deps): bump scanner from 1.4.0 to 1.4.1 (#454) Bumps [scanner](https://github.com/NordicSemiconductor/Android-Scanner-Compat-Library) from 1.4.0 to 1.4.1. - [Release notes](https://github.com/NordicSemiconductor/Android-Scanner-Compat-Library/releases) - [Commits](https://github.com/NordicSemiconductor/Android-Scanner-Compat-Library/compare/v1.4.0...v1.4.1) Signed-off-by: dependabot-preview[bot] --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 57f773ac..74ce0e93 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -98,7 +98,7 @@ dependencies { //Timber implementation 'com.jakewharton.timber:timber:4.7.1' - implementation 'no.nordicsemi.android.support.v18:scanner:1.4.0' + implementation 'no.nordicsemi.android.support.v18:scanner:1.4.1' implementation 'androidx.legacy:legacy-support-v4:1.0.0' testImplementation 'junit:junit:4.12' From b4de6ef30c1e415c35db547eed3ba743511fc37f Mon Sep 17 00:00:00 2001 From: Areeb Jamal Date: Sun, 28 Jul 2019 15:05:17 +0530 Subject: [PATCH 02/13] chore: Add fastlane metadata (#456) --- .travis.yml | 3 +- fastlane/Appfile | 2 + fastlane/Fastfile | 38 ++++++++++++++++++ .../metadata/android/en-US/changelogs/1.txt | 1 + .../metadata/android/en-US/changelogs/2.txt | 1 + .../metadata/android/en-US/changelogs/3.txt | 1 + .../metadata/android/en-US/changelogs/4.txt | 3 ++ .../android/en-US/full_description.txt | 3 ++ .../metadata/android/en-US/images/icon.png | Bin 0 -> 27953 bytes .../images/sevenInchScreenshots/.gitkeep | 0 .../en-US/images/tenInchScreenshots/.gitkeep | 0 .../en-US/images/tvScreenshots/.gitkeep | 0 .../en-US/images/wearScreenshots/.gitkeep | 0 .../android/en-US/short_description.txt | 1 + fastlane/metadata/android/en-US/title.txt | 1 + fastlane/metadata/android/en-US/video.txt | 0 scripts/.gitignore | 3 ++ 17 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 fastlane/Appfile create mode 100644 fastlane/Fastfile create mode 100644 fastlane/metadata/android/en-US/changelogs/1.txt create mode 100644 fastlane/metadata/android/en-US/changelogs/2.txt create mode 100644 fastlane/metadata/android/en-US/changelogs/3.txt create mode 100644 fastlane/metadata/android/en-US/changelogs/4.txt create mode 100644 fastlane/metadata/android/en-US/full_description.txt create mode 100644 fastlane/metadata/android/en-US/images/icon.png create mode 100644 fastlane/metadata/android/en-US/images/sevenInchScreenshots/.gitkeep create mode 100644 fastlane/metadata/android/en-US/images/tenInchScreenshots/.gitkeep create mode 100644 fastlane/metadata/android/en-US/images/tvScreenshots/.gitkeep create mode 100644 fastlane/metadata/android/en-US/images/wearScreenshots/.gitkeep create mode 100644 fastlane/metadata/android/en-US/short_description.txt create mode 100644 fastlane/metadata/android/en-US/title.txt create mode 100644 fastlane/metadata/android/en-US/video.txt create mode 100644 scripts/.gitignore diff --git a/.travis.yml b/.travis.yml index 288afb4e..ae1fd7ae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ language: android +dist: trusty sudo: false jdk: - oraclejdk8 @@ -22,4 +23,4 @@ script: - ./gradlew spotlessCheck - ./gradlew build --stacktrace after_success: - - bash scripts/upload-apk.sh \ No newline at end of file + - bash scripts/upload-apk.sh diff --git a/fastlane/Appfile b/fastlane/Appfile new file mode 100644 index 00000000..c90334b4 --- /dev/null +++ b/fastlane/Appfile @@ -0,0 +1,2 @@ +json_key_file("./scripts/fastlane.json") # Path to the json secret file - Follow https://docs.fastlane.tools/actions/supply/#setup to get one +package_name("org.fossasia.badgemagic") # e.g. com.krausefx.app diff --git a/fastlane/Fastfile b/fastlane/Fastfile new file mode 100644 index 00000000..19c557cc --- /dev/null +++ b/fastlane/Fastfile @@ -0,0 +1,38 @@ +# This file contains the fastlane.tools configuration +# You can find the documentation at https://docs.fastlane.tools +# +# For a list of all available actions, check out +# +# https://docs.fastlane.tools/actions +# +# For a list of all available plugins, check out +# +# https://docs.fastlane.tools/plugins/available-plugins +# + +# Uncomment the line if you want fastlane to automatically update itself +# update_fastlane + +default_platform(:android) + +platform :android do + desc "Runs all the tests" + lane :test do + gradle(task: "test") + end + + desc "Submit a new Beta Build to Crashlytics Beta" + lane :beta do + gradle(task: "clean assembleRelease") + crashlytics + + # sh "your_script.sh" + # You can also use other beta testing services here + end + + desc "Deploy a new version to the Google Play" + lane :deploy do + gradle(task: "clean assembleRelease") + upload_to_play_store + end +end diff --git a/fastlane/metadata/android/en-US/changelogs/1.txt b/fastlane/metadata/android/en-US/changelogs/1.txt new file mode 100644 index 00000000..aa949b47 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/1.txt @@ -0,0 +1 @@ +Initial Release \ No newline at end of file diff --git a/fastlane/metadata/android/en-US/changelogs/2.txt b/fastlane/metadata/android/en-US/changelogs/2.txt new file mode 100644 index 00000000..aa949b47 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/2.txt @@ -0,0 +1 @@ +Initial Release \ No newline at end of file diff --git a/fastlane/metadata/android/en-US/changelogs/3.txt b/fastlane/metadata/android/en-US/changelogs/3.txt new file mode 100644 index 00000000..c0ab60fa --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/3.txt @@ -0,0 +1 @@ +- Changes to Interface and bug fixes \ No newline at end of file diff --git a/fastlane/metadata/android/en-US/changelogs/4.txt b/fastlane/metadata/android/en-US/changelogs/4.txt new file mode 100644 index 00000000..c94c6d06 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/4.txt @@ -0,0 +1,3 @@ +- miscellaneous bug fixes +- draw support for cliparts +- edit support for badges \ No newline at end of file diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt new file mode 100644 index 00000000..966900e8 --- /dev/null +++ b/fastlane/metadata/android/en-US/full_description.txt @@ -0,0 +1,3 @@ +Badge Magic lets you create scrolling symbols and text on LED name badges through Bluetooth. The app provides options to portray names, clipart and simple animations on LED badges. For the data transfer from the smartphone to the LED badge we use Bluetooth. + +You can purchase a compatible LED Badge at https://sg.pslab.io \ No newline at end of file diff --git a/fastlane/metadata/android/en-US/images/icon.png b/fastlane/metadata/android/en-US/images/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..7692264722e1727c42c89b59126f363a5279271b GIT binary patch literal 27953 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 literal 0 HcmV?d00001 diff --git a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/.gitkeep b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/.gitkeep b/fastlane/metadata/android/en-US/images/tenInchScreenshots/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/fastlane/metadata/android/en-US/images/tvScreenshots/.gitkeep b/fastlane/metadata/android/en-US/images/tvScreenshots/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/fastlane/metadata/android/en-US/images/wearScreenshots/.gitkeep b/fastlane/metadata/android/en-US/images/wearScreenshots/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/fastlane/metadata/android/en-US/short_description.txt b/fastlane/metadata/android/en-US/short_description.txt new file mode 100644 index 00000000..322bb792 --- /dev/null +++ b/fastlane/metadata/android/en-US/short_description.txt @@ -0,0 +1 @@ +Magically Create Symbols and Text on LED Name Badges using Bluetooth \ No newline at end of file diff --git a/fastlane/metadata/android/en-US/title.txt b/fastlane/metadata/android/en-US/title.txt new file mode 100644 index 00000000..17355f5a --- /dev/null +++ b/fastlane/metadata/android/en-US/title.txt @@ -0,0 +1 @@ +Badge Magic \ No newline at end of file diff --git a/fastlane/metadata/android/en-US/video.txt b/fastlane/metadata/android/en-US/video.txt new file mode 100644 index 00000000..e69de29b diff --git a/scripts/.gitignore b/scripts/.gitignore new file mode 100644 index 00000000..024a5860 --- /dev/null +++ b/scripts/.gitignore @@ -0,0 +1,3 @@ +fastlane.json +*.jks + From c8ae8c6265ef6d6f557d0c8beb5bde4f900c069d Mon Sep 17 00:00:00 2001 From: Aditya Gupta Date: Mon, 29 Jul 2019 11:33:00 +0530 Subject: [PATCH 03/13] chore: improved fastlane usage and scripts (#457) --- .travis.yml | 2 ++ Gemfile | 3 +++ fastlane/Fastfile | 43 +++++++------------------------------------ scripts/upload-apk.sh | 31 +++++++++++++------------------ 4 files changed, 25 insertions(+), 54 deletions(-) create mode 100644 Gemfile diff --git a/.travis.yml b/.travis.yml index ae1fd7ae..a47587d3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,8 @@ cache: - "${TRAVIS_BUILD_DIR}/gradle/wrapper/dists/" - "$HOME/.gradle/caches/" - "$HOME/.gradle/wrapper/" +install: + - bundle install before_script: - bash scripts/prep-key.sh script: diff --git a/Gemfile b/Gemfile new file mode 100644 index 00000000..adc90d98 --- /dev/null +++ b/Gemfile @@ -0,0 +1,3 @@ +source "https://rubygems.org" + +gem "fastlane" \ No newline at end of file diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 19c557cc..c16a6ece 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -1,38 +1,9 @@ -# This file contains the fastlane.tools configuration -# You can find the documentation at https://docs.fastlane.tools -# -# For a list of all available actions, check out -# -# https://docs.fastlane.tools/actions -# -# For a list of all available plugins, check out -# -# https://docs.fastlane.tools/plugins/available-plugins -# - -# Uncomment the line if you want fastlane to automatically update itself -# update_fastlane - default_platform(:android) - platform :android do - desc "Runs all the tests" - lane :test do - gradle(task: "test") - end - - desc "Submit a new Beta Build to Crashlytics Beta" - lane :beta do - gradle(task: "clean assembleRelease") - crashlytics - - # sh "your_script.sh" - # You can also use other beta testing services here - end - - desc "Deploy a new version to the Google Play" - lane :deploy do - gradle(task: "clean assembleRelease") - upload_to_play_store - end -end + lane :buildAAB do + gradle(task: "bundle",build_type: "Release") + end + lane :uploadToPlaystore do + upload_to_play_store(track: "alpha",aab:"apk/badge-magic-master-app.aab") + end +end \ No newline at end of file diff --git a/scripts/upload-apk.sh b/scripts/upload-apk.sh index c6101eef..18651926 100644 --- a/scripts/upload-apk.sh +++ b/scripts/upload-apk.sh @@ -12,7 +12,7 @@ if [ "$TRAVIS_PULL_REQUEST" != "false" -o "$TRAVIS_REPO_SLUG" != "fossasia/badge exit 0 fi -./gradlew bundleRelease +bundle exec fastlane buildAAB git clone --quiet --branch=apk https://fossasia:$GITHUB_KEY@github.com/fossasia/badge-magic-android apk > /dev/null cd apk @@ -27,21 +27,17 @@ find ../app/build/outputs -type f \( -name '*.apk' -o -name '*.aab' \) -exec cp #removing unused apps for file in app*; do - if [[ ${file} =~ "unsigned" || ${file} =~ "unaligned" ]]; then - rm ${file} - else - if [[ "$TRAVIS_BRANCH" == "$PUBLISH_BRANCH" ]]; then - if [[ ${file} =~ ".aab" ]]; then - mv ${file} badge-magic-master-${file} - else - mv ${file} badge-magic-master-${file:4} - fi - elif [[ "$TRAVIS_BRANCH" == "$DEPLOY_BRANCH" ]]; then - if [[ ${file} =~ ".aab" ]]; then - mv ${file} badge-magic-dev-${file} - else - mv ${file} badge-magic-dev-${file:4} - fi + if [[ "$TRAVIS_BRANCH" == "$PUBLISH_BRANCH" ]]; then + if [[ ${file} =~ ".aab" ]]; then + mv ${file} badge-magic-master-${file} + else + mv ${file} badge-magic-master-${file:4} + fi + elif [[ "$TRAVIS_BRANCH" == "$DEPLOY_BRANCH" ]]; then + if [[ ${file} =~ ".aab" ]]; then + mv ${file} badge-magic-dev-${file} + else + mv ${file} badge-magic-dev-${file:4} fi fi done @@ -67,5 +63,4 @@ if [[ "$TRAVIS_BRANCH" != "$PUBLISH_BRANCH" ]]; then exit 0 fi -gem install fastlane -fastlane supply --aab badge-magic-master-app.aab --skip_upload_apk true --track alpha --json_key ../scripts/fastlane.json --package_name $PACKAGE_NAME +bundle exec fastlane uploadToPlaystore \ No newline at end of file From 7df65641a2f4601094026503aae0e096487cc5f4 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 30 Jul 2019 16:49:26 +0530 Subject: [PATCH 04/13] chore(deps): bump material from 1.1.0-alpha08 to 1.1.0-alpha09 (#459) Bumps [material](https://github.com/material-components/material-components-android) from 1.1.0-alpha08 to 1.1.0-alpha09. - [Release notes](https://github.com/material-components/material-components-android/releases) - [Commits](https://github.com/material-components/material-components-android/commits) Signed-off-by: dependabot-preview[bot] --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 74ce0e93..4dddf3ad 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -93,7 +93,7 @@ dependencies { implementation "org.koin:koin-androidx-viewmodel:${versions.koin_version}" //Material Design - implementation 'com.google.android.material:material:1.1.0-alpha08' + implementation 'com.google.android.material:material:1.1.0-alpha09' //Timber implementation 'com.jakewharton.timber:timber:4.7.1' From d28ca2e2f4e6413d15964c22fd38e8d7c69a46aa Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 30 Jul 2019 16:49:34 +0530 Subject: [PATCH 05/13] =?UTF-8?q?chore(deps):=20bump=20com.diffplug.gradle?= =?UTF-8?q?.spotless=20from=203.23.1=20to=203.=E2=80=A6=20(#458)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps com.diffplug.gradle.spotless from 3.23.1 to 3.24.0. Signed-off-by: dependabot-preview[bot] --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 4dddf3ad..1f0bcf99 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,5 +1,5 @@ plugins { - id "com.diffplug.gradle.spotless" version "3.23.1" + id "com.diffplug.gradle.spotless" version "3.24.0" } apply plugin: "com.github.b3er.local.properties" apply plugin: 'com.android.application' From fe2999cbb3613dd9a41f658fe44394a106632fa7 Mon Sep 17 00:00:00 2001 From: Aditya Gupta Date: Tue, 6 Aug 2019 13:12:17 +0530 Subject: [PATCH 06/13] chore: improved build scripts with deploy (#462) --- .travis.yml | 12 ++++++++++-- scripts/upload-apk.sh | 45 +++++++++++-------------------------------- 2 files changed, 21 insertions(+), 36 deletions(-) mode change 100644 => 100755 scripts/upload-apk.sh diff --git a/.travis.yml b/.travis.yml index a47587d3..0731d516 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,12 +17,20 @@ cache: - "${TRAVIS_BUILD_DIR}/gradle/wrapper/dists/" - "$HOME/.gradle/caches/" - "$HOME/.gradle/wrapper/" + install: - bundle install + before_script: - bash scripts/prep-key.sh + script: - ./gradlew spotlessCheck - ./gradlew build --stacktrace -after_success: - - bash scripts/upload-apk.sh + +deploy: + provider: script + script: bash scripts/upload-apk.sh + on: + all_branches: true + condition: $TRAVIS_BRANCH =~ ^(master|development)$ \ No newline at end of file diff --git a/scripts/upload-apk.sh b/scripts/upload-apk.sh old mode 100644 new mode 100755 index 18651926..c7d07df0 --- a/scripts/upload-apk.sh +++ b/scripts/upload-apk.sh @@ -1,66 +1,43 @@ #!/bin/sh -set -e git config --global user.name "Travis CI" git config --global user.email "noreply+travis@fossasia.org" -export DEPLOY_BRANCH=${DEPLOY_BRANCH:-development} -export PUBLISH_BRANCH=${PUBLISH_BRANCH:-master} - -if [ "$TRAVIS_PULL_REQUEST" != "false" -o "$TRAVIS_REPO_SLUG" != "fossasia/badge-magic-android" ] || ! [ "$TRAVIS_BRANCH" == "$DEPLOY_BRANCH" -o "$TRAVIS_BRANCH" == "$PUBLISH_BRANCH" ]; then - echo "We upload apk only for changes in development or master, and not PRs. So, let's skip this shall we ? :)" - exit 0 -fi - bundle exec fastlane buildAAB git clone --quiet --branch=apk https://fossasia:$GITHUB_KEY@github.com/fossasia/badge-magic-android apk > /dev/null cd apk -if [[ "$TRAVIS_BRANCH" == "$PUBLISH_BRANCH" ]]; then - /bin/rm -f * +if [[ $TRAVIS_BRANCH =~ ^(master)$ ]]; then + rm -rf * else - /bin/rm -f badge-magic-dev-* + rm -rf badge-magic-dev* fi find ../app/build/outputs -type f \( -name '*.apk' -o -name '*.aab' \) -exec cp -v {} . \; -#removing unused apps for file in app*; do - if [[ "$TRAVIS_BRANCH" == "$PUBLISH_BRANCH" ]]; then - if [[ ${file} =~ ".aab" ]]; then - mv ${file} badge-magic-master-${file} - else - mv ${file} badge-magic-master-${file:4} - fi - elif [[ "$TRAVIS_BRANCH" == "$DEPLOY_BRANCH" ]]; then - if [[ ${file} =~ ".aab" ]]; then - mv ${file} badge-magic-dev-${file} - else - mv ${file} badge-magic-dev-${file:4} - fi + if [[ $file =~ ".aab" ]]; then + mv $file badge-magic-$TRAVIS_BRANCH-$file + else + mv $file badge-magic-$TRAVIS_BRANCH-${file:4} fi done -# Create a new branch that will contains only latest apk git checkout --orphan temporary -# Add generated APK git add --all . git commit -am "[Auto] Update Test Apk ($(date +%Y-%m-%d.%H:%M:%S))" -# Delete current apk branch git branch -D apk -# Rename current branch to apk git branch -m apk -# Force push to origin since histories are unrelated git push origin apk --force --quiet > /dev/null -# Publish App to Play Store -if [[ "$TRAVIS_BRANCH" != "$PUBLISH_BRANCH" ]]; then - echo "We publish apk only for changes in master branch. So, let's skip this shall we ? :)" +if [[ $TRAVIS_BRANCH =~ ^(master)$ ]]; then + cd .. + bundle exec fastlane uploadToPlaystore exit 0 fi -bundle exec fastlane uploadToPlaystore \ No newline at end of file +echo "We publish apk only for changes in master branch. So, let's skip this shall we ? :)" \ No newline at end of file From 58df1a4f282c2730c90e8447bff7aa20c3bd22a0 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 8 Aug 2019 04:46:12 +0530 Subject: [PATCH 07/13] chore(deps): bump recyclerview from 1.1.0-beta01 to 1.1.0-beta02 (#464) Bumps recyclerview from 1.1.0-beta01 to 1.1.0-beta02. Signed-off-by: dependabot-preview[bot] --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 1f0bcf99..02b1ebe5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -85,7 +85,7 @@ dependencies { //Android X Libraries implementation 'androidx.appcompat:appcompat:1.1.0-rc01' - implementation 'androidx.recyclerview:recyclerview:1.1.0-beta01' + implementation 'androidx.recyclerview:recyclerview:1.1.0-beta02' implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.constraintlayout:constraintlayout:1.1.3' From 449610677612ea5795db32332632c1737343e999 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 8 Aug 2019 04:46:24 +0530 Subject: [PATCH 08/13] chore(deps): bump scanner from 1.4.1 to 1.4.2 (#463) Bumps [scanner](https://github.com/NordicSemiconductor/Android-Scanner-Compat-Library) from 1.4.1 to 1.4.2. - [Release notes](https://github.com/NordicSemiconductor/Android-Scanner-Compat-Library/releases) - [Commits](https://github.com/NordicSemiconductor/Android-Scanner-Compat-Library/compare/v1.4.1...v1.4.2) Signed-off-by: dependabot-preview[bot] --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 02b1ebe5..bbd0189d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -98,7 +98,7 @@ dependencies { //Timber implementation 'com.jakewharton.timber:timber:4.7.1' - implementation 'no.nordicsemi.android.support.v18:scanner:1.4.1' + implementation 'no.nordicsemi.android.support.v18:scanner:1.4.2' implementation 'androidx.legacy:legacy-support-v4:1.0.0' testImplementation 'junit:junit:4.12' From dc9ef2891e208d5a847dc61e0498ed88a0d89549 Mon Sep 17 00:00:00 2001 From: Aditya Gupta Date: Mon, 12 Aug 2019 21:37:42 +0530 Subject: [PATCH 09/13] feat: Preselect "Draw" when going to draw screen (#468) --- .../java/org/fossasia/badgemagic/viewmodels/DrawViewModel.kt | 2 +- .../org/fossasia/badgemagic/viewmodels/EditBadgeViewModel.kt | 2 +- .../org/fossasia/badgemagic/viewmodels/EditClipartViewModel.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/fossasia/badgemagic/viewmodels/DrawViewModel.kt b/app/src/main/java/org/fossasia/badgemagic/viewmodels/DrawViewModel.kt index 14127201..6d41b39f 100644 --- a/app/src/main/java/org/fossasia/badgemagic/viewmodels/DrawViewModel.kt +++ b/app/src/main/java/org/fossasia/badgemagic/viewmodels/DrawViewModel.kt @@ -12,7 +12,7 @@ class DrawViewModel( ) : ViewModel() { var drawModeState: ObservableField = ObservableField(DrawMode.NOTHING) - var drawState: ObservableBoolean = ObservableBoolean(false) + var drawState: ObservableBoolean = ObservableBoolean(true) var eraseState: ObservableBoolean = ObservableBoolean(false) var savedButton: MutableLiveData = MutableLiveData() diff --git a/app/src/main/java/org/fossasia/badgemagic/viewmodels/EditBadgeViewModel.kt b/app/src/main/java/org/fossasia/badgemagic/viewmodels/EditBadgeViewModel.kt index 91e574f8..14dc7653 100644 --- a/app/src/main/java/org/fossasia/badgemagic/viewmodels/EditBadgeViewModel.kt +++ b/app/src/main/java/org/fossasia/badgemagic/viewmodels/EditBadgeViewModel.kt @@ -13,7 +13,7 @@ class EditBadgeViewModel( var drawModeState: ObservableField = ObservableField(DrawMode.NOTHING) var drawingJSON: ObservableField = ObservableField("[]") - var drawState: ObservableBoolean = ObservableBoolean(false) + var drawState: ObservableBoolean = ObservableBoolean(true) var eraseState: ObservableBoolean = ObservableBoolean(false) var savedButton: MutableLiveData = MutableLiveData() diff --git a/app/src/main/java/org/fossasia/badgemagic/viewmodels/EditClipartViewModel.kt b/app/src/main/java/org/fossasia/badgemagic/viewmodels/EditClipartViewModel.kt index b5716a7c..1b61f6bd 100644 --- a/app/src/main/java/org/fossasia/badgemagic/viewmodels/EditClipartViewModel.kt +++ b/app/src/main/java/org/fossasia/badgemagic/viewmodels/EditClipartViewModel.kt @@ -13,7 +13,7 @@ class EditClipartViewModel( var drawModeState: ObservableField = ObservableField(DrawMode.NOTHING) var drawingJSON: ObservableField> = ObservableField(listOf()) - var drawState: ObservableBoolean = ObservableBoolean(false) + var drawState: ObservableBoolean = ObservableBoolean(true) var eraseState: ObservableBoolean = ObservableBoolean(false) var savedButton: MutableLiveData = MutableLiveData() From 8f1c4ce26f110719713f505f0925fddd7ba6ed77 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 14 Aug 2019 02:55:05 +0530 Subject: [PATCH 10/13] =?UTF-8?q?chore(deps):=20bump=20com.diffplug.gradle?= =?UTF-8?q?.spotless=20from=203.24.0=20to=203.=E2=80=A6=20(#470)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps com.diffplug.gradle.spotless from 3.24.0 to 3.24.1. Signed-off-by: dependabot-preview[bot] --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index bbd0189d..ed74aa07 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,5 +1,5 @@ plugins { - id "com.diffplug.gradle.spotless" version "3.24.0" + id "com.diffplug.gradle.spotless" version "3.24.1" } apply plugin: "com.github.b3er.local.properties" apply plugin: 'com.android.application' From 18ae0624ad71086e875dc938ff890daae7538d7b Mon Sep 17 00:00:00 2001 From: Aditya Gupta Date: Wed, 14 Aug 2019 16:20:35 +0530 Subject: [PATCH 11/13] chore: updated build version to 1.5.0 (#472) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index ed74aa07..c74ca1ba 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -23,8 +23,8 @@ android { applicationId 'org.fossasia.badgemagic' minSdkVersion versions.minSdk targetSdkVersion versions.targetSdk - versionCode 6 - versionName '1.4.0' + versionCode 7 + versionName '1.5.0' vectorDrawables.useSupportLibrary = true } From 2aaf4655fe0e5e11cdc2761729e2b6133cafbb92 Mon Sep 17 00:00:00 2001 From: Aditya Gupta Date: Wed, 14 Aug 2019 20:55:58 +0530 Subject: [PATCH 12/13] feat: prepare gh-pages on branch push (#465) --- .travis.yml | 18 ++++++++----- docs/sources/Makefile | 20 ++++++++++++++ docs/sources/conf.py | 53 ++++++++++++++++++++++++++++++++++++++ docs/sources/index.rst | 20 ++++++++++++++ docs/sources/make.bat | 35 +++++++++++++++++++++++++ scripts/upload-gh-pages.sh | 26 +++++++++++++++++++ 6 files changed, 166 insertions(+), 6 deletions(-) create mode 100644 docs/sources/Makefile create mode 100644 docs/sources/conf.py create mode 100644 docs/sources/index.rst create mode 100644 docs/sources/make.bat create mode 100755 scripts/upload-gh-pages.sh diff --git a/.travis.yml b/.travis.yml index 0731d516..a82dba3b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: android dist: trusty -sudo: false +sudo: true jdk: - oraclejdk8 android: @@ -29,8 +29,14 @@ script: - ./gradlew build --stacktrace deploy: - provider: script - script: bash scripts/upload-apk.sh - on: - all_branches: true - condition: $TRAVIS_BRANCH =~ ^(master|development)$ \ No newline at end of file + - provider: script + skip_cleanup: true + script: bash scripts/upload-apk.sh + on: + all_branches: true + condition: $TRAVIS_BRANCH =~ ^(master|development)$ + - provider: script + skip_cleanup: true + script: bash scripts/upload-gh-pages.sh + on: + all_branches: true \ No newline at end of file diff --git a/docs/sources/Makefile b/docs/sources/Makefile new file mode 100644 index 00000000..d4bb2cbb --- /dev/null +++ b/docs/sources/Makefile @@ -0,0 +1,20 @@ +# Minimal makefile for Sphinx documentation +# + +# You can set these variables from the command line, and also +# from the environment for the first two. +SPHINXOPTS ?= +SPHINXBUILD ?= sphinx-build +SOURCEDIR = . +BUILDDIR = _build + +# Put it first so that "make" without argument is like "make help". +help: + @$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) + +.PHONY: help Makefile + +# Catch-all target: route all unknown targets to Sphinx using the new +# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS). +%: Makefile + @$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) diff --git a/docs/sources/conf.py b/docs/sources/conf.py new file mode 100644 index 00000000..67322a4c --- /dev/null +++ b/docs/sources/conf.py @@ -0,0 +1,53 @@ +# Configuration file for the Sphinx documentation builder. +# +# This file only contains a selection of the most common options. For a full +# list see the documentation: +# http://www.sphinx-doc.org/en/master/config + +# -- Path setup -------------------------------------------------------------- + +# If extensions (or modules to document with autodoc) are in another directory, +# add these directories to sys.path here. If the directory is relative to the +# documentation root, use os.path.abspath to make it absolute, like shown here. +# +# import os +# import sys +# sys.path.insert(0, os.path.abspath('.')) + + +# -- Project information ----------------------------------------------------- + +project = 'Badge Magic' +copyright = '2019, FOSSASIA' +author = 'FOSSASIA' + +master_doc = 'index' + +# -- General configuration --------------------------------------------------- + +# Add any Sphinx extension module names here, as strings. They can be +# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom +# ones. +extensions = [ +] + +# Add any paths that contain templates here, relative to this directory. +templates_path = ['_templates'] + +# List of patterns, relative to source directory, that match files and +# directories to ignore when looking for source files. +# This pattern also affects html_static_path and html_extra_path. +exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store'] + + +# -- Options for HTML output ------------------------------------------------- + +# The theme to use for HTML and HTML Help pages. See the documentation for +# a list of builtin themes. +# +html_theme = 'alabaster' + +# Add any paths that contain custom static files (such as style sheets) here, +# relative to this directory. They are copied after the builtin static files, +# so a file named "default.css" will overwrite the builtin "default.css". +html_static_path = ['_static'] diff --git a/docs/sources/index.rst b/docs/sources/index.rst new file mode 100644 index 00000000..e2d33268 --- /dev/null +++ b/docs/sources/index.rst @@ -0,0 +1,20 @@ +.. Badge Magic documentation master file, created by + sphinx-quickstart on Thu Aug 8 09:11:41 2019. + You can adapt this file completely to your liking, but it should at least + contain the root `toctree` directive. + +Welcome to Badge Magic's documentation! +======================================= + +.. toctree:: + :maxdepth: 2 + :caption: Contents: + + + +Indices and tables +================== + +* :ref:`genindex` +* :ref:`modindex` +* :ref:`search` diff --git a/docs/sources/make.bat b/docs/sources/make.bat new file mode 100644 index 00000000..922152e9 --- /dev/null +++ b/docs/sources/make.bat @@ -0,0 +1,35 @@ +@ECHO OFF + +pushd %~dp0 + +REM Command file for Sphinx documentation + +if "%SPHINXBUILD%" == "" ( + set SPHINXBUILD=sphinx-build +) +set SOURCEDIR=. +set BUILDDIR=_build + +if "%1" == "" goto help + +%SPHINXBUILD% >NUL 2>NUL +if errorlevel 9009 ( + echo. + echo.The 'sphinx-build' command was not found. Make sure you have Sphinx + echo.installed, then set the SPHINXBUILD environment variable to point + echo.to the full path of the 'sphinx-build' executable. Alternatively you + echo.may add the Sphinx directory to PATH. + echo. + echo.If you don't have Sphinx installed, grab it from + echo.http://sphinx-doc.org/ + exit /b 1 +) + +%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O% +goto end + +:help +%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O% + +:end +popd diff --git a/scripts/upload-gh-pages.sh b/scripts/upload-gh-pages.sh new file mode 100755 index 00000000..291163f8 --- /dev/null +++ b/scripts/upload-gh-pages.sh @@ -0,0 +1,26 @@ +#!/bin/sh + +git config --global user.name "Travis CI" +git config --global user.email "noreply+travis@fossasia.org" + +sudo pip install Sphinx + +cd docs/sources + +make html + +git clone --quiet --branch=gh-pages https://fossasia:$GITHUB_KEY@github.com/fossasia/badge-magic-android gh-pages > /dev/null +cd gh-pages + +rm -rf * +cp -r ../_build/html/* . + +git checkout --orphan temporary + +git add --all . +git commit -am "[Auto] Update GH-Pages from $TRAVIS_BRANCH ($(date +%Y-%m-%d.%H:%M:%S))" + +git branch -D gh-pages +git branch -m gh-pages + +git push origin gh-pages --force --quiet > /dev/null \ No newline at end of file From 15c6d89d4c4f317d62c42576cba2108cec06c8da Mon Sep 17 00:00:00 2001 From: Aditya Gupta Date: Wed, 14 Aug 2019 21:14:34 +0530 Subject: [PATCH 13/13] chore: added fastlane changelog (#474) --- fastlane/metadata/android/en-US/changelogs/7.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 fastlane/metadata/android/en-US/changelogs/7.txt diff --git a/fastlane/metadata/android/en-US/changelogs/7.txt b/fastlane/metadata/android/en-US/changelogs/7.txt new file mode 100644 index 00000000..a0992b60 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/7.txt @@ -0,0 +1 @@ +feat: Preselect "Draw" when going to draw screen \ No newline at end of file