Merge pull request #39 from leo-lox/onboarding

Onboarding

Author: 1-leo

android/app/build.gradle

@@ -1,3 +1,10 @@
+plugins {
+    id "com.android.application"
+    id "kotlin-android"
+    id "dev.flutter.flutter-gradle-plugin"
+    id "com.google.protobuf"
+}
+
 def localProperties = new Properties()
 def localPropertiesFile = rootProject.file('local.properties')
 if (localPropertiesFile.exists()) {
@@ -6,10 +13,7 @@ if (localPropertiesFile.exists()) {
     }
 }
 
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-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) {
@@ -21,10 +25,7 @@ if (flutterVersionName == null) {
     flutterVersionName = '1.0'
 }
 
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: 'com.google.protobuf'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
+
 
 
 // signing
@@ -37,7 +38,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 
 android {
-    compileSdkVersion 33
+    compileSdkVersion 34
     ndkVersion flutter.ndkVersion
 
     compileOptions {
@@ -91,8 +92,8 @@ flutter {
     source '../..'
 }
 
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+// dependencies {
+//     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
-}
+// }
 

android/build.gradle

@@ -1,20 +1,3 @@
-buildscript {
-    ext.kotlin_version = '1.8.20'
-    ext.javalite_version = '3.21.7'
-    ext.protoc_version = '3.9.2'
-    ext.protobuf_gradle = '0.9.1'
-    
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "com.google.protobuf:protobuf-gradle-plugin:$protobuf_gradle"
-    }
-}
 
 allprojects {
     repositories {

android/settings.gradle

@@ -1,11 +1,26 @@
-include ':app'
+pluginManagement {
+    def flutterSdkPath = {
+        def properties = new Properties()
+        file("local.properties").withInputStream { properties.load(it) }
+        def flutterSdkPath = properties.getProperty("flutter.sdk")
+        assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
+        return flutterSdkPath
+    }()
 
-def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
-def properties = new Properties()
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
 
-assert localPropertiesFile.exists()
-localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
 
-def flutterSdkPath = properties.getProperty("flutter.sdk")
-assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
+plugins {
+    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
+    id "com.android.application" version "7.4.2" apply false
+    id "org.jetbrains.kotlin.android" version "1.8.20" apply false
+    id "com.google.protobuf" version "0.9.1" apply false
+}
+
+include ":app"

assets/images/header1.jpg

@@ -0,0 +1 @@
+extensions:

devtools_options.yaml

@@ -0,0 +1,58 @@
+import 'dart:typed_data';
+
+import 'package:camelus/atoms/long_button.dart';
+import 'package:camelus/config/palette.dart';
+import 'package:flutter/material.dart';
+import 'package:crop_your_image/crop_your_image.dart';
+
+class CropAvatar extends StatelessWidget {
+  final Uint8List _imageData;
+
+  Uint8List _croppedImageData = Uint8List(0);
+
+  CropAvatar({
+    super.key,
+    required Uint8List imageData,
+  })  : _imageData = imageData;
+
+  final _controller = CropController();
+
+  @override
+  build(context) {
+    return Stack(
+      children: [
+        Crop(
+          baseColor: Palette.background,
+          aspectRatio: 1,
+          //radius: 150,
+          interactive: false,
+          withCircleUi: true,
+          image: _imageData,
+          controller: _controller,
+
+          onCropped: (image) {
+            _croppedImageData = image;
+          },
+        ),
+        Column(
+          mainAxisAlignment: MainAxisAlignment.end,
+          children: [
+            Center(
+              child: SizedBox(
+                width: 250,
+                height: 40,
+                child: longButton(
+                  name: "apply",
+                  onPressed: () {
+                    Navigator.pop(context, _croppedImageData);
+                  },
+                ),
+              ),
+            ),
+            const SizedBox(height: 20),
+          ],
+        ),
+      ],
+    );
+  }
+}

lib/atoms/crop_avatar.dart

@@ -63,7 +63,7 @@ Widget myProfilePicture({
       shape: BoxShape.circle,
     ),
     child: SvgPicture.network(
-        "https://avatars.dicebear.com/api/personas/$pubkey.svg"),
+        "https://api.dicebear.com/7.x/personas/svg?seed=$pubkey"),
   );
 }
 
@@ -81,7 +81,7 @@ class UserImage extends StatelessWidget {
   Widget build(BuildContext context) {
     return myProfilePicture(
       pictureUrl: myMetadata?.picture ??
-          "https://avatars.dicebear.com/api/personas/$pubkey.svg",
+          "https://api.dicebear.com/7.x/personas/svg?seed=$pubkey",
       pubkey: pubkey,
       filterQuality: FilterQuality.medium,
     );

lib/atoms/my_profile_picture.dart

@@ -17,7 +17,7 @@ class PersonCard extends ConsumerWidget {
   final Function(bool) onFollowTab;
 
   const PersonCard({
-    Key? key,
+    super.key,
     required this.pubkey,
     required this.name,
     required this.pictureUrl,
@@ -26,7 +26,7 @@ class PersonCard extends ConsumerWidget {
     required this.onTap,
     required this.onFollowTab,
     this.nip05,
-  }) : super(key: key);
+  });
 
   Future<String> checkNip05(String nip05, String pubkey, WidgetRef ref) async {
     var nip05service = await ref.read(nip05provider.future);

lib/atoms/person_card.dart

@@ -5,7 +5,7 @@ import 'package:flutter_svg/svg.dart';
 Widget simplePicture(String? pictureUrl, String? pubkey) {
   if (pictureUrl == null) {
     return SvgPicture.network(
-        "https://avatars.dicebear.com/api/personas/$pubkey.svg");
+        "https://api.dicebear.com/7.x/personas/svg?seed=$pubkey");
   }
 
   if (pictureUrl.contains(".svg")) {
@@ -25,5 +25,5 @@ Widget simplePicture(String? pictureUrl, String? pubkey) {
   }
 
   return SvgPicture.network(
-      "https://avatars.dicebear.com/api/personas/$pubkey.svg");
+      "https://api.dicebear.com/7.x/personas/svg?seed=$pubkey");
 }