[Simulator/Android] Bump to latest dependencies + other improvements (#376)

Co-authored-by: mickbot-92 <e3rck4b4[at]duck[dot]com> * Bumping to latest stable dependencies and Gradle. * [CI] Building with JDK 21 instead of with JDK 11 (JDK 17 works fine too if you remove the latest line of build.gradle). * Using `mavenCentral()` instead of [deprecated](https://docs.gradle.org/current/userguide/upgrading_version_6.html#jcenter_deprecation) `jcenter()` * Removing useless Google plugins. * Setting `compileSdk` to 33 : Upsilon no longer requires the Notification permission. * versionCode : compiling with the current Unix/Epoch timestamp. * versionName : using the `UPSILON_VERSION` variable instead of the Omega one + adding the date of compiling. * Some improvements about icons. * [CI] Using the latests `uses: ` to make the warning about NodeJS deprecation disappear. Many thanks to @Yaya-Cout (and to @pi-dev500 too :) 🫡
2026-01-18 16:27:34 +01:00 · 2024-10-20 08:39:17 +00:00
parent 89def884f7
commit 172f168bb2
14 changed files with 78 additions and 84 deletions
--- a/.github/workflows/ci-docker.yml
+++ b/.github/workflows/ci-docker.yml
@@ -5,7 +5,7 @@ jobs:
  docker:
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
      with:
       submodules: true
    - name: Build the Docker image
--- a/.github/workflows/ci-workflow.yml
+++ b/.github/workflows/ci-workflow.yml
@@ -21,7 +21,7 @@ jobs:
  fxcg:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
        with:
          submodules: 'recursive'
      - name: Install dependencies
@@ -36,7 +36,7 @@ jobs:
        id: get-latest-commit-hash
      - name: Cache gint/fxsdk installation
        id: cache-gint
-        uses: actions/cache@v3
+        uses: actions/cache@v4
        with:
          path: |
            ~/.local/*/*
@@ -72,7 +72,7 @@ jobs:
          path: 'output/release/simulator/fxcg/epsilon.g3a'
          destination: 'upsilon-binfiles.appspot.com/dev/simulator/'
          parent: false
-      - uses: actions/upload-artifact@master
+      - uses: actions/upload-artifact@v4
        with:
          name: epsilon.g3a
          path: output/release/simulator/fxcg/epsilon.g3a
@@ -81,7 +81,7 @@ jobs:
    runs-on: ubuntu-latest
    container: devkitpro/devkitarm:latest
    steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
        with:
          submodules: true
      - run: sudo apt-get update
@@ -94,20 +94,25 @@ jobs:
      - run: echo "PATH=.:$PATH" >> $GITHUB_ENV
      - run: make -j2 PLATFORM=simulator TARGET=3ds
      - run: make -j2 PLATFORM=simulator TARGET=3ds epsilon.cia
-      - uses: actions/upload-artifact@master
+      - uses: actions/upload-artifact@v4
        with:
          name: epsilon-3ds.3dsx
          path: output/release/simulator/3ds/epsilon.3dsx
-      - uses: actions/upload-artifact@master
+      - uses: actions/upload-artifact@v4
        with:
          name: epsilon-3ds.cia
          path: output/release/simulator/3ds/epsilon.cia
  android:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
        with:
          submodules: 'recursive'
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
      - run: wget -nv https://dl.google.com/android/repository/android-ndk-r21e-linux-x86_64.zip
      - run: unzip -q android-ndk-r21e-linux-x86_64.zip
      - run: make -j2 PLATFORM=simulator TARGET=android NDK_PATH=./android-ndk-r21e
@@ -123,7 +128,7 @@ jobs:
          path: 'output/release/simulator/android/epsilon.apk'
          destination: 'upsilon-binfiles.appspot.com/dev/simulator/'
          parent: false
-      - uses: actions/upload-artifact@master
+      - uses: actions/upload-artifact@v4
        with:
          name: epsilon-android.apk
          path: output/release/simulator/android/epsilon.apk
@@ -132,7 +137,7 @@ jobs:
    steps:
      - run: sudo apt-get install build-essential imagemagick libfreetype6-dev libjpeg-dev libpng-dev pkg-config
      - uses: numworks/setup-arm-toolchain@2020-q2
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
        with:
          submodules: 'recursive'
      - run: mkdir final-output
@@ -176,7 +181,7 @@ jobs:
          path: 'final-output/'
          destination: 'upsilon-binfiles.appspot.com/dev/n100/'
          parent: false
-      - uses: actions/upload-artifact@master
+      - uses: actions/upload-artifact@v4
        with:
          name: epsilon-binpack-n0100.tgz
          path: binpack-n0100.tgz
@@ -185,7 +190,7 @@ jobs:
    steps:
      - run: sudo apt-get install build-essential imagemagick libfreetype6-dev libjpeg-dev libpng-dev pkg-config
      - uses: numworks/setup-arm-toolchain@2020-q2
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
        with:
          submodules: 'recursive'
      - run: make -j2 MODEL=n0110 epsilon.dfu
@@ -211,7 +216,7 @@ jobs:
          path: 'output/release/device/n0110/binpack/'
          destination: 'upsilon-binfiles.appspot.com/dev/n110/'
          parent: false
-      - uses: actions/upload-artifact@master
+      - uses: actions/upload-artifact@v4
        with:
          name: epsilon-binpack-n0110.tgz
          path: output/release/device/n0110/binpack-n0110.tgz
@@ -220,7 +225,7 @@ jobs:
    steps:
      - run: sudo apt-get install build-essential imagemagick libfreetype6-dev libjpeg-dev libpng-dev pkg-config
      - uses: numworks/setup-arm-toolchain@2022-08
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
        with:
          submodules: 'recursive'
      - run: make -j2 MODEL=n0110 bootloader
@@ -249,7 +254,7 @@ jobs:
          path: 'output/release/device/bootloader/binpack/'
          destination: 'upsilon-binfiles.appspot.com/dev/n110/'
          parent: false
-      - uses: actions/upload-artifact@master
+      - uses: actions/upload-artifact@v4
        with:
          name: epsilon-binpack-bootloader.tgz
          path: output/release/device/bootloader/binpack-bootloader.tgz
@@ -260,7 +265,7 @@ jobs:
         shell: msys2 {0}
    steps:
      - uses: msys2/setup-msys2@v2
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
        with:
          submodules: 'recursive'
      - run: pacman -S --noconfirm mingw-w64-x86_64-gcc mingw-w64-x86_64-freetype mingw-w64-x86_64-pkg-config make mingw-w64-x86_64-python3 mingw-w64-x86_64-libjpeg-turbo mingw-w64-x86_64-libpng
@@ -279,7 +284,7 @@ jobs:
          path: 'output/release/simulator/windows/epsilon.exe'
          destination: 'upsilon-binfiles.appspot.com/dev/simulator/'
          parent: false
-      - uses: actions/upload-artifact@master
+      - uses: actions/upload-artifact@v4
        with:
          name: epsilon-windows.exe
          path: output/release/simulator/windows/epsilon.exe
@@ -289,7 +294,7 @@ jobs:
      - uses: numworks/setup-emscripten@master
        with:
          sdk: latest
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
        with:
          submodules: 'recursive'
      - run: make -j2 PLATFORM=simulator TARGET=web
@@ -307,7 +312,7 @@ jobs:
          path: 'output/release/simulator/web/epsilon.js'
          destination: 'upsilon-binfiles.appspot.com/dev/simulator/'
          parent: false
-      - uses: actions/upload-artifact@master
+      - uses: actions/upload-artifact@v4
        with:
          name: epsilon-web.zip
          path: output/release/simulator/web/epsilon.zip
@@ -315,7 +320,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - run: sudo apt-get install build-essential imagemagick libfreetype6-dev libjpeg-dev libpng-dev pkg-config
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
        with:
          submodules: 'recursive'
      - run: make -j2 PLATFORM=simulator
@@ -333,7 +338,7 @@ jobs:
          path: 'output/release/simulator/linux/epsilon.bin'
          destination: 'upsilon-binfiles.appspot.com/dev/simulator/'
          parent: false
-      - uses: actions/upload-artifact@master
+      - uses: actions/upload-artifact@v4
        with:
          name: epsilon-linux.bin
          path: output/release/simulator/linux/epsilon.bin
@@ -342,13 +347,13 @@ jobs:
    runs-on: macOS-latest
    steps:
      - run: brew install numworks/tap/epsilon-sdk
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
        with:
          submodules: 'recursive'
      - run: make -j2 PLATFORM=simulator
      - run: make -j2 PLATFORM=simulator ARCH=x86_64 test.bin
      - run: output/release/simulator/macos/x86_64/test.bin --headless
-      - uses: actions/upload-artifact@master
+      - uses: actions/upload-artifact@v4
        with:
          name: epsilon-macos.zip
          path: output/release/simulator/macos/epsilon.app
@@ -357,12 +362,12 @@ jobs:
    runs-on: macOS-latest
    steps:
      - run: brew install numworks/tap/epsilon-sdk
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
        with:
          submodules: 'recursive'
      - run: make -j2 PLATFORM=simulator TARGET=ios EPSILON_TELEMETRY=0
      - run: make -j2 PLATFORM=simulator TARGET=ios EPSILON_TELEMETRY=0 APPLE_PLATFORM=ios-simulator
-      - uses: actions/upload-artifact@master
+      - uses: actions/upload-artifact@v4
        with:
          name: epsilon-ios.ipa
          path: output/release/simulator/ios/epsilon.ipa
--- a/.github/workflows/metric-workflow.yml
+++ b/.github/workflows/metric-workflow.yml
@@ -10,7 +10,7 @@ jobs:
      - name: Install ARM toolchain
        uses: numworks/setup-arm-toolchain@2020-q2
      - name: Checkout PR base
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
        with:
          submodules: recursive
          ref: ${{ github.event.pull_request.base.sha }}
@@ -18,7 +18,7 @@ jobs:
      - name: Build base
        run: make -j2 -C base MODEL=n0110 epsilon.elf
      - name: Checkout PR head
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
        with:
          submodules: recursive
          ref: ${{ github.event.pull_request.head.sha }}
@@ -29,7 +29,7 @@ jobs:
        id: binary_size
        run: echo "::set-output name=table::$(python3 head/build/metrics/binary_size.py base/output/release/device/n0110/epsilon.elf head/output/release/device/n0110/epsilon.elf --labels Base Head --sections .text .rodata .bss .data --custom 'Total (RAM)' .data .bss --custom 'Total (ROM)' .text .rodata .data --escape)"
      - name: Add comment
-        uses: actions/github-script@v3.0.0
+        uses: actions/github-script@v7
        with:
          script: |
            await github.issues.createComment({
--- a/README.md
+++ b/README.md
@@ -264,7 +264,7 @@ git checkout upsilon-dev

 ```bash
 make MODEL=n0100 clean
-make MODEL=n0100 EPSILON_I18N=en OMEGA_USERNAME="{Your name, max 15 characters}" -j(nproc)
+make MODEL=n0100 EPSILON_I18N=en OMEGA_USERNAME="{Your name, max 15 characters}" -j$(nproc)
 ```

 Now, run either:
@@ -280,7 +280,7 @@ to directly flash the calculator after pressing simultaneously `reset` and `6` b
 or:

 ```bash
-make MODEL=n0100 OMEGA_USERNAME="" binpack -j(nproc)
+make MODEL=n0100 OMEGA_USERNAME="" binpack -j$(nproc)
 ```

 to make binpack which you can flash to the calculator from [TI-Planet's WebDFU](https://ti-planet.github.io/webdfu_numworks/n0100/). Binpacks are a great way to share a custom build of Upsilon to friends.
@@ -417,7 +417,7 @@ You need devkitPro and devkitARM installed and in your path (instructions [here]
 git clone --recursive https://github.com/UpsilonNumworks/Upsilon.git
 cd Upsilon
 git checkout upsilon-dev
-make PLATFORM=simulator TARGET=3ds -j(nproc)
+make PLATFORM=simulator TARGET=3ds -j$(nproc)
 ```

 You can then put epsilon.3dsx on a SD card to run it from the HBC or use 3dslink to launch it over the network:
--- a/ion/src/simulator/android/Makefile
+++ b/ion/src/simulator/android/Makefile
@@ -30,11 +30,11 @@ ifndef ARCH

 $(BUILD_DIR)/app/res/mipmap/ic_launcher.png: ion/src/simulator/assets/logo.svg | $$(@D)/.
 	$(call rule_label,CONVERT)
-	$(Q) convert -background "#b1403b" $< $@
+	$(Q) convert -background "#5c83ab" $< $@

 $(BUILD_DIR)/app/res/mipmap-v26/ic_launcher_foreground.png: ion/src/simulator/assets/logo.svg | $$(@D)/.
 	$(call rule_label,CONVERT)
-	$(Q) convert -background none $< -resize 1024x1024 -gravity center -background none -extent 1024x1024 $@
+	$(Q) convert -background none $< -resize 694x694 -gravity center -background none -extent 1024x1024 $@

 $(BUILD_DIR)/app/res/mipmap-v26/ic_launcher_monochrome.png: ion/src/simulator/assets/logo_monochrome.svg | $$(@D)/.
 	$(call rule_label,CONVERT)
@@ -68,7 +68,7 @@ apk_deps += $(addprefix $(BUILD_DIR)/app/res/,mipmap/ic_launcher.png mipmap-v26/

 $(BUILD_DIR)/%.apk: $(apk_deps)
 	$(call rule_label,GRADLE)
-	$(Q) ANDROID_HOME=$(ANDROID_HOME) EPSILON_VERSION=$(EPSILON_VERSION) OMEGA_VERSION=$(OMEGA_VERSION) BUILD_DIR=$(BUILD_DIR) EPSILON_VARIANT=$* ion/src/simulator/android/gradlew -b ion/src/simulator/android/build.gradle assembleRelease
+	$(Q) ANDROID_HOME=$(ANDROID_HOME) UPSILON_VERSION=$(UPSILON_VERSION) BUILD_DIR=$(BUILD_DIR) EPSILON_VARIANT=$* ion/src/simulator/android/gradlew -p ion/src/simulator/android assembleRelease
 	$(Q) cp $(BUILD_DIR)/app/outputs/apk/release/android-release*.apk $@

 endif
--- a/ion/src/simulator/android/build.gradle
+++ b/ion/src/simulator/android/build.gradle
@@ -12,18 +12,17 @@ def fileIfPath(path) {

 buildscript {
  repositories {
-    jcenter()
+    mavenCentral()
    google()
  }
  dependencies {
-    classpath 'com.android.tools.build:gradle:3.2.0'
-    classpath 'com.google.gms:google-services:4.2.0'
+    classpath 'com.android.tools.build:gradle:8.7.1'
  }
 }

 allprojects {
  repositories {
-    jcenter()
+    mavenCentral()
    google()
  }
  buildDir = BUILD_DIR
@@ -32,14 +31,15 @@ allprojects {
 apply plugin: 'com.android.application'

 android {
-  compileSdkVersion 29
+  namespace = "io.github.upsilon.simulator"
+  compileSdkVersion 35
  defaultConfig {
    applicationId "io.github.upsilon.simulator"
-    minSdkVersion 16
-    targetSdkVersion 29
-    def (major, minor, patch) = System.getenv('OMEGA_VERSION').toLowerCase().tokenize('.').collect{it.toInteger()}
-    versionCode major*1000000 + minor*10000 + patch * 100
-    versionName System.getenv('OMEGA_VERSION')
+    minSdkVersion 21
+    targetSdkVersion 33
+    def d=new Date()
+    versionCode Instant.now().getEpochSecond().toInteger()
+    versionName LocalDate.now().format("yyyyMMdd")+'-'+System.getenv('UPSILON_VERSION')
  }
  signingConfigs {
    environment {
@@ -77,6 +77,8 @@ android {

 dependencies {
  implementation fileTree(include: ['*.jar'], dir: 'libs')
-  implementation "androidx.appcompat:appcompat:1.0.2"
-  implementation "com.google.android.gms:play-services-analytics:16.0.7"
+  implementation "androidx.appcompat:appcompat:1.7.0"
+  implementation(platform("org.jetbrains.kotlin:kotlin-bom:2.0.21"))
 }
+
+java{toolchain{languageVersion=JavaLanguageVersion.of(21)}}
--- a/ion/src/simulator/android/gradle/wrapper/gradle-wrapper.properties
+++ b/ion/src/simulator/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/ion/src/simulator/android/src/AndroidManifest.xml
+++ b/ion/src/simulator/android/src/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="io.github.upsilon.simulator"
  android:installLocation="auto">

  <uses-feature android:glEsVersion="0x00020000" />
@@ -23,6 +22,7 @@
      android:alwaysRetainTaskState="true"
      android:launchMode="singleInstance"
      android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
+      android:exported="true"
      >
      <intent-filter>
        <action android:name="android.intent.action.MAIN" />
--- a/ion/src/simulator/android/src/java/io/github/upsilon/simulator/UpsilonActivity.java
+++ b/ion/src/simulator/android/src/java/io/github/upsilon/simulator/UpsilonActivity.java
@@ -11,10 +11,6 @@ import android.os.Bundle;
 import android.provider.Settings;
 import android.util.Log;

-import com.google.android.gms.analytics.GoogleAnalytics;
-import com.google.android.gms.analytics.Tracker;
-import com.google.android.gms.analytics.HitBuilders;
-
 import org.libsdl.app.SDLActivity;
 import org.libsdl.app.SDL;

--- a/ion/src/simulator/android/src/res/mipmap-v26/ic_launcher.xml
+++ b/ion/src/simulator/android/src/res/mipmap-v26/ic_launcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-  <background android:drawable="@color/yellow" />
+  <background android:drawable="@color/blue" />
  <foreground android:drawable="@mipmap/ic_launcher_foreground" />
  <monochrome android:drawable="@mipmap/ic_launcher_monochrome" />
 </adaptive-icon>
--- a/ion/src/simulator/android/src/res/values/colors.xml
+++ b/ion/src/simulator/android/src/res/values/colors.xml
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <color name="yellow">#5c83ab</color>
-  <color name="lightGray">#F7F7F7</color>
-</resources>
--- a/ion/src/simulator/android/src/res/values/resources.xml
+++ b/ion/src/simulator/android/src/res/values/resources.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="app_name">Upsilon</string>
+  <color name="blue">#5c83ab</color>
  <style name="AppTheme" parent="Theme.AppCompat">
-    <item name="colorPrimary">@color/yellow</item>
-    <item name="colorAccent">@color/yellow</item> -->
+    <item name="colorPrimary">@color/blue</item>
+    <item name="colorAccent">@color/blue</item> -->
    <item name="android:windowLightStatusBar" tools:targetApi="21">false</item>
    <item name="android:windowLightNavigationBar" tools:targetApi="21">true</item>
    <item name="android:windowTranslucentNavigation" tools:targetApi="21">true</item>
--- a/ion/src/simulator/android/src/res/values/strings.xml
+++ b/ion/src/simulator/android/src/res/values/strings.xml
@@ -1,3 +0,0 @@
-<resources>
-  <string name="app_name">Upsilon</string>
-</resources>
--- a/ion/src/simulator/assets/logo.svg
+++ b/ion/src/simulator/assets/logo.svg
@@ -2,11 +2,11 @@
 <svg
   id="svg"
   version="1.1"
-   width="400"
-   height="400"
-   viewBox="-254.545454545, -254.545454545, 654.545454545,654.545454545"
+   width="268.99927"
+   height="268.99927"
+   viewBox="-254.54545 -254.54545 440.18062 440.18062"
   sodipodi:docname="logo.svg"
-   inkscape:version="1.3.2 (091e20ef0f, 2023-11-25, custom)"
+   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns="http://www.w3.org/2000/svg"
@@ -22,35 +22,32 @@
     inkscape:pageopacity="0.0"
     inkscape:pagecheckerboard="0"
     inkscape:deskcolor="#d1d1d1"
-     inkscape:zoom="2.0788939"
-     inkscape:cx="212.13203"
-     inkscape:cy="211.65101"
-     inkscape:window-width="2560"
-     inkscape:window-height="1374"
+     inkscape:zoom="8.2264833"
+     inkscape:cx="144.22931"
+     inkscape:cy="95.788197"
+     inkscape:window-width="1920"
+     inkscape:window-height="1011"
     inkscape:window-x="0"
     inkscape:window-y="0"
     inkscape:window-maximized="1"
-     inkscape:current-layer="svg" />
+     inkscape:current-layer="svgg"
+     showgrid="false" />
  <g
     id="svgg"
-     transform="matrix(1.1004516,0,0,1.1004516,-147.36305,-147.36305)">
-    <path
-       id="path0"
-       d="m 0,97.8 c 0,87.686 0.105,99.455 0.867,97.449 0.073,-0.193 0.883,-1.228 1.8,-2.3 0.917,-1.072 2.426,-2.849 3.353,-3.949 2.778,-3.297 8.486,-9.954 22.465,-26.2 2.556,-2.97 4.977,-5.76 5.381,-6.2 0.404,-0.44 1.543,-1.79 2.533,-3 2.034,-2.489 8.863,-10.495 9.211,-10.8 0.126,-0.11 2.551,-2.99 5.39,-6.4 2.839,-3.41 5.26,-6.29 5.381,-6.4 0.469,-0.428 5.608,-6.387 8.624,-10 1.744,-2.09 3.267,-3.89 3.383,-4 0.117,-0.11 1.292,-1.459 2.612,-2.998 1.32,-1.54 2.94,-3.41 3.6,-4.157 0.66,-0.746 1.38,-1.561 1.6,-1.811 0.22,-0.249 1.206,-1.439 2.191,-2.644 0.985,-1.204 2.45,-2.91 3.256,-3.79 0.805,-0.88 1.977,-2.23 2.602,-3 0.626,-0.77 1.241,-1.49 1.368,-1.6 0.126,-0.11 0.489,-0.577 0.806,-1.039 0.466,-0.677 2.771,-3.363 5.777,-6.732 0.22,-0.247 1.385,-1.614 2.588,-3.039 1.204,-1.424 2.584,-3.04 3.068,-3.59 0.483,-0.55 1.338,-1.54 1.899,-2.2 l 1.02,-1.2 0.025,38.8 c 0.024,36.317 0.077,39.21 0.826,45.2 1.061,8.48 1.976,13.557 2.741,15.2 0.205,0.44 0.467,1.25 0.581,1.8 0.578,2.766 1.221,4.8 1.519,4.8 0.183,0 0.333,0.362 0.333,0.805 0,0.443 0.171,1.118 0.381,1.5 0.209,0.382 0.677,1.415 1.039,2.295 0.363,0.88 1.092,2.503 1.62,3.606 0.528,1.103 0.96,2.213 0.96,2.466 0,0.254 0.135,0.521 0.3,0.595 0.165,0.073 0.792,1.09 1.393,2.259 1.552,3.021 2.469,4.643 2.753,4.874 0.135,0.11 0.373,0.605 0.527,1.1 0.155,0.495 0.449,0.9 0.654,0.9 0.205,0 0.373,0.183 0.373,0.406 0,0.457 3.33,5.165 5.784,8.178 7.393,9.077 16.48,16.924 26.732,23.086 3.488,2.096 10.73,5.658 13.684,6.729 0.44,0.16 1.481,0.585 2.314,0.946 0.832,0.36 1.779,0.655 2.105,0.655 0.326,0 0.904,0.158 1.286,0.352 1.152,0.583 4.647,1.652 5.395,1.65 0.662,-0.002 0.7,2.092 0.7,38.389 v 38.391 l 24.18,0.109 c 18.057,0.081 24.301,0.23 24.657,0.586 0.454,0.454 -0.411,1.581 -5.767,7.514 -0.402,0.445 -1.751,2.069 -2.999,3.609 -1.248,1.54 -2.365,2.89 -2.483,3 -0.488,0.457 -8.447,9.682 -11.388,13.2 -1.747,2.09 -3.272,3.89 -3.388,4 -0.117,0.11 -0.895,1.051 -1.731,2.09 -0.835,1.04 -1.736,2.12 -2.002,2.4 -0.265,0.281 -1.562,1.77 -2.881,3.31 -1.319,1.54 -2.493,2.89 -2.61,3 -0.116,0.11 -1.643,1.91 -3.393,4 -1.75,2.09 -3.401,4.029 -3.67,4.31 -0.268,0.28 -1.171,1.36 -2.006,2.4 -0.836,1.039 -1.612,1.98 -1.725,2.09 -0.113,0.11 -1.283,1.456 -2.6,2.99 -3.529,4.112 -4.636,5.39 -6.234,7.189 -1.202,1.354 -4.534,5.24 -7.995,9.324 -0.421,0.497 -0.765,1.082 -0.765,1.3 0,0.262 40.88,0.397 120,0.397 H 400 V 200 0 H 200 0 v 97.8 m 150.443,20 c 0.134,21.78 0.365,40.14 0.514,40.8 0.148,0.66 0.468,2.19 0.71,3.4 0.751,3.749 1.524,6.026 3.262,9.606 0.589,1.214 1.071,2.367 1.071,2.563 0,0.195 0.45,0.945 1,1.667 0.55,0.721 1,1.415 1,1.544 0,1.102 6.234,8.244 9.687,11.097 1.147,0.948 2.441,2.038 2.875,2.423 0.434,0.385 0.922,0.7 1.085,0.7 0.163,0 0.538,0.242 0.833,0.537 1.358,1.358 9.088,5.255 12.32,6.211 6.89,2.038 18.558,2.548 25,1.093 14.759,-3.333 27.322,-13.323 33.757,-26.841 5.129,-10.773 5.243,-12.055 5.243,-58.772 V 77.994 l 24.3,0.103 24.3,0.103 -0.009,41 c -0.009,43.445 0.048,41.811 -1.826,51.6 -1.014,5.293 -3.501,13.513 -5.002,16.532 -0.31,0.623 -0.563,1.328 -0.563,1.567 0,0.471 -4.593,9.772 -6.272,12.701 -4.542,7.926 -13.359,18.209 -21.328,24.876 -2.657,2.222 -9.836,7.524 -10.189,7.524 -0.108,0 -1.208,0.648 -2.445,1.439 -3.221,2.06 -10.521,5.654 -14.166,6.974 -0.77,0.279 -1.94,0.737 -2.6,1.018 -0.66,0.281 -2.91,1.041 -5,1.688 l -3.8,1.177 -0.102,38.252 -0.102,38.252 H 199.6 175.204 l -0.102,-38.27 -0.102,-38.27 -1.8,-0.685 c -0.99,-0.376 -2.61,-0.902 -3.6,-1.169 -0.99,-0.266 -2.117,-0.649 -2.505,-0.851 -0.387,-0.202 -1.557,-0.645 -2.6,-0.984 -2.159,-0.702 -2.655,-0.92 -8.695,-3.829 -4.419,-2.128 -11.707,-6.446 -13.2,-7.821 -0.44,-0.406 -1.359,-1.094 -2.042,-1.529 -3.338,-2.128 -12.538,-10.773 -15.955,-14.992 -1.158,-1.43 -2.488,-3.033 -2.954,-3.561 -0.467,-0.529 -0.849,-1.08 -0.849,-1.225 0,-0.145 -0.355,-0.644 -0.789,-1.11 -2.17,-2.329 -8.837,-14.157 -10.82,-19.195 -0.499,-1.27 -1.135,-2.849 -1.412,-3.509 -1.208,-2.878 -3.262,-9.706 -3.814,-12.675 -2.22,-11.948 -2.044,-7.835 -2.249,-52.642 -0.104,-22.725 -0.087,-41.581 0.036,-41.903 0.195,-0.508 3.464,-0.572 24.337,-0.483 l 24.111,0.103 0.243,39.6"
-       stroke="none"
-       fill="#5c83ab"
-       fill-rule="evenodd" />
+     transform="matrix(1.1004516,0,0,1.1004516,-254.54545,-254.54545)">
    <path
       id="path1"
-       d="m 101.752,78.58 c -0.123,0.322 -0.14,19.178 -0.036,41.903 0.205,44.807 0.029,40.694 2.249,52.642 0.552,2.969 2.606,9.797 3.814,12.675 0.277,0.66 0.913,2.239 1.412,3.509 1.983,5.038 8.65,16.866 10.82,19.195 0.434,0.466 0.789,0.965 0.789,1.11 0,0.145 0.382,0.696 0.849,1.225 0.466,0.528 1.796,2.131 2.954,3.561 3.417,4.219 12.617,12.864 15.955,14.992 0.683,0.435 1.602,1.123 2.042,1.529 1.493,1.375 8.781,5.693 13.2,7.821 6.04,2.909 6.536,3.127 8.695,3.829 1.043,0.339 2.213,0.782 2.6,0.984 0.388,0.202 1.515,0.585 2.505,0.851 0.99,0.267 2.61,0.793 3.6,1.169 l 1.8,0.685 0.102,38.27 0.102,38.27 h 24.396 24.396 l 0.102,-38.252 0.102,-38.252 3.8,-1.177 c 2.09,-0.647 4.34,-1.407 5,-1.688 0.66,-0.281 1.83,-0.739 2.6,-1.018 3.645,-1.32 10.945,-4.914 14.166,-6.974 1.237,-0.791 2.337,-1.439 2.445,-1.439 0.353,0 7.532,-5.302 10.189,-7.524 7.969,-6.667 16.786,-16.95 21.328,-24.876 1.679,-2.929 6.272,-12.23 6.272,-12.701 0,-0.239 0.253,-0.944 0.563,-1.567 1.501,-3.019 3.988,-11.239 5.002,-16.532 1.874,-9.789 1.817,-8.155 1.826,-51.6 l 0.009,-41 -24.3,-0.103 -24.3,-0.103 v 35.834 c 0,35.769 -0.219,43.152 -1.42,47.972 -1.461,5.859 -1.435,5.784 -3.823,10.8 -10.364,21.773 -35.281,32.691 -58.757,25.748 -3.232,-0.956 -10.962,-4.853 -12.32,-6.211 -0.295,-0.295 -0.67,-0.537 -0.833,-0.537 -0.163,0 -0.651,-0.315 -1.085,-0.7 -0.434,-0.385 -1.728,-1.475 -2.875,-2.423 -3.453,-2.853 -9.687,-9.995 -9.687,-11.097 0,-0.129 -0.45,-0.823 -1,-1.544 -0.55,-0.722 -1,-1.472 -1,-1.667 0,-0.196 -0.482,-1.349 -1.071,-2.563 -1.738,-3.58 -2.511,-5.857 -3.262,-9.606 -0.242,-1.21 -0.562,-2.74 -0.71,-3.4 -0.149,-0.66 -0.38,-19.02 -0.514,-40.8 L 150.2,78.2 126.089,78.097 c -20.873,-0.089 -24.142,-0.025 -24.337,0.483"
+       d="m 101.752,78.58 c -0.123,0.322 -0.14,19.178 -0.036,41.903 0.205,44.807 0.029,40.694 2.249,52.642 0.552,2.969 2.606,9.797 3.814,12.675 0.277,0.66 0.913,2.239 1.412,3.509 1.983,5.038 8.65,16.866 10.82,19.195 0.434,0.466 0.789,0.965 0.789,1.11 0,0.145 0.382,0.696 0.849,1.225 0.466,0.528 1.796,2.131 2.954,3.561 3.417,4.219 12.617,12.864 15.955,14.992 0.683,0.435 1.602,1.123 2.042,1.529 1.493,1.375 8.781,5.693 13.2,7.821 6.04,2.909 6.536,3.127 8.695,3.829 1.043,0.339 2.213,0.782 2.6,0.984 0.388,0.202 1.515,0.585 2.505,0.851 0.99,0.267 2.61,0.793 3.6,1.169 l 1.8,0.685 0.102,38.27 0.102,38.27 h 48.792 l 0.102,-38.252 0.102,-38.252 3.8,-1.177 c 2.09,-0.647 4.34,-1.407 5,-1.688 0.66,-0.281 1.83,-0.739 2.6,-1.018 3.645,-1.32 10.945,-4.914 14.166,-6.974 1.237,-0.791 2.337,-1.439 2.445,-1.439 0.353,0 7.532,-5.302 10.189,-7.524 7.969,-6.667 16.786,-16.95 21.328,-24.876 1.679,-2.929 6.272,-12.23 6.272,-12.701 0,-0.239 0.253,-0.944 0.563,-1.567 1.501,-3.019 3.988,-11.239 5.002,-16.532 1.874,-9.789 1.817,-8.155 1.826,-51.6 l 0.009,-41 C 281.2,78.131333 265,78.062667 248.8,77.994 v 35.834 c 0,35.769 -0.219,43.152 -1.42,47.972 -1.461,5.859 -1.435,5.784 -3.823,10.8 -10.364,21.773 -35.281,32.691 -58.757,25.748 -3.232,-0.956 -10.962,-4.853 -12.32,-6.211 -0.295,-0.295 -0.67,-0.537 -0.833,-0.537 -0.163,0 -0.651,-0.315 -1.085,-0.7 -0.434,-0.385 -1.728,-1.475 -2.875,-2.423 -3.453,-2.853 -9.687,-9.995 -9.687,-11.097 0,-0.129 -0.45,-0.823 -1,-1.544 -0.55,-0.722 -1,-1.472 -1,-1.667 0,-0.196 -0.482,-1.349 -1.071,-2.563 -1.738,-3.58 -2.511,-5.857 -3.262,-9.606 -0.242,-1.21 -0.562,-2.74 -0.71,-3.4 -0.149,-0.66 -0.38,-19.02 -0.514,-40.8 L 150.2,78.2 126.089,78.097 c -20.873,-0.089 -24.142,-0.025 -24.337,0.483"
       stroke="none"
       fill="#ebebeb"
-       fill-rule="evenodd" />
+       fill-rule="evenodd"
+       sodipodi:nodetypes="cccsccsccccccccccccccccsccsccscccccscccssscscsccccccc" />
    <path
       id="path2"
-       d="m 99.206,80.016 c -0.766,0.981 -1.591,1.964 -1.832,2.184 -0.24,0.22 -1.413,1.566 -2.606,2.99 -1.192,1.425 -2.348,2.792 -2.568,3.039 -3.006,3.369 -5.311,6.055 -5.777,6.732 -0.317,0.462 -0.68,0.929 -0.806,1.039 -0.127,0.11 -0.742,0.83 -1.368,1.6 -0.625,0.77 -1.797,2.12 -2.602,3 -0.806,0.88 -2.271,2.583 -3.256,3.784 -1.585,1.932 -3.383,4.036 -4.593,5.372 -0.221,0.244 -1.481,1.704 -2.8,3.244 -1.319,1.54 -2.493,2.89 -2.61,3 -0.116,0.11 -1.639,1.91 -3.383,4 -3.016,3.613 -8.155,9.572 -8.624,10 -0.121,0.11 -2.542,2.99 -5.381,6.4 -2.839,3.41 -5.264,6.29 -5.39,6.4 -0.348,0.305 -7.177,8.311 -9.211,10.8 -0.99,1.21 -2.129,2.56 -2.533,3 -0.404,0.44 -2.825,3.23 -5.381,6.2 C 14.506,179.046 8.798,185.703 6.02,189 2.377,193.323 0.98,194.953 0.5,195.438 0.103,195.839 0,216.885 0,297.971 V 400 h 80 c 52.658,0 80,-0.136 80,-0.397 0,-0.218 0.344,-0.803 0.765,-1.3 3.461,-4.084 6.793,-7.97 7.995,-9.324 1.598,-1.799 2.705,-3.077 6.234,-7.189 1.317,-1.534 2.487,-2.88 2.6,-2.99 0.113,-0.11 0.889,-1.051 1.725,-2.09 0.835,-1.04 1.738,-2.12 2.006,-2.4 0.269,-0.281 1.92,-2.22 3.67,-4.31 1.75,-2.09 3.277,-3.89 3.393,-4 0.117,-0.11 1.291,-1.46 2.61,-3 1.319,-1.54 2.616,-3.029 2.881,-3.31 0.266,-0.28 1.167,-1.36 2.002,-2.4 0.836,-1.039 1.614,-1.98 1.731,-2.09 0.116,-0.11 1.641,-1.91 3.388,-4 2.941,-3.518 10.9,-12.743 11.388,-13.2 0.118,-0.11 1.235,-1.46 2.483,-3 1.248,-1.54 2.597,-3.164 2.999,-3.609 5.356,-5.933 6.221,-7.06 5.767,-7.514 -0.356,-0.356 -6.6,-0.505 -24.657,-0.586 l -24.18,-0.109 v -38.391 c 0,-36.297 -0.038,-38.391 -0.7,-38.389 -0.748,0.002 -4.243,-1.067 -5.395,-1.65 -0.382,-0.194 -0.96,-0.352 -1.286,-0.352 -0.326,0 -1.273,-0.295 -2.105,-0.655 -0.833,-0.361 -1.874,-0.786 -2.314,-0.946 -2.954,-1.071 -10.196,-4.633 -13.684,-6.729 -10.252,-6.162 -19.339,-14.009 -26.732,-23.086 -2.454,-3.013 -5.784,-7.721 -5.784,-8.178 0,-0.223 -0.168,-0.406 -0.373,-0.406 -0.205,0 -0.499,-0.405 -0.654,-0.9 -0.154,-0.495 -0.392,-0.99 -0.527,-1.1 -0.284,-0.231 -1.201,-1.853 -2.753,-4.874 -0.601,-1.169 -1.228,-2.186 -1.393,-2.259 -0.165,-0.074 -0.3,-0.341 -0.3,-0.595 0,-0.253 -0.432,-1.363 -0.96,-2.466 -0.528,-1.103 -1.257,-2.726 -1.62,-3.606 -0.362,-0.88 -0.83,-1.913 -1.039,-2.295 -0.21,-0.382 -0.381,-1.057 -0.381,-1.5 0,-0.443 -0.15,-0.805 -0.333,-0.805 -0.298,0 -0.941,-2.034 -1.519,-4.8 -0.114,-0.55 -0.376,-1.36 -0.581,-1.8 -0.608,-1.307 -1.454,-5.612 -2.633,-13.4 -0.535,-3.535 -0.675,-10.658 -0.885,-44.984 L 100.6,78.232 99.206,80.016"
+       d="M 99.206,80.016 C 63.451924,120.81099 31.751659,160.16447 0.5,195.438 0.103,195.839 0,216.885 0,297.971 V 400 h 80 c 52.658,0 80,-0.136 80,-0.397 17.9137,-22.48491 38.5951,-44.62504 54.871,-64.603 2.63454,-3.7258 7.40036,-7.49564 8.766,-11.123 -0.356,-0.356 -6.6,-0.505 -24.657,-0.586 l -24.18,-0.109 v -38.391 c 0,-36.297 -0.038,-38.391 -0.7,-38.389 -0.748,0.002 -4.243,-1.067 -5.395,-1.65 -0.382,-0.194 -0.96,-0.352 -1.286,-0.352 -0.326,0 -1.273,-0.295 -2.105,-0.655 -0.833,-0.361 -1.874,-0.786 -2.314,-0.946 -2.954,-1.071 -10.196,-4.633 -13.684,-6.729 -10.252,-6.162 -19.339,-14.009 -26.732,-23.086 -2.454,-3.013 -5.784,-7.721 -5.784,-8.178 0,-0.223 -0.168,-0.406 -0.373,-0.406 -0.205,0 -0.499,-0.405 -0.654,-0.9 -0.154,-0.495 -0.392,-0.99 -0.527,-1.1 -0.284,-0.231 -1.201,-1.853 -2.753,-4.874 -0.601,-1.169 -1.228,-2.186 -1.393,-2.259 -0.165,-0.074 -0.3,-0.341 -0.3,-0.595 0,-0.253 -0.432,-1.363 -0.96,-2.466 -0.528,-1.103 -1.257,-2.726 -1.62,-3.606 -0.362,-0.88 -0.83,-1.913 -1.039,-2.295 -0.21,-0.382 -0.381,-1.057 -0.381,-1.5 0,-0.443 -0.15,-0.805 -0.333,-0.805 -0.298,0 -0.941,-2.034 -1.519,-4.8 -0.114,-0.55 -0.376,-1.36 -0.581,-1.8 -0.608,-1.307 -1.454,-5.612 -2.633,-13.4 -0.535,-3.535 -0.675,-10.658 -0.885,-44.984 L 100.6,78.232 99.206,80.016"
       stroke="none"
       fill="#3c546c"
-       fill-rule="evenodd" />
+       fill-rule="evenodd"
+       sodipodi:nodetypes="ccscscccccsccscccsssccccssccsscccccc" />
  </g>
 </svg>