Merge pull request #2 from Azzamubaidillah/safePoint

v1.1
Azzamubaidillah · Feb 15, 2022 · c1192c6 · c1192c6
2 parents 6821887 + 8f82ef9
commit c1192c6
Show file tree

Hide file tree

Showing 32 changed files with 615 additions and 427 deletions.
diff --git a/.gitignore b/.gitignore
@@ -44,3 +44,5 @@ app.*.map.json
 /android/app/debug
 /android/app/profile
 /android/app/release
+upload-keystore.jks
+/android/key.properties
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -21,6 +21,13 @@ if (flutterVersionName == null) {
     flutterVersionName = '1.0'
 }
 
+def keystoreProperties = new Properties()
+def keystorePropertiesFile = rootProject.file('key.properties')
+if (keystorePropertiesFile.exists()) {
+   keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+}
+
+
 apply plugin: 'com.android.application'
 apply plugin: 'com.google.gms.google-services'
 apply plugin: 'kotlin-android'
@@ -52,11 +59,17 @@ android {
         versionName flutterVersionName
     }
 
+    signingConfigs {
+        release {
+            keyAlias keystoreProperties['keyAlias']
+            keyPassword keystoreProperties['keyPassword']
+            storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
+            storePassword keystoreProperties['storePassword']
+        }
+    }
     buildTypes {
         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
+            signingConfig signingConfigs.release
         }
     }
 }

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.azzam.chatkuy">
    <application
-        android:label="chatkuy"
+        android:label="Chatkuy"
         android:icon="@mipmap/launcher_icon">
         <activity
             android:name=".MainActivity"

diff --git a/assets/image/search.png b/assets/image/search.png
diff --git a/assets/lottie/empty.json b/assets/lottie/empty.json
diff --git a/assets/lottie/forgot.json b/assets/lottie/forgot.json
diff --git a/assets/lottie/hello.json b/assets/lottie/hello.json
diff --git a/assets/lottie/login.json b/assets/lottie/login.json
diff --git a/assets/lottie/main-laptop-duduk.json b/assets/lottie/main-laptop-duduk.json
diff --git a/assets/lottie/newPassword.json b/assets/lottie/newPassword.json
diff --git a/assets/lottie/ojek.json b/assets/lottie/ojek.json
diff --git a/assets/lottie/password.json b/assets/lottie/password.json
diff --git a/assets/lottie/payment.json b/assets/lottie/payment.json
diff --git a/assets/lottie/pesawat.json b/assets/lottie/pesawat.json
diff --git a/assets/lottie/register.json b/assets/lottie/register.json
diff --git a/assets/lottie/sent.json b/assets/lottie/sent.json
diff --git a/lib/app/controllers/auth_controller.dart b/lib/app/controllers/auth_controller.dart
@@ -283,6 +283,26 @@ class AuthController extends GetxController {
     Get.defaultDialog(title: "Success", middleText: "Update status success");
   }
 
+  void updatePhotoUrl(String url) async {
+    String date = DateTime.now().toIso8601String();
+    // Update firebase
+    CollectionReference users = firestore.collection('users');
+
+    await users.doc(_currentUser!.email).update({
+      "photoUrl": url,
+      "updatedTime": date,
+    });
+
+    // Update model
+    user.update((user) {
+      user!.photoUrl = url;
+      user.updatedTime = date;
+    });
+
+    user.refresh();
+    Get.defaultDialog(
+        title: "Success", middleText: "Change photo profile success");
+  }
   // SEARCH
 
   void addNewConnection(String friendEmail) async {

diff --git a/lib/app/modules/change_profile/controllers/change_profile_controller.dart b/lib/app/modules/change_profile/controllers/change_profile_controller.dart
@@ -1,3 +1,6 @@
+import 'dart:io';
+
+import 'package:firebase_storage/firebase_storage.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:image_picker/image_picker.dart';
@@ -10,6 +13,23 @@ class ChangeProfileController extends GetxController {
 
   XFile? pickedImage = null;
 
+  FirebaseStorage storage = FirebaseStorage.instance;
+
+  Future<String?> uploadImage(String uid) async {
+    Reference storageRef = storage.ref("$uid.png");
+    File file = File(pickedImage!.path);
+
+    try {
+      await storageRef.putFile(file);
+      final photoUrl = await storageRef.getDownloadURL();
+      resetImage();
+      return photoUrl;
+    } catch (err) {
+      print(err);
+      return null;
+    }
+  }
+
   void resetImage() {
     pickedImage = null;
     update();