Skip to content

Commit

Permalink
Merge pull request #79 from TimPushkin/spbu-pf
Browse files Browse the repository at this point in the history
Faculty of Physics, St. Petersburg State University
  • Loading branch information
TimPushkin authored Dec 7, 2023
2 parents 5cfbac5 + 0815bb6 commit f8cd508
Show file tree
Hide file tree
Showing 6,106 changed files with 11,893 additions and 2,159 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ specific rooms on them.
The following maps are available:

- Mathematics and Mechanics Faculty, St. Petersburg State University
- Faculty of Physics, St. Petersburg State University

| [<img src="https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png" alt="Get it on Google Play" height="80" />](https://play.google.com/store/apps/details?id=ru.spbu.depnav&utm_source=https%3A%2F%2Fgithub.com%2FTimPushkin%2FDepNav&pcampaignid=pcampaignidMKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1) | [<img src="https://i.imgur.com/g5WjbFC.png" alt="AppGallery" height="80" />](https://appgallery.cloud.huawei.com/ag/n/app/C106717783?channelId=GitHub+repository&id=05d3f9cea9c44d829cd43b9f79593c88&s=A358D75497B3480E158A47713DE08E03B4047FD6FD5F2DA45C7AF9D9B5410F64&detailType=0&v=&callType=AGDLINK&installType=0000) |
|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|:--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|
Expand All @@ -20,11 +21,11 @@ The following maps are available:
With **DepNav** you can do the following:

- **View** the available maps by floors
- **Search** for specific rooms and other objects on the selected map with built-in search
- **Search** for specific rooms and other objects on the selected map with the built-in search
- Enjoy Material UI 3 in selectable light and dark themes
- Two languages available: English and Russian

| ![Map](https://i.imgur.com/1qjld38.png) | ![Search](https://i.imgur.com/cE3RtaA.png) | ![Info](https://i.imgur.com/Hcis0w0.png) |
| ![Map](https://i.imgur.com/Tyn21xJ.png) | ![Search](https://i.imgur.com/4XGDlQH.png) | ![Info](https://i.imgur.com/35E5mkG.png) |
|:---------------------------------------:|:------------------------------------------:|:----------------------------------------:|

## Get it!
Expand Down
2 changes: 1 addition & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ def keystorePropertiesFile = rootProject.file('keystore.properties')
def keystoreProperties = new Properties()
if (keystorePropertiesFile.exists()) keystoreProperties.load(new FileInputStream(keystorePropertiesFile))

def version = ['major': 1, 'minor': 3, 'patch': 3]
def version = ['major': 1, 'minor': 4, 'patch': 0]

android {
namespace 'ru.spbu.depnav'
Expand Down
340 changes: 340 additions & 0 deletions app/schemas/ru.spbu.depnav.data.db.AppDatabase/9.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,340 @@
{
"formatVersion": 1,
"database": {
"version": 9,
"identityHash": "b2f5f82a76e1409ed0ad2d4aafaef05b",
"entities": [
{
"tableName": "map_info",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `internal_name` TEXT NOT NULL, `floor_width` INTEGER NOT NULL, `floor_height` INTEGER NOT NULL, `tile_size` INTEGER NOT NULL, `levels_num` INTEGER NOT NULL, `floors_num` INTEGER NOT NULL, PRIMARY KEY(`id`))",
"fields": [
{
"fieldPath": "id",
"columnName": "id",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "internalName",
"columnName": "internal_name",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "floorWidth",
"columnName": "floor_width",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "floorHeight",
"columnName": "floor_height",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "tileSize",
"columnName": "tile_size",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "levelsNum",
"columnName": "levels_num",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "floorsNum",
"columnName": "floors_num",
"affinity": "INTEGER",
"notNull": true
}
],
"primaryKey": {
"autoGenerate": false,
"columnNames": [
"id"
]
},
"indices": [
{
"name": "index_map_info_internal_name",
"unique": true,
"columnNames": [
"internal_name"
],
"orders": [],
"createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_map_info_internal_name` ON `${TABLE_NAME}` (`internal_name`)"
}
],
"foreignKeys": []
},
{
"tableName": "map_title",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`map_id` INTEGER NOT NULL, `language_id` TEXT NOT NULL, `title` TEXT NOT NULL, PRIMARY KEY(`map_id`, `language_id`), FOREIGN KEY(`map_id`) REFERENCES `map_info`(`id`) ON UPDATE CASCADE ON DELETE RESTRICT )",
"fields": [
{
"fieldPath": "mapId",
"columnName": "map_id",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "languageId",
"columnName": "language_id",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "title",
"columnName": "title",
"affinity": "TEXT",
"notNull": true
}
],
"primaryKey": {
"autoGenerate": false,
"columnNames": [
"map_id",
"language_id"
]
},
"indices": [],
"foreignKeys": [
{
"table": "map_info",
"onDelete": "RESTRICT",
"onUpdate": "CASCADE",
"columns": [
"map_id"
],
"referencedColumns": [
"id"
]
}
]
},
{
"tableName": "marker",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `map_id` INTEGER NOT NULL, `type` TEXT NOT NULL, `floor` INTEGER NOT NULL, `x` REAL NOT NULL, `y` REAL NOT NULL, FOREIGN KEY(`map_id`) REFERENCES `map_info`(`id`) ON UPDATE CASCADE ON DELETE RESTRICT )",
"fields": [
{
"fieldPath": "id",
"columnName": "id",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "mapId",
"columnName": "map_id",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "type",
"columnName": "type",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "floor",
"columnName": "floor",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "x",
"columnName": "x",
"affinity": "REAL",
"notNull": true
},
{
"fieldPath": "y",
"columnName": "y",
"affinity": "REAL",
"notNull": true
}
],
"primaryKey": {
"autoGenerate": true,
"columnNames": [
"id"
]
},
"indices": [
{
"name": "index_marker_map_id_floor",
"unique": false,
"columnNames": [
"map_id",
"floor"
],
"orders": [],
"createSql": "CREATE INDEX IF NOT EXISTS `index_marker_map_id_floor` ON `${TABLE_NAME}` (`map_id`, `floor`)"
}
],
"foreignKeys": [
{
"table": "map_info",
"onDelete": "RESTRICT",
"onUpdate": "CASCADE",
"columns": [
"map_id"
],
"referencedColumns": [
"id"
]
}
]
},
{
"tableName": "marker_text",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`marker_id` INTEGER NOT NULL, `language_id` TEXT NOT NULL, `title` TEXT, `location` TEXT, `description` TEXT, PRIMARY KEY(`marker_id`, `language_id`), FOREIGN KEY(`marker_id`) REFERENCES `marker`(`id`) ON UPDATE CASCADE ON DELETE RESTRICT )",
"fields": [
{
"fieldPath": "markerId",
"columnName": "marker_id",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "languageId",
"columnName": "language_id",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "title",
"columnName": "title",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "location",
"columnName": "location",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "description",
"columnName": "description",
"affinity": "TEXT",
"notNull": false
}
],
"primaryKey": {
"autoGenerate": false,
"columnNames": [
"marker_id",
"language_id"
]
},
"indices": [],
"foreignKeys": [
{
"table": "marker",
"onDelete": "RESTRICT",
"onUpdate": "CASCADE",
"columns": [
"marker_id"
],
"referencedColumns": [
"id"
]
}
]
},
{
"ftsVersion": "FTS4",
"ftsOptions": {
"tokenizer": "unicode61",
"tokenizerArgs": [],
"contentTable": "marker_text",
"languageIdColumnName": "",
"matchInfo": "FTS4",
"notIndexedColumns": [],
"prefixSizes": [],
"preferredOrder": "ASC"
},
"contentSyncTriggers": [
"CREATE TRIGGER IF NOT EXISTS room_fts_content_sync_marker_text_fts_BEFORE_UPDATE BEFORE UPDATE ON `marker_text` BEGIN DELETE FROM `marker_text_fts` WHERE `docid`=OLD.`rowid`; END",
"CREATE TRIGGER IF NOT EXISTS room_fts_content_sync_marker_text_fts_BEFORE_DELETE BEFORE DELETE ON `marker_text` BEGIN DELETE FROM `marker_text_fts` WHERE `docid`=OLD.`rowid`; END",
"CREATE TRIGGER IF NOT EXISTS room_fts_content_sync_marker_text_fts_AFTER_UPDATE AFTER UPDATE ON `marker_text` BEGIN INSERT INTO `marker_text_fts`(`docid`, `title`, `location`, `description`) VALUES (NEW.`rowid`, NEW.`title`, NEW.`location`, NEW.`description`); END",
"CREATE TRIGGER IF NOT EXISTS room_fts_content_sync_marker_text_fts_AFTER_INSERT AFTER INSERT ON `marker_text` BEGIN INSERT INTO `marker_text_fts`(`docid`, `title`, `location`, `description`) VALUES (NEW.`rowid`, NEW.`title`, NEW.`location`, NEW.`description`); END"
],
"tableName": "marker_text_fts",
"createSql": "CREATE VIRTUAL TABLE IF NOT EXISTS `${TABLE_NAME}` USING FTS4(`title` TEXT, `location` TEXT, `description` TEXT, tokenize=unicode61, content=`marker_text`)",
"fields": [
{
"fieldPath": "title",
"columnName": "title",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "location",
"columnName": "location",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "description",
"columnName": "description",
"affinity": "TEXT",
"notNull": false
}
],
"primaryKey": {
"autoGenerate": false,
"columnNames": []
},
"indices": [],
"foreignKeys": []
},
{
"tableName": "search_history_entry",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`marker_id` INTEGER NOT NULL, `timestamp` INTEGER NOT NULL, PRIMARY KEY(`marker_id`), FOREIGN KEY(`marker_id`) REFERENCES `marker`(`id`) ON UPDATE CASCADE ON DELETE RESTRICT )",
"fields": [
{
"fieldPath": "markerId",
"columnName": "marker_id",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "timestamp",
"columnName": "timestamp",
"affinity": "INTEGER",
"notNull": true
}
],
"primaryKey": {
"autoGenerate": false,
"columnNames": [
"marker_id"
]
},
"indices": [],
"foreignKeys": [
{
"table": "marker",
"onDelete": "RESTRICT",
"onUpdate": "CASCADE",
"columns": [
"marker_id"
],
"referencedColumns": [
"id"
]
}
]
}
],
"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, 'b2f5f82a76e1409ed0ad2d4aafaef05b')"
]
}
}
Loading

0 comments on commit f8cd508

Please sign in to comment.