From a9f63b4832c712df1a03b76b30daf822fe90cf15 Mon Sep 17 00:00:00 2001
From: bintang433 <13521003@std.stei.itb.ac.id>
Date: Thu, 4 Apr 2024 16:44:31 +0700
Subject: [PATCH] fix: fix merge
---
.idea/deploymentTargetDropDown.xml | 12 -----------
.../example/bondoman/TransactionFragment.kt | 7 -------
.../bondoman/retrofit/data/TransactionDB.kt | 4 ----
.../data/entity/TransactionEntitiy.kt | 10 +++++-----
.../retrofit/data/entity/TransactionEntity.kt | 20 -------------------
build.gradle.kts | 1 -
6 files changed, 5 insertions(+), 49 deletions(-)
delete mode 100644 app/src/main/java/com/example/bondoman/retrofit/data/entity/TransactionEntity.kt
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index 23e166c..1222081 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -15,18 +15,6 @@
</deviceKey>
</Target>
</targetSelectedWithDropDown>
- <timeTargetWasSelectedWithDropDown value="2024-04-03T18:27:02.041955500Z" />
- <runningDeviceTargetSelectedWithDropDown>
- <Target>
- <type value="RUNNING_DEVICE_TARGET" />
- <deviceKey>
- <Key>
- <type value="SERIAL_NUMBER" />
- <value value="emulator-5554" />
- </Key>
- </deviceKey>
- </Target>
- </runningDeviceTargetSelectedWithDropDown>
<timeTargetWasSelectedWithDropDown value="2024-04-03T17:57:13.057353Z" />
</State>
</entry>
diff --git a/app/src/main/java/com/example/bondoman/TransactionFragment.kt b/app/src/main/java/com/example/bondoman/TransactionFragment.kt
index fd3e480..ca27a39 100644
--- a/app/src/main/java/com/example/bondoman/TransactionFragment.kt
+++ b/app/src/main/java/com/example/bondoman/TransactionFragment.kt
@@ -117,13 +117,6 @@ class TransactionFragment : Fragment() {
loadDatas()
}
- private fun loadDatas() {
- listTransaction.clear()
-
- listTransaction.addAll(database.transactionDao().getAll())
- adapter.notifyDataSetChanged()
- }
-
private fun loadDatas() {
listTransaction.clear()
diff --git a/app/src/main/java/com/example/bondoman/retrofit/data/TransactionDB.kt b/app/src/main/java/com/example/bondoman/retrofit/data/TransactionDB.kt
index bbf173a..a08188c 100644
--- a/app/src/main/java/com/example/bondoman/retrofit/data/TransactionDB.kt
+++ b/app/src/main/java/com/example/bondoman/retrofit/data/TransactionDB.kt
@@ -7,11 +7,7 @@ import androidx.room.RoomDatabase
import com.example.bondoman.retrofit.data.dao.TransactionDao
import com.example.bondoman.retrofit.data.entity.TransactionEntity
-<<<<<<< app/src/main/java/com/example/bondoman/retrofit/data/TransactionDB.kt
@Database(entities = [TransactionEntity::class], version = 2)
-=======
-@Database(entities = [TransactionEntity::class], version = 1)
->>>>>>> app/src/main/java/com/example/bondoman/retrofit/data/TransactionDB.kt
abstract class TransactionDB : RoomDatabase() {
abstract fun transactionDao(): TransactionDao
diff --git a/app/src/main/java/com/example/bondoman/retrofit/data/entity/TransactionEntitiy.kt b/app/src/main/java/com/example/bondoman/retrofit/data/entity/TransactionEntitiy.kt
index 1e443c9..efed108 100644
--- a/app/src/main/java/com/example/bondoman/retrofit/data/entity/TransactionEntitiy.kt
+++ b/app/src/main/java/com/example/bondoman/retrofit/data/entity/TransactionEntitiy.kt
@@ -12,9 +12,9 @@ enum class Category {
@Entity
data class TransactionEntity(
@PrimaryKey(autoGenerate = true) var id: Int? = null,
- @ColumnInfo(name = "name") var name: String? = null,
- @ColumnInfo(name = "category") var category: Category? = null,
- @ColumnInfo(name = "date") var date: String? = null,
- @ColumnInfo(name = "price") var price: Int? = null,
- @ColumnInfo(name = "location") var location: String? = null
+ @ColumnInfo(name = "nama_transaksi") var name: String? = null,
+ @ColumnInfo(name = "kategori_transaksi") var category: Category? = null,
+ @ColumnInfo(name = "tanggal_transaksi") var date: String? = null,
+ @ColumnInfo(name = "nominal_transaksi") var price: Int? = null,
+ @ColumnInfo(name = "lokasi_transaksi") var location: String? = null
)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/bondoman/retrofit/data/entity/TransactionEntity.kt b/app/src/main/java/com/example/bondoman/retrofit/data/entity/TransactionEntity.kt
deleted file mode 100644
index efed108..0000000
--- a/app/src/main/java/com/example/bondoman/retrofit/data/entity/TransactionEntity.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.example.bondoman.retrofit.data.entity
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-
-enum class Category {
- Pemasukan,
- Pengeluaran
-}
-
-@Entity
-data class TransactionEntity(
- @PrimaryKey(autoGenerate = true) var id: Int? = null,
- @ColumnInfo(name = "nama_transaksi") var name: String? = null,
- @ColumnInfo(name = "kategori_transaksi") var category: Category? = null,
- @ColumnInfo(name = "tanggal_transaksi") var date: String? = null,
- @ColumnInfo(name = "nominal_transaksi") var price: Int? = null,
- @ColumnInfo(name = "lokasi_transaksi") var location: String? = null
-)
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index 8682e0c..53f4a67 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -2,5 +2,4 @@
plugins {
id("com.android.application") version "8.2.2" apply false
id("org.jetbrains.kotlin.android") version "1.9.22" apply false
-
}
\ No newline at end of file
--
GitLab