-
-
Notifications
You must be signed in to change notification settings - Fork 46
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
22 changed files
with
204 additions
and
41 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| { | ||
| "formatVersion": 1, | ||
| "database": { | ||
| "version": 2, | ||
| "identityHash": "5dd91a2a8eee2a5ed8050f69dafb44e8", | ||
| "entities": [ | ||
| { | ||
| "tableName": "HistoryItem", | ||
| "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `sourceLanguageName` TEXT NOT NULL, `sourceLanguageCode` TEXT NOT NULL, `targetLanguageName` TEXT NOT NULL, `targetLanguageCode` TEXT NOT NULL, `insertedText` TEXT NOT NULL, `translatedText` TEXT NOT NULL)", | ||
| "fields": [ | ||
| { | ||
| "fieldPath": "id", | ||
| "columnName": "id", | ||
| "affinity": "INTEGER", | ||
| "notNull": true | ||
| }, | ||
| { | ||
| "fieldPath": "sourceLanguageName", | ||
| "columnName": "sourceLanguageName", | ||
| "affinity": "TEXT", | ||
| "notNull": true | ||
| }, | ||
| { | ||
| "fieldPath": "sourceLanguageCode", | ||
| "columnName": "sourceLanguageCode", | ||
| "affinity": "TEXT", | ||
| "notNull": true | ||
| }, | ||
| { | ||
| "fieldPath": "targetLanguageName", | ||
| "columnName": "targetLanguageName", | ||
| "affinity": "TEXT", | ||
| "notNull": true | ||
| }, | ||
| { | ||
| "fieldPath": "targetLanguageCode", | ||
| "columnName": "targetLanguageCode", | ||
| "affinity": "TEXT", | ||
| "notNull": true | ||
| }, | ||
| { | ||
| "fieldPath": "insertedText", | ||
| "columnName": "insertedText", | ||
| "affinity": "TEXT", | ||
| "notNull": true | ||
| }, | ||
| { | ||
| "fieldPath": "translatedText", | ||
| "columnName": "translatedText", | ||
| "affinity": "TEXT", | ||
| "notNull": true | ||
| } | ||
| ], | ||
| "primaryKey": { | ||
| "columnNames": [ | ||
| "id" | ||
| ], | ||
| "autoGenerate": true | ||
| }, | ||
| "indices": [], | ||
| "foreignKeys": [] | ||
| }, | ||
| { | ||
| "tableName": "Language", | ||
| "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`code` TEXT NOT NULL, `name` TEXT NOT NULL, PRIMARY KEY(`code`))", | ||
| "fields": [ | ||
| { | ||
| "fieldPath": "code", | ||
| "columnName": "code", | ||
| "affinity": "TEXT", | ||
| "notNull": true | ||
| }, | ||
| { | ||
| "fieldPath": "name", | ||
| "columnName": "name", | ||
| "affinity": "TEXT", | ||
| "notNull": true | ||
| } | ||
| ], | ||
| "primaryKey": { | ||
| "columnNames": [ | ||
| "code" | ||
| ], | ||
| "autoGenerate": false | ||
| }, | ||
| "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, '5dd91a2a8eee2a5ed8050f69dafb44e8')" | ||
| ] | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,25 @@ | ||
| package com.bnyro.translate.db | ||
|
|
||
| import androidx.room.AutoMigration | ||
| import androidx.room.Database | ||
| import androidx.room.RoomDatabase | ||
| import com.bnyro.translate.db.dao.HistoryDao | ||
| import com.bnyro.translate.db.dao.LanguageBookmarksDao | ||
| import com.bnyro.translate.db.obj.HistoryItem | ||
| import com.bnyro.translate.db.obj.Language | ||
|
|
||
| @Database( | ||
| entities = [ | ||
| HistoryItem::class | ||
| HistoryItem::class, | ||
| Language::class | ||
| ], | ||
| version = 1 | ||
| version = 2, | ||
| autoMigrations = [ | ||
| AutoMigration(from = 1, to = 2) | ||
| ] | ||
| ) | ||
| abstract class AppDatabase : RoomDatabase() { | ||
| abstract fun historyDao(): HistoryDao | ||
|
|
||
| abstract fun languageBookmarksDao(): LanguageBookmarksDao | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
22 changes: 22 additions & 0 deletions
22
app/src/main/java/com/bnyro/translate/db/dao/LanguageBookmarksDao.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| package com.bnyro.translate.db.dao | ||
|
|
||
| import androidx.room.Dao | ||
| import androidx.room.Delete | ||
| import androidx.room.Insert | ||
| import androidx.room.Query | ||
| import com.bnyro.translate.db.obj.Language | ||
|
|
||
| @Dao | ||
| interface LanguageBookmarksDao { | ||
| @Query("SELECT * FROM Language") | ||
| fun getAll(): List<Language> | ||
|
|
||
| @Insert | ||
| fun insertAll(vararg languages: Language) | ||
|
|
||
| @Delete | ||
| fun delete(language: Language) | ||
|
|
||
| @Query("DELETE FROM Language") | ||
| fun deleteAll() | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| package com.bnyro.translate.db.obj | ||
|
|
||
| import androidx.room.ColumnInfo | ||
| import androidx.room.Entity | ||
| import androidx.room.PrimaryKey | ||
|
|
||
| @Entity | ||
| data class Language( | ||
| @PrimaryKey(autoGenerate = false) | ||
| val code: String = "", | ||
| @ColumnInfo val name: String = "" | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| package com.bnyro.translate.ext | ||
|
|
||
| fun <T> awaitQuery(action: () -> T): T { | ||
| var value: T? = null | ||
| Thread { | ||
| value = action.invoke() | ||
| }.apply { | ||
| start() | ||
| join() | ||
| } | ||
| return value!! | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.