Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed error btn click #17

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
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
40 changes: 40 additions & 0 deletions android/app/google-services.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"project_info": {
"project_number": "410079293980",
"firebase_url": "https://loginfirebase-4e349-default-rtdb.firebaseio.com",
"project_id": "loginfirebase-4e349",
"storage_bucket": "loginfirebase-4e349.appspot.com"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:410079293980:android:c4aaff0dacd473ebaaa5d9",
"android_client_info": {
"package_name": "com.example.vritant"
}
},
"oauth_client": [
{
"client_id": "410079293980-m65cqngrokeen1ojoh6vidrfd3000sig.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyCyXAiOhA2pm8spX2C-1TRevUfJUKPev8Y"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": [
{
"client_id": "410079293980-m65cqngrokeen1ojoh6vidrfd3000sig.apps.googleusercontent.com",
"client_type": 3
}
]
}
}
}
],
"configuration_version": "1"
}
99 changes: 12 additions & 87 deletions android/google-services.json
Original file line number Diff line number Diff line change
@@ -1,124 +1,49 @@
{
"project_info": {
"project_number": "463875638784",
"project_id": "swarabhaas",
"storage_bucket": "swarabhaas.appspot.com"
"project_number": "410079293980",
"firebase_url": "https://loginfirebase-4e349-default-rtdb.firebaseio.com",
"project_id": "loginfirebase-4e349",
"storage_bucket": "loginfirebase-4e349.appspot.com"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:463875638784:android:210ae8ad749a0b59e77ae5",
"android_client_info": {
"package_name": "com.example.swarabhaas"
}
},
"oauth_client": [
{
"client_id": "463875638784-06lgiuurbaho267pqdphc2dbitb6dapc.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.example.swarabhaas",
"certificate_hash": "adbacd138854718f2da6c410bbd48160b8da305a"
}
},
{
"client_id": "463875638784-1ubd1ehf694ivfe4kgdt8aalj0pvtkd4.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.example.swarabhaas",
"certificate_hash": "d01be48eba59c41c236c6994765d919240372071"
}
},
{
"client_id": "463875638784-465hgrs3tak7kg17u89fps55j19tt358.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.example.swarabhaas",
"certificate_hash": "a0ac509a8fa23e32531147533e806ba73ce50157"
}
},
{
"client_id": "463875638784-crrrkc6td0sabntkca8ueo2f5opgs1o6.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.example.swarabhaas",
"certificate_hash": "e7b10127e9de20f7224fbfa7835cd86ae4ba5e76"
}
},
{
"client_id": "463875638784-lakv07jnjt2c3jkomusc86ooi3bh939n.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.example.swarabhaas",
"certificate_hash": "877087bb6cc730b61232322fba931ed5ab8f37bf"
}
},
{
"client_id": "463875638784-8fktne1ogjbodglhan9ge9odhb3dj5ti.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyCpGoBPjnde9avujhIVl3KxpFLUn0np_wk"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": [
{
"client_id": "463875638784-8fktne1ogjbodglhan9ge9odhb3dj5ti.apps.googleusercontent.com",
"client_type": 3
},
{
"client_id": "463875638784-a1eseek2tor3fj1bqqtasrl3u6q177hg.apps.googleusercontent.com",
"client_type": 2,
"ios_info": {
"bundle_id": "com.example.swarabhaas"
}
}
]
}
}
},
{
"client_info": {
"mobilesdk_app_id": "1:463875638784:android:90798fbb1d7aaf83e77ae5",
"mobilesdk_app_id": "1:410079293980:android:c4aaff0dacd473ebaaa5d9",
"android_client_info": {
"package_name": "com.example.vritant"
}
},
"oauth_client": [
{
"client_id": "463875638784-3r2l81del2kbs5pmsamsudr8bbbbqu5t.apps.googleusercontent.com",
"client_id": "410079293980-3us9m0k97hm9utr02jttu4dqierqr3ga.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.example.vritant",
"certificate_hash": "877087bb6cc730b61232322fba931ed5ab8f37bf"
"certificate_hash": "b69deaaa5412500b41c2b23de5258b48697899c7"
}
},
{
"client_id": "463875638784-8fktne1ogjbodglhan9ge9odhb3dj5ti.apps.googleusercontent.com",
"client_id": "410079293980-anmrbgabnbitn23qphucujidm400pfb3.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyCpGoBPjnde9avujhIVl3KxpFLUn0np_wk"
"current_key": "AIzaSyCyXAiOhA2pm8spX2C-1TRevUfJUKPev8Y"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": [
{
"client_id": "463875638784-8fktne1ogjbodglhan9ge9odhb3dj5ti.apps.googleusercontent.com",
"client_id": "410079293980-anmrbgabnbitn23qphucujidm400pfb3.apps.googleusercontent.com",
"client_type": 3
},
{
"client_id": "463875638784-a1eseek2tor3fj1bqqtasrl3u6q177hg.apps.googleusercontent.com",
"client_id": "410079293980-9p4srp8a98l8p095h82v9lo7rjm5o640.apps.googleusercontent.com",
"client_type": 2,
"ios_info": {
"bundle_id": "com.example.swarabhaas"
"bundle_id": "com.example.vritant"
}
}
]
Expand Down
36 changes: 36 additions & 0 deletions ios/Runner/GoogleService-Info.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<?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>410079293980-9p4srp8a98l8p095h82v9lo7rjm5o640.apps.googleusercontent.com</string>
<key>REVERSED_CLIENT_ID</key>
<string>com.googleusercontent.apps.410079293980-9p4srp8a98l8p095h82v9lo7rjm5o640</string>
<key>API_KEY</key>
<string>AIzaSyCf3dCwyBvYE_lQ73cjPL8Q1-O63DpuBdY</string>
<key>GCM_SENDER_ID</key>
<string>410079293980</string>
<key>PLIST_VERSION</key>
<string>1</string>
<key>BUNDLE_ID</key>
<string>com.example.vritant</string>
<key>PROJECT_ID</key>
<string>loginfirebase-4e349</string>
<key>STORAGE_BUCKET</key>
<string>loginfirebase-4e349.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:410079293980:ios:cb09cb6d2dfc7d21aaa5d9</string>
<key>DATABASE_URL</key>
<string>https://loginfirebase-4e349-default-rtdb.firebaseio.com</string>
</dict>
</plist>
7 changes: 7 additions & 0 deletions ios/firebase_app_id_file.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"file_generated_by": "FlutterFire CLI",
"purpose": "FirebaseAppID & ProjectID for this Firebase app in this directory",
"GOOGLE_APP_ID": "1:410079293980:ios:cb09cb6d2dfc7d21aaa5d9",
"FIREBASE_PROJECT_ID": "loginfirebase-4e349",
"GCM_SENDER_ID": "410079293980"
}
70 changes: 52 additions & 18 deletions lib/firebase_options.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// File generated by FlutterFire CLI.
// ignore_for_file: lines_longer_than_80_chars
// 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;
Expand All @@ -17,37 +17,71 @@ import 'package:flutter/foundation.dart'
class DefaultFirebaseOptions {
static FirebaseOptions get currentPlatform {
if (kIsWeb) {
throw UnsupportedError(
'DefaultFirebaseOptions have not been configured for web - '
'you can reconfigure this by running the FlutterFire CLI again.',
);
return web;
}
// ignore: missing_enum_constant_in_switch
switch (defaultTargetPlatform) {
case TargetPlatform.android:
return android;
case TargetPlatform.iOS:
return ios;
case TargetPlatform.macOS:
return macos;
case TargetPlatform.windows:
throw UnsupportedError(
'DefaultFirebaseOptions have not been configured for ios - '
'DefaultFirebaseOptions have not been configured for windows - '
'you can reconfigure this by running the FlutterFire CLI again.',
);
case TargetPlatform.macOS:
case TargetPlatform.linux:
throw UnsupportedError(
'DefaultFirebaseOptions have not been configured for macos - '
'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.',
);
}

throw UnsupportedError(
'DefaultFirebaseOptions are not supported for this platform.',
);
}

static const FirebaseOptions web = FirebaseOptions(
apiKey: 'AIzaSyCmSXR0uqjHYD75YgwUOe4J_EDSfida6Zs',
appId: '1:410079293980:web:ef95b0cc09b895c8aaa5d9',
messagingSenderId: '410079293980',
projectId: 'loginfirebase-4e349',
authDomain: 'loginfirebase-4e349.firebaseapp.com',
databaseURL: 'https://loginfirebase-4e349-default-rtdb.firebaseio.com',
storageBucket: 'loginfirebase-4e349.appspot.com',
measurementId: 'G-SEPNG31MCM',
);

static const FirebaseOptions android = FirebaseOptions(
apiKey: 'AIzaSyCpGoBPjnde9avujhIVl3KxpFLUn0np_wk',
appId: '1:463875638784:android:210ae8ad749a0b59e77ae5',
messagingSenderId: '463875638784',
projectId: 'swarabhaas',
storageBucket: 'swarabhaas.appspot.com',
apiKey: 'AIzaSyCyXAiOhA2pm8spX2C-1TRevUfJUKPev8Y',
appId: '1:410079293980:android:c4aaff0dacd473ebaaa5d9',
messagingSenderId: '410079293980',
projectId: 'loginfirebase-4e349',
databaseURL: 'https://loginfirebase-4e349-default-rtdb.firebaseio.com',
storageBucket: 'loginfirebase-4e349.appspot.com',
);

static const FirebaseOptions ios = FirebaseOptions(
apiKey: 'AIzaSyCf3dCwyBvYE_lQ73cjPL8Q1-O63DpuBdY',
appId: '1:410079293980:ios:cb09cb6d2dfc7d21aaa5d9',
messagingSenderId: '410079293980',
projectId: 'loginfirebase-4e349',
databaseURL: 'https://loginfirebase-4e349-default-rtdb.firebaseio.com',
storageBucket: 'loginfirebase-4e349.appspot.com',
iosClientId: '410079293980-9p4srp8a98l8p095h82v9lo7rjm5o640.apps.googleusercontent.com',
iosBundleId: 'com.example.vritant',
);

static const FirebaseOptions macos = FirebaseOptions(
apiKey: 'AIzaSyCf3dCwyBvYE_lQ73cjPL8Q1-O63DpuBdY',
appId: '1:410079293980:ios:cb09cb6d2dfc7d21aaa5d9',
messagingSenderId: '410079293980',
projectId: 'loginfirebase-4e349',
databaseURL: 'https://loginfirebase-4e349-default-rtdb.firebaseio.com',
storageBucket: 'loginfirebase-4e349.appspot.com',
iosClientId: '410079293980-9p4srp8a98l8p095h82v9lo7rjm5o640.apps.googleusercontent.com',
iosBundleId: 'com.example.vritant',
);
}
4 changes: 2 additions & 2 deletions lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ class LandingPage extends StatelessWidget {
child: MaterialApp(
title: 'Vritant',
debugShowCheckedModeBanner: false,
// home: LoginPage(), // enable google sign-in
home: TabsScreen(),
home: LoginPage(), // enable google sign-in
// home: TabsScreen(),
// routes: {'/routes': (ctx) => TabsScreen()},
),
);
Expand Down
9 changes: 3 additions & 6 deletions lib/tabs/screens/tabs_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ class _TabsScreenState extends State<TabsScreen> {
),
Flexible(
child: Text(
"Welcome to Vritant",
// ' ${user?.displayName.toString()}',
// "Welcome to Vritant",
' ${user?.displayName.toString()}',
overflow: TextOverflow.ellipsis,
style: const TextStyle(
fontFamily: 'Open-Sauce-Sans',
Expand Down Expand Up @@ -141,9 +141,6 @@ class _TabsScreenState extends State<TabsScreen> {
void changeLang() {}

void signOut(GoogleSignInProvider gAuth) {
if (user!.providerData[0].providerId == "google.com") {
// signed via google
gAuth.handleSignOut();
}
gAuth.handleSignOut();
}
}
2 changes: 1 addition & 1 deletion macos/Flutter/GeneratedPluginRegistrant.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import flutter_archive
import flutter_tts
import geolocator_apple
import just_audio
import path_provider_macos
import path_provider_foundation

func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
AudioSessionPlugin.register(with: registry.registrar(forPlugin: "AudioSessionPlugin"))
Expand Down
Loading