Merge pull request wilburx9#91 from wilburt/flutter-2.0.0-migration

Flutter 2.0.0 migration

Author: Wilberforce Uwadiegwu

CHANGELOG.md

@@ -1,3 +1,11 @@
+## 1.0.5 (Breaking change)
+* Supported sound null-safety
+* Resolved build failure due to unresolved VERSION_NAME and VERSION_CODE
+* Fixed issue with dark mode (courtesy of nuelsoft)
+* Switched static initialization for instance initialization of the plugin
+* Upgraded all native and cross-platform dependencies
+
+
 ## 1.0.4+1
 * Downgraded minimum Flutter version to 1.20.1
 

android/build.gradle

@@ -2,14 +2,14 @@ group 'co.paystack.flutterpaystack'
 version '1.0-SNAPSHOT'
 
 buildscript {
-    ext.kotlin_version = '1.3.72'
+    ext.kotlin_version = '1.4.31'
     repositories {
         google()
         jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -23,7 +23,6 @@ rootProject.allprojects {
 
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion 28
@@ -44,5 +43,5 @@ android {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'com.google.android.material:material:1.3.0-alpha02'
+    implementation 'com.google.android.material:material:1.4.0-alpha01'
 }

android/src/main/kotlin/co/paystack/flutterpaystack/AuthActivity.kt

@@ -7,7 +7,6 @@ import android.os.Bundle
 import android.webkit.JavascriptInterface
 import android.webkit.WebView
 import android.webkit.WebViewClient
-import kotlinx.android.synthetic.main.co_paystack_android____activity_auth.*
 
 /**
  * Created by Wilberforce on 29/07/18 at 18:47.
@@ -19,10 +18,12 @@ class AuthActivity : Activity() {
 
     private val si = AuthSingleton.instance
     private var responseJson: String? = null
+    private var webView: WebView? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.co_paystack_android____activity_auth)
+        webView = findViewById(R.id.webView)
         title = "Authorize your card"
         setup()
     }
@@ -40,7 +41,7 @@ class AuthActivity : Activity() {
 
     @SuppressLint("SetJavaScriptEnabled", "AddJavascriptInterface")
     private fun setup() {
-        webView!!.keepScreenOn = true
+        webView?.keepScreenOn = true
 
         abstract class AuthResponseJI {
             abstract fun processContent(aContent: String)
@@ -64,19 +65,19 @@ class AuthActivity : Activity() {
 
         class JIFactory {
 
-            internal val ji: AuthResponseJI
-                get() = if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+            val ji: AuthResponseJI
+                get() = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
                     AuthResponse17JI()
                 } else {
                     AuthResponseLegacyJI()
                 }
         }
 
 
-        webView!!.settings.javaScriptEnabled = true
-        webView!!.settings.javaScriptCanOpenWindowsAutomatically = true
-        webView!!.addJavascriptInterface(JIFactory().ji, "INTERFACE")
-        webView!!.webViewClient = object : WebViewClient() {
+        webView?.settings?.javaScriptEnabled = true
+        webView?.settings?.javaScriptCanOpenWindowsAutomatically = true
+        webView?.addJavascriptInterface(JIFactory().ji, "INTERFACE")
+        webView?.webViewClient = object : WebViewClient() {
             override fun onPageFinished(view: WebView, url: String) {
                 if (url.contains(API_URL + "charge/three_d_response/")) {
                     view.loadUrl("javascript:window.INTERFACE.processContent(document.getElementById('return').innerText);")
@@ -88,15 +89,13 @@ class AuthActivity : Activity() {
             }
         }
 
-        webView!!.loadUrl(si.url)
+        webView?.loadUrl(si.url)
     }
 
     public override fun onDestroy() {
         super.onDestroy()
-        if (webView != null) {
-            webView!!.stopLoading()
-            webView!!.removeJavascriptInterface("INTERFACE")
-        }
+        webView?.stopLoading()
+        webView?.removeJavascriptInterface("INTERFACE")
         handleResponse()
     }
 

android/src/main/kotlin/co/paystack/flutterpaystack/AuthDelegate.kt

@@ -21,7 +21,7 @@ class AuthDelegate(private val activity: Activity) {
             return
         }
         AuthAsyncTask(WeakReference(activity), WeakReference(onAuthCompleteListener))
-                .execute(methodCall.argument<String>("authUrl"))
+                .execute(methodCall.argument("authUrl"))
     }
 
     private val onAuthCompleteListener = object : OnAuthCompleteListener {

android/src/main/kotlin/co/paystack/flutterpaystack/Crypto.kt

@@ -4,7 +4,6 @@ import android.util.Base64
 
 import java.security.KeyFactory
 import java.security.NoSuchAlgorithmException
-import java.security.PrivateKey
 import java.security.PublicKey
 import java.security.spec.InvalidKeySpecException
 import java.security.spec.X509EncodedKeySpec
@@ -43,34 +42,13 @@ object Crypto {
 
         return cipherText
     }
-
-    @Throws(SecurityException::class)
-    fun encrypt(text: String, publicKey: String): String {
-        return String(Base64.encode(encrypt(text, getPublicKeyFromString(publicKey)), Base64.NO_WRAP))
-    }
+    
 
     @Throws(SecurityException::class)
     fun encrypt(text: String): String {
         return String(Base64.encode(encrypt(text, getPublicKeyFromString(PAYSTACK_RSA_PUBLIC_KEY)), Base64.NO_WRAP))
     }
-
-    private fun decrypt(text: ByteArray, key: PrivateKey): String {
-        var decryptedText: ByteArray? = null
-
-        try {
-            // get an RSA cipher object
-            val cipher = Cipher.getInstance(CIPHER)
-
-            //init cipher and decrypt the text using the private key
-            cipher.init(Cipher.DECRYPT_MODE, key)
-            decryptedText = cipher.doFinal(text)
-        } catch (ex: Exception) {
-            ex.printStackTrace()
-        }
-
-        return String(decryptedText ?: ByteArray(0))
-    }
-
+    
 
     @Throws(SecurityException::class)
     private fun getPublicKeyFromString(pubKey: String): PublicKey {

android/src/main/kotlin/co/paystack/flutterpaystack/MethodCallHandlerImpl.kt

@@ -28,14 +28,6 @@ class MethodCallHandlerImpl(messenger: BinaryMessenger?, private val activity: A
                 val deviceId = Settings.Secure.getString(activity?.contentResolver, Settings.Secure.ANDROID_ID)
                 result.success("androidsdk_$deviceId")
             }
-            "getUserAgent" -> {
-                result.success("Android_" + Build.VERSION.SDK_INT + "_Paystack_" + BuildConfig.VERSION_NAME)
-            }
-
-            "getVersionCode" -> {
-                result.success(BuildConfig.VERSION_CODE.toString())
-            }
-
             "getAuthorization" -> {
                 authDelegate?.handleAuthorization(result, call)
             }

example/android/build.gradle

@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.3.72'
+    ext.kotlin_version = '1.4.31'
     repositories {
         google()
         jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

example/android/gradle.properties

@@ -1,4 +1,3 @@
 android.enableJetifier=true
 android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536M
-android.enableR8=true

example/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Aug 21 21:56:56 WAT 2020
+#Sun Mar 14 03:06:25 WAT 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip

example/ios/Flutter/Flutter.podspec

@@ -1,18 +1,18 @@
 #
 # NOTE: This podspec is NOT to be published. It is only used as a local source!
+#       This is a generated file; do not edit or check into version control.
 #
 
 Pod::Spec.new do |s|
   s.name             = 'Flutter'
   s.version          = '1.0.0'
   s.summary          = 'High-performance, high-fidelity mobile apps.'
-  s.description      = <<-DESC
-Flutter provides an easy and productive way to build and deploy high-performance mobile apps for Android and iOS.
-                       DESC
   s.homepage         = 'https://flutter.io'
   s.license          = { :type => 'MIT' }
   s.author           = { 'Flutter Dev Team' => 'flutter-dev@googlegroups.com' }
   s.source           = { :git => 'https://github.com/flutter/engine', :tag => s.version.to_s }
   s.ios.deployment_target = '8.0'
-  s.vendored_frameworks = 'Flutter.framework'
+  # Framework linking is handled by Flutter tooling, not CocoaPods.
+  # Add a placeholder to satisfy `s.dependency 'Flutter'` plugin podspecs.
+  s.vendored_frameworks = 'path/to/nothing'
 end

example/ios/Runner.xcodeproj/project.pbxproj

@@ -147,7 +147,6 @@
 				97C146EC1CF9000F007C117D /* Resources */,
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
-				C0FC88BF64931ED5FCF4DBDF /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -169,7 +168,7 @@
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
 						CreatedOnToolsVersion = 7.3.1;
-						DevelopmentTeam = 599T4B53UD;
+						DevelopmentTeam = A75A29V65V;
 						SystemCapabilities = {
 							com.apple.BackgroundModes = {
 								enabled = 1;
@@ -258,24 +257,6 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
 		};
-		C0FC88BF64931ED5FCF4DBDF /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
-				"${PODS_ROOT}/../Flutter/Flutter.framework",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -421,7 +402,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = 599T4B53UD;
+				DEVELOPMENT_TEAM = A75A29V65V;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -445,7 +426,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = 599T4B53UD;
+				DEVELOPMENT_TEAM = A75A29V65V;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",

example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>