diff --git a/app/build.gradle b/app/build.gradle index ac38331502fad8c5ec3fb5d445685238c65a4674..3473dcb3db7d15e33649baf2fc21b29ce9851d2a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,6 +1,8 @@ plugins { id 'com.android.application' + id 'com.google.gms.google-services' id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' } android { @@ -49,13 +51,35 @@ dependencies { implementation 'androidx.core:core-ktx:1.7.0' implementation "androidx.compose.ui:ui:$compose_version" - implementation "androidx.compose.material:material:$compose_version" implementation "androidx.compose.ui:ui-tooling-preview:$compose_version" - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1' - implementation 'androidx.activity:activity-compose:1.3.1' + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.1' + implementation 'androidx.activity:activity-compose:1.4.0' testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.3' androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version" debugImplementation "androidx.compose.ui:ui-tooling:$compose_version" + debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version" + implementation 'androidx.compose.material3:material3:1.0.0-alpha11' + implementation 'com.google.android.material:material:1.6.0' + implementation "androidx.compose.material:material-icons-extended:$compose_version" + + def nav_version = "2.4.2" + implementation "androidx.navigation:navigation-compose:$nav_version" + + + implementation 'com.google.firebase:firebase-bom:30.0.1' + implementation 'com.google.firebase:firebase-analytics-ktx' + implementation 'com.google.firebase:firebase-auth-ktx' + implementation 'com.firebaseui:firebase-ui-auth:8.0.1' + implementation 'com.google.android.gms:play-services-auth:20.2.0' + implementation 'com.google.firebase:firebase-firestore-ktx' + + implementation "com.google.accompanist:accompanist-placeholder-material:$accompanist_version" + implementation "com.google.accompanist:accompanist-systemuicontroller:$accompanist_version" + implementation "com.google.accompanist:accompanist-permissions:$accompanist_version" + + implementation("androidx.datastore:datastore-preferences:1.0.0") + implementation("androidx.datastore:datastore-preferences-rxjava2:1.0.0") + implementation("androidx.datastore:datastore-preferences-rxjava3:1.0.0") } \ No newline at end of file diff --git a/app/google-services.json b/app/google-services.json new file mode 100644 index 0000000000000000000000000000000000000000..0c38f945d42c896513f901c0b12ba11e03c6c166 --- /dev/null +++ b/app/google-services.json @@ -0,0 +1,39 @@ +{ + "project_info": { + "project_number": "662802770735", + "project_id": "szobatarsch", + "storage_bucket": "szobatarsch.appspot.com" + }, + "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:662802770735:android:e155835b0c8d0e768a0fda", + "android_client_info": { + "package_name": "hu.bme.kszk.szobatarsch" + } + }, + "oauth_client": [ + { + "client_id": "662802770735-hdine6c5o0nt242hdfj17bbg62rtgdcg.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyAAq0MBErqn5Md3GVuq3MxAch-Tfa1Bb2Y" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [ + { + "client_id": "662802770735-hdine6c5o0nt242hdfj17bbg62rtgdcg.apps.googleusercontent.com", + "client_type": 3 + } + ] + } + } + } + ], + "configuration_version": "1" +} \ No newline at end of file diff --git a/build.gradle b/build.gradle index 4f657a6fe5ebfa692518b1a43899b524cf8b8fbe..9b017ab14f7dcf15fb51fe72d84b584e6690f364 100644 --- a/build.gradle +++ b/build.gradle @@ -1,12 +1,22 @@ buildscript { ext { - compose_version = '1.0.1' + compose_version = '1.1.1' + accompanist_version = "0.21.3-beta" + } + repositories { + google() + mavenCentral() + } + dependencies { + classpath "com.android.tools.build:gradle:7.0.4" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.21" + classpath 'com.google.gms:google-services:4.3.10' } }// Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '7.1.3' apply false - id 'com.android.library' version '7.1.3' apply false - id 'org.jetbrains.kotlin.android' version '1.5.21' apply false + id 'com.android.application' version '7.2.0' apply false + id 'com.android.library' version '7.2.0' apply false + id 'org.jetbrains.kotlin.android' version '1.6.10' apply false } task clean(type: Delete) {