Skip to content

Commit 7ef547d

Browse files
EdenwareAppsEdenwareApps
committed
v17.5.0
- Migration from Cordova to Capacitor to bring compatibility to Android 13 and 14. - Project restructuring. - UI rendering tweaks (Svelte), layout improvements, and minor bug fixes.
1 parent 52ece97 commit 7ef547d

File tree

1,228 files changed

+9621
-85762
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,228 files changed

+9621
-85762
lines changed

‎.gitignore

Lines changed: 45 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,10 @@
1-
# Cordova Global
2-
plugins/
3-
4-
# iOS Platform
5-
platforms/ios/build/
6-
platforms/ios/www/
7-
platforms/ios/cordova/console.log
8-
*.xcuserdatad
9-
10-
# Android Platform
11-
platforms/android/.gradle
12-
platforms/android/build
13-
platforms/android/assets/www
14-
platforms/android/local.properties
15-
platforms/android/CordovaLib/build
16-
platforms/android/CordovaLib/gen
17-
platforms/android/CordovaLib/local.properties
18-
19-
# wp8
20-
platforms/wp8/bin
21-
platforms/wp8/obj
22-
platforms/wp8/www
23-
platforms/wp8/.staging
24-
platforms/wp8/*.suo
25-
platforms/wp8/*.csproj.user
26-
27-
# Windows Universal App (Windows Platform)
28-
platforms/windows/build
29-
platforms/windows/www
30-
platforms/windows/AppPackages
31-
32-
# Electron
33-
platforms/electron/build
34-
platforms/electron/build-res
35-
platforms/electron/www
36-
platforms/electron/config.xml
37-
platforms/electron/electron.json
38-
39-
# Browser
40-
platforms/browser/www
41-
42-
# res
43-
resources/signing
1+
# IDE - VSCode
2+
.vscode/*
3+
!.vscode/settings.json
4+
!.vscode/tasks.json
5+
!.vscode/launch.json
6+
!.vscode/extensions.json
7+
.history/*
448

459
# Node JS + TS
4610
logs
@@ -108,13 +72,43 @@ $RECYCLE.BIN/
10872
.AppleDesktop
10973
.apdisk
11074

75+
# Gradle files
76+
.gradle/
77+
build/
78+
79+
# Local configuration file (sdk path, etc)
80+
local.properties
81+
82+
# Log/OS Files
83+
*.log
84+
85+
# Android Studio generated files and folders
86+
captures/
87+
.externalNativeBuild/
88+
.cxx/
89+
*.apk
90+
output.json
91+
92+
# IntelliJ
93+
*.iml
94+
.idea/
95+
96+
# Keystore files
97+
*.jks
98+
*.keystore
99+
100+
# Google Services (e.g. APIs or Firebase)
101+
google-services.json
102+
103+
# Android Profiling
104+
*.hprof
105+
111106
# Custom
112107
www/.vscode
113-
www/nodejs-project/modules/premium/
114-
www/nodejs-project/node_modules/
115-
www/nodejs-project/ffmpeg/*
116-
www/nodejs-project/.arch
117-
build-extras.gradle
118-
www/nodejs-project/arch.dat
119-
www/nodejs-project/run-node.cmd
120-
www/nodejs-project/tool.html
108+
www/nodejs/modules/premium/
109+
www/nodejs/node_modules/
110+
www/nodejs/ffmpeg/*
111+
www/nodejs/.arch
112+
www/nodejs/arch.dat
113+
www/nodejs/tool.html
114+
android/app/release/output-metadata.json

‎android/.gitignore

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
# Using Android gitignore template: https://github.com/github/gitignore/blob/HEAD/Android.gitignore
2+
3+
# Built application files
4+
*.apk
5+
*.aar
6+
*.ap_
7+
*.aab
8+
9+
# Files for the ART/Dalvik VM
10+
*.dex
11+
12+
# Java class files
13+
*.class
14+
15+
# Generated files
16+
bin/
17+
gen/
18+
out/
19+
# Uncomment the following line in case you need and you don't have the release build type files in your app
20+
# release/
21+
22+
# Gradle files
23+
.gradle/
24+
build/
25+
26+
# Local configuration file (sdk path, etc)
27+
local.properties
28+
29+
# Proguard folder generated by Eclipse
30+
proguard/
31+
32+
# Log Files
33+
*.log
34+
35+
# Android Studio Navigation editor temp files
36+
.navigation/
37+
38+
# Android Studio captures folder
39+
captures/
40+
41+
# IntelliJ
42+
*.iml
43+
.idea/workspace.xml
44+
.idea/tasks.xml
45+
.idea/gradle.xml
46+
.idea/assetWizardSettings.xml
47+
.idea/dictionaries
48+
.idea/libraries
49+
# Android Studio 3 in .gitignore file.
50+
.idea/caches
51+
.idea/modules.xml
52+
# Comment next line if keeping position of elements in Navigation Editor is relevant for you
53+
.idea/navEditor.xml
54+
55+
# Keystore files
56+
# Uncomment the following lines if you do not want to check your keystore files in.
57+
#*.jks
58+
#*.keystore
59+
60+
# External native build folder generated in Android Studio 2.2 and later
61+
.externalNativeBuild
62+
.cxx/
63+
64+
# Google Services (e.g. APIs or Firebase)
65+
# google-services.json
66+
67+
# Freeline
68+
freeline.py
69+
freeline/
70+
freeline_project_description.json
71+
72+
# fastlane
73+
fastlane/report.xml
74+
fastlane/Preview.html
75+
fastlane/screenshots
76+
fastlane/test_output
77+
fastlane/readme.md
78+
79+
# Version control
80+
vcs.xml
81+
82+
# lint
83+
lint/intermediates/
84+
lint/generated/
85+
lint/outputs/
86+
lint/tmp/
87+
# lint/reports/
88+
89+
# Android Profiling
90+
*.hprof
91+
92+
# Cordova plugins for Capacitor
93+
capacitor-cordova-android-plugins
94+
95+
# Copied web assets
96+
app/src/main/assets/public
97+
98+
# Generated Config files
99+
app/src/main/assets/capacitor.config.json
100+
app/src/main/assets/capacitor.plugins.json
101+
app/src/main/res/xml/config.xml

‎android/app/.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
./release/
2+
./debug/
3+
/build/*
4+
!/build/.npmkeep

‎android/app/build.gradle

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
apply plugin: 'com.android.application'
2+
3+
android {
4+
namespace "tv.megacubo.app"
5+
compileSdkVersion rootProject.ext.compileSdkVersion
6+
defaultConfig {
7+
applicationId "tv.megacubo.app"
8+
minSdk 24
9+
targetSdkVersion 33
10+
versionCode 471
11+
versionName '17.5.0'
12+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
13+
aaptOptions {
14+
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
15+
// Default: https://android.googlesource.com/platform/frameworks/base/+/282e181b58cf72b6ca770dc7ca5f91f135444502/tools/aapt/AaptAssets.cpp#61
16+
ignoreAssetsPattern '!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~'
17+
}
18+
vectorDrawables.useSupportLibrary = true
19+
}
20+
buildTypes {
21+
release {
22+
minifyEnabled false
23+
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
24+
}
25+
}
26+
splits {
27+
abi {
28+
enable true
29+
reset()
30+
include 'arm64-v8a', 'armeabi-v7a'
31+
universalApk true
32+
}
33+
}
34+
applicationVariants.all { variant ->
35+
variant.outputs.each { output ->
36+
def abi = output.getFilter(com.android.build.OutputFile.ABI)
37+
output.outputFileName = "Megacubo_${versionName}_android_${abi}.apk"
38+
}
39+
}
40+
packagingOptions {
41+
jniLibs {
42+
useLegacyPackaging = true
43+
}
44+
}
45+
}
46+
47+
repositories {
48+
flatDir{
49+
dirs '../capacitor-cordova-android-plugins/src/main/libs', 'libs'
50+
}
51+
}
52+
53+
dependencies {
54+
implementation fileTree(dir: 'libs', include: ['*.jar','*.aar'])
55+
implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
56+
implementation "androidx.coordinatorlayout:coordinatorlayout:$androidxCoordinatorLayoutVersion"
57+
implementation "androidx.core:core-splashscreen:$coreSplashScreenVersion"
58+
implementation project(':capacitor-android')
59+
testImplementation "junit:junit:$junitVersion"
60+
androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
61+
androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
62+
implementation project(':capacitor-cordova-android-plugins')
63+
}
64+
65+
apply from: 'capacitor.build.gradle'
66+
67+
try {
68+
def servicesJSON = file('google-services.json')
69+
if (servicesJSON.text) {
70+
apply plugin: 'com.google.gms.google-services'
71+
}
72+
} catch(Exception e) {
73+
logger.info("google-services.json not found, google-services plugin not applied. Push Notifications won't work")
74+
}

‎android/app/capacitor.build.gradle

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
// DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN
2+
3+
android {
4+
compileOptions {
5+
sourceCompatibility JavaVersion.VERSION_17
6+
targetCompatibility JavaVersion.VERSION_17
7+
}
8+
}
9+
10+
apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
11+
dependencies {
12+
implementation project(':capacitor-community-keep-awake')
13+
implementation project(':capacitor-app')
14+
implementation project(':capacitor-filesystem')
15+
implementation project(':capacitor-keyboard')
16+
implementation project(':capacitor-share')
17+
implementation project(':capacitor-status-bar')
18+
implementation project(':eoscz-capacitor-plugin-native-file-downloader')
19+
implementation project(':capacitor-nodejs')
20+
implementation "androidx.core:core:1.0.0"
21+
}
22+
apply from: "../../node_modules/cordova-androidx-build/src/android/cordova-androidx-build.gradle"
23+
apply from: "../../node_modules/cordova-plugin-brightsdk/src/android/BrightSDKHelper.gradle"
24+
apply from: "../../node_modules/tv.megacubo.ffmpeg/src/android/FFmpegKit.gradle"
25+
apply from: "../../../../../GitHub/tv.megacubo.player/src/android/megacubo.gradle"
26+
27+
if (hasProperty('postBuildExtras')) {
28+
postBuildExtras()
29+
}

‎android/app/proguard-rules.pro

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Add project specific ProGuard rules here.
2+
# You can control the set of applied configuration files using the
3+
# proguardFiles setting in build.gradle.
4+
#
5+
# For more details, see
6+
# http://developer.android.com/guide/developing/tools/proguard.html
7+
8+
# If your project uses WebView with JS, uncomment the following
9+
# and specify the fully qualified class name to the JavaScript interface
10+
# class:
11+
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
12+
# public *;
13+
#}
14+
15+
# Uncomment this to preserve the line number information for
16+
# debugging stack traces.
17+
#-keepattributes SourceFile,LineNumberTable
18+
19+
# If you keep the line number information, uncomment this to
20+
# hide the original source file name.
21+
#-renamesourcefileattribute SourceFile

‎android/app/src/androidTest/java/com/getcapacitor/myapp/ExampleInstrumentedTest.java

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
package com.getcapacitor.myapp;
2+
3+
import static org.junit.Assert.*;
4+
5+
import android.content.Context;
6+
import androidx.test.ext.junit.runners.AndroidJUnit4;
7+
import androidx.test.platform.app.InstrumentationRegistry;
8+
import org.junit.Test;
9+
import org.junit.runner.RunWith;
10+
11+
/**
12+
* Instrumented test, which will execute on an Android device.
13+
*
14+
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
15+
*/
16+
@RunWith(AndroidJUnit4.class)
17+
public class ExampleInstrumentedTest {
18+
19+
@Test
20+
public void useAppContext() throws Exception {
21+
// Context of the app under test.
22+
Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
23+
24+
assertEquals("com.getcapacitor.app", appContext.getPackageName());
25+
}
26+
}

0 commit comments

Comments
 (0)