diff --git a/.gitignore b/.gitignore index c818556..591deb9 100644 --- a/.gitignore +++ b/.gitignore @@ -4,5 +4,9 @@ *.ipa xcuserdata/ +/fastlane/screenshots/**/*.png +/fastlane/screenshots/fonts/* /fastlane/report.xml + +!/fastlane/screenshots/fonts/.keep BlackCandy.xcconfig diff --git a/Gemfile.lock b/Gemfile.lock index 2ffd4eb..329e020 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,43 +1,45 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.5) + CFPropertyList (3.0.7) + base64 + nkf rexml - addressable (2.8.1) + addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) - artifactory (3.0.15) + artifactory (3.0.17) atomos (0.1.3) - aws-eventstream (1.2.0) - aws-partitions (1.692.0) - aws-sdk-core (3.168.4) - aws-eventstream (~> 1, >= 1.0.2) + aws-eventstream (1.3.0) + aws-partitions (1.930.0) + aws-sdk-core (3.196.1) + aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) - aws-sigv4 (~> 1.5) + aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.61.0) - aws-sdk-core (~> 3, >= 3.165.0) + aws-sdk-kms (1.81.0) + aws-sdk-core (~> 3, >= 3.193.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.117.2) - aws-sdk-core (~> 3, >= 3.165.0) + aws-sdk-s3 (1.151.0) + aws-sdk-core (~> 3, >= 3.194.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.4) - aws-sigv4 (1.5.2) + aws-sigv4 (~> 1.8) + aws-sigv4 (1.8.0) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) + base64 (0.2.0) claide (1.1.0) colored (1.2) colored2 (3.1.2) commander (4.6.0) highline (~> 2.0.0) declarative (0.0.20) - digest-crc (0.6.4) + digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) - domain_name (0.5.20190701) - unf (>= 0.0.5, < 1.0.0) + domain_name (0.6.20240107) dotenv (2.8.1) emoji_regex (3.2.3) - excon (0.97.1) - faraday (1.10.2) + excon (0.110.0) + faraday (1.10.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) @@ -65,15 +67,15 @@ GEM faraday-retry (1.0.3) faraday_middleware (1.2.0) faraday (~> 1.0) - fastimage (2.2.6) - fastlane (2.211.0) + fastimage (2.3.1) + fastlane (2.220.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) aws-sdk-s3 (~> 1.0) babosa (>= 1.0.3, < 2.0.0) bundler (>= 1.12.0, < 3.0.0) - colored + colored (~> 1.2) commander (~> 4.6) dotenv (>= 2.1.1, < 3.0.0) emoji_regex (>= 0.1, < 4.0) @@ -85,30 +87,32 @@ GEM gh_inspector (>= 1.1.2, < 2.0.0) google-apis-androidpublisher_v3 (~> 0.3) google-apis-playcustomapp_v1 (~> 0.1) + google-cloud-env (>= 1.6.0, < 2.0.0) google-cloud-storage (~> 1.31) highline (~> 2.0) + http-cookie (~> 1.0.5) json (< 3.0.0) jwt (>= 2.1.0, < 3) mini_magick (>= 4.9.4, < 5.0.0) - multipart-post (~> 2.0.0) + multipart-post (>= 2.0.0, < 3.0.0) naturally (~> 2.2) - optparse (~> 0.1.1) + optparse (>= 0.1.1, < 1.0.0) plist (>= 3.1.0, < 4.0.0) rubyzip (>= 2.0.0, < 3.0.0) - security (= 0.1.3) + security (= 0.1.5) simctl (~> 1.6.3) terminal-notifier (>= 2.0.0, < 3.0.0) - terminal-table (>= 1.4.5, < 2.0.0) + terminal-table (~> 3) tty-screen (>= 0.6.3, < 1.0.0) tty-spinner (>= 0.8.0, < 1.0.0) word_wrap (~> 1.0.0) xcodeproj (>= 1.13.0, < 2.0.0) xcpretty (~> 0.3.0) - xcpretty-travis-formatter (>= 0.0.3) + xcpretty-travis-formatter (>= 0.0.3, < 2.0.0) gh_inspector (1.1.3) - google-apis-androidpublisher_v3 (0.32.0) - google-apis-core (>= 0.9.1, < 2.a) - google-apis-core (0.9.5) + google-apis-androidpublisher_v3 (0.54.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-core (0.11.3) addressable (~> 2.5, >= 2.5.1) googleauth (>= 0.16.2, < 2.a) httpclient (>= 2.8.1, < 3.a) @@ -116,31 +120,29 @@ GEM representable (~> 3.0) retriable (>= 2.0, < 4.a) rexml - webrick - google-apis-iamcredentials_v1 (0.16.0) - google-apis-core (>= 0.9.1, < 2.a) - google-apis-playcustomapp_v1 (0.12.0) - google-apis-core (>= 0.9.1, < 2.a) - google-apis-storage_v1 (0.19.0) - google-apis-core (>= 0.9.0, < 2.a) - google-cloud-core (1.6.0) - google-cloud-env (~> 1.0) + google-apis-iamcredentials_v1 (0.17.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-playcustomapp_v1 (0.13.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-storage_v1 (0.31.0) + google-apis-core (>= 0.11.0, < 2.a) + google-cloud-core (1.7.0) + google-cloud-env (>= 1.0, < 3.a) google-cloud-errors (~> 1.0) google-cloud-env (1.6.0) faraday (>= 0.17.3, < 3.0) - google-cloud-errors (1.3.0) - google-cloud-storage (1.44.0) + google-cloud-errors (1.4.0) + google-cloud-storage (1.47.0) addressable (~> 2.8) digest-crc (~> 0.4) google-apis-iamcredentials_v1 (~> 0.1) - google-apis-storage_v1 (~> 0.19.0) + google-apis-storage_v1 (~> 0.31.0) google-cloud-core (~> 1.6) googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) - googleauth (1.3.0) + googleauth (1.8.1) faraday (>= 0.17.3, < 3.a) jwt (>= 1.4, < 3.0) - memoist (~> 0.16) multi_json (~> 1.11) os (>= 0.9, < 2.0) signet (>= 0.16, < 2.a) @@ -149,54 +151,53 @@ GEM domain_name (~> 0.5) httpclient (2.8.3) jmespath (1.6.2) - json (2.6.3) - jwt (2.6.0) - memoist (0.16.2) + json (2.7.2) + jwt (2.8.1) + base64 mini_magick (4.12.0) - mini_mime (1.1.2) + mini_mime (1.1.5) multi_json (1.15.0) - multipart-post (2.0.0) + multipart-post (2.4.1) nanaimo (0.3.0) naturally (2.2.1) - optparse (0.1.1) + nkf (0.2.0) + optparse (0.5.0) os (1.1.4) - plist (3.6.0) - public_suffix (5.0.1) - rake (13.0.6) + plist (3.7.1) + public_suffix (5.0.5) + rake (13.2.1) representable (3.2.0) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) retriable (3.1.2) - rexml (3.2.5) + rexml (3.2.8) + strscan (>= 3.0.9) rouge (2.0.7) ruby2_keywords (0.0.5) rubyzip (2.3.2) - security (0.1.3) - signet (0.17.0) + security (0.1.5) + signet (0.19.0) addressable (~> 2.8) faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) - simctl (1.6.8) + simctl (1.6.10) CFPropertyList naturally + strscan (3.1.0) terminal-notifier (2.0.0) - terminal-table (1.8.0) - unicode-display_width (~> 1.1, >= 1.1.1) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) trailblazer-option (0.1.2) tty-cursor (0.7.1) - tty-screen (0.8.1) + tty-screen (0.8.2) tty-spinner (0.9.3) tty-cursor (~> 0.7) uber (0.1.0) - unf (0.1.4) - unf_ext - unf_ext (0.0.8.2) - unicode-display_width (1.8.0) - webrick (1.7.0) + unicode-display_width (2.5.0) word_wrap (1.0.0) - xcodeproj (1.22.0) + xcodeproj (1.24.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) diff --git a/LICENSE b/LICENSE index a91c241..3c7b197 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) Aidewoode +Copyright (c) Ed Chao Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index d790f4d..876c8d3 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,11 @@ # Black Candy for iOS +[![CI](https://github.com/blackcandy-org/ios/actions/workflows/ci.yml/badge.svg)](https://github.com/blackcandy-org/ios/actions/workflows/ci.yml) + +![Screenshot](https://raw.githubusercontent.com/blackcandy-org/ios/master/images/screenshot_main.png) + +The official Black Candy iOS app. To use this app, you must have a Black Candy server set up. For more information, please visit https://github.com/blackcandy-org/blackcandy + +## Get the app + The iOS app of Black Candy in beta now. You can visite [here](https://testflight.apple.com/join/TwMUVmDl) to join beta in TestFlight. diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 25b7946..503fcc8 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -13,6 +13,7 @@ # Uncomment the line if you want fastlane to automatically update itself # update_fastlane +skip_docs default_platform(:ios) platform :ios do @@ -29,14 +30,18 @@ platform :ios do force: true ) + build_app(scheme: "BlackCandy") + upload_to_testflight + add_git_tag(tag: "v#{get_version_number}.beta#{get_build_number}") push_to_git_remote + end - build_app(scheme: "BlackCandy") + desc "Frame screenshot" + lane :frame do + # Clear previous framed screenshots + sh("find #{ENV['PWD']}/fastlane/screenshots -type f -name '*framed*' -delete") - changelog_from_git_commits( - merge_commit_filtering: "exclude_merges" - ) - upload_to_testflight + frameit(path: "./fastlane/screenshots") end end diff --git a/fastlane/README.md b/fastlane/README.md deleted file mode 100644 index 891747d..0000000 --- a/fastlane/README.md +++ /dev/null @@ -1,32 +0,0 @@ -fastlane documentation ----- - -# Installation - -Make sure you have the latest version of the Xcode command line tools installed: - -```sh -xcode-select --install -``` - -For _fastlane_ installation instructions, see [Installing _fastlane_](https://docs.fastlane.tools/#installing-fastlane) - -# Available Actions - -## iOS - -### ios beta - -```sh -[bundle exec] fastlane ios beta -``` - -Push a new beta build to TestFlight - ----- - -This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run. - -More information about _fastlane_ can be found on [fastlane.tools](https://fastlane.tools). - -The documentation of _fastlane_ can be found on [docs.fastlane.tools](https://docs.fastlane.tools). diff --git a/fastlane/screenshots/Framefile.json b/fastlane/screenshots/Framefile.json new file mode 100644 index 0000000..6d71490 --- /dev/null +++ b/fastlane/screenshots/Framefile.json @@ -0,0 +1,44 @@ +{ + "device_frame_version": "latest", + "default": { + "title": { + "font": "./fonts/GillSans.ttc", + "font_size": 45, + "font_weight": 300, + "color": "#2c2c2e" + }, + + "background": "./background.jpg", + "padding": "7%x7.5%" + }, + + "data": [ + { + "filter": "iPhone SE", + "title": { + "font_size": 45 + }, + "padding": "7%x9.5%" + }, + { + "filter": "iPhone 14 Plus", + "title": { + "font_size": 80 + }, + "padding": "5%x15%" + }, + { + "filter": "iPhone 14 Pro Max", + "title": { + "font_size": 85 + }, + "padding": "5%x15%" + }, + { + "filter": "iPad Pro", + "title": { + "font_size": 75 + } + } + ] +} diff --git a/fastlane/screenshots/background.jpg b/fastlane/screenshots/background.jpg new file mode 100644 index 0000000..1fcda5d Binary files /dev/null and b/fastlane/screenshots/background.jpg differ diff --git a/fastlane/screenshots/en-US/title.strings b/fastlane/screenshots/en-US/title.strings new file mode 100644 index 0000000..1f4fdbc --- /dev/null +++ b/fastlane/screenshots/en-US/title.strings @@ -0,0 +1,5 @@ +"Home" = "The Home of Your Music" +"Library" = "Access Your Library Easily" +"Playback" = "Control Your Playback" +"LightMode" = "Come With Light Theme" +"Orientation" = "Fits Any Orientation" diff --git a/fastlane/screenshots/fonts/.keep b/fastlane/screenshots/fonts/.keep new file mode 100644 index 0000000..e69de29 diff --git a/images/screenshot_main.png b/images/screenshot_main.png new file mode 100644 index 0000000..31b42f3 Binary files /dev/null and b/images/screenshot_main.png differ