Merge pull request #18 from knightbenax/develop

Clean some bugs out and move to JitPack

app/build.gradle

@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 30
     defaultConfig {
         applicationId "app.ephod.pentecost.sample"
-        minSdkVersion 16
-        targetSdkVersion 27
-        versionCode 2
-        versionName "1.0.1"
+        minSdkVersion 21
+        targetSdkVersion 30
+        versionCode 3
+        versionName "1.0.2"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -16,16 +16,21 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.0'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.1'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
-
+    implementation 'androidx.appcompat:appcompat:1.3.0'
+    implementation "androidx.constraintlayout:constraintlayout:2.0.4"
+    // To use constraintlayout in compose
+    implementation "androidx.constraintlayout:constraintlayout-compose:1.0.0-alpha08"
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 
     implementation project(':pentecost')
 

app/src/main/AndroidManifest.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="app.ephod.pentecost.sample">
 
     <application

app/src/main/java/app/ephod/pentecost/sample/MainActivity.java

@@ -1,10 +1,11 @@
 package app.ephod.pentecost.sample;
 
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
 
+import androidx.appcompat.app.AppCompatActivity;
+import app.ephod.pentecost.library.paystack.PAYMENT_FORM_TYPE;
 import app.ephod.pentecost.library.paystack.PaymentView;
 
 public class MainActivity extends AppCompatActivity {
@@ -36,10 +37,12 @@ public void onClick(View view) {
                 "Wema Bank", "Zenith Bank"
         };
 
+        paymentView.setPAYMENT_FROM(PAYMENT_FORM_TYPE.CARD);
         paymentView.setBanksSpinner(arraySpinner);
         paymentView.setPentecostBackgroundColor(getResources().getColor(R.color.gold));
 
-        paymentView.getHeaderContentView().setTextColor(getResources().getColor(R.color.cardview_dark_background));
+        //paymentView.getHeaderContentView().setTextColor(getResources().getColor(R.color.cardview_dark_background));
+
 
         paymentView.setBillContent("₦5000");
     }

app/src/main/res/layout/activity_main.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -16,4 +17,4 @@
     android:layout_height="match_parent">
 </app.ephod.pentecost.library.paystack.PaymentView>
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/values/colors.xml

@@ -3,6 +3,5 @@
     <color name="colorPrimary">#3F51B5</color>
     <color name="colorPrimaryDark">#303F9F</color>
     <color name="colorAccent">#FF4081</color>
-
     <color name="gold">#FF4081</color>
 </resources>

build.gradle

@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:4.2.1'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
         // NOTE: Do not place your application dependencies here; they belong

gradle.properties

@@ -11,3 +11,8 @@ org.gradle.jvmargs=-Xmx1536m
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
+# AndroidX package structure to make it clearer which packages are bundled with the
+# Android operating system, and which are packaged with your app"s APK
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
+android.enableJetifier=true
+android.useAndroidX=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Sep 24 11:42:10 WAT 2018
+#Wed Jun 05 18:05:04 WAT 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-6.7.1-all.zip

pentecost/build.gradle

@@ -12,7 +12,7 @@ ext{
     libraryDescription = 'Payment Android UI Library for PayStack'
     siteUrl = 'https://github.com/knightbenax/Pentecost'
     gitUrl = 'https://github.com/knightbenax/Pentecost.git'
-    libraryVersion = '1.1.12'
+    libraryVersion = '1.1.13'
     developerId = 'knightbenax'
     developerName = 'Ashefor Reuben Bezaleel'
     developerEmail = 'knightbenax@gmail.com'
@@ -22,33 +22,30 @@ ext{
 }
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 30
     lintOptions {
         abortOnError false
     }
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 27
-        versionCode 9
-        versionName '1.1.12'
+        targetSdkVersion 30
+        versionCode 10
+        versionName '1.1.13'
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
 }
 
-
 //./gradlew clean build bintrayUpload
 
-
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation ('com.android.support:appcompat-v7:27.1.1')
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    implementation 'androidx.appcompat:appcompat:1.3.0'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
-    implementation 'com.android.support:cardview-v7:27.1.1'
-    //https://github.com/GwonHyeok/StickySwitch
-    compile 'com.github.GwonHyeok:StickySwitch:0.0.15'
+    implementation "androidx.cardview:cardview:1.0.0"
+    implementation 'com.github.GwonHyeok:StickySwitch:0.0.16'
 }
 
 repositories {

pentecost/src/main/java/app/ephod/pentecost/library/paystack/PAYMENT_FORM_TYPE.java

@@ -0,0 +1,14 @@
+package app.ephod.pentecost.library.paystack;
+
+public enum PAYMENT_FORM_TYPE {
+    CARD(0),
+    BANK(1);
+
+    private final int value;
+
+    PAYMENT_FORM_TYPE(final int newValue) {
+        value = newValue;
+    }
+
+    public int getValue() { return value; }
+}