Browse Source

fix(twa) update template

Set version to 1.0.0 with a very large version code so it's automatically kept
around when pushing new versions.

Additionally drop some no longer needed icon assets (bubblewrap did this).
master
Saúl Ibarra Corretgé 3 years ago
parent
commit
2763c2f5c9

+ 12
- 18
twa/app/build.gradle View File

@@ -46,20 +46,14 @@ def twaManifest = [
46 46
     enableSiteSettingsShortcut: 'true',
47 47
 ]
48 48
 
49
-// Use the number of seconds/10 since Jan 1 2019 as the versionCode.
50
-// This lets us upload a new build at most every 10 seconds for the
51
-// next ~680 years.
52
-// https://stackoverflow.com/a/38643838
53
-def vcode = (int) (((new Date().getTime() / 1000) - 1546297200) / 10)
54
-
55 49
 android {
56 50
     compileSdkVersion 29
57 51
     defaultConfig {
58 52
         applicationId "org.jitsi.meet"
59 53
         minSdkVersion 19
60 54
         targetSdkVersion 29
61
-        versionCode vcode
62
-        versionName "20.5.0"
55
+        versionCode 2000000000
56
+        versionName "1.0.0"
63 57
 
64 58
         // The name for the application
65 59
         resValue "string", "appName", twaManifest.name
@@ -71,12 +65,12 @@ android {
71 65
         def launchUrl = "https://" + twaManifest.hostName + twaManifest.launchUrl
72 66
         resValue "string", "launchUrl", launchUrl
73 67
 
74
-
68
+        
75 69
             // The URL the Web Manifest for the Progressive Web App that the TWA points to. This
76 70
             // is used by Chrome OS to open the Web version of the PWA instead of the TWA, as it
77 71
             // will probably give a better user experience for non-mobile devices.
78
-            resValue "string", "webManifestUrl", 'https://meet.jit.si/static/pwa/manifest.json'
79
-
72
+            resValue "string", "webManifestUrl", 'https://meet.jit.si/manifest.json'
73
+        
80 74
 
81 75
         // The hostname is used when building the intent-filter, so the TWA is able to
82 76
         // handle Intents to open https://svgomg.firebaseapp.com.
@@ -106,13 +100,13 @@ android {
106 100
         // compile. If not set, the navigation bar color defaults to #000000 - black.
107 101
         resValue "color", "navigationColorDark", twaManifest.navigationColorDark
108 102
 
109
-        // This attribute sets the navbar divider color for the TWA. It can be either
110
-        // set here or in `res/values/colors.xml`. Setting in both places is an error and the app
103
+        // This attribute sets the navbar divider color for the TWA. It can be either 
104
+        // set here or in `res/values/colors.xml`. Setting in both places is an error and the app 
111 105
         // will not compile. If not set, the divider color defaults to #00000000 - transparent.
112 106
         resValue "color", "navigationDividerColor", twaManifest.navigationDividerColor
113 107
 
114
-        // This attribute sets the dark navbar divider color for the TWA. It can be either
115
-        // set here or in `res/values/colors.xml`. Setting in both places is an error and the
108
+        // This attribute sets the dark navbar divider color for the TWA. It can be either 
109
+        // set here or in `res/values/colors.xml`. Setting in both places is an error and the 
116 110
         //app will not compile. If not set, the divider color defaults to #000000 - black.
117 111
         resValue "color", "navigationDividerColorDark", twaManifest.navigationDividerColorDark
118 112
 
@@ -192,11 +186,11 @@ task generateShorcutsFile {
192 186
 preBuild.dependsOn(generateShorcutsFile)
193 187
 
194 188
 repositories {
195
-
189
+    
196 190
 }
197 191
 
198 192
 dependencies {
199 193
     implementation fileTree(include: ['*.jar'], dir: 'libs')
200
-
201
-    implementation 'com.google.androidbrowserhelper:androidbrowserhelper:2.0.0'
194
+    
195
+    implementation 'com.google.androidbrowserhelper:androidbrowserhelper:2.0.0'    
202 196
 }

BIN
twa/app/src/main/ic_launcher-playstore.png View File


+ 0
- 5
twa/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml View File

@@ -1,5 +0,0 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
3
-    <background android:drawable="@color/ic_launcher_background"/>
4
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
5
-</adaptive-icon>

+ 0
- 5
twa/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml View File

@@ -1,5 +0,0 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
3
-    <background android:drawable="@color/ic_launcher_background"/>
4
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
5
-</adaptive-icon>

BIN
twa/app/src/main/res/mipmap-hdpi/ic_launcher.png View File


BIN
twa/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png View File


BIN
twa/app/src/main/res/mipmap-hdpi/ic_launcher_round.png View File


BIN
twa/app/src/main/res/mipmap-mdpi/ic_launcher.png View File


BIN
twa/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png View File


BIN
twa/app/src/main/res/mipmap-mdpi/ic_launcher_round.png View File


BIN
twa/app/src/main/res/mipmap-xhdpi/ic_launcher.png View File


BIN
twa/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png View File


BIN
twa/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png View File


BIN
twa/app/src/main/res/mipmap-xxhdpi/ic_launcher.png View File


BIN
twa/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png View File


BIN
twa/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png View File


BIN
twa/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png View File


BIN
twa/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png View File


BIN
twa/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png View File


+ 1
- 1
twa/app/src/main/res/raw/web_app_manifest.json View File

@@ -1 +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"}
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":"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"}

+ 0
- 4
twa/app/src/main/res/values/ic_launcher_background.xml View File

@@ -1,4 +0,0 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<resources>
3
-    <color name="ic_launcher_background">#66A8DD</color>
4
-</resources>

+ 15
- 0
twa/app/src/main/res/xml/shortcuts.xml View File

@@ -1 +1,16 @@
1
+<!--
2
+    Copyright 2019 Google Inc. All Rights Reserved.
3
+
4
+     Licensed under the Apache License, Version 2.0 (the "License");
5
+     you may not use this file except in compliance with the License.
6
+     You may obtain a copy of the License at
7
+
8
+         http://www.apache.org/licenses/LICENSE-2.0
9
+
10
+     Unless required by applicable law or agreed to in writing, software
11
+     distributed under the License is distributed on an "AS IS" BASIS,
12
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13
+     See the License for the specific language governing permissions and
14
+     limitations under the License.
15
+-->
1 16
 <shortcuts xmlns:android='http://schemas.android.com/apk/res/android' />

+ 1
- 2
twa/gradle/wrapper/gradle-wrapper.properties View File

@@ -1,6 +1,5 @@
1
-#Wed Oct 14 15:52:23 CEST 2020
2 1
 distributionBase=GRADLE_USER_HOME
3 2
 distributionPath=wrapper/dists
4 3
 zipStoreBase=GRADLE_USER_HOME
5 4
 zipStorePath=wrapper/dists
6
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
5
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip

+ 5
- 5
twa/twa-manifest.json View File

@@ -13,15 +13,15 @@
13 13
   "enableNotifications": false,
14 14
   "startUrl": "/",
15 15
   "iconUrl": "https://meet.jit.si/static/pwa/icons/icon512.png",
16
-  "maskableIconUrl": "https://meet.jit.si/static/pwa/icons/iconMask.png",
17 16
   "splashScreenFadeOutDuration": 300,
18
-  "appVersionName": "20.5.0",
19
-  "appVersionCode": 1,
17
+  "appVersionName": "1.0.0",
18
+  "appVersionCode": 2000000000,
19
+  "shortcuts": [],
20 20
   "generatorApp": "bubblewrap-cli",
21
-  "webManifestUrl": "https://meet.jit.si/static/pwa/manifest.json",
21
+  "webManifestUrl": "https://meet.jit.si/manifest.json",
22 22
   "fallbackType": "customtabs",
23 23
   "features": {},
24 24
   "enableSiteSettingsShortcut": true,
25 25
   "isChromeOSOnly": true,
26
-  "appVersion": "20.5.0"
26
+  "appVersion": "1.0.0"
27 27
 }

Loading…
Cancel
Save