-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #51 from private-yusuke/make-recently-checked-in-v…
…enues-selectable Make recently checked-in venues selectable
- Loading branch information
Showing
22 changed files
with
363 additions
and
14 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
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,64 @@ | ||
| { | ||
| "formatVersion": 1, | ||
| "database": { | ||
| "version": 1, | ||
| "identityHash": "e1ce587d7ca33db324d2788059075aa5", | ||
| "entities": [ | ||
| { | ||
| "tableName": "visited_venues", | ||
| "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `name` TEXT NOT NULL, `categoriesString` TEXT, `location` BLOB NOT NULL, `icon_name` TEXT, `icon_url` TEXT, PRIMARY KEY(`id`))", | ||
| "fields": [ | ||
| { | ||
| "fieldPath": "id", | ||
| "columnName": "id", | ||
| "affinity": "TEXT", | ||
| "notNull": true | ||
| }, | ||
| { | ||
| "fieldPath": "name", | ||
| "columnName": "name", | ||
| "affinity": "TEXT", | ||
| "notNull": true | ||
| }, | ||
| { | ||
| "fieldPath": "categoriesString", | ||
| "columnName": "categoriesString", | ||
| "affinity": "TEXT", | ||
| "notNull": false | ||
| }, | ||
| { | ||
| "fieldPath": "location", | ||
| "columnName": "location", | ||
| "affinity": "BLOB", | ||
| "notNull": true | ||
| }, | ||
| { | ||
| "fieldPath": "iconName", | ||
| "columnName": "icon_name", | ||
| "affinity": "TEXT", | ||
| "notNull": false | ||
| }, | ||
| { | ||
| "fieldPath": "iconUrl", | ||
| "columnName": "icon_url", | ||
| "affinity": "TEXT", | ||
| "notNull": false | ||
| } | ||
| ], | ||
| "primaryKey": { | ||
| "autoGenerate": false, | ||
| "columnNames": [ | ||
| "id" | ||
| ] | ||
| }, | ||
| "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, 'e1ce587d7ca33db324d2788059075aa5')" | ||
| ] | ||
| } | ||
| } |
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
26 changes: 26 additions & 0 deletions
26
...droidTest/java/pub/yusuke/interscheckin/repositories/visitedvenues/FakeVisitedVenueDao.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,26 @@ | ||
| package pub.yusuke.interscheckin.repositories.visitedvenues | ||
|
|
||
| import co.anbora.labs.spatia.geometry.Point | ||
| import javax.inject.Inject | ||
|
|
||
| class FakeVisitedVenueDao @Inject constructor() : VisitedVenueDao { | ||
| override suspend fun findByLatLong( | ||
| latitude: Double, | ||
| longitude: Double, | ||
| nameLike: String, | ||
| limit: Long | ||
| ): List<VisitedVenue> = listOf( | ||
| VisitedVenue( | ||
| id = "venue_id", | ||
| name = "An visited Venue", | ||
| categoriesString = "Intersection", | ||
| location = Point(0.0, 0.0), | ||
| iconName = "Intersection", | ||
| iconUrl = "https://example.com/visited_venue.png" | ||
| ) | ||
| ) | ||
|
|
||
| override suspend fun insertVisitedVenues(visitedVenues: List<VisitedVenue>) {} | ||
|
|
||
| override suspend 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
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,20 @@ | ||
| package pub.yusuke.interscheckin | ||
|
|
||
| import androidx.room.Database | ||
| import androidx.room.RoomDatabase | ||
| import androidx.room.TypeConverters | ||
| import co.anbora.labs.spatia.geometry.GeometryConverters | ||
| import pub.yusuke.interscheckin.repositories.visitedvenues.VisitedVenue | ||
| import pub.yusuke.interscheckin.repositories.visitedvenues.VisitedVenueDao | ||
|
|
||
| @Database( | ||
| entities = [ | ||
| VisitedVenue::class | ||
| ], | ||
| version = 1, | ||
| exportSchema = true | ||
| ) | ||
| @TypeConverters(GeometryConverters::class) | ||
| abstract class AppDatabase : RoomDatabase() { | ||
| abstract fun visitedVenueDao(): VisitedVenueDao | ||
| } |
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
24 changes: 24 additions & 0 deletions
24
app/src/main/java/pub/yusuke/interscheckin/repositories/visitedvenues/VisitedVenue.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,24 @@ | ||
| package pub.yusuke.interscheckin.repositories.visitedvenues | ||
|
|
||
| import androidx.room.ColumnInfo | ||
| import androidx.room.Entity | ||
| import androidx.room.PrimaryKey | ||
| import co.anbora.labs.spatia.geometry.Point | ||
|
|
||
| @Entity(tableName = VisitedVenue.TABLE_NAME) | ||
| data class VisitedVenue( | ||
| @PrimaryKey | ||
| val id: String, | ||
| val name: String, | ||
| val categoriesString: String? = null, | ||
| val location: Point, | ||
| @ColumnInfo(name = "icon_name") | ||
| val iconName: String?, | ||
| @ColumnInfo(name = "icon_url") | ||
| val iconUrl: String? | ||
| ) { | ||
| companion object { | ||
| const val TABLE_NAME = "visited_venues" | ||
| const val SRID = 4326 | ||
| } | ||
| } |
40 changes: 40 additions & 0 deletions
40
app/src/main/java/pub/yusuke/interscheckin/repositories/visitedvenues/VisitedVenueDao.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,40 @@ | ||
| package pub.yusuke.interscheckin.repositories.visitedvenues | ||
|
|
||
| import androidx.room.Dao | ||
| import androidx.room.Insert | ||
| import androidx.room.OnConflictStrategy | ||
| import androidx.room.Query | ||
| import androidx.room.SkipQueryVerification | ||
|
|
||
| @Dao | ||
| interface VisitedVenueDao { | ||
| @Query( | ||
| """ | ||
| select | ||
| * | ||
| from | ||
| ${VisitedVenue.TABLE_NAME} | ||
| where | ||
| name like '%' || :nameLike || '%' | ||
| order by | ||
| distance( | ||
| setsrid(location, ${VisitedVenue.SRID}), | ||
| makepoint(:latitude, :longitude, ${VisitedVenue.SRID}) | ||
| ) asc | ||
| limit :limit | ||
| """ | ||
| ) | ||
| @SkipQueryVerification | ||
| suspend fun findByLatLong( | ||
| latitude: Double, | ||
| longitude: Double, | ||
| nameLike: String = "", | ||
| limit: Long = 10 | ||
| ): List<VisitedVenue> | ||
|
|
||
| @Insert(onConflict = OnConflictStrategy.REPLACE) | ||
| suspend fun insertVisitedVenues(visitedVenues: List<VisitedVenue>) | ||
|
|
||
| @Query("delete from ${VisitedVenue.TABLE_NAME}") | ||
| suspend 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
Oops, something went wrong.