chore: release 1.7.0

.gitignore

@@ -2,9 +2,14 @@
 .gradle/
 build/
 
+#iOS framework
+iOS/badgemagic/BadgeMagicModule.framework
+
 # Local configuration
 local.properties
 
 # IntelliJ
 *.iml
 .idea/
+
+.DS_Store

.travis.yml

@@ -1,46 +1,98 @@
-language: android
-dist: trusty
-sudo: true
-jdk:
-  - oraclejdk8
-android:
-  components:
-    - tools
-    - android-29
-    - build-tools-29.0.2
-    - platform-tools
-before_cache:
-  - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
-cache:
-  bundler : true
-  directories:
-    - "${TRAVIS_BUILD_DIR}/gradle/caches/"
-    - "${TRAVIS_BUILD_DIR}/gradle/wrapper/dists/"
-    - "$HOME/.gradle/caches/"
-    - "$HOME/.gradle/wrapper/"
-
-install:
-  - bundle install
-
-before_script:
-  - bash scripts/prep-key.sh
-  - bash scripts/check-screenshots.sh
-
-script:
-  - ./gradlew spotlessCheck
-  - ./gradlew build --stacktrace
-
-deploy:
-  - provider: script
-    skip_cleanup: true
-    script: bash scripts/upload-apk.sh
-    on:
-      all_branches: true
-      condition: $TRAVIS_BRANCH =~ ^(master|development)$
-      repo: fossasia/badge-magic-android
-  - provider: script
-    skip_cleanup: true
-    script: bash scripts/upload-gh-pages.sh
-    on:
-      all_branches: true
-      repo: fossasia/badge-magic-android
+jobs:
+  include:
+    - name: Build Android
+      language: android
+      dist: trusty
+      sudo: true
+      jdk:
+        - oraclejdk8
+      android:
+        components:
+          - tools
+          - android-29
+          - build-tools-29.0.2
+          - platform-tools
+      before_cache:
+        - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
+      cache:
+        bundler: true
+        directories:
+          - "${TRAVIS_BUILD_DIR}/gradle/caches/"
+          - "${TRAVIS_BUILD_DIR}/gradle/wrapper/dists/"
+          - "$HOME/.gradle/caches/"
+          - "$HOME/.gradle/wrapper/"
+
+      install:
+        - bundle install
+
+      before_script:
+        - bash scripts/prep-key.sh
+        - bash scripts/check-screenshots.sh
+
+      script:
+        - ./gradlew spotlessCheck
+        - ./gradlew build --stacktrace
+
+      deploy:
+        - provider: script
+          skip_cleanup: true
+          script: bash scripts/upload-apk.sh
+          on:
+            all_branches: true
+            condition: $TRAVIS_BRANCH =~ ^(master|development)$
+            repo: fossasia/badge-magic-android
+        - provider: script
+          skip_cleanup: true
+          script: bash scripts/upload-gh-pages.sh
+          on:
+            all_branches: true
+            repo: fossasia/badge-magic-android
+
+    - name: Build iOS
+      os: osx
+      osx_image: xcode11.3
+      language: objective-c
+
+      before_cache:
+        - brew cleanup
+
+      cache:
+        bundler: true
+        directories:
+          - $HOME/.konan
+          - $HOME/Library/Caches/Homebrew
+          - "${TRAVIS_BUILD_DIR}/gradle/caches/"
+          - "${TRAVIS_BUILD_DIR}/gradle/wrapper/dists/"
+          - "$HOME/.gradle/caches/"
+          - "$HOME/.gradle/wrapper/"
+
+      before_script:
+        # Java Installation
+        - java -version
+        - sudo rm -rf /Library/Java/*
+        - sudo rm -rf /Library/PreferencePanes/Java*
+        - sudo rm -rf /Library/Internet\ Plug-Ins/Java*
+        - brew tap AdoptOpenJDK/openjdk
+        - brew cask install adoptopenjdk8
+        - java -version
+        # -----------
+        # -----------
+        # Remove Project from gradle.settings
+        - echo "include ':BadgeMagicModule'" > settings.gradle
+        # -----------
+        - brew install swiftlint
+
+      script:
+        - cd iOS
+        - bundle exec fastlane run swiftlint strict:"true"
+        - bundle exec fastlane gym --skip_codesigning --skip_archive --skip_package_ipa
+        - cd ..
+
+      deploy:
+        - provider: script
+          skip_cleanup: true
+          script: bash scripts/upload-ios-framework.sh
+          on:
+            all_branches: true
+            condition: $TRAVIS_BRANCH =~ ^(master|development)$
+            repo: fossasia/badge-magic-android

BadgeMagicModule/build.gradle.kts

@@ -0,0 +1,68 @@
+import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
+
+plugins {
+    kotlin("multiplatform")
+    id("kotlinx-serialization")
+
+}
+
+val kt_serial = "0.14.0"
+val klockVersion = "1.8.6"
+
+kotlin {
+    val iOSTarget: (String, KotlinNativeTarget.() -> Unit) -> KotlinNativeTarget = ::iosArm64
+
+    iOSTarget("ios") {
+        binaries {
+            framework {
+                baseName = "BadgeMagicModule"
+            }
+        }
+    }
+
+    jvm("android")
+
+    sourceSets["commonMain"].dependencies {
+        implementation("org.jetbrains.kotlin:kotlin-stdlib-common")
+        implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime-common:$kt_serial")
+        implementation("com.soywiz.korlibs.klock:klock:$klockVersion")
+    }
+
+    sourceSets["androidMain"].dependencies {
+        implementation("org.jetbrains.kotlin:kotlin-stdlib")
+        implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime:$kt_serial")
+    }
+
+    sourceSets["iosMain"].dependencies {
+        implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime-native:$kt_serial")
+    }
+}
+
+val packForXcode by tasks.creating(Sync::class) {
+    val targetDir = File(buildDir, "xcode-frameworks")
+
+    /// selecting the right configuration for the iOS
+    /// framework depending on the environment
+    /// variables set by Xcode build
+    val mode = System.getenv("CONFIGURATION") ?: "DEBUG"
+    val framework = kotlin.targets
+        .getByName<KotlinNativeTarget>("ios")
+        .binaries.getFramework(mode)
+    inputs.property("mode", mode)
+    dependsOn(framework.linkTask)
+
+    from({ framework.outputDirectory })
+    into(targetDir)
+
+    /// generate a helpful ./gradlew wrapper with embedded Java path
+    doLast {
+        val gradlew = File(targetDir, "gradlew")
+        gradlew.writeText("#!/bin/bash\n"
+            + "export 'JAVA_HOME=${System.getProperty("java.home")}'\n"
+            + "cd '${rootProject.rootDir}'\n"
+            + "./gradlew \$@\n")
+        gradlew.setExecutable(true)
+    }
+}
+
+tasks.getByName("build").dependsOn(packForXcode)

app/src/main/java/org/fossasia/badgemagic/data/fragments/BadgeConfig.kt → BadgeMagicModule/src/commonMain/kotlin/org/fossasia/badgemagic/data/BadgeConfig.kt

@@ -1,9 +1,7 @@
-package org.fossasia.badgemagic.data.fragments
+package org.fossasia.badgemagic.data
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
-import org.fossasia.badgemagic.data.device.model.Mode
-import org.fossasia.badgemagic.data.device.model.Speed
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 
 const val CONF_HEX_STRINGS = "hex_strings"
 const val CONF_SPEED = "speed"
@@ -12,23 +10,23 @@ const val CONF_FLASH = "flash"
 const val CONF_MARQUEE = "marquee"
 const val CONF_INVERTED = "inverted"
 
-@JsonClass(generateAdapter = true)
+@Serializable
 class BadgeConfig {
-    @Json(name = CONF_HEX_STRINGS)
+    @SerialName(CONF_HEX_STRINGS)
     var hexStrings: List<String> = mutableListOf()
 
-    @Json(name = CONF_SPEED)
+    @SerialName(CONF_SPEED)
     var speed: Speed = Speed.ONE
 
-    @Json(name = CONF_MODE)
+    @SerialName(CONF_MODE)
     var mode: Mode = Mode.LEFT
 
-    @Json(name = CONF_FLASH)
+    @SerialName(CONF_FLASH)
     var isFlash: Boolean = false
 
-    @Json(name = CONF_MARQUEE)
+    @SerialName(CONF_MARQUEE)
     var isMarquee: Boolean = false
 
-    @Json(name = CONF_INVERTED)
+    @SerialName(CONF_INVERTED)
     var isInverted: Boolean = false
 }

app/src/main/java/org/fossasia/badgemagic/data/fragments/ConfigInfo.kt → BadgeMagicModule/src/commonMain/kotlin/org/fossasia/badgemagic/data/ConfigInfo.kt

@@ -1,3 +1,3 @@
-package org.fossasia.badgemagic.data.fragments
+package org.fossasia.badgemagic.data
 
 data class ConfigInfo(val badgeJSON: String, val fileName: String)

BadgeMagicModule/src/commonMain/kotlin/org/fossasia/badgemagic/data/DataToSend.kt

@@ -0,0 +1,6 @@
+package org.fossasia.badgemagic.data
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class DataToSend(val messages: List<Message>)

app/src/main/java/org/fossasia/badgemagic/data/device/model/Message.kt → BadgeMagicModule/src/commonMain/kotlin/org/fossasia/badgemagic/data/Message.kt

@@ -1,3 +1,6 @@
-package org.fossasia.badgemagic.data.device.model
+package org.fossasia.badgemagic.data
 
+import kotlinx.serialization.Serializable
+
+@Serializable
 data class Message(val hexStrings: List<String>, val flash: Boolean = false, val marquee: Boolean = false, val speed: Speed = Speed.ONE, val mode: Mode = Mode.LEFT)

BadgeMagicModule/src/commonMain/kotlin/org/fossasia/badgemagic/data/Mode.kt

@@ -0,0 +1,13 @@
+package org.fossasia.badgemagic.data
+
+enum class Mode(val hexValue: Byte) {
+    LEFT(0x00),
+    RIGHT(0x01),
+    UP(0x02),
+    DOWN(0x03),
+    FIXED(0x04),
+    SNOWFLAKE(0x05),
+    PICTURE(0x06),
+    ANIMATION(0x07),
+    LASER(0x08);
+}

BadgeMagicModule/src/commonMain/kotlin/org/fossasia/badgemagic/data/Speed.kt

@@ -0,0 +1,12 @@
+package org.fossasia.badgemagic.data
+
+enum class Speed(val hexValue: Byte) {
+    ONE(0x00),
+    TWO(0x10),
+    THREE(0x20),
+    FOUR(0x30),
+    FIVE(0x40),
+    SIX(0x50),
+    SEVEN(0x60),
+    EIGHT(0x70);
+}