Skip to content

wip #3

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

Open
wants to merge 10 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
2 changes: 1 addition & 1 deletion android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ android {

defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "com.muhammadali.telegramchatapp"
applicationId "com.just2click.hivechatapp"
minSdkVersion 16
targetSdkVersion 28
multiDexEnabled true
Expand Down
31 changes: 12 additions & 19 deletions android/app/google-services.json
Original file line number Diff line number Diff line change
@@ -1,50 +1,43 @@
{
"project_info": {
"project_number": "569979142021",
"firebase_url": "https://chat-app-2021.firebaseio.com",
"project_id": "chat-app-2021",
"storage_bucket": "chat-app-2021.appspot.com"
"project_number": "883352695161",
"firebase_url": "https://hive1-a9048.firebaseio.com",
"project_id": "hive1-a9048",
"storage_bucket": "hive1-a9048.appspot.com"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:569979142021:android:5bb02f0cb46e9c40898eec",
"mobilesdk_app_id": "1:883352695161:android:210561df6b8743f5953fa8",
"android_client_info": {
"package_name": "com.muhammadali.telegramchatapp"
"package_name": "com.just2click.hivechatapp"
}
},
"oauth_client": [
{
"client_id": "569979142021-7j4rr51i9fo2hdivauv7ee1ahkmifmog.apps.googleusercontent.com",
"client_id": "883352695161-a97nhr56cssjvl69vq1nv55lcofagvkf.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.muhammadali.telegramchatapp",
"certificate_hash": "3498fdb3a7b76c02a72d33027ff1bab13b7330a1"
"package_name": "com.just2click.hivechatapp",
"certificate_hash": "a2e05f984204ad69f5126c19b5a1d18070bdf753"
}
},
{
"client_id": "569979142021-7tnf70vgh3dl2u6pgsdf3a6lp2ej9nkc.apps.googleusercontent.com",
"client_id": "883352695161-5qi6vdbp7rf5aklvku2gkoj4icrm6kup.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyDiNucLksbgNIEFWuDsTXrxBHe1SKfNcKY"
"current_key": "AIzaSyAgdyYvoBH0SNB_TKbIfi84a9UeOSBesBo"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": [
{
"client_id": "569979142021-7tnf70vgh3dl2u6pgsdf3a6lp2ej9nkc.apps.googleusercontent.com",
"client_id": "883352695161-5qi6vdbp7rf5aklvku2gkoj4icrm6kup.apps.googleusercontent.com",
"client_type": 3
},
{
"client_id": "569979142021-odjemf6j2jv9c1k999rv82v6ootii0r6.apps.googleusercontent.com",
"client_type": 2,
"ios_info": {
"bundle_id": "com.muhammadali.telegramchatapp"
}
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion android/app/src/debug/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.muhammadali.telegramchatapp">
package="com.just2click.hivechatapp">
<!-- Flutter needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
-->
Expand Down
2 changes: 1 addition & 1 deletion android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.muhammadali.telegramchatapp">
package="com.just2click.hivechatapp">
<!-- io.flutter.app.FlutterApplication is an android.app.Application that
calls FlutterMain.startInitialization(this); in its onCreate method.
In most cases you can leave this as-is, but you if you want to provide
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.muhammadali.telegramchatapp
package com.just2click.hivechatapp

import androidx.annotation.NonNull;
import io.flutter.embedding.android.FlutterActivity
Expand Down
2 changes: 1 addition & 1 deletion android/app/src/profile/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.muhammadali.telegramchatapp">
package="com.just2click.hivechatapp">
<!-- Flutter needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
-->
Expand Down
Binary file added assets/images/Friend [email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/Friend [email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/Friend [email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/Friend [email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/Friend [email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/Friend_1@2x_100.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/Friend_2@2x_100.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/Friend_3@2x_100.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/Friend_4@2x_100.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/Friend_5@2x_100.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/Icon [email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/Icon [email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/Icon [email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/Icon [email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/Icon [email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/Icon [email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/Icon [email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/Icon [email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/Icon-Yellow.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions assets/images/Icon-fill.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/Iconfill.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/Logo [email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/Logo [email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/Logo [email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/Logo [email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/Logo [email protected]
Binary file added assets/images/Logo [email protected]
Binary file added assets/images/Logo [email protected]
Binary file added assets/images/Logo [email protected]
Binary file added assets/images/Typo [email protected]
Binary file added assets/images/Typo [email protected]
Binary file added assets/images/Typo [email protected]
Binary file added assets/images/Typo [email protected]
Binary file added assets/images/Typo [email protected]
Binary file added assets/images/Typo [email protected]
Binary file added assets/images/camera.png
Binary file added assets/images/gallery.png
Binary file added assets/images/hive-bee-on-boarding.png
Binary file added assets/images/iconyellow.png
Binary file added assets/images/logo1.jpg
Binary file added assets/images/people.jpeg
1 change: 1 addition & 0 deletions ios/Flutter/.last_build_id
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
30dcd1506d550883b561a48d41d2ad13
20 changes: 10 additions & 10 deletions ios/GoogleService-Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,23 @@
<plist version="1.0">
<dict>
<key>CLIENT_ID</key>
<string>569979142021-odjemf6j2jv9c1k999rv82v6ootii0r6.apps.googleusercontent.com</string>
<string>883352695161-d416o0l8rpp8vo35mc5orj3f9shj7m15.apps.googleusercontent.com</string>
<key>REVERSED_CLIENT_ID</key>
<string>Paste your Key Here</string>
<string>com.googleusercontent.apps.883352695161-d416o0l8rpp8vo35mc5orj3f9shj7m15</string>
<key>ANDROID_CLIENT_ID</key>
<string>569979142021-7j4rr51i9fo2hdivauv7ee1ahkmifmog.apps.googleusercontent.com</string>
<string>883352695161-a97nhr56cssjvl69vq1nv55lcofagvkf.apps.googleusercontent.com</string>
<key>API_KEY</key>
<string>AIzaSyD1beeMpBpbazkf5ZEgNSbOsTA6qKakgIk</string>
<string>AIzaSyDf-ZdPh0YbokRjSdr9ZlpNiu6lEQihbfo</string>
<key>GCM_SENDER_ID</key>
<string>569979142021</string>
<string>883352695161</string>
<key>PLIST_VERSION</key>
<string>1</string>
<key>BUNDLE_ID</key>
<string>com.muhammadali.telegramchatapp</string>
<string>com.just2click.hivechatapp</string>
<key>PROJECT_ID</key>
<string>chat-app-2021</string>
<string>hive1-a9048</string>
<key>STORAGE_BUCKET</key>
<string>chat-app-2021.appspot.com</string>
<string>hive1-a9048.appspot.com</string>
<key>IS_ADS_ENABLED</key>
<false></false>
<key>IS_ANALYTICS_ENABLED</key>
Expand All @@ -31,8 +31,8 @@
<key>IS_SIGNIN_ENABLED</key>
<true></true>
<key>GOOGLE_APP_ID</key>
<string>1:569979142021:ios:884d5cae87f2742f898eec</string>
<string>1:883352695161:ios:34089d9e884693b6953fa8</string>
<key>DATABASE_URL</key>
<string>https://chat-app-2021.firebaseio.com</string>
<string>https://hive1-a9048.firebaseio.com</string>
</dict>
</plist>
81 changes: 17 additions & 64 deletions ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,81 +10,34 @@ project 'Runner', {
'Release' => :release,
}

def parse_KV_file(file, separator='=')
file_abs_path = File.expand_path(file)
if !File.exists? file_abs_path
return [];
def flutter_root
generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__)
unless File.exist?(generated_xcode_build_settings_path)
raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first"
end
generated_key_values = {}
skip_line_start_symbols = ["#", "/"]
File.foreach(file_abs_path) do |line|
next if skip_line_start_symbols.any? { |symbol| line =~ /^\s*#{symbol}/ }
plugin = line.split(pattern=separator)
if plugin.length == 2
podname = plugin[0].strip()
path = plugin[1].strip()
podpath = File.expand_path("#{path}", file_abs_path)
generated_key_values[podname] = podpath
else
puts "Invalid plugin specification: #{line}"
end

File.foreach(generated_xcode_build_settings_path) do |line|
matches = line.match(/FLUTTER_ROOT\=(.*)/)
return matches[1].strip if matches
end
generated_key_values
raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get"
end

require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)

flutter_ios_podfile_setup

target 'Runner' do
use_frameworks!
use_modular_headers!

# Flutter Pod

copied_flutter_dir = File.join(__dir__, 'Flutter')
copied_framework_path = File.join(copied_flutter_dir, 'Flutter.framework')
copied_podspec_path = File.join(copied_flutter_dir, 'Flutter.podspec')
unless File.exist?(copied_framework_path) && File.exist?(copied_podspec_path)
# Copy Flutter.framework and Flutter.podspec to Flutter/ to have something to link against if the xcode backend script has not run yet.
# That script will copy the correct debug/profile/release version of the framework based on the currently selected Xcode configuration.
# CocoaPods will not embed the framework on pod install (before any build phases can generate) if the dylib does not exist.

generated_xcode_build_settings_path = File.join(copied_flutter_dir, 'Generated.xcconfig')
unless File.exist?(generated_xcode_build_settings_path)
raise "Generated.xcconfig must exist. If you're running pod install manually, make sure flutter pub get is executed first"
end
generated_xcode_build_settings = parse_KV_file(generated_xcode_build_settings_path)
cached_framework_dir = generated_xcode_build_settings['FLUTTER_FRAMEWORK_DIR'];

unless File.exist?(copied_framework_path)
FileUtils.cp_r(File.join(cached_framework_dir, 'Flutter.framework'), copied_flutter_dir)
end
unless File.exist?(copied_podspec_path)
FileUtils.cp(File.join(cached_framework_dir, 'Flutter.podspec'), copied_flutter_dir)
end
end

# Keep pod path relative so it can be checked into Podfile.lock.
pod 'Flutter', :path => 'Flutter'

# Plugin Pods

# Prepare symlinks folder. We use symlinks to avoid having Podfile.lock
# referring to absolute paths on developers' machines.
system('rm -rf .symlinks')
system('mkdir -p .symlinks/plugins')
plugin_pods = parse_KV_file('../.flutter-plugins')
plugin_pods.each do |name, path|
symlink = File.join('.symlinks', 'plugins', name)
File.symlink(path, symlink)
pod name, :path => File.join(symlink, 'ios')
end
flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
end

# Prevent Cocoapods from embedding a second Flutter framework and causing an error with the new Xcode build system.
install! 'cocoapods', :disable_input_output_paths => true

post_install do |installer|
installer.pods_project.targets.each do |target|
target.build_configurations.each do |config|
config.build_settings['ENABLE_BITCODE'] = 'NO'
end
flutter_additional_ios_build_settings(target)
end
end

pod 'Firebase/Auth'
Loading