File diff suppressed because it is too large
Load Diff
@ -1,45 +1,30 @@
|
|||||||
# This file tracks properties of this Flutter project.
|
# This file tracks properties of this Flutter project.
|
||||||
# Used by Flutter tool to assess capabilities and perform upgrades etc.
|
# Used by Flutter tool to assess capabilities and perform upgrades etc.
|
||||||
#
|
#
|
||||||
# This file should be version controlled.
|
# This file should be version controlled.
|
||||||
|
|
||||||
version:
|
version:
|
||||||
revision: 18a827f3933c19f51862dde3fa472197683249d6
|
revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
|
||||||
channel: stable
|
channel: stable
|
||||||
|
|
||||||
project_type: app
|
project_type: app
|
||||||
|
|
||||||
# Tracks metadata for the flutter migrate command
|
# Tracks metadata for the flutter migrate command
|
||||||
migration:
|
migration:
|
||||||
platforms:
|
platforms:
|
||||||
- platform: root
|
- platform: root
|
||||||
create_revision: 18a827f3933c19f51862dde3fa472197683249d6
|
create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
|
||||||
base_revision: 18a827f3933c19f51862dde3fa472197683249d6
|
base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
|
||||||
- platform: android
|
- platform: android
|
||||||
create_revision: 18a827f3933c19f51862dde3fa472197683249d6
|
create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
|
||||||
base_revision: 18a827f3933c19f51862dde3fa472197683249d6
|
base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
|
||||||
- platform: ios
|
|
||||||
create_revision: 18a827f3933c19f51862dde3fa472197683249d6
|
# User provided section
|
||||||
base_revision: 18a827f3933c19f51862dde3fa472197683249d6
|
|
||||||
- platform: linux
|
# List of Local paths (relative to this file) that should be
|
||||||
create_revision: 18a827f3933c19f51862dde3fa472197683249d6
|
# ignored by the migrate tool.
|
||||||
base_revision: 18a827f3933c19f51862dde3fa472197683249d6
|
#
|
||||||
- platform: macos
|
# Files that are not part of the templates will be ignored by default.
|
||||||
create_revision: 18a827f3933c19f51862dde3fa472197683249d6
|
unmanaged_files:
|
||||||
base_revision: 18a827f3933c19f51862dde3fa472197683249d6
|
- 'lib/main.dart'
|
||||||
- platform: web
|
- 'ios/Runner.xcodeproj/project.pbxproj'
|
||||||
create_revision: 18a827f3933c19f51862dde3fa472197683249d6
|
|
||||||
base_revision: 18a827f3933c19f51862dde3fa472197683249d6
|
|
||||||
- platform: windows
|
|
||||||
create_revision: 18a827f3933c19f51862dde3fa472197683249d6
|
|
||||||
base_revision: 18a827f3933c19f51862dde3fa472197683249d6
|
|
||||||
|
|
||||||
# User provided section
|
|
||||||
|
|
||||||
# List of Local paths (relative to this file) that should be
|
|
||||||
# ignored by the migrate tool.
|
|
||||||
#
|
|
||||||
# Files that are not part of the templates will be ignored by default.
|
|
||||||
unmanaged_files:
|
|
||||||
- 'lib/main.dart'
|
|
||||||
- 'ios/Runner.xcodeproj/project.pbxproj'
|
|
||||||
|
|||||||
@ -1,71 +1,78 @@
|
|||||||
def localProperties = new Properties()
|
def localProperties = new Properties()
|
||||||
def localPropertiesFile = rootProject.file('local.properties')
|
|
||||||
if (localPropertiesFile.exists()) {
|
def localPropertiesFile = rootProject.file('local.properties')
|
||||||
localPropertiesFile.withReader('UTF-8') { reader ->
|
if (localPropertiesFile.exists()) {
|
||||||
localProperties.load(reader)
|
localPropertiesFile.withReader('UTF-8') { reader ->
|
||||||
}
|
localProperties.load(reader)
|
||||||
}
|
}
|
||||||
|
}
|
||||||
def flutterRoot = localProperties.getProperty('flutter.sdk')
|
|
||||||
if (flutterRoot == null) {
|
def flutterRoot = localProperties.getProperty('flutter.sdk')
|
||||||
throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
|
if (flutterRoot == null) {
|
||||||
}
|
throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
|
||||||
|
}
|
||||||
def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
|
|
||||||
if (flutterVersionCode == null) {
|
def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
|
||||||
flutterVersionCode = '1'
|
if (flutterVersionCode == null) {
|
||||||
}
|
flutterVersionCode = '1'
|
||||||
|
}
|
||||||
def flutterVersionName = localProperties.getProperty('flutter.versionName')
|
|
||||||
if (flutterVersionName == null) {
|
def flutterVersionName = localProperties.getProperty('flutter.versionName')
|
||||||
flutterVersionName = '1.0'
|
if (flutterVersionName == null) {
|
||||||
}
|
flutterVersionName = '1.0'
|
||||||
|
}
|
||||||
apply plugin: 'com.android.application'
|
|
||||||
apply plugin: 'kotlin-android'
|
apply plugin: 'com.android.application'
|
||||||
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
|
apply plugin: 'kotlin-android'
|
||||||
|
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
|
||||||
android {
|
|
||||||
compileSdkVersion 33
|
android {
|
||||||
ndkVersion flutter.ndkVersion
|
namespace "com.example.justmusic"
|
||||||
|
compileSdkVersion 33
|
||||||
compileOptions {
|
ndkVersion flutter.ndkVersion
|
||||||
sourceCompatibility JavaVersion.VERSION_1_8
|
|
||||||
targetCompatibility JavaVersion.VERSION_1_8
|
|
||||||
}
|
compileOptions {
|
||||||
|
sourceCompatibility JavaVersion.VERSION_1_8
|
||||||
kotlinOptions {
|
targetCompatibility JavaVersion.VERSION_1_8
|
||||||
jvmTarget = '1.8'
|
}
|
||||||
}
|
|
||||||
|
kotlinOptions {
|
||||||
sourceSets {
|
jvmTarget = '1.8'
|
||||||
main.java.srcDirs += 'src/main/kotlin'
|
}
|
||||||
}
|
|
||||||
|
sourceSets {
|
||||||
defaultConfig {
|
main.java.srcDirs += 'src/main/kotlin'
|
||||||
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
|
}
|
||||||
applicationId "com.example.justmusic"
|
|
||||||
// You can update the following values to match your application needs.
|
defaultConfig {
|
||||||
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration.
|
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
|
||||||
minSdkVersion flutter.minSdkVersion
|
applicationId "com.example.justmusic"
|
||||||
targetSdkVersion flutter.targetSdkVersion
|
// You can update the following values to match your application needs.
|
||||||
versionCode flutterVersionCode.toInteger()
|
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
|
||||||
versionName flutterVersionName
|
minSdkVersion 19
|
||||||
}
|
targetSdkVersion flutter.targetSdkVersion
|
||||||
|
versionCode flutterVersionCode.toInteger()
|
||||||
buildTypes {
|
versionName flutterVersionName
|
||||||
release {
|
}
|
||||||
// TODO: Add your own signing config for the release build.
|
|
||||||
// Signing with the debug keys for now, so `flutter run --release` works.
|
buildTypes {
|
||||||
signingConfig signingConfigs.debug
|
release {
|
||||||
}
|
// TODO: Add your own signing config for the release build.
|
||||||
}
|
// Signing with the debug keys for now, so `flutter run --release` works.
|
||||||
}
|
signingConfig signingConfigs.debug
|
||||||
|
}
|
||||||
flutter {
|
}
|
||||||
source '../..'
|
}
|
||||||
}
|
|
||||||
|
flutter {
|
||||||
dependencies {
|
source '../..'
|
||||||
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
|
}
|
||||||
}
|
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
|
||||||
|
implementation(platform("com.google.firebase:firebase-bom:32.2.0"))
|
||||||
|
implementation 'com.google.firebase:firebase-analytics-ktx'
|
||||||
|
}
|
||||||
|
apply plugin: 'com.google.gms.google-services'
|
||||||
|
|||||||
@ -0,0 +1,46 @@
|
|||||||
|
{
|
||||||
|
"project_info": {
|
||||||
|
"project_number": "994903990520",
|
||||||
|
"project_id": "justmusic-435d5",
|
||||||
|
"storage_bucket": "justmusic-435d5.appspot.com"
|
||||||
|
},
|
||||||
|
"client": [
|
||||||
|
{
|
||||||
|
"client_info": {
|
||||||
|
"mobilesdk_app_id": "1:994903990520:android:02a445b6561bf2820a9b0d",
|
||||||
|
"android_client_info": {
|
||||||
|
"package_name": "com.example.justmusic"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"oauth_client": [
|
||||||
|
{
|
||||||
|
"client_id": "994903990520-rdk6ldrmbi71ddqt84qfhtuficm7ngon.apps.googleusercontent.com",
|
||||||
|
"client_type": 3
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"api_key": [
|
||||||
|
{
|
||||||
|
"current_key": "AIzaSyCjkofl0nvfzQqRZPv_-H99WoyYa7O660g"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"services": {
|
||||||
|
"appinvite_service": {
|
||||||
|
"other_platform_oauth_client": [
|
||||||
|
{
|
||||||
|
"client_id": "994903990520-9jsnq9ipdn7smk7tlbdd20i7j6sl3jcd.apps.googleusercontent.com",
|
||||||
|
"client_type": 3
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"client_id": "994903990520-n6jd98ena56kb1tvtrd67tvb5et3nfbf.apps.googleusercontent.com",
|
||||||
|
"client_type": 2,
|
||||||
|
"ios_info": {
|
||||||
|
"bundle_id": "com.example.justmusic"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"configuration_version": "1"
|
||||||
|
}
|
||||||
@ -1,34 +1,35 @@
|
|||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
package="com.example.justmusic">
|
package="com.example.justmusic">
|
||||||
<application
|
<application
|
||||||
android:label="justmusic"
|
android:label="justmusic"
|
||||||
android:name="${applicationName}"
|
android:name="${applicationName}"
|
||||||
android:icon="@mipmap/ic_launcher">
|
android:icon="@mipmap/ic_launcher">
|
||||||
<activity
|
<activity
|
||||||
android:name=".MainActivity"
|
android:name=".MainActivity"
|
||||||
android:exported="true"
|
android:exported="true"
|
||||||
android:launchMode="singleTop"
|
android:launchMode="singleTop"
|
||||||
android:theme="@style/LaunchTheme"
|
android:theme="@style/LaunchTheme"
|
||||||
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
|
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
|
||||||
android:hardwareAccelerated="true"
|
android:hardwareAccelerated="true"
|
||||||
android:windowSoftInputMode="adjustResize">
|
android:windowSoftInputMode="adjustResize">
|
||||||
<!-- Specifies an Android theme to apply to this Activity as soon as
|
<!-- Specifies an Android theme to apply to this Activity as soon as
|
||||||
the Android process has started. This theme is visible to the user
|
the Android process has started. This theme is visible to the user
|
||||||
while the Flutter UI initializes. After that, this theme continues
|
while the Flutter UI initializes. After that, this theme continues
|
||||||
to determine the Window background behind the Flutter UI. -->
|
to determine the Window background behind the Flutter UI. -->
|
||||||
<meta-data
|
<meta-data
|
||||||
android:name="io.flutter.embedding.android.NormalTheme"
|
android:name="io.flutter.embedding.android.NormalTheme"
|
||||||
android:resource="@style/NormalTheme"
|
android:resource="@style/NormalTheme"
|
||||||
/>
|
/>
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="android.intent.action.MAIN"/>
|
<action android:name="android.intent.action.MAIN"/>
|
||||||
<category android:name="android.intent.category.LAUNCHER"/>
|
<category android:name="android.intent.category.LAUNCHER"/>
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
</activity>
|
</activity>
|
||||||
<!-- Don't delete the meta-data below.
|
<!-- Don't delete the meta-data below.
|
||||||
This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
|
This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
|
||||||
<meta-data
|
<meta-data
|
||||||
android:name="flutterEmbedding"
|
android:name="flutterEmbedding"
|
||||||
android:value="2" />
|
android:value="2" />
|
||||||
</application>
|
</application>
|
||||||
</manifest>
|
</manifest>
|
||||||
|
|
||||||
|
|||||||
@ -0,0 +1,25 @@
|
|||||||
|
// Generated file.
|
||||||
|
//
|
||||||
|
// If you wish to remove Flutter's multidex support, delete this entire file.
|
||||||
|
//
|
||||||
|
// Modifications to this file should be done in a copy under a different name
|
||||||
|
// as this file may be regenerated.
|
||||||
|
|
||||||
|
package io.flutter.app;
|
||||||
|
|
||||||
|
import android.app.Application;
|
||||||
|
import android.content.Context;
|
||||||
|
import androidx.annotation.CallSuper;
|
||||||
|
import androidx.multidex.MultiDex;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Extension of {@link android.app.Application}, adding multidex support.
|
||||||
|
*/
|
||||||
|
public class FlutterMultiDexApplication extends Application {
|
||||||
|
@Override
|
||||||
|
@CallSuper
|
||||||
|
protected void attachBaseContext(Context base) {
|
||||||
|
super.attachBaseContext(base);
|
||||||
|
MultiDex.install(this);
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,8 +1,9 @@
|
|||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
package="com.example.justmusic">
|
package="com.example.justmusic">
|
||||||
<!-- The INTERNET permission is required for development. Specifically,
|
<!-- The INTERNET permission is required for development. Specifically,
|
||||||
the Flutter tool needs it to communicate with the running application
|
the Flutter tool needs it to communicate with the running application
|
||||||
to allow setting breakpoints, to provide hot reload, etc.
|
to allow setting breakpoints, to provide hot reload, etc.
|
||||||
-->
|
-->
|
||||||
<uses-permission android:name="android.permission.INTERNET"/>
|
<uses-permission android:name="android.permission.INTERNET"/>
|
||||||
</manifest>
|
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
|
||||||
|
</manifest>
|
||||||
@ -1,31 +1,32 @@
|
|||||||
buildscript {
|
buildscript {
|
||||||
ext.kotlin_version = '1.9.0'
|
ext.kotlin_version = '1.9.0'
|
||||||
repositories {
|
repositories {
|
||||||
google()
|
google()
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:7.1.2'
|
classpath 'com.android.tools.build:gradle:7.1.2'
|
||||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
classpath 'com.google.gms:google-services:4.3.15'
|
||||||
}
|
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
||||||
}
|
}
|
||||||
|
}
|
||||||
allprojects {
|
|
||||||
repositories {
|
allprojects {
|
||||||
google()
|
repositories {
|
||||||
mavenCentral()
|
google()
|
||||||
}
|
mavenCentral()
|
||||||
}
|
}
|
||||||
|
}
|
||||||
rootProject.buildDir = '../build'
|
|
||||||
subprojects {
|
rootProject.buildDir = '../build'
|
||||||
project.buildDir = "${rootProject.buildDir}/${project.name}"
|
subprojects {
|
||||||
}
|
project.buildDir = "${rootProject.buildDir}/${project.name}"
|
||||||
subprojects {
|
}
|
||||||
project.evaluationDependsOn(':app')
|
subprojects {
|
||||||
}
|
project.evaluationDependsOn(':app')
|
||||||
|
}
|
||||||
tasks.register("clean", Delete) {
|
|
||||||
delete rootProject.buildDir
|
tasks.register("clean", Delete) {
|
||||||
}
|
delete rootProject.buildDir
|
||||||
|
}
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
|
||||||
|
|||||||
@ -0,0 +1,34 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||||
|
<plist version="1.0">
|
||||||
|
<dict>
|
||||||
|
<key>CLIENT_ID</key>
|
||||||
|
<string>994903990520-n6jd98ena56kb1tvtrd67tvb5et3nfbf.apps.googleusercontent.com</string>
|
||||||
|
<key>REVERSED_CLIENT_ID</key>
|
||||||
|
<string>com.googleusercontent.apps.994903990520-n6jd98ena56kb1tvtrd67tvb5et3nfbf</string>
|
||||||
|
<key>API_KEY</key>
|
||||||
|
<string>AIzaSyBbYqsR6t7JTi8_XFNEHd43IRuKlYGeI3U</string>
|
||||||
|
<key>GCM_SENDER_ID</key>
|
||||||
|
<string>994903990520</string>
|
||||||
|
<key>PLIST_VERSION</key>
|
||||||
|
<string>1</string>
|
||||||
|
<key>BUNDLE_ID</key>
|
||||||
|
<string>com.example.justmusic</string>
|
||||||
|
<key>PROJECT_ID</key>
|
||||||
|
<string>justmusic-435d5</string>
|
||||||
|
<key>STORAGE_BUCKET</key>
|
||||||
|
<string>justmusic-435d5.appspot.com</string>
|
||||||
|
<key>IS_ADS_ENABLED</key>
|
||||||
|
<false></false>
|
||||||
|
<key>IS_ANALYTICS_ENABLED</key>
|
||||||
|
<false></false>
|
||||||
|
<key>IS_APPINVITE_ENABLED</key>
|
||||||
|
<true></true>
|
||||||
|
<key>IS_GCM_ENABLED</key>
|
||||||
|
<true></true>
|
||||||
|
<key>IS_SIGNIN_ENABLED</key>
|
||||||
|
<true></true>
|
||||||
|
<key>GOOGLE_APP_ID</key>
|
||||||
|
<string>1:994903990520:ios:93188f32e320babe0a9b0d</string>
|
||||||
|
</dict>
|
||||||
|
</plist>
|
||||||
@ -0,0 +1,7 @@
|
|||||||
|
{
|
||||||
|
"file_generated_by": "FlutterFire CLI",
|
||||||
|
"purpose": "FirebaseAppID & ProjectID for this Firebase app in this directory",
|
||||||
|
"GOOGLE_APP_ID": "1:994903990520:ios:93188f32e320babe0a9b0d",
|
||||||
|
"FIREBASE_PROJECT_ID": "justmusic-435d5",
|
||||||
|
"GCM_SENDER_ID": "994903990520"
|
||||||
|
}
|
||||||
@ -1,66 +1,68 @@
|
|||||||
import 'package:flutter/cupertino.dart';
|
import 'package:flutter/cupertino.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_screenutil/flutter_screenutil.dart';
|
import 'package:flutter_screenutil/flutter_screenutil.dart';
|
||||||
|
|
||||||
class LoginButton extends StatefulWidget {
|
class LoginButton extends StatefulWidget {
|
||||||
const LoginButton({Key? key}) : super(key: key);
|
final Function callback;
|
||||||
|
|
||||||
@override
|
const LoginButton({Key? key, required this.callback}) : super(key: key);
|
||||||
State<LoginButton> createState() => _LoginButtonState();
|
|
||||||
}
|
@override
|
||||||
|
State<LoginButton> createState() => _LoginButtonState();
|
||||||
class _LoginButtonState extends State<LoginButton> {
|
}
|
||||||
@override
|
|
||||||
Widget build(BuildContext context) {
|
class _LoginButtonState extends State<LoginButton> {
|
||||||
return ElevatedButton(
|
@override
|
||||||
onPressed: () {
|
Widget build(BuildContext context) {
|
||||||
Navigator.pushNamed(context, '/explanation');
|
return ElevatedButton(
|
||||||
},
|
onPressed: () {
|
||||||
style: ButtonStyle(
|
widget.callback();
|
||||||
backgroundColor: MaterialStateProperty.all(Color(0xFF1C1C1C)),
|
},
|
||||||
overlayColor:
|
style: ButtonStyle(
|
||||||
MaterialStateProperty.all(Color(0xffD3C2FF).withOpacity(0.2)),
|
backgroundColor: MaterialStateProperty.all(Color(0xFF1C1C1C)),
|
||||||
shape: MaterialStateProperty.all(RoundedRectangleBorder(
|
overlayColor:
|
||||||
borderRadius: BorderRadius.circular(18),
|
MaterialStateProperty.all(Color(0xffD3C2FF).withOpacity(0.2)),
|
||||||
)),
|
shape: MaterialStateProperty.all(RoundedRectangleBorder(
|
||||||
padding: MaterialStateProperty.all(EdgeInsets.all(0.0)),
|
borderRadius: BorderRadius.circular(18),
|
||||||
),
|
)),
|
||||||
child: Ink(
|
padding: MaterialStateProperty.all(EdgeInsets.all(0.0)),
|
||||||
decoration: BoxDecoration(
|
),
|
||||||
gradient: RadialGradient(
|
child: Ink(
|
||||||
center: Alignment(0, 3),
|
decoration: BoxDecoration(
|
||||||
focalRadius: 10,
|
gradient: RadialGradient(
|
||||||
radius: 2.5,
|
center: Alignment(0, 3),
|
||||||
stops: <double>[0.4, 1.0],
|
focalRadius: 10,
|
||||||
colors: [Color(0xff9E78FF), Color(0xff633AF4)],
|
radius: 2.5,
|
||||||
),
|
stops: <double>[0.4, 1.0],
|
||||||
borderRadius: BorderRadius.circular(18.0),
|
colors: [Color(0xff9E78FF), Color(0xff633AF4)],
|
||||||
border: Border.all(
|
),
|
||||||
color: Color(0xff1C1C1C),
|
borderRadius: BorderRadius.circular(18.0),
|
||||||
width: 5,
|
border: Border.all(
|
||||||
),
|
color: Color(0xff1C1C1C),
|
||||||
),
|
width: 5,
|
||||||
child: Container(
|
),
|
||||||
padding: EdgeInsets.only(top: 20.h, bottom: 20.h),
|
),
|
||||||
constraints: BoxConstraints(maxWidth: 600, minHeight: 50),
|
child: Container(
|
||||||
decoration: BoxDecoration(
|
padding: EdgeInsets.only(top: 20.h, bottom: 20.h),
|
||||||
boxShadow: [
|
constraints: BoxConstraints(maxWidth: 600, minHeight: 50),
|
||||||
BoxShadow(
|
decoration: BoxDecoration(
|
||||||
color: Color(0xff7E56F9).withOpacity(0.23),
|
boxShadow: [
|
||||||
spreadRadius: 4,
|
BoxShadow(
|
||||||
blurRadius: 40,
|
color: Color(0xff7E56F9).withOpacity(0.23),
|
||||||
offset: Offset(0, 3), // changes position of shadow
|
spreadRadius: 4,
|
||||||
),
|
blurRadius: 40,
|
||||||
],
|
offset: Offset(0, 3), // changes position of shadow
|
||||||
),
|
),
|
||||||
alignment: Alignment.center,
|
],
|
||||||
child: Text(
|
),
|
||||||
"Se connecter",
|
alignment: Alignment.center,
|
||||||
textAlign: TextAlign.center,
|
child: Text(
|
||||||
style: TextStyle(color: Colors.white, fontSize: 18),
|
"Se connecter",
|
||||||
),
|
textAlign: TextAlign.center,
|
||||||
),
|
style: TextStyle(color: Colors.white, fontSize: 18),
|
||||||
),
|
),
|
||||||
);
|
),
|
||||||
}
|
),
|
||||||
}
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@ -0,0 +1,76 @@
|
|||||||
|
// File generated by FlutterFire CLI.
|
||||||
|
// ignore_for_file: lines_longer_than_80_chars, avoid_classes_with_only_static_members
|
||||||
|
import 'package:firebase_core/firebase_core.dart' show FirebaseOptions;
|
||||||
|
import 'package:flutter/foundation.dart'
|
||||||
|
show defaultTargetPlatform, kIsWeb, TargetPlatform;
|
||||||
|
|
||||||
|
/// Default [FirebaseOptions] for use with your Firebase apps.
|
||||||
|
///
|
||||||
|
/// Example:
|
||||||
|
/// ```dart
|
||||||
|
/// import 'firebase_options.dart';
|
||||||
|
/// // ...
|
||||||
|
/// await Firebase.initializeApp(
|
||||||
|
/// options: DefaultFirebaseOptions.currentPlatform,
|
||||||
|
/// );
|
||||||
|
/// ```
|
||||||
|
class DefaultFirebaseOptions {
|
||||||
|
static FirebaseOptions get currentPlatform {
|
||||||
|
if (kIsWeb) {
|
||||||
|
return web;
|
||||||
|
}
|
||||||
|
switch (defaultTargetPlatform) {
|
||||||
|
case TargetPlatform.android:
|
||||||
|
return android;
|
||||||
|
case TargetPlatform.iOS:
|
||||||
|
return ios;
|
||||||
|
case TargetPlatform.macOS:
|
||||||
|
throw UnsupportedError(
|
||||||
|
'DefaultFirebaseOptions have not been configured for macos - '
|
||||||
|
'you can reconfigure this by running the FlutterFire CLI again.',
|
||||||
|
);
|
||||||
|
case TargetPlatform.windows:
|
||||||
|
throw UnsupportedError(
|
||||||
|
'DefaultFirebaseOptions have not been configured for windows - '
|
||||||
|
'you can reconfigure this by running the FlutterFire CLI again.',
|
||||||
|
);
|
||||||
|
case TargetPlatform.linux:
|
||||||
|
throw UnsupportedError(
|
||||||
|
'DefaultFirebaseOptions have not been configured for linux - '
|
||||||
|
'you can reconfigure this by running the FlutterFire CLI again.',
|
||||||
|
);
|
||||||
|
default:
|
||||||
|
throw UnsupportedError(
|
||||||
|
'DefaultFirebaseOptions are not supported for this platform.',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static const FirebaseOptions web = FirebaseOptions(
|
||||||
|
apiKey: 'AIzaSyBv-Sba07nFFhctn6c3ARyvi9RfYwEKoNA',
|
||||||
|
appId: '1:994903990520:web:724c75003432ddbc0a9b0d',
|
||||||
|
messagingSenderId: '994903990520',
|
||||||
|
projectId: 'justmusic-435d5',
|
||||||
|
authDomain: 'justmusic-435d5.firebaseapp.com',
|
||||||
|
storageBucket: 'justmusic-435d5.appspot.com',
|
||||||
|
measurementId: 'G-D4YRLXK9TQ',
|
||||||
|
);
|
||||||
|
|
||||||
|
static const FirebaseOptions android = FirebaseOptions(
|
||||||
|
apiKey: 'AIzaSyCjkofl0nvfzQqRZPv_-H99WoyYa7O660g',
|
||||||
|
appId: '1:994903990520:android:02a445b6561bf2820a9b0d',
|
||||||
|
messagingSenderId: '994903990520',
|
||||||
|
projectId: 'justmusic-435d5',
|
||||||
|
storageBucket: 'justmusic-435d5.appspot.com',
|
||||||
|
);
|
||||||
|
|
||||||
|
static const FirebaseOptions ios = FirebaseOptions(
|
||||||
|
apiKey: 'AIzaSyBbYqsR6t7JTi8_XFNEHd43IRuKlYGeI3U',
|
||||||
|
appId: '1:994903990520:ios:93188f32e320babe0a9b0d',
|
||||||
|
messagingSenderId: '994903990520',
|
||||||
|
projectId: 'justmusic-435d5',
|
||||||
|
storageBucket: 'justmusic-435d5.appspot.com',
|
||||||
|
iosClientId: '994903990520-n6jd98ena56kb1tvtrd67tvb5et3nfbf.apps.googleusercontent.com',
|
||||||
|
iosBundleId: 'com.example.justmusic',
|
||||||
|
);
|
||||||
|
}
|
||||||
@ -1,62 +1,71 @@
|
|||||||
import 'package:audioplayers/audioplayers.dart';
|
import 'package:audioplayers/audioplayers.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:cloud_firestore/cloud_firestore.dart';
|
||||||
import 'package:flutter/services.dart';
|
import 'package:firebase_core/firebase_core.dart';
|
||||||
import 'package:flutter_screenutil/flutter_screenutil.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:justmusic/screens/explanations_screen.dart';
|
import 'package:flutter/services.dart';
|
||||||
import 'package:justmusic/screens/feed_screen.dart';
|
import 'package:flutter_screenutil/flutter_screenutil.dart';
|
||||||
import 'package:justmusic/screens/login_screen.dart';
|
import 'package:justmusic/screens/explanations_screen.dart';
|
||||||
import 'package:justmusic/screens/post_screen.dart';
|
import 'package:justmusic/screens/feed_screen.dart';
|
||||||
import 'package:justmusic/screens/profile_screen.dart';
|
import 'package:justmusic/screens/login_screen.dart';
|
||||||
import 'package:justmusic/screens/registration_screen.dart';
|
import 'package:justmusic/screens/post_screen.dart';
|
||||||
import 'package:justmusic/screens/welcome_screen.dart';
|
import 'package:justmusic/screens/profile_screen.dart';
|
||||||
import 'package:justmusic/view_model/MusicViewModel.dart';
|
import 'package:justmusic/screens/registration_screen.dart';
|
||||||
import 'package:justmusic/view_model/UserViewModel.dart';
|
import 'package:justmusic/screens/welcome_screen.dart';
|
||||||
|
import 'package:justmusic/view_model/MusicViewModel.dart';
|
||||||
void main() {
|
import 'package:justmusic/view_model/UserViewModel.dart';
|
||||||
runApp(const MyApp());
|
|
||||||
}
|
import 'firebase_options.dart';
|
||||||
|
|
||||||
class MyApp extends StatelessWidget {
|
Future<void> main() async {
|
||||||
static UserViewModel userViewModel = UserViewModel();
|
WidgetsFlutterBinding.ensureInitialized();
|
||||||
static MusicViewModel musicViewModel = MusicViewModel();
|
await Firebase.initializeApp(
|
||||||
static AudioPlayer audioPlayer = AudioPlayer();
|
options: DefaultFirebaseOptions.currentPlatform,
|
||||||
|
);
|
||||||
const MyApp({super.key});
|
runApp(const MyApp());
|
||||||
|
}
|
||||||
// This widget is the root of your application.
|
|
||||||
@override
|
class MyApp extends StatelessWidget {
|
||||||
Widget build(BuildContext context) {
|
static FirebaseFirestore db = FirebaseFirestore.instance;
|
||||||
SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersiveSticky);
|
static UserViewModel userViewModel = UserViewModel();
|
||||||
Paint.enableDithering = true;
|
static MusicViewModel musicViewModel = MusicViewModel();
|
||||||
return ScreenUtilInit(
|
static AudioPlayer audioPlayer = AudioPlayer();
|
||||||
useInheritedMediaQuery: true,
|
|
||||||
builder: (context, child) {
|
const MyApp({super.key});
|
||||||
return MaterialApp(
|
|
||||||
routes: {
|
// This widget is the root of your application.
|
||||||
'/welcome': (context) => WellcomeScreen(),
|
@override
|
||||||
'/feed': (context) => FeedScreen(),
|
Widget build(BuildContext context) {
|
||||||
'/login': (context) => LoginScreen(),
|
SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersiveSticky);
|
||||||
'/register': (context) => RegistrationScreen(),
|
Paint.enableDithering = true;
|
||||||
'/post': (context) => PostScreen(),
|
return ScreenUtilInit(
|
||||||
'/profile': (context) => ProfileScreen(),
|
useInheritedMediaQuery: true,
|
||||||
'/explanation': (context) => ExplanationsScreen(),
|
builder: (context, child) {
|
||||||
},
|
return MaterialApp(
|
||||||
debugShowCheckedModeBanner: false,
|
routes: {
|
||||||
theme: ThemeData(
|
'/welcome': (context) => WellcomeScreen(),
|
||||||
// This is the theme of your application.
|
'/feed': (context) => FeedScreen(),
|
||||||
//
|
'/login': (context) => LoginScreen(),
|
||||||
// Try running your application with "flutter run". You'll see the
|
'/register': (context) => RegistrationScreen(),
|
||||||
// application has a blue toolbar. Then, without quitting the app, try
|
'/post': (context) => PostScreen(),
|
||||||
// changing the primarySwatch below to Colors.green and then invoke
|
'/profile': (context) => ProfileScreen(),
|
||||||
// "hot reload" (press "r" in the console where you ran "flutter run",
|
'/explanation': (context) => ExplanationsScreen(),
|
||||||
// or simply save your changes to "hot reload" in a Flutter IDE).
|
},
|
||||||
// Notice that the counter didn't reset back to zero; the application
|
debugShowCheckedModeBanner: false,
|
||||||
// is not restarted.
|
theme: ThemeData(
|
||||||
primarySwatch: Colors.blue,
|
// This is the theme of your application.
|
||||||
),
|
//
|
||||||
home: WellcomeScreen());
|
// Try running your application with "flutter run". You'll see the
|
||||||
},
|
// application has a blue toolbar. Then, without quitting the app, try
|
||||||
designSize: Size(390, 844),
|
// changing the primarySwatch below to Colors.green and then invoke
|
||||||
);
|
// "hot reload" (press "r" in the console where you ran "flutter run",
|
||||||
}
|
// or simply save your changes to "hot reload" in a Flutter IDE).
|
||||||
}
|
// Notice that the counter didn't reset back to zero; the application
|
||||||
|
// is not restarted.
|
||||||
|
primarySwatch: Colors.blue,
|
||||||
|
),
|
||||||
|
home: WellcomeScreen());
|
||||||
|
},
|
||||||
|
designSize: Size(390, 844),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@ -1,60 +1,60 @@
|
|||||||
class User {
|
class User {
|
||||||
final int _id;
|
final String _id;
|
||||||
String _pseudo;
|
String _pseudo;
|
||||||
String _country;
|
String _country;
|
||||||
String _mail;
|
String _mail;
|
||||||
String _pp;
|
String _pp;
|
||||||
int _followers;
|
int _followers;
|
||||||
int _capsules;
|
int _capsules;
|
||||||
int _followed;
|
int _followed;
|
||||||
List<User> friends = [];
|
List<User> friends = [];
|
||||||
|
|
||||||
// Constructor
|
// Constructor
|
||||||
User(this._id, this._pseudo, this._country, this._mail, this._pp,
|
User(this._id, this._pseudo, this._country, this._mail, this._pp,
|
||||||
this._followers, this._capsules, this._followed, this.friends);
|
this._followers, this._capsules, this._followed, this.friends);
|
||||||
|
|
||||||
//Getters and setters
|
//Getters and setters
|
||||||
int get id => _id;
|
String get id => _id;
|
||||||
|
|
||||||
String get pseudo => _pseudo;
|
String get pseudo => _pseudo;
|
||||||
|
|
||||||
set pseudo(String value) {
|
set pseudo(String value) {
|
||||||
_pseudo = value;
|
_pseudo = value;
|
||||||
}
|
}
|
||||||
|
|
||||||
String get country => _country;
|
String get country => _country;
|
||||||
|
|
||||||
set country(String value) {
|
set country(String value) {
|
||||||
_country = value;
|
_country = value;
|
||||||
}
|
}
|
||||||
|
|
||||||
String get mail => _mail;
|
String get mail => _mail;
|
||||||
|
|
||||||
set mail(String value) {
|
set mail(String value) {
|
||||||
_mail = value;
|
_mail = value;
|
||||||
}
|
}
|
||||||
|
|
||||||
String get pp => _pp;
|
String get pp => _pp;
|
||||||
|
|
||||||
set pp(String value) {
|
set pp(String value) {
|
||||||
_pp = value;
|
_pp = value;
|
||||||
}
|
}
|
||||||
|
|
||||||
int get capsules => _capsules;
|
int get capsules => _capsules;
|
||||||
|
|
||||||
set capsules(int value) {
|
set capsules(int value) {
|
||||||
_capsules = value;
|
_capsules = value;
|
||||||
}
|
}
|
||||||
|
|
||||||
int get followed => _followed;
|
int get followed => _followed;
|
||||||
|
|
||||||
set followed(int value) {
|
set followed(int value) {
|
||||||
_followed = value;
|
_followed = value;
|
||||||
}
|
}
|
||||||
|
|
||||||
int get followers => _followers;
|
int get followers => _followers;
|
||||||
|
|
||||||
set followers(int value) {
|
set followers(int value) {
|
||||||
_followers = value;
|
_followers = value;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -0,0 +1,31 @@
|
|||||||
|
import 'package:cloud_firestore/cloud_firestore.dart';
|
||||||
|
import 'package:justmusic/model/User.dart';
|
||||||
|
|
||||||
|
class UserMapper {
|
||||||
|
static User toModel(DocumentSnapshot<Map<String, dynamic>> snapshot,
|
||||||
|
SnapshotOptions? options) {
|
||||||
|
final data = snapshot.data();
|
||||||
|
return User(
|
||||||
|
data?["uid"] ?? "",
|
||||||
|
data?["unique_id"] ?? "",
|
||||||
|
data?["country"] ?? "",
|
||||||
|
data?["mail"] ?? "",
|
||||||
|
data?["profilePicture"] ?? "",
|
||||||
|
data?["followers"] ?? 0,
|
||||||
|
data?["nbCapsules"] ?? 0,
|
||||||
|
data?["followed"] ?? 0,
|
||||||
|
data?['friends'] is List<User> ? List.from(data?['friends']) : []);
|
||||||
|
}
|
||||||
|
/*
|
||||||
|
static Map<String, dynamic> toFirebase(User user) {
|
||||||
|
return {
|
||||||
|
if (user.pseudo != null) "name": u,
|
||||||
|
if (user.country != null) "state": state,
|
||||||
|
if (user.mail != null) "country": country,
|
||||||
|
if (user.pp != null) "capital": capital,
|
||||||
|
if (user.followers != null) "population": population,
|
||||||
|
if (user.capsules != null) "regions": regions,
|
||||||
|
if ()
|
||||||
|
};
|
||||||
|
}*/
|
||||||
|
}
|
||||||
File diff suppressed because it is too large
Load Diff
@ -1,90 +1,98 @@
|
|||||||
import 'package:flutter/cupertino.dart';
|
import 'package:flutter/cupertino.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:google_fonts/google_fonts.dart';
|
import 'package:google_fonts/google_fonts.dart';
|
||||||
import 'package:justmusic/values/constants.dart';
|
import 'package:justmusic/values/constants.dart';
|
||||||
|
|
||||||
import '../components/join_button.dart';
|
import '../components/join_button.dart';
|
||||||
|
|
||||||
class WellcomeScreen extends StatelessWidget {
|
class WellcomeScreen extends StatelessWidget {
|
||||||
const WellcomeScreen({Key? key}) : super(key: key);
|
const WellcomeScreen({Key? key}) : super(key: key);
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return Scaffold(
|
return Scaffold(
|
||||||
body: Container(
|
body: Container(
|
||||||
padding: EdgeInsets.all(defaultPadding),
|
padding: EdgeInsets.all(defaultPadding),
|
||||||
width: double.infinity,
|
width: double.infinity,
|
||||||
height: double.infinity,
|
height: double.infinity,
|
||||||
decoration: const BoxDecoration(
|
decoration: const BoxDecoration(
|
||||||
image: DecorationImage(
|
image: DecorationImage(
|
||||||
image: AssetImage("assets/images/wellcome_background.png"),
|
image: AssetImage("assets/images/wellcome_background.png"),
|
||||||
fit: BoxFit.cover,
|
fit: BoxFit.cover,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
child: Align(
|
child: Align(
|
||||||
child: Column(
|
child: Column(
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
children: [
|
children: [
|
||||||
Expanded(
|
Expanded(
|
||||||
flex: 10,
|
flex: 10,
|
||||||
child: Padding(
|
child: Padding(
|
||||||
padding: EdgeInsets.only(bottom: 100),
|
padding: EdgeInsets.only(bottom: 100),
|
||||||
child: Column(
|
child: Column(
|
||||||
mainAxisAlignment: MainAxisAlignment.end,
|
mainAxisAlignment: MainAxisAlignment.end,
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
children: [
|
children: [
|
||||||
Text(
|
Text(
|
||||||
"Bienvenue sur,",
|
"Bienvenue sur,",
|
||||||
style: GoogleFonts.plusJakartaSans(
|
style: GoogleFonts.plusJakartaSans(
|
||||||
color: Colors.white,
|
color: Colors.white,
|
||||||
fontWeight: FontWeight.bold,
|
fontWeight: FontWeight.bold,
|
||||||
fontSize: 34),
|
fontSize: 34),
|
||||||
),
|
),
|
||||||
Image(
|
Image(
|
||||||
image: AssetImage("assets/images/logo.png"),
|
image: AssetImage("assets/images/logo.png"),
|
||||||
width: 230,
|
width: 230,
|
||||||
),
|
),
|
||||||
SizedBox(
|
SizedBox(
|
||||||
height: 25,
|
height: 25,
|
||||||
),
|
),
|
||||||
ConstrainedBox(
|
ConstrainedBox(
|
||||||
constraints: BoxConstraints(maxWidth: 520),
|
constraints: BoxConstraints(maxWidth: 520),
|
||||||
child: Text(
|
child: Text(
|
||||||
"Explore les nouvelles découvertes musicales de tes amis, et partage leur ton mood.",
|
"Explore les nouvelles découvertes musicales de tes amis, et partage leur ton mood.",
|
||||||
style: GoogleFonts.plusJakartaSans(
|
style: GoogleFonts.plusJakartaSans(
|
||||||
color: Colors.white,
|
color: Colors.white,
|
||||||
fontWeight: FontWeight.w200,
|
fontWeight: FontWeight.w200,
|
||||||
fontSize: 15),
|
fontSize: 15),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
Expanded(
|
Expanded(
|
||||||
flex: 3,
|
flex: 3,
|
||||||
child: Column(
|
child: Column(
|
||||||
mainAxisAlignment: MainAxisAlignment.start,
|
mainAxisAlignment: MainAxisAlignment.start,
|
||||||
crossAxisAlignment: CrossAxisAlignment.center,
|
crossAxisAlignment: CrossAxisAlignment.center,
|
||||||
children: [
|
children: [
|
||||||
JoinButton(),
|
JoinButton(),
|
||||||
SizedBox(
|
SizedBox(
|
||||||
height: defaultPadding,
|
height: defaultPadding,
|
||||||
),
|
),
|
||||||
Text(
|
GestureDetector(
|
||||||
"Tu as déja un compte? Connexion",
|
onTap: () {
|
||||||
style: GoogleFonts.plusJakartaSans(
|
Navigator.pushNamed(context, '/login');
|
||||||
color: Colors.white,
|
},
|
||||||
fontWeight: FontWeight.w400,
|
child: Padding(
|
||||||
fontSize: 15),
|
padding: const EdgeInsets.all(3.0),
|
||||||
),
|
child: Text(
|
||||||
],
|
"Tu as déja un compte? Connexion",
|
||||||
),
|
style: GoogleFonts.plusJakartaSans(
|
||||||
),
|
color: Colors.white,
|
||||||
],
|
fontWeight: FontWeight.w400,
|
||||||
),
|
fontSize: 15),
|
||||||
) /* add child content here */,
|
),
|
||||||
),
|
),
|
||||||
);
|
),
|
||||||
}
|
],
|
||||||
}
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
) /* add child content here */,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@ -0,0 +1,80 @@
|
|||||||
|
import 'package:cloud_firestore/cloud_firestore.dart';
|
||||||
|
import 'package:firebase_auth/firebase_auth.dart';
|
||||||
|
import '../main.dart';
|
||||||
|
|
||||||
|
class AuthService {
|
||||||
|
register(String pseudo, String email, String password) async {
|
||||||
|
try {
|
||||||
|
final data = await FirebaseAuth.instance.createUserWithEmailAndPassword(
|
||||||
|
email: email,
|
||||||
|
password: password,
|
||||||
|
);
|
||||||
|
|
||||||
|
String uniqueId = await generateUniqueId(pseudo);
|
||||||
|
|
||||||
|
final user = <String, dynamic>{
|
||||||
|
"mail": email,
|
||||||
|
"pseudo": pseudo,
|
||||||
|
"phone_number": "",
|
||||||
|
"unique_id": uniqueId,
|
||||||
|
"picture":
|
||||||
|
"https://media.licdn.com/dms/image/D4E03AQHvc_b89ogFtQ/profile-displayphoto-shrink_400_400/0/1665060931103?e=1695859200&v=beta&t=wVLbxqeokYiPJ13nJ3SMq97iZvcm3ra0ufWFZCSzhjg",
|
||||||
|
"friends": []
|
||||||
|
};
|
||||||
|
|
||||||
|
MyApp.db
|
||||||
|
.collection("users")
|
||||||
|
.doc(data.user?.uid)
|
||||||
|
.set(user)
|
||||||
|
.then((value) => print("User Added"))
|
||||||
|
.catchError((error) => print("Failed to add user: $error"));
|
||||||
|
} on FirebaseAuthException catch (e) {
|
||||||
|
if (e.code == 'weak-password') {
|
||||||
|
throw ('Mot de passe trop court');
|
||||||
|
} else if (e.code == 'email-already-in-use') {
|
||||||
|
throw ('Mail déjà utilisé');
|
||||||
|
} else if (e.code == 'invalid-email') {
|
||||||
|
throw ('Mauvais format de mail');
|
||||||
|
}
|
||||||
|
rethrow;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<String> generateUniqueId(String pseudo) async {
|
||||||
|
String uniqueId = '$pseudo#0001';
|
||||||
|
int suffix = 1;
|
||||||
|
final CollectionReference usersCollection =
|
||||||
|
FirebaseFirestore.instance.collection("users");
|
||||||
|
final QuerySnapshot querySnapshot =
|
||||||
|
await usersCollection.where('pseudo', isEqualTo: pseudo).get();
|
||||||
|
|
||||||
|
for (final doc in querySnapshot.docs) {
|
||||||
|
suffix++;
|
||||||
|
uniqueId = '$pseudo#${suffix.toString().padLeft(4, '0')}';
|
||||||
|
}
|
||||||
|
|
||||||
|
return uniqueId;
|
||||||
|
}
|
||||||
|
|
||||||
|
login(String email, String password) async {
|
||||||
|
try {
|
||||||
|
await FirebaseAuth.instance
|
||||||
|
.signInWithEmailAndPassword(email: email, password: password);
|
||||||
|
} on FirebaseAuthException catch (e) {
|
||||||
|
if (e.code == 'user-not-found') {
|
||||||
|
throw ('Mail incorrect');
|
||||||
|
} else if (e.code == 'wrong-password') {
|
||||||
|
throw ('Mot de passe incorrect');
|
||||||
|
} else if (e.code == 'invalid-email') {
|
||||||
|
throw ('Format de mail incorrect');
|
||||||
|
} else if (e.code == 'too-many-requests') {
|
||||||
|
throw ('L\'accès à ce compte a été temporairement désactivé en raison de nombreuses tentatives de connexion infructueuses. Réessayer plus tard.');
|
||||||
|
}
|
||||||
|
rethrow;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void signOut() async {
|
||||||
|
await FirebaseAuth.instance.signOut();
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,15 @@
|
|||||||
|
import 'package:cloud_firestore/cloud_firestore.dart';
|
||||||
|
|
||||||
|
import '../model/User.dart';
|
||||||
|
import '../main.dart';
|
||||||
|
|
||||||
|
class UserService {
|
||||||
|
acceptFriend(User user, String idFriend) {
|
||||||
|
MyApp.db.collection("users").doc(user.id).update({
|
||||||
|
"friends": FieldValue.arrayUnion([idFriend])
|
||||||
|
});
|
||||||
|
MyApp.db.collection("users").doc(idFriend).update({
|
||||||
|
"friends": FieldValue.arrayUnion([user.id])
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1 @@
|
|||||||
|
const geoKey = "85a2724ad38b3994c2b7ebe1d239bbff";
|
||||||
@ -1,19 +1,66 @@
|
|||||||
import '../model/User.dart';
|
import 'package:firebase_auth/firebase_auth.dart' as firebase_auth;
|
||||||
|
import 'package:justmusic/service/AuthService.dart';
|
||||||
class UserViewModel {
|
|
||||||
User _userCurrent = User(
|
import '../model/User.dart';
|
||||||
1, "MelinaShow", "France", "test@gmail.com", "zezrzrzr", 5, 12, 114, []);
|
import '../model/mapper/UserMapper.dart';
|
||||||
|
import '../main.dart';
|
||||||
User get userCurrent => _userCurrent;
|
|
||||||
|
class UserViewModel {
|
||||||
set userCurrent(User value) {
|
late User _userCurrent;
|
||||||
_userCurrent = value;
|
final AuthService _authService = AuthService();
|
||||||
} // Constructor
|
|
||||||
|
User get userCurrent => _userCurrent;
|
||||||
UserViewModel();
|
|
||||||
|
set userCurrent(User value) {
|
||||||
// Methods
|
_userCurrent = value;
|
||||||
User getUser(int id) {
|
} // Constructor
|
||||||
throw new Error();
|
|
||||||
}
|
UserViewModel();
|
||||||
}
|
|
||||||
|
// Methods
|
||||||
|
Future<User?> getUser(String id) async {
|
||||||
|
final user = await MyApp.db.collection("users").doc(id).get();
|
||||||
|
return UserMapper.toModel(user, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
login(String pseudo, String password) async {
|
||||||
|
try {
|
||||||
|
await _authService.login(pseudo, password);
|
||||||
|
final user = await MyApp.db
|
||||||
|
.collection("users")
|
||||||
|
.doc(firebase_auth.FirebaseAuth.instance.currentUser?.uid)
|
||||||
|
.get();
|
||||||
|
User data = UserMapper.toModel(user, null);
|
||||||
|
_userCurrent = data;
|
||||||
|
} catch (e) {
|
||||||
|
rethrow;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool _isAlphaNumeric(String input) {
|
||||||
|
final RegExp alphaNumericRegExp = RegExp(r'^[a-zA-Z0-9]+$');
|
||||||
|
return alphaNumericRegExp.hasMatch(input);
|
||||||
|
}
|
||||||
|
|
||||||
|
register(String pseudo, String password, String email) async {
|
||||||
|
if (!_isAlphaNumeric(pseudo)) {
|
||||||
|
throw ("Le pseudo doit contenir seulement des lettres et des chiffres");
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
await _authService.register(pseudo.toLowerCase(), email, password);
|
||||||
|
final user = await MyApp.db
|
||||||
|
.collection("users")
|
||||||
|
.doc(firebase_auth.FirebaseAuth.instance.currentUser?.uid)
|
||||||
|
.get();
|
||||||
|
User data = UserMapper.toModel(user, null);
|
||||||
|
_userCurrent = data;
|
||||||
|
} catch (e) {
|
||||||
|
rethrow;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
logout() {
|
||||||
|
_authService.signOut();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
Loading…
Reference in new issue