Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
762450d
Merge branch '27-feat-uso-del-sensor-de-biometría' into develop
Samu-Kiss Apr 22, 2026
54e8ad9
[Feat]:Uso sensor luz
MalejaGS Apr 22, 2026
0f55168
Merge pull request #42 from ICM2610G2/SensorLuz
Samu-Kiss Apr 22, 2026
71d2913
[Feat]: Plan and intenerary useful
JDOG-JuanDORtiz Apr 22, 2026
d37edae
[Feat]: Map follows user
JDOG-JuanDORtiz Apr 22, 2026
945b353
[Feat]: Map permission keeping scaffold
JDOG-JuanDORtiz Apr 22, 2026
ac096f9
Merge branch 'develop' into feat/maps_routes
JDOG-JuanDORtiz Apr 22, 2026
9b1b608
[Feat]: Map routes
JDOG-JuanDORtiz Apr 22, 2026
944f811
[Feat]: Map routes fix
JDOG-JuanDORtiz Apr 22, 2026
bf50e25
Merge pull request #44 from ICM2610G2/feat/maps_routes
MalejaGS Apr 22, 2026
7eafc03
[Fix]: Map routes fix
JDOG-JuanDORtiz Apr 22, 2026
e3d67d9
[Fix]: Faster update initial location
JDOG-JuanDORtiz Apr 22, 2026
6dc0995
Merge pull request #45 from ICM2610G2/hotfix/FinalDestination
Samu-Kiss Apr 22, 2026
d9adff5
[Merge]: Conflict fixing
Samu-Kiss Apr 24, 2026
171d45d
Revert "[Merge]: Conflict fixing"
Samu-Kiss Apr 24, 2026
6d2a4f0
[Fix]: InitPrefs catch exception
JDOG-JuanDORtiz May 28, 2026
9b6390a
[Feat]: Add userLocationViewModel
JDOG-JuanDORtiz May 28, 2026
aeca548
[Feat]: Map Template User marker depending on userLocationViewModel
JDOG-JuanDORtiz May 28, 2026
01a1868
[Fix]: Move updates to launchEffect
JDOG-JuanDORtiz May 28, 2026
4afd4db
[Fix]: Minimize Recomposition in MapTemplate
JDOG-JuanDORtiz May 28, 2026
c3f0d70
[Feat] Add Google Places required dependencies
JDOG-JuanDORtiz May 28, 2026
2d75454
[Feat] Dynamic plan list
JDOG-JuanDORtiz May 28, 2026
0625d53
[Feat]: Improve compass
JDOG-JuanDORtiz May 28, 2026
c25a859
[Fix]: DNC as dialog
JDOG-JuanDORtiz May 29, 2026
aee56b9
Merge pull request #47 from ICM2610G2/feat/userLocationViewModel
JDOG-JuanDORtiz May 31, 2026
51a5552
[Feat]: Implement Firebase user registration and profile management
MalejaGS May 31, 2026
b5705e9
[Feat]: Enhance secure credential storage and Firebase DB updates
MalejaGS Jun 1, 2026
75e4905
[Hotfix]:SignUp Form correction
MalejaGS Jun 1, 2026
3a4500d
[Feat]: Display user profile images as map markers
MalejaGS Jun 1, 2026
52191cb
[Feat]: Enhance UI/UX with dynamic opening hours and map refinements
Samu-Kiss Jun 1, 2026
2f15926
[Feat]: Implement dynamic add/remove functionality for itinerary items
Samu-Kiss Jun 1, 2026
910fc6b
[Feat]: Introduce real-time drop notes on map with Firebase persistence
MalejaGS Jun 1, 2026
1dcb2b1
[Feat]: Refine UI components for improved avatar display and map elem…
Samu-Kiss Jun 1, 2026
f8b6759
[Feat]: Refactor drop note management, enhance view, and implement ex…
MalejaGS Jun 1, 2026
8fc8a20
Merge pull request #59 from ICM2610G2/feat/RealTimeDB
JDOG-JuanDORtiz Jun 1, 2026
682b167
Implementar gestion de amigos, chat 1-1, chat grupal contextual y mej…
Miguel4950 Jun 2, 2026
0784ebd
[Feat]: Add user profile screen and visit tracking
Samu-Kiss Jun 2, 2026
7649323
[Feat]: Improve UI/UX and Contact Disctovery
Samu-Kiss Jun 2, 2026
5f389dd
Merge pull request #63 from ICM2610G2/feature/profile
Samu-Kiss Jun 2, 2026
f134294
Merge branch 'develop' into feature/amigos-y-chat-mejorado
Samu-Kiss Jun 2, 2026
a9e2abe
feat: completa funcionalidades en vivo de POI, reseñas y mapa de calo…
samypipe470 Jun 2, 2026
79d6b1d
[Feat]: Implement Profile screen and refine chat UI
Samu-Kiss Jun 2, 2026
4baf9b0
[Feat]: UI Fixes
Samu-Kiss Jun 3, 2026
5302a88
[Feat]: Basic notifications working
JDOG-JuanDORtiz Jun 3, 2026
0727698
[Feat]: Enhance online presence and filter chat list by friendship
MalejaGS Jun 3, 2026
2fcd037
[Fix]: Online and Status clash
Samu-Kiss Jun 3, 2026
5233dcb
[Feat]: Notifications working with message from chat
JDOG-JuanDORtiz Jun 3, 2026
0d8691d
feat: Implement Google Maps HeatmapTileProvider
MalejaGS Jun 3, 2026
0e7e5ae
[feat]: Implement comprehensive POI search and enhanced map interaction
MalejaGS Jun 3, 2026
e67f7ce
[Feat]: Notification navigate directly to chat
JDOG-JuanDORtiz Jun 3, 2026
7372261
[Feat]: Minor UI
Samu-Kiss Jun 3, 2026
50c9587
Merge branch 'feature/mapacalorypoi' into develop
Samu-Kiss Jun 3, 2026
0875d54
Merge remote-tracking branch 'origin/feat/notifications' into feature…
Samu-Kiss Jun 3, 2026
8a1d93f
Merge branch 'feature/amigos-y-chat-mejorado' into develop
Samu-Kiss Jun 3, 2026
6359c46
[Fix]: Biometric Fix
Samu-Kiss Jun 3, 2026
bad35b5
[Feat]: Add expandable FAB for map controls
MalejaGS Jun 3, 2026
f431fcd
[Fix]: Refine ItineraryItemCard layout
MalejaGS Jun 3, 2026
03665ee
[Fix]: Chat lost messages fixed
JDOG-JuanDORtiz Jun 3, 2026
9246d3b
[feat]: add itinerary persistence
MalejaGS Jun 3, 2026
2b11e3a
Merge remote-tracking branch 'origin/fixes/touchUps' into fixes/touchUps
MalejaGS Jun 3, 2026
c722d41
[Fix]: Rework ItineraryItemCard layout and standardize icons
Samu-Kiss Jun 3, 2026
64dedec
[Fix]: Accesible Auth flow
Samu-Kiss Jun 3, 2026
479f9e6
[Fix]: Photos taken with camera sent through chat
JDOG-JuanDORtiz Jun 3, 2026
f13a12e
Merge remote-tracking branch 'origin/fixes/touchUps' into fixes/touchUps
Samu-Kiss Jun 3, 2026
093b0f7
Merge branch 'fixes/touchUps' into develop
Samu-Kiss Jun 3, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,6 @@ google-services.json

