Skip to content

Commit

Permalink
Merge branch 'release/v1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
manuelduarte077 committed Nov 24, 2024
2 parents 6a0a3f1 + 58ab15d commit 33276a6
Show file tree
Hide file tree
Showing 94 changed files with 2,054 additions and 549 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@
.externalNativeBuild
.cxx
local.properties

keystore
20 changes: 13 additions & 7 deletions .idea/appInsightsSettings.xml

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

2 changes: 1 addition & 1 deletion .idea/compiler.xml

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

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.

3 changes: 2 additions & 1 deletion .idea/misc.xml

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

38 changes: 33 additions & 5 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,27 @@ plugins {
alias(libs.plugins.compose.compiler)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.kotlin.serialization)
alias(libs.plugins.dagger.hilt)
alias(libs.plugins.room)
alias(libs.plugins.ksp)
id("com.google.firebase.crashlytics")
}

room {
schemaDirectory("$projectDir/schemas")
}



android {
namespace = "dev.donmanuel.note"
namespace = "com.manuelduarte077.notyapp"
compileSdk = 35

defaultConfig {
applicationId = "dev.donmanuel.note"
applicationId = "com.manuelduarte077.notyapp"
minSdk = 24
targetSdk = 35
versionCode = 1
versionCode = 4
versionName = "1.0"

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
Expand Down Expand Up @@ -51,20 +61,38 @@ android {

dependencies {

//Librerias Android y compose
implementation(libs.androidx.core.ktx)
implementation(libs.androidx.lifecycle.runtime.ktx)
implementation(libs.androidx.activity.compose)
implementation(platform(libs.androidx.compose.bom))
implementation(libs.androidx.lifecycle.viewmodel.compose)

implementation(libs.androidx.ui)
implementation(libs.androidx.ui.graphics)
implementation(libs.androidx.ui.tooling.preview)

implementation(libs.androidx.material3)

implementation(libs.androidx.ui.text.google.fonts)
debugImplementation(libs.androidx.ui.tooling)
debugImplementation(libs.androidx.ui.test.manifest)
implementation(libs.androidx.navigation.compose)

//Librerias Room
implementation(libs.room.ktx)
implementation(libs.room.runtime)
ksp(libs.room.compiler)

//Librerias Dagger Hilt
implementation(libs.dagger.hilt.navigation.compose)
implementation(libs.dagger.hilt)
ksp(libs.dagger.hilt.compiler)

//Libreria Serializacion
implementation(libs.kotlinx.serialization.json)

//Librerias Firebase
implementation(platform(libs.firebase.bom))
implementation(libs.firebase.crashlytics)
implementation(libs.firebase.analytics)
implementation(libs.firebase.auth)
}
68 changes: 68 additions & 0 deletions app/google-services.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
{
"project_info": {
"project_number": "516322502988",
"project_id": "notyapp-7f6fd",
"storage_bucket": "notyapp-7f6fd.firebasestorage.app"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:516322502988:android:7041f1a870ecac65d047e9",
"android_client_info": {
"package_name": "com.manuelduarte077.notyapp"
}
},
"oauth_client": [
{
"client_id": "516322502988-gchp0ddj7h6jjbddt8ejgtv6dppvr4sc.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyCjYZ61A9ocsxPKvtaV01Xt5OQJA1wecLw"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": [
{
"client_id": "516322502988-gchp0ddj7h6jjbddt8ejgtv6dppvr4sc.apps.googleusercontent.com",
"client_type": 3
}
]
}
}
},
{
"client_info": {
"mobilesdk_app_id": "1:516322502988:android:dfcf3c59ae15d8cad047e9",
"android_client_info": {
"package_name": "dev.donmanuel.note"
}
},
"oauth_client": [
{
"client_id": "516322502988-gchp0ddj7h6jjbddt8ejgtv6dppvr4sc.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyCjYZ61A9ocsxPKvtaV01Xt5OQJA1wecLw"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": [
{
"client_id": "516322502988-gchp0ddj7h6jjbddt8ejgtv6dppvr4sc.apps.googleusercontent.com",
"client_type": 3
}
]
}
}
}
],
"configuration_version": "1"
}
Binary file added app/release/app-release.aab
Binary file not shown.
64 changes: 64 additions & 0 deletions app/schemas/com.manuelduarte077.notyapp.data.TodoDatabase/1.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
{
"formatVersion": 1,
"database": {
"version": 1,
"identityHash": "47dd0aa783550c78088f33c5a3fdafc7",
"entities": [
{
"tableName": "notes",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `title` TEXT NOT NULL, `description` TEXT, `category` INTEGER, `is_completed` INTEGER NOT NULL, `date` INTEGER NOT NULL, PRIMARY KEY(`id`))",
"fields": [
{
"fieldPath": "id",
"columnName": "id",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "title",
"columnName": "title",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "description",
"columnName": "description",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "category",
"columnName": "category",
"affinity": "INTEGER",
"notNull": false
},
{
"fieldPath": "isCompleted",
"columnName": "is_completed",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "date",
"columnName": "date",
"affinity": "INTEGER",
"notNull": true
}
],
"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, '47dd0aa783550c78088f33c5a3fdafc7')"
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
{
"formatVersion": 1,
"database": {
"version": 1,
"identityHash": "47dd0aa783550c78088f33c5a3fdafc7",
"entities": [
{
"tableName": "notes",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `title` TEXT NOT NULL, `description` TEXT, `category` INTEGER, `is_completed` INTEGER NOT NULL, `date` INTEGER NOT NULL, PRIMARY KEY(`id`))",
"fields": [
{
"fieldPath": "id",
"columnName": "id",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "title",
"columnName": "title",
"affinity": "TEXT",
"notNull": true
},
{
"fieldPath": "description",
"columnName": "description",
"affinity": "TEXT",
"notNull": false
},
{
"fieldPath": "category",
"columnName": "category",
"affinity": "INTEGER",
"notNull": false
},
{
"fieldPath": "isCompleted",
"columnName": "is_completed",
"affinity": "INTEGER",
"notNull": true
},
{
"fieldPath": "date",
"columnName": "date",
"affinity": "INTEGER",
"notNull": true
}
],
"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, '47dd0aa783550c78088f33c5a3fdafc7')"
]
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dev.donmanuel.note
package com.manuelduarte077.notyapp

import androidx.test.platform.app.InstrumentationRegistry
import androidx.test.ext.junit.runners.AndroidJUnit4
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@

<application
android:allowBackup="true"
android:name=".NoteApplication"
android:dataExtractionRules="@xml/data_extraction_rules"
android:fullBackupContent="@xml/backup_rules"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:roundIcon="@mipmap/ic_launcher"
android:supportsRtl="true"
android:theme="@style/Theme.Note"
tools:targetApi="31">
Expand Down
26 changes: 26 additions & 0 deletions app/src/main/java/com/manuelduarte077/notyapp/MainActivity.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package com.manuelduarte077.notyapp

import android.os.Bundle
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.activity.enableEdgeToEdge
import androidx.navigation.compose.rememberNavController
import com.manuelduarte077.notyapp.navigation.NavigationRoot
import com.manuelduarte077.notyapp.ui.theme.NoteTheme
import dagger.hilt.android.AndroidEntryPoint

@AndroidEntryPoint
class MainActivity : ComponentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)

enableEdgeToEdge()
setContent {
NoteTheme() {
val navController = rememberNavController()
NavigationRoot(navController)
}
}
}
}

Loading

0 comments on commit 33276a6

Please sign in to comment.