Skip to content

Commit 624b8fc

Browse files
fquirinfquirin
authored
Merge pull request #18 from SEPIA-Framework/dev
v0.19.0
2 parents bc73bfa + eb1c4d6 commit 624b8fc

Some content is hidden

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

45 files changed

+3008
-469
lines changed

‎config.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version='1.0' encoding='utf-8'?>
2-
<widget id="org.example.sepia.app.web" version="0.18.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
2+
<widget id="org.example.sepia.app.web" version="0.19.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
33
<name>S.E.P.I.A.</name>
44
<description>
55
Prototype of S.E.P.I.A. framework client
@@ -52,11 +52,12 @@
5252
<!--config stuff-->
5353
<preference name="AndroidLaunchMode" value="singleTask" />
5454
<preference name="android-minSdkVersion" value="19" /><!-- Android 4.4+ -->
55-
<preference name="android-targetSdkVersion" value="26" /><!-- Android 8.0 -->
55+
<preference name="android-targetSdkVersion" value="28" /><!-- Android 9.0 -->
5656
<preference name="android-windowSoftInputMode" value="adjustSize" />
5757
<!-- custom manifest changes -->
5858
<custom-preference name="android-manifest/application/activity/@android:theme" value="@style/SplashTheme"/> <!-- Theme mainly for splash screen or background colors -->
5959
<custom-preference name="android-manifest/application/activity/@android:configChanges" value="orientation|keyboardHidden|keyboard|screenSize|locale|navigation"/> <!-- Navigation is for bluetooth restart! -->
60+
<custom-preference name="android-manifest/application/@android:networkSecurityConfig" value="@xml/network_security_config"/> <!-- Network security config (e.g. to whitelist non-SSL domains for audio stream) -->
6061

6162
<!--intents-->
6263
<allow-intent href="market:*" />

‎create-android-project.sh‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ cordova plugin add cordova-plugin-whitelist
2727
cordova plugin add cordova-universal-links-plugin
2828
cordova plugin add cordova-plugin-statusbar
2929
cordova plugin add cordova-plugin-splashscreen
30+
#cordova plugin add https://github.com/apache/cordova-plugin-splashscreen.git -- NOTE: use this in case releases are too old
3031
cordova plugin add cordova-plugin-cache-clear
3132
cordova plugin add cordova-custom-config
3233
cordova plugin add plugin_mods/speechrecognition/org.apache.cordova.speech.speechrecognition
@@ -62,13 +63,14 @@ echo "#Preparing build ..."
6263
cordova prepare android
6364
# overwrite icons (this will be replaced with a proper implementation)
6465
sleep 2
65-
echo "#Replacing icons and theme with launch screen ..."
66+
echo "#Adding or overwriting resources, e.g. icons, themes, xml ..."
6667
cp -r -f "resources/icons/android/notifications/res/" "platforms/android/res/"
6768
cp -r "resources/themes/android/background_splash.xml" "platforms/android/res/drawable/background_splash.xml"
6869
cp -r "resources/themes/android/launch_screen.png" "platforms/android/res/drawable/launch_screen.png"
6970
#cp -r "resources/themes/android/styles.xml" "platforms/android/res/values/styles.xml"
7071
cp -r "resources/themes/android/values/" "platforms/android/res/values/"
7172
mkdir -p "platforms/android/res/values-v21"
7273
cp -r "resources/themes/android/values-v21/" "platforms/android/res/values-v21/"
74+
cp -r "resources/config/android/xml/" "platforms/android/res/xml/"
7375
echo "#DONE"
7476
echo "If everything worked out fine the next step would be to build the app from the %APP_NAME% folder: cordova build android"

