changed

RisingLight · Feb 18, 2020 · 2c4e37c · 2c4e37c
1 parent 6041290
commit 2c4e37c
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 20 deletions.
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/main/java/tech/risinglight/financebuddy/UpiPaymentActivity.kt b/app/src/main/java/tech/risinglight/financebuddy/UpiPaymentActivity.kt
@@ -16,14 +16,16 @@ class UpiPaymentActivity : AppCompatActivity() {
             upi_idET.setText(intent.getStringExtra("UPI"))
 
         }
+        val des= if (noteET.text.toString().isNullOrEmpty()) else "Finance buddy"
+
         payBtn.setOnClickListener {
             val amount =
                 if (amountET.text.toString().contains('.')) amountET.text.toString() else amountET.text.toString() + ".00"
             val random = Random(1100000)
             val easyUpiPayment = EasyUpiPayment.Builder()
                 .with(this)
                 .setPayeeVpa(upi_idET.text.toString())
-                .setPayeeName("")
+                .setPayeeName("via Finance Buddy")
                 .setTransactionId(random.nextInt().toString())
                 .setTransactionRefId(random.nextInt().toString())
                 .setDescription(noteET.text.toString())

diff --git a/app/src/main/java/tech/risinglight/financebuddy/model/CardDetailsModel.kt b/app/src/main/java/tech/risinglight/financebuddy/model/CardDetailsModel.kt
@@ -5,6 +5,8 @@ import androidx.annotation.NonNull
 import androidx.room.Entity
 import androidx.room.Ignore
 import androidx.room.PrimaryKey
+
+
 @Entity(tableName = "cardDetails")
 class CardDetailsModel{
     @PrimaryKey

diff --git a/app/src/main/java/tech/risinglight/financebuddy/model/SplitWiseModel.kt b/app/src/main/java/tech/risinglight/financebuddy/model/SplitWiseModel.kt
@@ -1,9 +1,29 @@
 package tech.risinglight.financebuddy.model
 
+import androidx.annotation.NonNull
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import java.lang.reflect.Constructor
 import java.util.*
 
-class SplitWiseModel(
-    var name: String,
-    var amount: String,
+@Entity(tableName ="splitmodel")
+class SplitWiseModel {
+    @PrimaryKey
+    @NonNull
+    var emailId: String? = null
+    var name: String? = null
+    var amount: String? = null
     var transactionsList: ArrayList<Transaction>
-)
+
+    constructor(
+        emailId: String,
+        name: String,
+        amount: String,
+
+        ) {
+        this.emailId = emailId
+        this.name = name
+        this.amount = amount
+
+    }
+}
diff --git a/app/src/main/java/tech/risinglight/financebuddy/repo/CardDao.kt b/app/src/main/java/tech/risinglight/financebuddy/repo/CardDao.kt
@@ -17,5 +17,7 @@ interface CardDao{
     @Query("DELETE from cardDetails")
     fun deleteAll()
 
+    @Insert
+    fun insert(splitWiseDetail: CardDetailsModel) : Long
 
 }
diff --git a/app/src/main/java/tech/risinglight/financebuddy/view/MainActivity.kt b/app/src/main/java/tech/risinglight/financebuddy/view/MainActivity.kt
@@ -1,12 +1,16 @@
 package tech.risinglight.financebuddy.view
 
+import android.Manifest
 import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
+import android.content.pm.PackageManager
 import android.os.Bundle
 import android.provider.Telephony
 import android.view.View
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.app.ActivityCompat
+import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.bottomsheet.BottomSheetBehavior
@@ -62,8 +66,21 @@ class MainActivity : AppCompatActivity() {
             startActivity(Intent(applicationContext, CouponsActivity::class.java))
         }
         addbottomSheetCallBack()
+        if (ContextCompat.checkSelfPermission(applicationContext, Manifest.permission.READ_SMS)
+            != PackageManager.PERMISSION_GRANTED) {
+            ActivityCompat.requestPermissions(this,
+                arrayOf(Manifest.permission.READ_SMS),0)
+            GlobalScope.launch {
+                getTransactions(applicationContext)
+
+            } }
+        else
+        {
         GlobalScope.launch {
-            getTransactions(applicationContext)
+
+                getTransactions(applicationContext)
+            }
+
         }
     }
 

diff --git a/app/src/main/java/tech/risinglight/financebuddy/view/SplashActivity.kt b/app/src/main/java/tech/risinglight/financebuddy/view/SplashActivity.kt
@@ -11,11 +11,7 @@ import androidx.core.content.ContextCompat
 class SplashActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        if (ContextCompat.checkSelfPermission(applicationContext, Manifest.permission.READ_SMS)
-            != PackageManager.PERMISSION_GRANTED) {
-            ActivityCompat.requestPermissions(this,
-                arrayOf(Manifest.permission.READ_SMS),0)
-        }
+
         val intent = Intent(this, MainActivity::class.java)
         startActivity(intent)
         finish()