Skip to content

Commit

Permalink
Merge branch 'main' into dialer
Browse files Browse the repository at this point in the history
# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/com/bnyro/contacts/ui/activities/MainActivity.kt
#	app/src/main/java/com/bnyro/contacts/ui/screens/MainAppContent.kt
#	app/src/main/java/com/bnyro/contacts/ui/screens/SettingsScreen.kt
#	app/src/main/res/values/strings.xml
  • Loading branch information
SuhasDissa committed Apr 13, 2024
2 parents db24913 + f5ebcb5 commit 8bbf71e
Show file tree
Hide file tree
Showing 109 changed files with 4,652 additions and 2,227 deletions.
13 changes: 9 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,20 @@ jobs:
debug-builds:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: gradle/wrapper-validation-action@v1
- uses: actions/checkout@v4
- uses: gradle/wrapper-validation-action@v2

- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: 17
distribution: "temurin"
cache: "gradle"

- name: Compile
run: |
./gradlew assembleDebug
- name: Sign Apk
continue-on-error: true
id: sign_apk
Expand All @@ -40,12 +43,14 @@ jobs:
keyAlias: ${{ secrets.ANDROID_KEY_ALIAS }}
keyStorePassword: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
keyPassword: ${{ secrets.ANDROID_KEY_PASSWORD }}

- name: Remove file that aren't signed
continue-on-error: true
run: |
ls | grep 'signed\.apk$' && find . -type f -name '*.apk' ! -name '*-signed.apk' -delete
- name: Upload APK
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: app
path: app/build/outputs/apk/debug/*.apk
2 changes: 1 addition & 1 deletion .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 11 additions & 2 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,16 @@ android {
namespace = "com.bnyro.contacts"
compileSdk = 33

androidResources {
generateLocaleConfig = true
}

defaultConfig {
applicationId = "com.bnyro.contacts"
minSdk = 23
targetSdk = 33
versionCode = 27
versionName = "8.1"
versionCode = 28
versionName = "9.0"

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables {
Expand Down Expand Up @@ -76,6 +80,7 @@ dependencies {
implementation("androidx.compose.ui:ui-tooling-preview:$compose_version")
implementation("androidx.compose.material3:material3:1.2.0-alpha02")
implementation("androidx.compose.material:material-icons-extended:1.4.3")
implementation("com.github.nanihadesuka:LazyColumnScrollbar:1.9.0")

// VCard
implementation("com.googlecode.ez-vcard:ez-vcard:0.11.3")
Expand All @@ -84,12 +89,16 @@ dependencies {
// Image parsing
implementation("androidx.exifinterface:exifinterface:1.3.6")

// Phone number formatting
implementation("com.googlecode.libphonenumber:libphonenumber:8.2.0")

// Markdown support for notes
implementation("com.halilibo.compose-richtext:richtext-ui-material3:0.17.0")
implementation("com.halilibo.compose-richtext:richtext-commonmark:0.17.0")

// Room database
implementation("androidx.room:room-ktx:2.5.1")
implementation("androidx.navigation:navigation-compose:2.5.2")
kapt("androidx.room:room-compiler:2.5.1")

// Testing
Expand Down
165 changes: 165 additions & 0 deletions app/schemas/com.bnyro.contacts.db.AppDatabase/4.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,165 @@
{
"formatVersion": 1,
"database": {
"version": 4,
"identityHash": "9c6b62e79ca517c51c6b234b62f23eb4",
"entities": [
{
"tableName": "localContacts",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `displayName` TEXT, `firstName` TEXT, `surName` TEXT, `nickName` TEXT, `organization` TEXT)",
"fields": [
{
"fieldPath": "id",
"columnName": "id",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "displayName",
"columnName": "displayName",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "firstName",
"columnName": "firstName",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "surName",
"columnName": "surName",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "nickName",
"columnName": "nickName",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "organization",
"columnName": "organization",
"affinity": "TEXT",
"notNull": false
}
],
"primaryKey": {
"autoGenerate": true,
"columnNames": [
"id"
]
},
"indices": [],
"foreignKeys": []
},
{
"tableName": "valuableTypes",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `contactId` INTEGER NOT NULL, `category` INTEGER NOT NULL, `value` TEXT NOT NULL, `type` INTEGER)",
"fields": [
{
"fieldPath": "id",
"columnName": "id",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "contactId",
"columnName": "contactId",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "category",
"columnName": "category",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "value",
"columnName": "value",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "type",
"columnName": "type",
"affinity": "INTEGER",
"notNull": false
}
],
"primaryKey": {
"autoGenerate": true,
"columnNames": [
"id"
]
},
"indices": [],
"foreignKeys": []
},
{
"tableName": "localSms",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `address` TEXT NOT NULL, `body` TEXT NOT NULL, `timestamp` INTEGER NOT NULL, `threadId` INTEGER NOT NULL, `type` INTEGER NOT NULL, `simNumber` INTEGER DEFAULT NULL)",
"fields": [
{
"fieldPath": "id",
"columnName": "id",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "address",
"columnName": "address",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "body",
"columnName": "body",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "timestamp",
"columnName": "timestamp",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "threadId",
"columnName": "threadId",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "type",
"columnName": "type",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "simNumber",
"columnName": "simNumber",
"affinity": "INTEGER",
"notNull": false,
"defaultValue": "NULL"
}
],
"primaryKey": {
"autoGenerate": true,
"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, '9c6b62e79ca517c51c6b234b62f23eb4')"
]
}
}
Loading

0 comments on commit 8bbf71e

Please sign in to comment.