Merge pull request #169 from ostdotcom/develop

Preparing for Release v2.3.8
OpenST · Jan 23, 2020 · c2ddda8 · c2ddda8
2 parents a442c99 + 465d270
commit c2ddda8
Show file tree

Hide file tree

Showing 46 changed files with 2,398 additions and 78 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,6 +13,10 @@
 bin/
 gen/
 out/
+.cxx/
+ostsdk/src/main/jniLibs/
+app/src/obj/
+ostsdk/src/obj/
 
 # Gradle files
 .gradle/

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # OST Wallet SDK Changelog
 
+## Version 2.3.8
+### Changes:
+* Reduced recovery key generation time substantially by leveraging on NDK.
+
+### Bug Fix:
+* In OstWalletSDK UI workflows progress bar crashes in background.
+
 ## Version 2.3.7
 ### Bug Fix:
 * Inaccurate error is thrown when application runs out of memory during recover device workflow.

diff --git a/README.md b/README.md
@@ -108,7 +108,7 @@ compileOptions {
 
 ```
 dependencies {
-    implementation 'com.ost:ost-wallet-sdk-android:2.3.7'
+    implementation 'com.ost:ost-wallet-sdk-android:2.3.8'
     ...
     ...
     ...

diff --git a/Samples/customloader/src/OstMockLoaderFragment.java b/Samples/customloader/src/OstMockLoaderFragment.java
@@ -3,15 +3,15 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.DialogFragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
 
 import com.ost.ostwallet.R;
 import com.ost.walletsdk.ui.loader.OstLoaderFragment;

diff --git a/Samples/customloader/src/OstMockLoaderManager.java b/Samples/customloader/src/OstMockLoaderManager.java
@@ -22,6 +22,12 @@ public OstLoaderFragment getLoader(OstWorkflowContext.WORKFLOW_TYPE workflowType
 
     @Override
     public boolean waitForFinalization(OstWorkflowContext.WORKFLOW_TYPE workflowType) {
+        if (OstWorkflowContext.WORKFLOW_TYPE.ACTIVATE_USER.equals(workflowType)) {
+            return false;
+        }
+        if (OstWorkflowContext.WORKFLOW_TYPE.EXECUTE_TRANSACTION.equals(workflowType)) {
+            return false;
+        }
         return true;
     }
 }
diff --git a/build.gradle b/build.gradle
@@ -18,7 +18,7 @@ buildscript {
         maven { url 'https://maven.fabric.io/public' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.5.0'
         classpath 'io.fabric.tools:gradle:1.+'
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/documentation/OstWalletUI.md b/documentation/OstWalletUI.md
@@ -50,6 +50,13 @@ try {
 OstWalletUI.setThemeConfig(themeConfig)
 ```
 
+### Get Theme Config
+Get currently applied theme config from sdk.
+
+```java
+OstWalletUI.getThemeConfig()
+```
+
 ### Set Content Config
 
 Content for OstWalletUI can be initialized by calling `setContentConfig` API.

diff --git a/documentation/ThemeConfig.md b/documentation/ThemeConfig.md
@@ -120,6 +120,7 @@ The following UI components properties supported by navigation bar:
 | ---------------------- | :-----------------------------: |
 | bar logo               | nav_bar_logo_image.asset_name   |
 | bar tint color         | navigation_bar.tint_color       |
+| bar title color        | navigation_bar_header.tint_color  |
 | close icon tint color  | icons.close.tint_color          |
 | close icon tint color  | icons.back.tint_color           |
 
@@ -132,6 +133,36 @@ The following UI components properties supported by navigation bar:
 | empty_color          | hex value(String)  |
 | filled_color         | hex value(String)  |
 
+### Cell Separator
+
+ The following UI components properties supported by cell separator:
+
+| Configuration Keys   | Type               | 
+| -------------------- | :---------------- |
+| color                | hex value(String)  |
+
+ ### Link
+
+ The following UI components properties supported by link:
+
+| Configuration Keys   | Type               | 
+| -------------------- | :---------------- |
+| size                 | number             |
+| color                | hex value(String)  |
+| system_font_weight   | string             |
+| alignment            | string             |
+
+ ### status
+
+The following UI components properties supported by status:
+
+| Configuration Keys   | Type               | 
+| -------------------- | :---------------- |
+| size                 | number             |
+| color                | hex value(String)  |
+| system_font_weight   | string             |
+| alignment            | string             |
+
 ## UI Components
 
 ![copy-framework-file](images/NavBar.png)
@@ -140,4 +171,4 @@ The following UI components properties supported by navigation bar:
 
 ![copy-framework-file](images/Card.png)
 
-![copy-framework-file](images/TextField.png)
+![copy-framework-file](images/TextField.png)
diff --git a/documentation/images/TextField.png b/documentation/images/TextField.png
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,16 +1,6 @@
-#
-# Copyright 2019 OST.com Inc
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-
-#Mon Feb 25 12:36:41 IST 2019
+#Tue Dec 17 03:00:32 IST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
diff --git a/ostsdk/build.gradle b/ostsdk/build.gradle
@@ -1,3 +1,5 @@
+import org.apache.tools.ant.taskdefs.condition.Os
+
 /*
  * Copyright 2019 OST.com Inc
  *
@@ -57,6 +59,36 @@ android {
     lintOptions {
         abortOnError false
     }
+
+    task ndkBuild(type: Exec) {
+        def rootDir = project.rootDir
+        def localProperties = new File(rootDir, "local.properties")
+        Properties properties = new Properties()
+        localProperties.withInputStream { instr ->
+            properties.load(instr)
+        }
+        def ndkDir = properties.getProperty('ndk.dir')
+
+        if (Os.isFamily(Os.FAMILY_WINDOWS)) {
+            commandLine ndkDir + '\\ndk-build.cmd',
+                    'NDK_LIBS_OUT=main/jniLibs',
+                    'NDK_PROJECT_PATH=' + rootDir + '\\ostsdk\\src',
+                    'APP_BUILD_SCRIPT=jni/Android.mk',
+                    '-C',
+                    file('src').absolutePath
+        } else {
+            commandLine ndkDir + '/ndk-build',
+                    'NDK_LIBS_OUT=main/jniLibs',
+                    'NDK_PROJECT_PATH=' + rootDir + '/ostsdk/src',
+                    'APP_BUILD_SCRIPT=jni/Android.mk',
+                    '-C',
+                    file('src').absolutePath
+        }
+    }
+
+    tasks.withType(JavaCompile) {
+        compileTask -> compileTask.dependsOn ndkBuild
+    }
 }
 
 dependencies {

diff --git a/ostsdk/gradle.properties b/ostsdk/gradle.properties
@@ -22,9 +22,9 @@
 # org.gradle.parallel=true
 
 #Increase version when publishing.
-VERSION_NAME=2.3.7
+VERSION_NAME=2.3.8
 #Increase version code when publishing.
-VERSION_CODE=49
+VERSION_CODE=53
 
 #Everything else.
 GROUP=com.ost

diff --git a/ostsdk/src/jni/Android.mk b/ostsdk/src/jni/Android.mk
@@ -0,0 +1,16 @@
+
+LOCAL_MODULE    := libscrypt
+LOCAL_MODULE_FILENAME := libscrypt
+LOCAL_PATH := $(NDK_PROJECT_PATH)
+
+LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/scrypt/c/*.c)
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/scrypt/include/
+
+LOCAL_CFLAGS := -std=c99 -Wall -O2
+
+LOCAL_LDFLAGS   := -shared
+LOCAL_CFLAGS += -DHAVE_CONFIG_H -I $(LOCAL_PATH)/scrypt/include
+CC      := arm-linux-androideabi-gcc
+LOCAL_CFLAGS  += --sysroot=$(SYSROOT)
+
+include $(BUILD_SHARED_LIBRARY)
diff --git a/ostsdk/src/main/assets/ost-theme-config.json b/ostsdk/src/main/assets/ost-theme-config.json
@@ -1,5 +1,4 @@
 {
-
   "nav_bar_logo_image": {
     "asset_name": "ost_nav_bar_logo"
   },
@@ -68,6 +67,28 @@
     "system_font_weight": "medium"
   },
 
+  "navigation_bar": {
+    "tint_color": "#ffffff"
+  },
+
+  "navigation_bar_header": {
+    "tint_color": "#438bad"
+  },
+
+  "icons": {
+    "close": {
+      "tint_color": "#438bad"
+    },
+    "back":{
+      "tint_color": "#438bad"
+    }
+  },
+
+  "pin_input": {
+    "empty_color": "#c7c7cc",
+    "filled_color": "#438bad"
+  },
+
   "edit_text": {
     "size": 15,
     "color": "#101010",
@@ -77,25 +98,26 @@
     "placeholder": {
       "size": 15,
       "color": "#888888",
+      "alignment": "left",
       "system_font_weight": "regular"
     }
   },
 
-  "navigation_bar": {
-    "tint_color": "#ffffff"
+  "cell_separator": {
+    "color": "#DBDBDB"
   },
 
-  "icons": {
-    "close": {
-      "tint_color": "#438bad"
-    },
-    "back":{
-      "tint_color": "#438bad"
-    }
+  "link": {
+    "size": 15,
+    "color": "#007aff",
+    "system_font_weight": "medium",
+    "alignment": "left"
   },
 
-  "pin_input": {
-    "empty_color": "#c7c7cc",
-    "filled_color": "#438bad"
+  "status": {
+    "size": 15,
+    "color": "#0F9D58",
+    "system_font_weight": "regular",
+    "alignment": "left"
   }
 }