# Android Profiling
*.hprof

.gradle-sandbox/
.codegraph/
43 changes: 40 additions & 3 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
import java.util.Properties

plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.kotlin.compose)
alias(libs.plugins.google.gms.google.services)
alias(libs.plugins.mapsplatform.secrets.plugin)
}

android {
namespace = "com.appnotresponding.rumbo"
compileSdk {
version = release(36)
}

buildFeatures {
buildConfig = true
}
defaultConfig {
applicationId = "com.appnotresponding.rumbo"
minSdk = 26
Expand All @@ -17,14 +23,26 @@ android {
versionName = "1.0"

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

val keystoreFile = project.rootProject.file("local.properties")
val properties = Properties()
properties.load(keystoreFile.inputStream())
val mapsApiKey = properties.getProperty("MAPS_API_KEY") ?: error("MAPS_API_KEY no encontrada en local.properties")

buildConfigField(
"String",
"MAPS_API_KEY",
"\"$mapsApiKey\""
)

manifestPlaceholders["MAPS_API_KEY"] = mapsApiKey
}

buildTypes {
release {
isMinifyEnabled = false
proguardFiles(
getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro"
getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
)
}
}
Expand Down Expand Up @@ -52,6 +70,15 @@ dependencies {
implementation(libs.androidx.navigation.compose)
implementation(libs.androidx.material3)
implementation(libs.androidx.compose.foundation.layout)
implementation(libs.firebase.auth)
implementation(libs.androidx.credentials)
implementation(libs.androidx.credentials.play.services.auth)
implementation(libs.androidx.security.crypto)
implementation(libs.firebase.database)
implementation(libs.firebase.storage)
implementation(libs.googleid)
implementation(libs.androidx.compose.runtime)
implementation(libs.firebase.messaging)
testImplementation(libs.junit)
androidTestImplementation(libs.androidx.junit)
androidTestImplementation(libs.androidx.espresso.core)
Expand All @@ -61,4 +88,14 @@ dependencies {
debugImplementation(libs.androidx.compose.ui.test.manifest)
implementation(libs.coil.compose)
implementation(libs.coil.network.okhttp)
implementation(libs.play.services.location)
implementation(libs.accompanist.permissions)
implementation(libs.maps.compose)
implementation(libs.maps.compose.utils)
implementation(libs.play.services.maps)
implementation("androidx.compose.material:material-icons-extended")
implementation("org.osmdroid:osmdroid-android:6.1.16")
implementation("com.github.MKergall:osmbonuspack:6.8.0")
implementation("com.google.android.gms:play-services-location:21.3.0")
implementation("com.android.volley:volley:1.2.1")
}
40 changes: 35 additions & 5 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<!-- Añadido para que el fetch de fotos de perfil de internet funcione :) -->
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.READ_CONTACTS" />
<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
<uses-feature
android:name="android.hardware.camera"
android:required="true" />

<application
android:name=".ui.utils.MyApp"
android:allowBackup="true"
android:dataExtractionRules="@xml/data_extraction_rules"
android:fullBackupContent="@xml/backup_rules"
Expand All @@ -14,16 +22,38 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.Rumbo">

<activity
android:name=".MainActivity"
android:exported="true"
android:theme="@style/Theme.Rumbo">
android:theme="@style/Theme.Rumbo"
android:windowSoftInputMode="adjustResize">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>
<service
android:name=".ui.utils.MyFirebaseMessagingService"
android:exported="false">
<intent-filter>
<action android:name="com.google.firebase.MESSAGING_EVENT"/>
</intent-filter>
</service>
<provider
android:name="androidx.core.content.FileProvider"
android:authorities="com.appnotresponding.rumbo.fileprovider"
android:exported="false"
android:grantUriPermissions="true">
<meta-data
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/provider_paths" />
</provider>

<meta-data
android:name="com.google.android.geo.API_KEY"
android:value="${MAPS_API_KEY}" />

</manifest>
</application>
</manifest>
Loading
Loading