Skip to content

Commit

Permalink
upload bundles + downloads
Browse files Browse the repository at this point in the history
  • Loading branch information
christopherweinhardt committed Oct 31, 2023
1 parent f286997 commit 17a79a9
Show file tree
Hide file tree
Showing 21 changed files with 310 additions and 43 deletions.
2 changes: 2 additions & 0 deletions android/app/capacitor.build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,11 @@ apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
dependencies {
implementation project(':capacitor-app')
implementation project(':capacitor-dialog')
implementation project(':capacitor-filesystem')
implementation project(':capacitor-network')
implementation project(':capacitor-preferences')
implementation project(':capacitor-toast')
implementation project(':capacitor-plugin-filedownload')

}

Expand Down
6 changes: 6 additions & 0 deletions android/capacitor.settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ project(':capacitor-app').projectDir = new File('../node_modules/@capacitor/app/
include ':capacitor-dialog'
project(':capacitor-dialog').projectDir = new File('../node_modules/@capacitor/dialog/android')

include ':capacitor-filesystem'
project(':capacitor-filesystem').projectDir = new File('../node_modules/@capacitor/filesystem/android')

include ':capacitor-network'
project(':capacitor-network').projectDir = new File('../node_modules/@capacitor/network/android')

Expand All @@ -16,3 +19,6 @@ project(':capacitor-preferences').projectDir = new File('../node_modules/@capaci

include ':capacitor-toast'
project(':capacitor-toast').projectDir = new File('../node_modules/@capacitor/toast/android')

include ':capacitor-plugin-filedownload'
project(':capacitor-plugin-filedownload').projectDir = new File('../node_modules/capacitor-plugin-filedownload/android')
15 changes: 14 additions & 1 deletion ios/App/Podfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
require_relative '../../node_modules/@capacitor/ios/scripts/pods_helpers'
def assertDeploymentTarget(installer)
installer.pods_project.targets.each do |target|
target.build_configurations.each do |config|
# ensure IPHONEOS_DEPLOYMENT_TARGET is at least 13.0
deployment_target = config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'].to_f
should_upgrade = deployment_target < 13.0 && deployment_target != 0.0
if should_upgrade
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '13.0'
end
end
end
end

platform :ios, '13.0'
use_frameworks!
Expand All @@ -13,9 +24,11 @@ def capacitor_pods
pod 'CapacitorCordova', :path => '../../node_modules/@capacitor/ios'
pod 'CapacitorApp', :path => '../../node_modules/@capacitor/app'
pod 'CapacitorDialog', :path => '../../node_modules/@capacitor/dialog'
pod 'CapacitorFilesystem', :path => '../../node_modules/@capacitor/filesystem'
pod 'CapacitorNetwork', :path => '../../node_modules/@capacitor/network'
pod 'CapacitorPreferences', :path => '../../node_modules/@capacitor/preferences'
pod 'CapacitorToast', :path => '../../node_modules/@capacitor/toast'
pod 'CapacitorPluginFiledownload', :path => '../../node_modules/capacitor-plugin-filedownload'
end

target 'ACC Hymns' do
Expand Down
30 changes: 30 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,14 @@
"@capacitor/app": "^5.0.6",
"@capacitor/core": "^5.0.2",
"@capacitor/dialog": "^5.0.6",
"@capacitor/filesystem": "^5.1.4",
"@capacitor/ios": "^5.3.0",
"@capacitor/network": "^5.0.6",
"@capacitor/preferences": "^5.0.6",
"@capacitor/toast": "^5.0.6",
"@ionic/pwa-elements": "^3.2.2",
"@vueuse/core": "^9.13.0",
"capacitor-plugin-filedownload": "^2.0.0",
"panzoom": "^9.4.3",
"pdfjs-dist": "^3.10.111",
"pinia": "^2.1.6",
Expand Down
1 change: 1 addition & 0 deletions public/assets/arrow-down-circle-outline.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/assets/trash-outline.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/books/HS/HS.zip
Binary file not shown.
Binary file added public/books/HZ/HZ.zip
Binary file not shown.
Binary file added public/books/PC/PC.zip
Binary file not shown.
Binary file added public/books/ZG/ZG.zip
Binary file not shown.
Binary file added public/books/ZGE/ZGE.zip
Binary file not shown.
Binary file added public/books/ZHG/ZHG.zip
Binary file not shown.
Binary file added public/books/ZHH/ZHH.zip
Binary file not shown.
Binary file added public/books/ZHJ/ZHJ.zip
Binary file not shown.
Binary file added public/books/ZHR/ZHR.zip
Binary file not shown.
Binary file added public/books/ZHSP/ZHSP.zip
Binary file not shown.
1 change: 0 additions & 1 deletion src/assets/css/book.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
display: flex;
justify-content: space-between;
align-items: center;

}

.book_title {
Expand Down
32 changes: 31 additions & 1 deletion src/scripts/color.ts
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,36 @@ class Solver {
}
}

function newShade(col:string, amt:number) {

var usePound = false;

if (col[0] == "#") {
col = col.slice(1);
usePound = true;
}

var num = parseInt(col,16);

var r = (num >> 16) + amt;

if (r > 255) r = 255;
else if (r < 0) r = 0;

var b = ((num >> 8) & 0x00FF) + amt;

if (b > 255) b = 255;
else if (b < 0) b = 0;

var g = (num & 0x0000FF) + amt;

if (g > 255) g = 255;
else if (g < 0) g = 0;

return (usePound?"#":"") + (g | (b << 8) | (r << 16)).toString(16);

}

function hexToRgb(hex: string) {
// Expand shorthand form (e.g. "03F") to full form (e.g. "0033FF")
const shorthandRegex = /^#?([a-f\d])([a-f\d])([a-f\d])$/i;
Expand All @@ -295,4 +325,4 @@ function hexToRgb(hex: string) {
return result ? [parseInt(result[1], 16), parseInt(result[2], 16), parseInt(result[3], 16)] : null;
}

export { Solver, Color, hexToRgb };
export { Solver, Color, hexToRgb, newShade };
3 changes: 1 addition & 2 deletions src/scripts/hex.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,4 @@ function darken(input: string) {
return rgbToHex(color);
}

export { hexToRgb, componentToHex, rgbToHex, darken };
export type { RGB };
export { hexToRgb, componentToHex, rgbToHex, darken };
Loading

0 comments on commit 17a79a9

Please sign in to comment.