Skip to content

Commit

Permalink
Merge pull request #498 from HackIllinois/leah/version-code-app-refresh
Browse files Browse the repository at this point in the history 
Version API Sync & Room Database Revamp
  • Loading branch information
@leahlud
leahlud authored Oct 19, 2023
2 parents 59c57b8 + a649eff commit 24df4b2
Show file tree
Hide file tree
Showing 34 changed files with 286 additions and 2,154 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ android {
applicationId "org.hackillinois.android"
minSdkVersion 23
targetSdkVersion 33
versionCode 41
versionName "3.0.1"
versionCode 53
versionName "2024.1.1"
multiDexEnabled true
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true
Expand Down
171 changes: 77 additions & 94 deletions app/schemas/org.hackillinois.android.database.Database/3.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,28 @@
"formatVersion": 1,
"database": {
"version": 3,
"identityHash": "b093b3f1f522dfcc747cc607b6c8eafd",
"identityHash": "c2fbde5199b6e0ed9f6ea7c24034ace0",
"entities": [
{
"tableName": "qr_codes",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` INTEGER NOT NULL, `id` TEXT NOT NULL, `qr_info` TEXT NOT NULL, PRIMARY KEY(`key`))",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` TEXT NOT NULL, `qrInfo` TEXT NOT NULL, `key` INTEGER NOT NULL, PRIMARY KEY(`key`))",
"fields": [
{
"fieldPath": "key",
"columnName": "key",
"affinity": "INTEGER",
"fieldPath": "userId",
"columnName": "userId",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "id",
"columnName": "id",
"fieldPath": "qrInfo",
"columnName": "qrInfo",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "qrInfo",
"columnName": "qr_info",
"affinity": "TEXT",
"fieldPath": "key",
"columnName": "key",
"affinity": "INTEGER",
"notNull": true
}
],
Expand All @@ -38,14 +38,8 @@
},
{
"tableName": "attendees",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` INTEGER NOT NULL, `id` TEXT NOT NULL, `firstName` TEXT NOT NULL, `lastName` TEXT NOT NULL, PRIMARY KEY(`key`))",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `firstName` TEXT NOT NULL, `lastName` TEXT NOT NULL, `dietary` TEXT NOT NULL, `key` INTEGER NOT NULL, PRIMARY KEY(`key`))",
"fields": [
{
"fieldPath": "key",
"columnName": "key",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "id",
"columnName": "id",
Expand All @@ -63,6 +57,18 @@
"columnName": "lastName",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "dietary",
"columnName": "dietary",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "key",
"columnName": "key",
"affinity": "INTEGER",
"notNull": true
}
],
"primaryKey": {
Expand All @@ -76,29 +82,17 @@
},
{
"tableName": "users",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` INTEGER NOT NULL, `id` TEXT NOT NULL, `firstName` TEXT NOT NULL, `lastName` TEXT NOT NULL, `email` TEXT NOT NULL, `username` TEXT NOT NULL, PRIMARY KEY(`key`))",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` TEXT NOT NULL, `name` TEXT NOT NULL, `email` TEXT NOT NULL, `key` INTEGER NOT NULL, PRIMARY KEY(`key`))",
"fields": [
{
"fieldPath": "key",
"columnName": "key",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "id",
"columnName": "id",
"fieldPath": "userId",
"columnName": "userId",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "firstName",
"columnName": "firstName",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "lastName",
"columnName": "lastName",
"fieldPath": "name",
"columnName": "name",
"affinity": "TEXT",
"notNull": true
},
Expand All @@ -109,9 +103,9 @@
"notNull": true
},
{
"fieldPath": "username",
"columnName": "username",
"affinity": "TEXT",
"fieldPath": "key",
"columnName": "key",
"affinity": "INTEGER",
"notNull": true
}
],
Expand All @@ -126,7 +120,7 @@
},
{
"tableName": "events",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `name` TEXT NOT NULL, `description` TEXT NOT NULL, `startTime` INTEGER NOT NULL, `endTime` INTEGER NOT NULL, `locations` TEXT NOT NULL, `sponsor` TEXT NOT NULL, `eventType` TEXT NOT NULL, `points` TEXT NOT NULL, PRIMARY KEY(`id`))",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `name` TEXT NOT NULL, `description` TEXT NOT NULL, `startTime` INTEGER NOT NULL, `endTime` INTEGER NOT NULL, `locations` TEXT NOT NULL, `sponsor` TEXT NOT NULL, `eventType` TEXT NOT NULL, `points` TEXT NOT NULL, `isAsync` INTEGER NOT NULL, PRIMARY KEY(`id`))",
"fields": [
{
"fieldPath": "id",
Expand Down Expand Up @@ -181,6 +175,12 @@
"columnName": "points",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "isAsync",
"columnName": "isAsync",
"affinity": "INTEGER",
"notNull": true
}
],
"primaryKey": {
Expand All @@ -194,14 +194,8 @@
},
{
"tableName": "roles",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` INTEGER NOT NULL, `id` TEXT NOT NULL, `roles` TEXT NOT NULL, PRIMARY KEY(`key`))",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `roles` TEXT NOT NULL, `key` INTEGER NOT NULL, PRIMARY KEY(`key`))",
"fields": [
{
"fieldPath": "key",
"columnName": "key",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "id",
"columnName": "id",
Expand All @@ -213,6 +207,12 @@
"columnName": "roles",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "key",
"columnName": "key",
"affinity": "INTEGER",
"notNull": true
}
],
"primaryKey": {
Expand All @@ -225,80 +225,80 @@
"foreignKeys": []
},
{
"tableName": "projects",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `name` TEXT NOT NULL, `description` TEXT NOT NULL, `mentors` TEXT NOT NULL, `room` TEXT NOT NULL, `tags` TEXT NOT NULL, `number` INTEGER NOT NULL, PRIMARY KEY(`id`))",
"tableName": "profiles",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` TEXT NOT NULL, `displayName` TEXT NOT NULL, `discordTag` TEXT NOT NULL, `avatarUrl` TEXT NOT NULL, `points` INTEGER NOT NULL, `userId` TEXT NOT NULL, `foodWave` INTEGER NOT NULL, `key` INTEGER NOT NULL, PRIMARY KEY(`key`))",
"fields": [
{
"fieldPath": "id",
"columnName": "id",
"fieldPath": "_id",
"columnName": "_id",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "name",
"columnName": "name",
"fieldPath": "displayName",
"columnName": "displayName",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "description",
"columnName": "description",
"fieldPath": "discordTag",
"columnName": "discordTag",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "mentors",
"columnName": "mentors",
"fieldPath": "avatarUrl",
"columnName": "avatarUrl",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "room",
"columnName": "room",
"affinity": "TEXT",
"fieldPath": "points",
"columnName": "points",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "tags",
"columnName": "tags",
"fieldPath": "userId",
"columnName": "userId",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "number",
"columnName": "number",
"fieldPath": "foodWave",
"columnName": "foodWave",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "key",
"columnName": "key",
"affinity": "INTEGER",
"notNull": true
}
],
"primaryKey": {
"columnNames": [
"id"
"key"
],
"autoGenerate": false
},
"indices": [],
"foreignKeys": []
},
{
"tableName": "profiles",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `firstName` TEXT NOT NULL, `lastName` TEXT NOT NULL, `points` INTEGER NOT NULL, `timezone` TEXT NOT NULL, `avatarUrl` TEXT NOT NULL, `discord` TEXT NOT NULL, PRIMARY KEY(`id`))",
"tableName": "leaderboard",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `displayName` TEXT NOT NULL, `points` INTEGER NOT NULL)",
"fields": [
{
"fieldPath": "id",
"columnName": "id",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "firstName",
"columnName": "firstName",
"affinity": "TEXT",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "lastName",
"columnName": "lastName",
"fieldPath": "displayName",
"columnName": "displayName",
"affinity": "TEXT",
"notNull": true
},
Expand All @@ -307,39 +307,22 @@
"columnName": "points",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "timezone",
"columnName": "timezone",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "avatarUrl",
"columnName": "avatarUrl",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "discord",
"columnName": "discord",
"affinity": "TEXT",
"notNull": true
}
],
"primaryKey": {
"columnNames": [
"id"
],
"autoGenerate": false
"autoGenerate": true
},
"indices": [],
"foreignKeys": []
}
],
"views": [],
"setupQueries": [
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"b093b3f1f522dfcc747cc607b6c8eafd\")"
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'c2fbde5199b6e0ed9f6ea7c24034ace0')"
]
}
}
Loading

0 comments on commit 24df4b2

Please sign in to comment.