‎create-ios-project-wkwebview.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ cordova plugin add cordova-plugin-whitelist
2828
cordova plugin add cordova-universal-links-plugin
2929
cordova plugin add cordova-plugin-statusbar
3030
cordova plugin add cordova-plugin-splashscreen
31+
#cordova plugin add https://github.com/apache/cordova-plugin-splashscreen.git -- NOTE: use this in case releases are too old
3132
cordova plugin add cordova-plugin-cache-clear
3233
cordova plugin add plugin_mods/speechrecognition/org.apache.cordova.speech.speechrecognition
3334
#cordova plugin add de.appplant.cordova.plugin.local-notification

‎resources/config/android/xml/network_security_config.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<network-security-config>
3+
<base-config cleartextTrafficPermitted="true">
4+
<trust-anchors>
5+
<certificates src="system" />
6+
<certificates src="user" />
7+
</trust-anchors>
8+
</base-config>
9+
</network-security-config>

‎win-create-android-project.bat‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ cordova plugin add cordova-plugin-whitelist |more
2626
cordova plugin add cordova-universal-links-plugin |more
2727
cordova plugin add cordova-plugin-statusbar |more
2828
cordova plugin add cordova-plugin-splashscreen |more
29+
REM cordova plugin add https://github.com/apache/cordova-plugin-splashscreen.git |more -- NOTE: use this in case releases are too old
2930
cordova plugin add cordova-plugin-cache-clear |more
3031
cordova plugin add cordova-custom-config |more
3132
cordova plugin add plugin_mods/speechrecognition/org.apache.cordova.speech.speechrecognition |more
@@ -60,12 +61,13 @@ echo "#Preparing build ..."
6061
cordova prepare android |more
6162
REM overwrite icons (this will be replaced with a proper implementation)
6263
sleep 2
63-
echo "#Replacing icons ..."
64+
echo "#Adding or overwriting resources, e.g. icons, themes, xml ..."
6465
xcopy "resources\icons\android\notifications\res" "platforms\android\res" /e /h /y |more
6566
xcopy "resources\themes\android\background_splash.xml" "platforms\android\res\drawable" |more
6667
xcopy "resources\themes\android\launch_screen.png" "platforms\android\res\drawable" |more
6768
xcopy "resources\themes\android\values" "platforms\android\res\values" |more
6869
xcopy "resources\themes\android\values-v21" "platforms\android\res\values-v21" /i |more
70+
xcopy "resources\config\android\xml" "platforms\android\res\xml" /i |more
6971
echo "#DONE"
7072
echo "If everything worked out fine the next step would be to build the app from the %APP_NAME% folder: cordova build android"
7173
pause

‎www/admin.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ <h3>User Accounts</h3>
2929
<div id="sepiaFW-frames-nav-bar-page-indicator"><div>&nbsp;</div><div>&nbsp;</div></div>
3030
</div>
3131
<script>
32-
$('[data-localize]').each(function(){
32+
$('#sepiaFW-frame-carousel').find('[data-localize]').each(function(){
3333
$(this).html(SepiaFW.local.g(this.dataset.localize));
3434
});
3535
</script>

‎www/always-on.html‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525
<div id="sepiaFW-alwaysOn-battery"></div>
2626
</div>
2727
</div>
28-
<div id="sepiaFW-alwaysOn-stt-out"></div>
28+
<div id="sepiaFW-alwaysOn-stt-out" class="sepiaFW-alwaysOn-text-block"></div>
29+
<div id="sepiaFW-alwaysOn-tts-out" class="sepiaFW-alwaysOn-text-block"></div>
2930
</div>
3031
</div>
3132
</div>
@@ -46,7 +47,7 @@
4647
<div id="sepiaFW-frames-nav-bar-page-indicator"><div>&nbsp;</div></div>
4748
</div>
4849
<script>
49-
$('[data-localize]').each(function(){
50+
$('#sepiaFW-frame-carousel').find('[data-localize]').each(function(){
5051
$(this).html(SepiaFW.local.g(this.dataset.localize));
5152
});
5253
</script>

0 commit comments

Comments
 (0)