Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
411 changes: 410 additions & 1 deletion flutter/.dart_tool/package_config.json

Large diffs are not rendered by default.

268 changes: 220 additions & 48 deletions flutter/.dart_tool/package_config_subset

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion flutter/.dart_tool/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.3.3
3.3.4
16 changes: 15 additions & 1 deletion flutter/.idea/libraries/Flutter_Plugins.xml

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

9 changes: 8 additions & 1 deletion flutter/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,12 @@ if (flutterVersionName == null) {
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
apply plugin: 'com.android.application'
apply plugin: 'com.google.gms.google-services'

// Add the Google services Gradle plugin



android {
compileSdkVersion flutter.compileSdkVersion
Expand All @@ -47,7 +53,7 @@ android {
applicationId "com.example.command_flutter"
// You can update the following values to match your application needs.
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration.
minSdkVersion flutter.minSdkVersion
minSdkVersion 22//flutter.minSdkVersion
targetSdkVersion flutter.targetSdkVersion
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
Expand All @@ -68,4 +74,5 @@ flutter {

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation platform('com.google.firebase:firebase-bom:31.0.1')
}
39 changes: 39 additions & 0 deletions flutter/android/app/google-services.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"project_info": {
"project_number": "112117989138",
"project_id": "chat-data-50b33",
"storage_bucket": "chat-data-50b33.appspot.com"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:112117989138:android:d4681f95b1087904943dcb",
"android_client_info": {
"package_name": "com.example.command_flutter"
}
},
"oauth_client": [
{
"client_id": "112117989138-q73rbh4rre4sgdn80lbh3e3hlbjamg7q.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyCVy3vA-6D9dwvwDQb7WzEFCp5ThfoQoRA"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": [
{
"client_id": "112117989138-q73rbh4rre4sgdn80lbh3e3hlbjamg7q.apps.googleusercontent.com",
"client_type": 3
}
]
}
}
}
],
"configuration_version": "1"
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,30 @@
public final class GeneratedPluginRegistrant {
private static final String TAG = "GeneratedPluginRegistrant";
public static void registerWith(@NonNull FlutterEngine flutterEngine) {
try {
flutterEngine.getPlugins().add(new io.flutter.plugins.firebase.firestore.FlutterFirebaseFirestorePlugin());
} catch(Exception e) {
Log.e(TAG, "Error registering plugin cloud_firestore, io.flutter.plugins.firebase.firestore.FlutterFirebaseFirestorePlugin", e);
}
try {
flutterEngine.getPlugins().add(new io.flutter.plugins.firebase.auth.FlutterFirebaseAuthPlugin());
} catch(Exception e) {
Log.e(TAG, "Error registering plugin firebase_auth, io.flutter.plugins.firebase.auth.FlutterFirebaseAuthPlugin", e);
}
try {
flutterEngine.getPlugins().add(new io.flutter.plugins.firebase.core.FlutterFirebaseCorePlugin());
} catch(Exception e) {
Log.e(TAG, "Error registering plugin firebase_core, io.flutter.plugins.firebase.core.FlutterFirebaseCorePlugin", e);
}
try {
flutterEngine.getPlugins().add(new io.flutter.plugins.pathprovider.PathProviderPlugin());
} catch(Exception e) {
Log.e(TAG, "Error registering plugin path_provider_android, io.flutter.plugins.pathprovider.PathProviderPlugin", e);
}
try {
flutterEngine.getPlugins().add(new com.tekartik.sqflite.SqflitePlugin());
} catch(Exception e) {
Log.e(TAG, "Error registering plugin sqflite, com.tekartik.sqflite.SqflitePlugin", e);
}
}
}
1 change: 1 addition & 0 deletions flutter/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ buildscript {
dependencies {
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.13'
}
}

Expand Down
4 changes: 2 additions & 2 deletions flutter/android/local.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
sdk.dir=C:\\Users\\SCO\\AppData\\Local\\Android\\sdk
flutter.sdk=C:\\flutter
sdk.dir=/home/foward01/Android/Sdk
flutter.sdk=/home/foward01/snap/flutter/common/flutter
flutter.buildMode=debug
flutter.versionName=1.0.0
flutter.versionCode=1
1 change: 1 addition & 0 deletions flutter/command_flutter.iml
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Dart SDK" level="project" />
<orderEntry type="library" name="Dart Packages" level="project" />
<orderEntry type="library" name="Flutter Plugins" level="project" />
</component>
</module>
35 changes: 35 additions & 0 deletions flutter/ios/Runner/GeneratedPluginRegistrant.m
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,44 @@

#import "GeneratedPluginRegistrant.h"

#if __has_include(<cloud_firestore/FLTFirebaseFirestorePlugin.h>)
#import <cloud_firestore/FLTFirebaseFirestorePlugin.h>
#else
@import cloud_firestore;
#endif

#if __has_include(<firebase_auth/FLTFirebaseAuthPlugin.h>)
#import <firebase_auth/FLTFirebaseAuthPlugin.h>
#else
@import firebase_auth;
#endif

#if __has_include(<firebase_core/FLTFirebaseCorePlugin.h>)
#import <firebase_core/FLTFirebaseCorePlugin.h>
#else
@import firebase_core;
#endif

#if __has_include(<path_provider_ios/FLTPathProviderPlugin.h>)
#import <path_provider_ios/FLTPathProviderPlugin.h>
#else
@import path_provider_ios;
#endif

#if __has_include(<sqflite/SqflitePlugin.h>)
#import <sqflite/SqflitePlugin.h>
#else
@import sqflite;
#endif

