diff --git a/twa/app/build.gradle b/twa/app/build.gradle index cba11e374..accd3ac85 100644 --- a/twa/app/build.gradle +++ b/twa/app/build.gradle @@ -46,20 +46,14 @@ def twaManifest = [ enableSiteSettingsShortcut: 'true', ] -// Use the number of seconds/10 since Jan 1 2019 as the versionCode. -// This lets us upload a new build at most every 10 seconds for the -// next ~680 years. -// https://stackoverflow.com/a/38643838 -def vcode = (int) (((new Date().getTime() / 1000) - 1546297200) / 10) - android { compileSdkVersion 29 defaultConfig { applicationId "org.jitsi.meet" minSdkVersion 19 targetSdkVersion 29 - versionCode vcode - versionName "20.5.0" + versionCode 2000000000 + versionName "1.0.0" // The name for the application resValue "string", "appName", twaManifest.name @@ -71,12 +65,12 @@ android { def launchUrl = "https://" + twaManifest.hostName + twaManifest.launchUrl resValue "string", "launchUrl", launchUrl - + // The URL the Web Manifest for the Progressive Web App that the TWA points to. This // is used by Chrome OS to open the Web version of the PWA instead of the TWA, as it // will probably give a better user experience for non-mobile devices. - resValue "string", "webManifestUrl", 'https://meet.jit.si/static/pwa/manifest.json' - + resValue "string", "webManifestUrl", 'https://meet.jit.si/manifest.json' + // The hostname is used when building the intent-filter, so the TWA is able to // handle Intents to open https://svgomg.firebaseapp.com. @@ -106,13 +100,13 @@ android { // compile. If not set, the navigation bar color defaults to #000000 - black. resValue "color", "navigationColorDark", twaManifest.navigationColorDark - // This attribute sets the navbar divider color for the TWA. It can be either - // set here or in `res/values/colors.xml`. Setting in both places is an error and the app + // This attribute sets the navbar divider color for the TWA. It can be either + // set here or in `res/values/colors.xml`. Setting in both places is an error and the app // will not compile. If not set, the divider color defaults to #00000000 - transparent. resValue "color", "navigationDividerColor", twaManifest.navigationDividerColor - // This attribute sets the dark navbar divider color for the TWA. It can be either - // set here or in `res/values/colors.xml`. Setting in both places is an error and the + // This attribute sets the dark navbar divider color for the TWA. It can be either + // set here or in `res/values/colors.xml`. Setting in both places is an error and the //app will not compile. If not set, the divider color defaults to #000000 - black. resValue "color", "navigationDividerColorDark", twaManifest.navigationDividerColorDark @@ -192,11 +186,11 @@ task generateShorcutsFile { preBuild.dependsOn(generateShorcutsFile) repositories { - + } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - - implementation 'com.google.androidbrowserhelper:androidbrowserhelper:2.0.0' + + implementation 'com.google.androidbrowserhelper:androidbrowserhelper:2.0.0' } diff --git a/twa/app/src/main/ic_launcher-playstore.png b/twa/app/src/main/ic_launcher-playstore.png deleted file mode 100644 index 2090e74aa..000000000 Binary files a/twa/app/src/main/ic_launcher-playstore.png and /dev/null differ diff --git a/twa/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/twa/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index 036d09bc5..000000000 --- a/twa/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/twa/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/twa/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index 036d09bc5..000000000 --- a/twa/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/twa/app/src/main/res/mipmap-hdpi/ic_launcher.png b/twa/app/src/main/res/mipmap-hdpi/ic_launcher.png index 878db1a13..a1213c555 100644 Binary files a/twa/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/twa/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/twa/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/twa/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png deleted file mode 100644 index 3299de6f9..000000000 Binary files a/twa/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/twa/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/twa/app/src/main/res/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index 8562a3e67..000000000 Binary files a/twa/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ diff --git a/twa/app/src/main/res/mipmap-mdpi/ic_launcher.png b/twa/app/src/main/res/mipmap-mdpi/ic_launcher.png index 76cc1d870..7068ba5d7 100644 Binary files a/twa/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/twa/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/twa/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/twa/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png deleted file mode 100644 index 9af115d9f..000000000 Binary files a/twa/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/twa/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/twa/app/src/main/res/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index 60ffcfb45..000000000 Binary files a/twa/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ diff --git a/twa/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/twa/app/src/main/res/mipmap-xhdpi/ic_launcher.png index fbeac87db..564b6b31e 100644 Binary files a/twa/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/twa/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/twa/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/twa/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png deleted file mode 100644 index 649807480..000000000 Binary files a/twa/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/twa/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/twa/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index 137a91a0d..000000000 Binary files a/twa/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ diff --git a/twa/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/twa/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 8e1a312ff..6837e1fd7 100644 Binary files a/twa/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/twa/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/twa/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/twa/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png deleted file mode 100644 index fd0ad523a..000000000 Binary files a/twa/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/twa/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/twa/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index 9bb2be6e2..000000000 Binary files a/twa/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/twa/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/twa/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 02e0a1ea6..4f21fc177 100644 Binary files a/twa/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/twa/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/twa/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/twa/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png deleted file mode 100644 index d82365275..000000000 Binary files a/twa/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/twa/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/twa/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png deleted file mode 100644 index 40a00cef7..000000000 Binary files a/twa/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/twa/app/src/main/res/raw/web_app_manifest.json b/twa/app/src/main/res/raw/web_app_manifest.json index e6dc04416..c1271f2fc 100644 --- a/twa/app/src/main/res/raw/web_app_manifest.json +++ b/twa/app/src/main/res/raw/web_app_manifest.json @@ -1 +1 @@ -{"android_package_name":"org.jitsi.meet","prefer_related_applications":true,"related_applications":[{"id":"org.jitsi.meet","platform":"chromeos_play"}],"short_name":"Jitsi Meet","name":"Jitsi Meet","icons":[{"src":"icons/icon192.png","type":"image/png","sizes":"192x192"},{"src":"icons/icon512.png","type":"image/png","sizes":"512x512"},{"src":"icons/iconMask.png","sizes":"512x512","type":"image/png","purpose":"maskable"}],"start_url":"/","background_color":"#17A0DB","display":"standalone","scope":"/","theme_color":"#17A0DB"} \ No newline at end of file +{"android_package_name":"org.jitsi.meet","prefer_related_applications":true,"related_applications":[{"id":"org.jitsi.meet","platform":"chromeos_play"}],"short_name":"Jitsi Meet","name":"Jitsi Meet","icons":[{"src":"static/pwa/icons/icon192.png","type":"image/png","sizes":"192x192"},{"src":"static/pwa/icons/icon512.png","type":"image/png","sizes":"512x512"},{"src":"static/pwa/icons/iconMask.png","sizes":"512x512","type":"image/png","purpose":"maskable"}],"start_url":"/","background_color":"#17A0DB","display":"standalone","scope":"/","theme_color":"#17A0DB"} \ No newline at end of file diff --git a/twa/app/src/main/res/values/ic_launcher_background.xml b/twa/app/src/main/res/values/ic_launcher_background.xml deleted file mode 100644 index 55c23776a..000000000 --- a/twa/app/src/main/res/values/ic_launcher_background.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - #66A8DD - \ No newline at end of file diff --git a/twa/app/src/main/res/xml/shortcuts.xml b/twa/app/src/main/res/xml/shortcuts.xml index 5effdb1d1..7f3e9c196 100644 --- a/twa/app/src/main/res/xml/shortcuts.xml +++ b/twa/app/src/main/res/xml/shortcuts.xml @@ -1 +1,16 @@ + diff --git a/twa/gradle/wrapper/gradle-wrapper.properties b/twa/gradle/wrapper/gradle-wrapper.properties index 248e613de..0b7ed8da0 100644 --- a/twa/gradle/wrapper/gradle-wrapper.properties +++ b/twa/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Wed Oct 14 15:52:23 CEST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip diff --git a/twa/twa-manifest.json b/twa/twa-manifest.json index c26f9879b..86f25d9cd 100644 --- a/twa/twa-manifest.json +++ b/twa/twa-manifest.json @@ -13,15 +13,15 @@ "enableNotifications": false, "startUrl": "/", "iconUrl": "https://meet.jit.si/static/pwa/icons/icon512.png", - "maskableIconUrl": "https://meet.jit.si/static/pwa/icons/iconMask.png", "splashScreenFadeOutDuration": 300, - "appVersionName": "20.5.0", - "appVersionCode": 1, + "appVersionName": "1.0.0", + "appVersionCode": 2000000000, + "shortcuts": [], "generatorApp": "bubblewrap-cli", - "webManifestUrl": "https://meet.jit.si/static/pwa/manifest.json", + "webManifestUrl": "https://meet.jit.si/manifest.json", "fallbackType": "customtabs", "features": {}, "enableSiteSettingsShortcut": true, "isChromeOSOnly": true, - "appVersion": "20.5.0" + "appVersion": "1.0.0" } \ No newline at end of file