Skip to content

Commit 763194a

Browse files
author
therealbluepandabear
committed
Removed unused columns from database model.
1 parent 925b2a3 commit 763194a

5 files changed

Lines changed: 12 additions & 9 deletions

File tree

app/src/main/java/com/therealbluepandabear/pixapencil/activities/canvas/onoptionsitemselected/CanvasActivity+onSaveInBackgroundOptionsItemSelected.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ fun CanvasActivity.onSaveInBackgroundOptionsItemSelected() {
2727
BitmapConverter.convertBitmapToString(drawPixelGridViewBitmap()),
2828
width,
2929
height,
30-
binding.activityCanvasPixelGridView.width,
31-
binding.activityCanvasPixelGridView.height,
3230
title.toString(),
3331
false
3432
)

app/src/main/java/com/therealbluepandabear/pixapencil/activities/canvas/onoptionsitemselected/CanvasActivity+onSaveProjectOptionsItemSelected.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ fun CanvasActivity.onSaveProjectOptionsItemSelected() {
3333
BitmapConverter.convertBitmapToString(drawPixelGridViewBitmap()),
3434
drawPixelGridViewBitmap().width,
3535
drawPixelGridViewBitmap().height,
36-
binding.activityCanvasPixelGridView.width,
37-
binding.activityCanvasPixelGridView.height,
3836
title.toString(),
3937
false
4038
)

app/src/main/java/com/therealbluepandabear/pixapencil/activities/main/bottomsheet/MainActivity+onDuplicateTapped.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ fun MainActivity.extendedOnDuplicateTapped(pixelArt: PixelArt, bottomSheetDialog
1010
pixelArt.bitmap,
1111
pixelArt.width,
1212
pixelArt.height,
13-
pixelArt.dimenCW,
14-
pixelArt.dimenCH,
1513
pixelArt.title,
1614
pixelArt.starred
1715
)

app/src/main/java/com/therealbluepandabear/pixapencil/database/PixelArtDatabase.kt

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.therealbluepandabear.pixapencil.database
22

33
import android.content.Context
4+
import android.widget.Toast
45
import androidx.room.*
56
import androidx.room.migration.AutoMigrationSpec
67
import androidx.sqlite.db.SupportSQLiteDatabase
@@ -11,13 +12,17 @@ import com.therealbluepandabear.pixapencil.models.PixelArt
1112
from = 3,
1213
to = 4,
1314
spec = PixelArtDatabase.PixelArtDatabaseMigrationThreeToFour::class
15+
), AutoMigration(
16+
from = 4,
17+
to = 5,
18+
spec = PixelArtDatabase.PixelArtDatabaseMigrationFourToFive::class
1419
)], exportSchema = true)
1520

1621
abstract class PixelArtDatabase: RoomDatabase() {
1722
abstract fun dao(): PixelArtCreationsDao
1823

1924
companion object {
20-
const val LATEST_VERSION = 4
25+
const val LATEST_VERSION = 5
2126

2227
private var instance: PixelArtDatabase? = null
2328
fun get(context: Context): PixelArtDatabase {
@@ -38,4 +43,10 @@ abstract class PixelArtDatabase: RoomDatabase() {
3843
class PixelArtDatabaseMigrationThreeToFour : AutoMigrationSpec {
3944
override fun onPostMigrate(db: SupportSQLiteDatabase) { }
4045
}
46+
47+
@DeleteColumn(tableName = "PixelArt", columnName = "item_dimen_cw")
48+
@DeleteColumn(tableName = "PixelArt", columnName = "item_dimen_ch")
49+
class PixelArtDatabaseMigrationFourToFive : AutoMigrationSpec {
50+
override fun onPostMigrate(db: SupportSQLiteDatabase) { }
51+
}
4152
}

app/src/main/java/com/therealbluepandabear/pixapencil/models/PixelArt.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ data class PixelArt(
1212
@ColumnInfo(name = "item_bitmap") var bitmap: String,
1313
@ColumnInfo(name = "item_width") var width: Int,
1414
@ColumnInfo(name = "item_height") var height: Int,
15-
@ColumnInfo(name = "item_dimen_cw") var dimenCW: Int,
16-
@ColumnInfo(name = "item_dimen_ch") var dimenCH: Int,
1715
@ColumnInfo(name = "item_title") var title: String,
1816
@ColumnInfo(name = "item_starred") var starred: Boolean,
1917
@ColumnInfo(name = "item_date_created") var dateCreated: String = LocalDateTime.now().format(DateTimeFormatter.ofPattern("MMMM dd, yyyy\nHH:mm"))) {

0 commit comments

Comments
 (0)