@implementation GeneratedPluginRegistrant

+ (void)registerWithRegistry:(NSObject<FlutterPluginRegistry>*)registry {
[FLTFirebaseFirestorePlugin registerWithRegistrar:[registry registrarForPlugin:@"FLTFirebaseFirestorePlugin"]];
[FLTFirebaseAuthPlugin registerWithRegistrar:[registry registrarForPlugin:@"FLTFirebaseAuthPlugin"]];
[FLTFirebaseCorePlugin registerWithRegistrar:[registry registrarForPlugin:@"FLTFirebaseCorePlugin"]];
[FLTPathProviderPlugin registerWithRegistrar:[registry registrarForPlugin:@"FLTPathProviderPlugin"]];
[SqflitePlugin registerWithRegistrar:[registry registrarForPlugin:@"SqflitePlugin"]];
}

@end
34 changes: 34 additions & 0 deletions flutter/ios/Runner/GoogleService-Info.plist
Original file line number Diff line number Diff line change
@@ -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>112117989138-tur0gu6lcpf2bs5k84dho1bvjn99sqhd.apps.googleusercontent.com</string>
<key>REVERSED_CLIENT_ID</key>
<string>com.googleusercontent.apps.112117989138-tur0gu6lcpf2bs5k84dho1bvjn99sqhd</string>
<key>API_KEY</key>
<string>AIzaSyCtTX3FIVSV8ZBMMf4FJg_AGQN5P0-X_1I</string>
<key>GCM_SENDER_ID</key>
<string>112117989138</string>
<key>PLIST_VERSION</key>
<string>1</string>
<key>BUNDLE_ID</key>
<string>com.example.command</string>
<key>PROJECT_ID</key>
<string>chat-data-50b33</string>
<key>STORAGE_BUCKET</key>
<string>chat-data-50b33.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:112117989138:ios:c528a3bdf349d26c943dcb</string>
</dict>
</plist>
75 changes: 75 additions & 0 deletions flutter/lib/Chats/Chats.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
import 'package:command_flutter/Chats/Data/Admin.dart';
import 'package:command_flutter/Chats/Models/User.dart';
import 'package:command_flutter/Chats/Pages/ChatPage.dart';
import 'package:command_flutter/Chats/api/firebase.dart';
import 'package:flutter/material.dart';


class Chats extends StatefulWidget {
const Chats({super.key});

@override
State<Chats> createState() => _ChatsState();
}

class _ChatsState extends State<Chats> {
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
title: Text("Сообщения"),
actions: [
IconButton(
onPressed: () {
Navigator.of(context).push(
MaterialPageRoute(builder: (context) {
return Container(
child: Text("В разработке"),
); //SearchPage();
}),
);
},
icon: Icon(Icons.search),
splashRadius: 20,
),
],
),
body:
StreamBuilder<List<User>>(
stream: base.readUsers(),
builder: (context, snapshot) {
final users = snapshot.data!;
return ListView(
children: users.map(buildUser).toList(),
);
}),
);
}

Widget buildUser(User user) {
return ListTile(
leading: CircleAvatar(
radius: 20.0,
backgroundImage: NetworkImage(user.urlAvatar),
),
title: Text(user.name),
subtitle: Text(user.description),
onTap: () {
Navigator.of(context).push(MaterialPageRoute(
builder: (context) => ChatPage(
currentUserId: myId,
friendId: user.idUser!,
friendName: user.name,
friendDescription: user.name,
friendImage: user.urlAvatar)));
},
);
}

Widget buildText(String text) => Center(
child: Text(
text,
style: TextStyle(fontSize: 24, color: Colors.white),
),
);
}
4 changes: 4 additions & 0 deletions flutter/lib/Chats/Data/Admin.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
String myId = 'b9YFGIpJjzGpJftfLnS6';
String myUsername = 'user1';
String myDecription = 'citizen';
String myUrlAvatar = 'https://avatars.mds.yandex.net/i?id=e3f19061fc32953419cea5c5a238f86c_l-5309503-images-thumbs&n=13';
36 changes: 36 additions & 0 deletions flutter/lib/Chats/Data/users.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
import 'package:cloud_firestore/cloud_firestore.dart';

import '../Models/User.dart';


List <User> users = [
User(
name: 'user1',
description: 'citizen',
urlAvatar:
'https://avatars.mds.yandex.net/i?id=e3f19061fc32953419cea5c5a238f86c_l-5309503-images-thumbs&n=13',
lastMessageTime: Timestamp.now(),
),
User(
name: 'user2',
description: 'citizen',
urlAvatar:
'https://avatars.mds.yandex.net/i?id=e3f19061fc32953419cea5c5a238f86c_l-5309503-images-thumbs&n=13',
lastMessageTime: Timestamp.now(),
),
User(
name: 'user3',
description: 'citizen',
urlAvatar:
'https://avatars.mds.yandex.net/i?id=e3f19061fc32953419cea5c5a238f86c_l-5309503-images-thumbs&n=13',
lastMessageTime: Timestamp.now(),
),
User(
name: 'user4',
description: 'citizen',
urlAvatar:
'https://avatars.mds.yandex.net/i?id=e3f19061fc32953419cea5c5a238f86c_l-5309503-images-thumbs&n=13',
lastMessageTime: Timestamp.now(),
),
];

9 changes: 9 additions & 0 deletions flutter/lib/Chats/Models/ModelPerson.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// class Person {
// String Name;
// String Description;

// Person({
// required this.Name,
// required this.Description
// });
// }
Loading