feat: optional match mode for the filter tag and content (#240)

core/ui/icons/src/main/res/drawable/ic_call_split.xml

@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal"
+    android:autoMirrored="true">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M240,296L240,360Q240,377 228.5,388.5Q217,400 200,400Q183,400 171.5,388.5Q160,377 160,360L160,200Q160,183 171.5,171.5Q183,160 200,160L360,160Q377,160 388.5,171.5Q400,183 400,200Q400,217 388.5,228.5Q377,240 360,240L296,240L497,441Q508,452 514,466.5Q520,481 520,497L520,760Q520,777 508.5,788.5Q497,800 480,800Q463,800 451.5,788.5Q440,777 440,760L440,496Q440,496 440,496Q440,496 440,496L240,296ZM720,296L622,395Q610,407 593.5,407Q577,407 565,395Q553,383 553,366Q553,349 565,337L664,240L600,240Q583,240 571.5,228.5Q560,217 560,200Q560,183 571.5,171.5Q583,160 600,160L760,160Q777,160 788.5,171.5Q800,183 800,200L800,360Q800,377 788.5,388.5Q777,400 760,400Q743,400 731.5,388.5Q720,377 720,360L720,296Z"/>
+</vector>

core/ui/icons/src/main/res/drawable/ic_equal.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M220,680Q195,680 177.5,662.5Q160,645 160,620Q160,595 177.5,577.5Q195,560 220,560L740,560Q765,560 782.5,577.5Q800,595 800,620Q800,645 782.5,662.5Q765,680 740,680L220,680ZM220,400Q195,400 177.5,382.5Q160,365 160,340Q160,315 177.5,297.5Q195,280 220,280L740,280Q765,280 782.5,297.5Q800,315 800,340Q800,365 782.5,382.5Q765,400 740,400L220,400Z"/>
+</vector>

core/ui/icons/src/main/res/drawable/ic_regular_expression.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M80,478Q80,409 102.5,344.5Q125,280 169,226Q180,213 196.5,212Q213,211 225,223Q237,235 237.5,251.5Q238,268 227,282Q194,324 177,374Q160,424 160,478Q160,532 178,582Q196,632 228,674Q239,688 238.5,704Q238,720 226,732Q214,744 197.5,743.5Q181,743 170,730Q127,676 103.5,611.5Q80,547 80,478ZM337.5,702.5Q320,685 320,660Q320,635 337.5,617.5Q355,600 380,600Q405,600 422.5,617.5Q440,635 440,660Q440,685 422.5,702.5Q405,720 380,720Q355,720 337.5,702.5ZM530.5,508.5Q519,497 519,480L519,449L493,465Q479,473 462.5,468.5Q446,464 438,450Q430,436 434.5,419.5Q439,403 453,395L479,380L452,365Q438,357 434,340.5Q430,324 438,310Q446,295 462.5,291.5Q479,288 493,296L519,311L519,280Q519,263 530.5,251.5Q542,240 559,240Q576,240 587.5,251.5Q599,263 599,280L599,311L625,295Q639,287 655.5,291.5Q672,296 680,310Q688,324 683.5,340.5Q679,357 665,365L639,380L666,395Q680,403 684,419.5Q688,436 680,450Q672,465 655.5,468.5Q639,472 625,464L599,449L599,480Q599,497 587.5,508.5Q576,520 559,520Q542,520 530.5,508.5ZM880,478Q880,547 857.5,611.5Q835,676 791,730Q780,743 763.5,743.5Q747,744 735,732Q723,720 722.5,704Q722,688 733,674Q766,632 783,582Q800,532 800,478Q800,424 782,374Q764,324 732,282Q721,268 722,251.5Q723,235 735,223Q747,211 763,212Q779,213 790,226Q833,280 856.5,344.5Q880,409 880,478Z"/>
+</vector>

core/ui/icons/src/main/res/drawable/ic_tilde.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M633.364 583.32C613.684 583.32 591.844 579.96 567.844 573.24C544.324 566.04 510.004 552.6 464.884 532.92C426.484 516.12 397.684 504.6 378.484 498.36C359.764 491.64 343.924 488.28 330.964 488.28C318.004 488.28 306.964 490.92 297.844 496.2C289.204 501 282.244 508.68 276.964 519.24C272.164 529.32 267.604 537.96 263.284 545.16C258.964 552.36 252.244 558.36 243.124 563.16C234.004 567.96 222.964 570.12 210.004 569.64C196.564 568.68 184.564 562.44 174.004 550.92C163.444 539.4 158.404 525.96 158.884 510.6C159.364 494.76 166.564 475.32 180.484 452.28C194.404 429.24 213.604 411 238.084 397.56C262.564 383.64 291.604 376.68 325.204 376.68C344.404 376.68 365.764 379.8 389.284 386.04C412.804 391.8 449.044 405.24 498.004 426.36C536.884 444.12 565.204 456.12 582.964 462.36C601.204 468.6 616.564 471.72 629.044 471.72C641.524 471.72 652.084 469.32 660.724 464.52C669.364 459.24 676.084 451.56 680.884 441.48C685.684 431.4 690.484 422.52 695.284 414.84C700.084 406.68 707.764 399.96 718.324 394.68C728.884 388.92 740.884 387.24 754.324 389.64C767.284 391.56 778.084 397.56 786.724 407.64C795.844 417.72 800.644 429.96 801.124 444.36C801.604 458.76 794.644 478.92 780.244 504.84C765.844 530.76 746.404 550.44 721.924 563.88C697.444 576.84 667.924 583.32 633.364 583.32Z"/>
+</vector>

feature/database/api/src/main/kotlin/com/f0x1d/logfox/feature/database/api/entity/MatchMode.kt

@@ -0,0 +1,10 @@
+package com.f0x1d.logfox.feature.database.api.entity
+
+// Database-local copy of the filters-domain MatchMode, so this module stays free of the filters
+// feature (mirrors CrashType). filters:impl maps between the two by name. Persisted by ordinal via
+// MatchModeConverter, so the order of these entries must never change.
+enum class MatchMode {
+    CONTAINS,
+    REGEX,
+    EXACT,
+}

feature/database/api/src/main/kotlin/com/f0x1d/logfox/feature/database/api/entity/UserFilterEntity.kt

@@ -12,6 +12,8 @@ data class UserFilterEntity(
     val tid: String? = null,
     val packageName: String? = null,
     val tag: String? = null,
+    val tagMatchMode: MatchMode = MatchMode.CONTAINS,
     val content: String? = null,
+    val contentMatchMode: MatchMode = MatchMode.CONTAINS,
     val enabled: Boolean = true,
 )

feature/database/impl/schemas/com.f0x1d.logfox.feature.database.impl.AppDatabase/19.json

@@ -0,0 +1,248 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 19,
+    "identityHash": "ea915a8ab40f066886dac35e5e5f2c0c",
+    "entities": [
+      {
+        "tableName": "AppCrash",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`app_name` TEXT, `package_name` TEXT NOT NULL, `crash_type` INTEGER NOT NULL, `date_and_time` INTEGER NOT NULL, `log` TEXT NOT NULL, `log_file` TEXT, `log_dump_file` TEXT, `is_deleted` INTEGER NOT NULL DEFAULT 0, `deleted_time` INTEGER, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "appName",
+            "columnName": "app_name",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "packageName",
+            "columnName": "package_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "crashType",
+            "columnName": "crash_type",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateAndTime",
+            "columnName": "date_and_time",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "log",
+            "columnName": "log",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "logFile",
+            "columnName": "log_file",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "logDumpFile",
+            "columnName": "log_dump_file",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "isDeleted",
+            "columnName": "is_deleted",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "deletedTime",
+            "columnName": "deleted_time",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_AppCrash_date_and_time",
+            "unique": false,
+            "columnNames": [
+              "date_and_time"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_AppCrash_date_and_time` ON `${TABLE_NAME}` (`date_and_time`)"
+          }
+        ]
+      },
+      {
+        "tableName": "LogRecording",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`title` TEXT NOT NULL, `date_and_time` INTEGER NOT NULL, `file` TEXT NOT NULL, `is_cache_recording` INTEGER NOT NULL DEFAULT 0, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dateAndTime",
+            "columnName": "date_and_time",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "file",
+            "columnName": "file",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isCacheRecording",
+            "columnName": "is_cache_recording",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        }
+      },
+      {
+        "tableName": "UserFilter",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT, `including` INTEGER NOT NULL, `allowed_levels` TEXT NOT NULL, `uid` TEXT, `pid` TEXT, `tid` TEXT, `package_name` TEXT, `tag` TEXT, `tag_match_mode` INTEGER NOT NULL, `content` TEXT, `enabled` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "including",
+            "columnName": "including",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "allowedLevels",
+            "columnName": "allowed_levels",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "uid",
+            "columnName": "uid",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "pid",
+            "columnName": "pid",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "tid",
+            "columnName": "tid",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "packageName",
+            "columnName": "package_name",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "tag",
+            "columnName": "tag",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "tagMatchMode",
+            "columnName": "tag_match_mode",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "enabled",
+            "columnName": "enabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        }
+      },
+      {
+        "tableName": "DisabledApp",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`package_name` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "packageName",
+            "columnName": "package_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_DisabledApp_package_name",
+            "unique": false,
+            "columnNames": [
+              "package_name"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_DisabledApp_package_name` ON `${TABLE_NAME}` (`package_name`)"
+          }
+        ]
+      }
+    ],
+    "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, 'ea915a8ab40f066886dac35e5e5f2c0c')"
+    ]
+  }
+}