diff --git a/client/android/.gitignore b/client/android/.gitignore new file mode 100644 index 0000000..55afd91 --- /dev/null +++ b/client/android/.gitignore @@ -0,0 +1,13 @@ +gradle-wrapper.jar +/.gradle +/captures/ +/gradlew +/gradlew.bat +/local.properties +GeneratedPluginRegistrant.java + +# Remember to never publicly share your keystore. +# See https://flutter.dev/to/reference-keystore +key.properties +**/*.keystore +**/*.jks diff --git a/client/android/app/build.gradle b/client/android/app/build.gradle new file mode 100644 index 0000000..5f9d1bc --- /dev/null +++ b/client/android/app/build.gradle @@ -0,0 +1,44 @@ +plugins { + id "com.android.application" + id "kotlin-android" + // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. + id "dev.flutter.flutter-gradle-plugin" +} + +android { + namespace = "com.jam.jam_client" + compileSdk = flutter.compileSdkVersion + ndkVersion = flutter.ndkVersion + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + + kotlinOptions { + jvmTarget = JavaVersion.VERSION_1_8 + } + + defaultConfig { + // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). + applicationId = "com.jam.jam_client" + // You can update the following values to match your application needs. + // For more information, see: https://flutter.dev/to/review-gradle-config. + minSdk = flutter.minSdkVersion + targetSdk = flutter.targetSdkVersion + versionCode = flutter.versionCode + versionName = flutter.versionName + } + + 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 + } + } +} + +flutter { + source = "../.." +} diff --git a/client/android/app/src/debug/AndroidManifest.xml b/client/android/app/src/debug/AndroidManifest.xml new file mode 100644 index 0000000..399f698 --- /dev/null +++ b/client/android/app/src/debug/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/client/android/app/src/main/AndroidManifest.xml b/client/android/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..e4f768b --- /dev/null +++ b/client/android/app/src/main/AndroidManifest.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/client/android/app/src/main/kotlin/com/jam/jam_client/MainActivity.kt b/client/android/app/src/main/kotlin/com/jam/jam_client/MainActivity.kt new file mode 100644 index 0000000..24baf7d --- /dev/null +++ b/client/android/app/src/main/kotlin/com/jam/jam_client/MainActivity.kt @@ -0,0 +1,5 @@ +package com.jam.jam_client + +import io.flutter.embedding.android.FlutterActivity + +class MainActivity: FlutterActivity() diff --git a/client/android/app/src/main/res/drawable-v21/launch_background.xml b/client/android/app/src/main/res/drawable-v21/launch_background.xml new file mode 100644 index 0000000..f74085f --- /dev/null +++ b/client/android/app/src/main/res/drawable-v21/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/client/android/app/src/main/res/drawable/launch_background.xml b/client/android/app/src/main/res/drawable/launch_background.xml new file mode 100644 index 0000000..304732f --- /dev/null +++ b/client/android/app/src/main/res/drawable/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/client/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/client/android/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..db77bb4 Binary files /dev/null and b/client/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/client/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/client/android/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..17987b7 Binary files /dev/null and b/client/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/client/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/client/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..09d4391 Binary files /dev/null and b/client/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/client/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/client/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..d5f1c8d Binary files /dev/null and b/client/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/client/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/client/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..4d6372e Binary files /dev/null and b/client/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/client/android/app/src/main/res/values-night/styles.xml b/client/android/app/src/main/res/values-night/styles.xml new file mode 100644 index 0000000..06952be --- /dev/null +++ b/client/android/app/src/main/res/values-night/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/client/android/app/src/main/res/values/styles.xml b/client/android/app/src/main/res/values/styles.xml new file mode 100644 index 0000000..cb1ef88 --- /dev/null +++ b/client/android/app/src/main/res/values/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/client/android/app/src/profile/AndroidManifest.xml b/client/android/app/src/profile/AndroidManifest.xml new file mode 100644 index 0000000..399f698 --- /dev/null +++ b/client/android/app/src/profile/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/client/android/build.gradle b/client/android/build.gradle new file mode 100644 index 0000000..d2ffbff --- /dev/null +++ b/client/android/build.gradle @@ -0,0 +1,18 @@ +allprojects { + repositories { + google() + mavenCentral() + } +} + +rootProject.buildDir = "../build" +subprojects { + project.buildDir = "${rootProject.buildDir}/${project.name}" +} +subprojects { + project.evaluationDependsOn(":app") +} + +tasks.register("clean", Delete) { + delete rootProject.buildDir +} diff --git a/client/android/gradle.properties b/client/android/gradle.properties new file mode 100644 index 0000000..c220d99 --- /dev/null +++ b/client/android/gradle.properties @@ -0,0 +1,3 @@ +org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError --add-exports=java.base/sun.security.provider=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED +android.useAndroidX=true +android.enableJetifier=true diff --git a/client/android/gradle/wrapper/gradle-wrapper.properties b/client/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..3c85cfe --- /dev/null +++ b/client/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip diff --git a/client/android/jam_client_android.iml b/client/android/jam_client_android.iml new file mode 100644 index 0000000..1899969 --- /dev/null +++ b/client/android/jam_client_android.iml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/client/android/settings.gradle b/client/android/settings.gradle new file mode 100644 index 0000000..e07c1cb --- /dev/null +++ b/client/android/settings.gradle @@ -0,0 +1,25 @@ +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 + }() + + includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") + + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} + +plugins { + id "dev.flutter.flutter-plugin-loader" version "1.0.0" + id "com.android.application" version "8.2.2" apply false + id "org.jetbrains.kotlin.android" version "1.8.22" apply false +} + +include ":app" diff --git a/client/ios/Flutter/Generated.xcconfig b/client/ios/Flutter/Generated.xcconfig new file mode 100644 index 0000000..00f7b71 --- /dev/null +++ b/client/ios/Flutter/Generated.xcconfig @@ -0,0 +1,14 @@ +// This is a generated file; do not edit or check into version control. +FLUTTER_ROOT=/opt/flutter +FLUTTER_APPLICATION_PATH=/root/JustAMessenger/client +COCOAPODS_PARALLEL_CODE_SIGN=true +FLUTTER_TARGET=lib/main.dart +FLUTTER_BUILD_DIR=build +FLUTTER_BUILD_NAME=1.0.0 +FLUTTER_BUILD_NUMBER=1 +EXCLUDED_ARCHS[sdk=iphonesimulator*]=i386 +EXCLUDED_ARCHS[sdk=iphoneos*]=armv7 +DART_OBFUSCATION=false +TRACK_WIDGET_CREATION=true +TREE_SHAKE_ICONS=false +PACKAGE_CONFIG=.dart_tool/package_config.json diff --git a/client/ios/Flutter/flutter_export_environment.sh b/client/ios/Flutter/flutter_export_environment.sh new file mode 100755 index 0000000..4717e64 --- /dev/null +++ b/client/ios/Flutter/flutter_export_environment.sh @@ -0,0 +1,13 @@ +#!/bin/sh +# This is a generated file; do not edit or check into version control. +export "FLUTTER_ROOT=/opt/flutter" +export "FLUTTER_APPLICATION_PATH=/root/JustAMessenger/client" +export "COCOAPODS_PARALLEL_CODE_SIGN=true" +export "FLUTTER_TARGET=lib/main.dart" +export "FLUTTER_BUILD_DIR=build" +export "FLUTTER_BUILD_NAME=1.0.0" +export "FLUTTER_BUILD_NUMBER=1" +export "DART_OBFUSCATION=false" +export "TRACK_WIDGET_CREATION=true" +export "TREE_SHAKE_ICONS=false" +export "PACKAGE_CONFIG=.dart_tool/package_config.json" diff --git a/client/ios/Runner/GeneratedPluginRegistrant.h b/client/ios/Runner/GeneratedPluginRegistrant.h new file mode 100644 index 0000000..7a89092 --- /dev/null +++ b/client/ios/Runner/GeneratedPluginRegistrant.h @@ -0,0 +1,19 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#ifndef GeneratedPluginRegistrant_h +#define GeneratedPluginRegistrant_h + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface GeneratedPluginRegistrant : NSObject ++ (void)registerWithRegistry:(NSObject*)registry; +@end + +NS_ASSUME_NONNULL_END +#endif /* GeneratedPluginRegistrant_h */ diff --git a/client/ios/Runner/GeneratedPluginRegistrant.m b/client/ios/Runner/GeneratedPluginRegistrant.m new file mode 100644 index 0000000..4260074 --- /dev/null +++ b/client/ios/Runner/GeneratedPluginRegistrant.m @@ -0,0 +1,21 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#import "GeneratedPluginRegistrant.h" + +#if __has_include() +#import +#else +@import shared_preferences_foundation; +#endif + +@implementation GeneratedPluginRegistrant + ++ (void)registerWithRegistry:(NSObject*)registry { + [SharedPreferencesPlugin registerWithRegistrar:[registry registrarForPlugin:@"SharedPreferencesPlugin"]]; +} + +@end diff --git a/client/lib/screens/chat_screen.dart b/client/lib/screens/chat_screen.dart index fdee05d..9c82c50 100644 --- a/client/lib/screens/chat_screen.dart +++ b/client/lib/screens/chat_screen.dart @@ -8,7 +8,6 @@ import '../services/api_service.dart'; import '../services/theme_service.dart'; import '../models/message.dart'; import '../models/channel.dart'; -import '../models/guild.dart'; import '../widgets/message_bubble.dart'; import '../widgets/chat_input.dart'; @@ -28,7 +27,6 @@ class _ChatScreenState extends State { bool _atBottom = true; late Channel _channel; - late Guild _guild; @override void didChangeDependencies() { @@ -36,7 +34,6 @@ class _ChatScreenState extends State { final args = ModalRoute.of(context)?.settings.arguments as Map?; if (args != null) { _channel = args['channel'] as Channel; - _guild = args['guild'] as Guild; } } @@ -201,7 +198,7 @@ class _ChatScreenState extends State { Icon( _channel.isText ? Icons.tag : Icons.volume_up, size: 48, - color: ThemeService.textMuted.withValues(alpha: 0.5), + color: ThemeService.textMuted.withOpacity(0.5), ), const SizedBox(height: 12), Text( @@ -226,7 +223,7 @@ class _ChatScreenState extends State { Text( 'No messages yet. Start the conversation!', style: TextStyle( - color: ThemeService.textMuted.withValues(alpha: 0.8), + color: ThemeService.textMuted.withOpacity(0.8), fontSize: 14, ), ), diff --git a/client/lib/screens/home_screen.dart b/client/lib/screens/home_screen.dart index 11a70e1..c8902a1 100644 --- a/client/lib/screens/home_screen.dart +++ b/client/lib/screens/home_screen.dart @@ -207,7 +207,7 @@ class _HomeScreenState extends State { color: ThemeService.surfacePrimary, borderRadius: BorderRadius.circular(24), border: Border.all( - color: ThemeService.success.withValues(alpha: 0.5), + color: ThemeService.success.withOpacity(0.5), width: 2, ), ), diff --git a/client/lib/screens/login_screen.dart b/client/lib/screens/login_screen.dart index d126452..ee7b869 100644 --- a/client/lib/screens/login_screen.dart +++ b/client/lib/screens/login_screen.dart @@ -120,10 +120,10 @@ class _LoginScreenState extends State { Container( padding: const EdgeInsets.all(12), decoration: BoxDecoration( - color: ThemeService.danger.withValues(alpha: 0.1), + color: ThemeService.danger.withOpacity(0.1), borderRadius: BorderRadius.circular(8), border: Border.all( - color: ThemeService.danger.withValues(alpha: 0.3)), + color: ThemeService.danger.withOpacity(0.3)), ), child: Row( children: [ diff --git a/client/lib/screens/splash_screen.dart b/client/lib/screens/splash_screen.dart index 394b707..107fc45 100644 --- a/client/lib/screens/splash_screen.dart +++ b/client/lib/screens/splash_screen.dart @@ -62,7 +62,7 @@ class _SplashScreenState extends State borderRadius: BorderRadius.circular(24), boxShadow: [ BoxShadow( - color: ThemeService.primary.withValues(alpha: 0.4), + color: ThemeService.primary.withOpacity(0.4), blurRadius: 30, spreadRadius: 5, ), @@ -94,7 +94,7 @@ class _SplashScreenState extends State Text( 'Lightweight · Decentralized · Secure', style: TextStyle( - color: ThemeService.textSecondary.withValues(alpha: 0.7), + color: ThemeService.textSecondary.withOpacity(0.7), fontSize: 14, letterSpacing: 0.5, ), diff --git a/client/lib/services/connection_service.dart b/client/lib/services/connection_service.dart index fdb023f..3ca15a9 100644 --- a/client/lib/services/connection_service.dart +++ b/client/lib/services/connection_service.dart @@ -1,9 +1,7 @@ import 'dart:async'; import 'dart:convert'; -import 'dart:typed_data'; import 'package:flutter/foundation.dart'; import 'package:web_socket_channel/web_socket_channel.dart'; -import '../models/message.dart'; enum ConnectionState { disconnected, connecting, connected } diff --git a/client/lib/services/crypto_service.dart b/client/lib/services/crypto_service.dart index 294e8be..2a1cad2 100644 --- a/client/lib/services/crypto_service.dart +++ b/client/lib/services/crypto_service.dart @@ -2,7 +2,7 @@ import 'dart:convert'; import 'dart:math'; import 'dart:typed_data'; import 'package:crypto/crypto.dart'; -import 'package:pointycastle/export.dart' as pc; + class CryptoService { static const int keySize = 32; @@ -28,20 +28,40 @@ class CryptoService { } Uint8List deriveKey(String password, Uint8List salt) { - final key = pbkdf2( - hash: sha256, - password: utf8.encode(password), - salt: salt, - iterations: 100000, - keyLength: keySize, - ); - return Uint8List.fromList(key); + return _pbkdf2(sha256, utf8.encode(password), salt, 100000, keySize); + } + + static Uint8List _pbkdf2(Hash hash, List password, List salt, int iterations, int keyLength) { + const hLen = 32; + final blocks = (keyLength + hLen - 1) ~/ hLen; + final result = Uint8List(keyLength); + + for (int block = 1; block <= blocks; block++) { + final blockBytes = ByteData(4)..setUint32(0, block, Endian.big); + final blockSalt = Uint8List.fromList([...salt, ...blockBytes.buffer.asUint8List()]); + final prf = Hmac(hash, password); + var u = prf.convert(blockSalt).bytes; + var t = Uint8List.fromList(u); + + for (int i = 1; i < iterations; i++) { + u = prf.convert(u).bytes; + for (int j = 0; j < hLen; j++) { + t[j] ^= u[j]; + } + } + + final offset = (block - 1) * hLen; + final length = min(hLen, keyLength - offset); + result.setRange(offset, offset + length, t.sublist(0, length)); + } + + return result; } Uint8List encrypt(Uint8List plaintext, Uint8List key) { - final nonce = generateNonce(); final hmac = Hmac(sha256, key); final mac = hmac.convert(plaintext).bytes; + final nonce = generateNonce(); final result = Uint8List(nonce.length + mac.length + plaintext.length); result.setAll(0, nonce); @@ -54,7 +74,6 @@ class CryptoService { Uint8List? decrypt(Uint8List ciphertext, Uint8List key) { try { if (ciphertext.length < nonceSize + 32) return null; - final nonce = ciphertext.sublist(0, nonceSize); final mac = ciphertext.sublist(nonceSize, nonceSize + 32); final plaintext = ciphertext.sublist(nonceSize + 32); diff --git a/client/lib/widgets/message_bubble.dart b/client/lib/widgets/message_bubble.dart index 25e1a92..e38d849 100644 --- a/client/lib/widgets/message_bubble.dart +++ b/client/lib/widgets/message_bubble.dart @@ -39,7 +39,7 @@ class MessageBubble extends StatelessWidget { width: 32, height: 32, decoration: BoxDecoration( - color: ThemeService.primary.withValues(alpha: 0.8), + color: ThemeService.primary.withOpacity(0.8), borderRadius: BorderRadius.circular(16), ), child: Center( @@ -88,7 +88,7 @@ class MessageBubble extends StatelessWidget { borderRadius: BorderRadius.circular(4), border: Border( left: BorderSide( - color: ThemeService.primary.withValues(alpha: 0.5), + color: ThemeService.primary.withOpacity(0.5), width: 3, ), ), @@ -154,7 +154,7 @@ class MessageBubble extends StatelessWidget { width: 120, height: 4, decoration: BoxDecoration( - color: ThemeService.textMuted.withValues(alpha: 0.3), + color: ThemeService.textMuted.withOpacity(0.3), borderRadius: BorderRadius.circular(2), ), ), diff --git a/client/linux/.gitignore b/client/linux/.gitignore new file mode 100644 index 0000000..d3896c9 --- /dev/null +++ b/client/linux/.gitignore @@ -0,0 +1 @@ +flutter/ephemeral diff --git a/client/linux/CMakeLists.txt b/client/linux/CMakeLists.txt new file mode 100644 index 0000000..caa0cd6 --- /dev/null +++ b/client/linux/CMakeLists.txt @@ -0,0 +1,145 @@ +# Project-level configuration. +cmake_minimum_required(VERSION 3.10) +project(runner LANGUAGES CXX) + +# The name of the executable created for the application. Change this to change +# the on-disk name of your application. +set(BINARY_NAME "jam_client") +# The unique GTK application identifier for this application. See: +# https://wiki.gnome.org/HowDoI/ChooseApplicationID +set(APPLICATION_ID "com.jam.jam_client") + +# Explicitly opt in to modern CMake behaviors to avoid warnings with recent +# versions of CMake. +cmake_policy(SET CMP0063 NEW) + +# Load bundled libraries from the lib/ directory relative to the binary. +set(CMAKE_INSTALL_RPATH "$ORIGIN/lib") + +# Root filesystem for cross-building. +if(FLUTTER_TARGET_PLATFORM_SYSROOT) + set(CMAKE_SYSROOT ${FLUTTER_TARGET_PLATFORM_SYSROOT}) + set(CMAKE_FIND_ROOT_PATH ${CMAKE_SYSROOT}) + set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) + set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) + set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) + set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) +endif() + +# Define build configuration options. +if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + set(CMAKE_BUILD_TYPE "Debug" CACHE + STRING "Flutter build mode" FORCE) + set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS + "Debug" "Profile" "Release") +endif() + +# Compilation settings that should be applied to most targets. +# +# Be cautious about adding new options here, as plugins use this function by +# default. In most cases, you should add new options to specific targets instead +# of modifying this function. +function(APPLY_STANDARD_SETTINGS TARGET) + target_compile_features(${TARGET} PUBLIC cxx_std_14) + target_compile_options(${TARGET} PRIVATE -Wall -Werror) + target_compile_options(${TARGET} PRIVATE "$<$>:-O3>") + target_compile_definitions(${TARGET} PRIVATE "$<$>:NDEBUG>") +endfunction() + +# Flutter library and tool build rules. +set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter") +add_subdirectory(${FLUTTER_MANAGED_DIR}) + +# System-level dependencies. +find_package(PkgConfig REQUIRED) +pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) + +add_definitions(-DAPPLICATION_ID="${APPLICATION_ID}") + +# Define the application target. To change its name, change BINARY_NAME above, +# not the value here, or `flutter run` will no longer work. +# +# Any new source files that you add to the application should be added here. +add_executable(${BINARY_NAME} + "main.cc" + "my_application.cc" + "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc" +) + +# Apply the standard set of build settings. This can be removed for applications +# that need different build settings. +apply_standard_settings(${BINARY_NAME}) + +# Add dependency libraries. Add any application-specific dependencies here. +target_link_libraries(${BINARY_NAME} PRIVATE flutter) +target_link_libraries(${BINARY_NAME} PRIVATE PkgConfig::GTK) + +# Run the Flutter tool portions of the build. This must not be removed. +add_dependencies(${BINARY_NAME} flutter_assemble) + +# Only the install-generated bundle's copy of the executable will launch +# correctly, since the resources must in the right relative locations. To avoid +# people trying to run the unbundled copy, put it in a subdirectory instead of +# the default top-level location. +set_target_properties(${BINARY_NAME} + PROPERTIES + RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/intermediates_do_not_run" +) + + +# Generated plugin build rules, which manage building the plugins and adding +# them to the application. +include(flutter/generated_plugins.cmake) + + +# === Installation === +# By default, "installing" just makes a relocatable bundle in the build +# directory. +set(BUILD_BUNDLE_DIR "${PROJECT_BINARY_DIR}/bundle") +if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE) +endif() + +# Start with a clean build bundle directory every time. +install(CODE " + file(REMOVE_RECURSE \"${BUILD_BUNDLE_DIR}/\") + " COMPONENT Runtime) + +set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data") +set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib") + +install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +foreach(bundled_library ${PLUGIN_BUNDLED_LIBRARIES}) + install(FILES "${bundled_library}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endforeach(bundled_library) + +# Copy the native assets provided by the build.dart from all packages. +set(NATIVE_ASSETS_DIR "${PROJECT_BUILD_DIR}native_assets/linux/") +install(DIRECTORY "${NATIVE_ASSETS_DIR}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +# Fully re-copy the assets directory on each build to avoid having stale files +# from a previous install. +set(FLUTTER_ASSET_DIR_NAME "flutter_assets") +install(CODE " + file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\") + " COMPONENT Runtime) +install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}" + DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime) + +# Install the AOT library on non-Debug builds only. +if(NOT CMAKE_BUILD_TYPE MATCHES "Debug") + install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endif() diff --git a/client/linux/flutter/CMakeLists.txt b/client/linux/flutter/CMakeLists.txt new file mode 100644 index 0000000..d5bd016 --- /dev/null +++ b/client/linux/flutter/CMakeLists.txt @@ -0,0 +1,88 @@ +# This file controls Flutter-level build steps. It should not be edited. +cmake_minimum_required(VERSION 3.10) + +set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral") + +# Configuration provided via flutter tool. +include(${EPHEMERAL_DIR}/generated_config.cmake) + +# TODO: Move the rest of this into files in ephemeral. See +# https://github.com/flutter/flutter/issues/57146. + +# Serves the same purpose as list(TRANSFORM ... PREPEND ...), +# which isn't available in 3.10. +function(list_prepend LIST_NAME PREFIX) + set(NEW_LIST "") + foreach(element ${${LIST_NAME}}) + list(APPEND NEW_LIST "${PREFIX}${element}") + endforeach(element) + set(${LIST_NAME} "${NEW_LIST}" PARENT_SCOPE) +endfunction() + +# === Flutter Library === +# System-level dependencies. +find_package(PkgConfig REQUIRED) +pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) +pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0) +pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0) + +set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/libflutter_linux_gtk.so") + +# Published to parent scope for install step. +set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE) +set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE) +set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE) +set(AOT_LIBRARY "${PROJECT_DIR}/build/lib/libapp.so" PARENT_SCOPE) + +list(APPEND FLUTTER_LIBRARY_HEADERS + "fl_basic_message_channel.h" + "fl_binary_codec.h" + "fl_binary_messenger.h" + "fl_dart_project.h" + "fl_engine.h" + "fl_json_message_codec.h" + "fl_json_method_codec.h" + "fl_message_codec.h" + "fl_method_call.h" + "fl_method_channel.h" + "fl_method_codec.h" + "fl_method_response.h" + "fl_plugin_registrar.h" + "fl_plugin_registry.h" + "fl_standard_message_codec.h" + "fl_standard_method_codec.h" + "fl_string_codec.h" + "fl_value.h" + "fl_view.h" + "flutter_linux.h" +) +list_prepend(FLUTTER_LIBRARY_HEADERS "${EPHEMERAL_DIR}/flutter_linux/") +add_library(flutter INTERFACE) +target_include_directories(flutter INTERFACE + "${EPHEMERAL_DIR}" +) +target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}") +target_link_libraries(flutter INTERFACE + PkgConfig::GTK + PkgConfig::GLIB + PkgConfig::GIO +) +add_dependencies(flutter flutter_assemble) + +# === Flutter tool backend === +# _phony_ is a non-existent file to force this command to run every time, +# since currently there's no way to get a full input/output list from the +# flutter tool. +add_custom_command( + OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS} + ${CMAKE_CURRENT_BINARY_DIR}/_phony_ + COMMAND ${CMAKE_COMMAND} -E env + ${FLUTTER_TOOL_ENVIRONMENT} + "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.sh" + ${FLUTTER_TARGET_PLATFORM} ${CMAKE_BUILD_TYPE} + VERBATIM +) +add_custom_target(flutter_assemble DEPENDS + "${FLUTTER_LIBRARY}" + ${FLUTTER_LIBRARY_HEADERS} +) diff --git a/client/linux/flutter/generated_plugin_registrant.cc b/client/linux/flutter/generated_plugin_registrant.cc new file mode 100644 index 0000000..e71a16d --- /dev/null +++ b/client/linux/flutter/generated_plugin_registrant.cc @@ -0,0 +1,11 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#include "generated_plugin_registrant.h" + + +void fl_register_plugins(FlPluginRegistry* registry) { +} diff --git a/client/linux/flutter/generated_plugin_registrant.h b/client/linux/flutter/generated_plugin_registrant.h new file mode 100644 index 0000000..e0f0a47 --- /dev/null +++ b/client/linux/flutter/generated_plugin_registrant.h @@ -0,0 +1,15 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#ifndef GENERATED_PLUGIN_REGISTRANT_ +#define GENERATED_PLUGIN_REGISTRANT_ + +#include + +// Registers Flutter plugins. +void fl_register_plugins(FlPluginRegistry* registry); + +#endif // GENERATED_PLUGIN_REGISTRANT_ diff --git a/client/linux/flutter/generated_plugins.cmake b/client/linux/flutter/generated_plugins.cmake new file mode 100644 index 0000000..2e1de87 --- /dev/null +++ b/client/linux/flutter/generated_plugins.cmake @@ -0,0 +1,23 @@ +# +# Generated file, do not edit. +# + +list(APPEND FLUTTER_PLUGIN_LIST +) + +list(APPEND FLUTTER_FFI_PLUGIN_LIST +) + +set(PLUGIN_BUNDLED_LIBRARIES) + +foreach(plugin ${FLUTTER_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/linux plugins/${plugin}) + target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin) + list(APPEND PLUGIN_BUNDLED_LIBRARIES $) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) +endforeach(plugin) + +foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/linux plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach(ffi_plugin) diff --git a/client/linux/main.cc b/client/linux/main.cc new file mode 100644 index 0000000..e7c5c54 --- /dev/null +++ b/client/linux/main.cc @@ -0,0 +1,6 @@ +#include "my_application.h" + +int main(int argc, char** argv) { + g_autoptr(MyApplication) app = my_application_new(); + return g_application_run(G_APPLICATION(app), argc, argv); +} diff --git a/client/linux/my_application.cc b/client/linux/my_application.cc new file mode 100644 index 0000000..313820f --- /dev/null +++ b/client/linux/my_application.cc @@ -0,0 +1,124 @@ +#include "my_application.h" + +#include +#ifdef GDK_WINDOWING_X11 +#include +#endif + +#include "flutter/generated_plugin_registrant.h" + +struct _MyApplication { + GtkApplication parent_instance; + char** dart_entrypoint_arguments; +}; + +G_DEFINE_TYPE(MyApplication, my_application, GTK_TYPE_APPLICATION) + +// Implements GApplication::activate. +static void my_application_activate(GApplication* application) { + MyApplication* self = MY_APPLICATION(application); + GtkWindow* window = + GTK_WINDOW(gtk_application_window_new(GTK_APPLICATION(application))); + + // Use a header bar when running in GNOME as this is the common style used + // by applications and is the setup most users will be using (e.g. Ubuntu + // desktop). + // If running on X and not using GNOME then just use a traditional title bar + // in case the window manager does more exotic layout, e.g. tiling. + // If running on Wayland assume the header bar will work (may need changing + // if future cases occur). + gboolean use_header_bar = TRUE; +#ifdef GDK_WINDOWING_X11 + GdkScreen* screen = gtk_window_get_screen(window); + if (GDK_IS_X11_SCREEN(screen)) { + const gchar* wm_name = gdk_x11_screen_get_window_manager_name(screen); + if (g_strcmp0(wm_name, "GNOME Shell") != 0) { + use_header_bar = FALSE; + } + } +#endif + if (use_header_bar) { + GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new()); + gtk_widget_show(GTK_WIDGET(header_bar)); + gtk_header_bar_set_title(header_bar, "jam_client"); + gtk_header_bar_set_show_close_button(header_bar, TRUE); + gtk_window_set_titlebar(window, GTK_WIDGET(header_bar)); + } else { + gtk_window_set_title(window, "jam_client"); + } + + gtk_window_set_default_size(window, 1280, 720); + gtk_widget_show(GTK_WIDGET(window)); + + g_autoptr(FlDartProject) project = fl_dart_project_new(); + fl_dart_project_set_dart_entrypoint_arguments(project, self->dart_entrypoint_arguments); + + FlView* view = fl_view_new(project); + gtk_widget_show(GTK_WIDGET(view)); + gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(view)); + + fl_register_plugins(FL_PLUGIN_REGISTRY(view)); + + gtk_widget_grab_focus(GTK_WIDGET(view)); +} + +// Implements GApplication::local_command_line. +static gboolean my_application_local_command_line(GApplication* application, gchar*** arguments, int* exit_status) { + MyApplication* self = MY_APPLICATION(application); + // Strip out the first argument as it is the binary name. + self->dart_entrypoint_arguments = g_strdupv(*arguments + 1); + + g_autoptr(GError) error = nullptr; + if (!g_application_register(application, nullptr, &error)) { + g_warning("Failed to register: %s", error->message); + *exit_status = 1; + return TRUE; + } + + g_application_activate(application); + *exit_status = 0; + + return TRUE; +} + +// Implements GApplication::startup. +static void my_application_startup(GApplication* application) { + //MyApplication* self = MY_APPLICATION(object); + + // Perform any actions required at application startup. + + G_APPLICATION_CLASS(my_application_parent_class)->startup(application); +} + +// Implements GApplication::shutdown. +static void my_application_shutdown(GApplication* application) { + //MyApplication* self = MY_APPLICATION(object); + + // Perform any actions required at application shutdown. + + G_APPLICATION_CLASS(my_application_parent_class)->shutdown(application); +} + +// Implements GObject::dispose. +static void my_application_dispose(GObject* object) { + MyApplication* self = MY_APPLICATION(object); + g_clear_pointer(&self->dart_entrypoint_arguments, g_strfreev); + G_OBJECT_CLASS(my_application_parent_class)->dispose(object); +} + +static void my_application_class_init(MyApplicationClass* klass) { + G_APPLICATION_CLASS(klass)->activate = my_application_activate; + G_APPLICATION_CLASS(klass)->local_command_line = my_application_local_command_line; + G_APPLICATION_CLASS(klass)->startup = my_application_startup; + G_APPLICATION_CLASS(klass)->shutdown = my_application_shutdown; + G_OBJECT_CLASS(klass)->dispose = my_application_dispose; +} + +static void my_application_init(MyApplication* self) {} + +MyApplication* my_application_new() { + return MY_APPLICATION(g_object_new(my_application_get_type(), + "application-id", APPLICATION_ID, + "flags", G_APPLICATION_NON_UNIQUE, + nullptr)); +} diff --git a/client/linux/my_application.h b/client/linux/my_application.h new file mode 100644 index 0000000..72271d5 --- /dev/null +++ b/client/linux/my_application.h @@ -0,0 +1,18 @@ +#ifndef FLUTTER_MY_APPLICATION_H_ +#define FLUTTER_MY_APPLICATION_H_ + +#include + +G_DECLARE_FINAL_TYPE(MyApplication, my_application, MY, APPLICATION, + GtkApplication) + +/** + * my_application_new: + * + * Creates a new Flutter-based application. + * + * Returns: a new #MyApplication. + */ +MyApplication* my_application_new(); + +#endif // FLUTTER_MY_APPLICATION_H_ diff --git a/client/pubspec.yaml b/client/pubspec.yaml index 6d0749c..9df6551 100644 --- a/client/pubspec.yaml +++ b/client/pubspec.yaml @@ -1,10 +1,10 @@ name: jam_client description: JustAMessenger - Lightweight Decentralized Messenger publish_to: 'none' -version: 0.1.0+1 +version: 1.0.0+1 environment: - sdk: '>=3.2.0 <4.0.0' + sdk: ^3.5.4 dependencies: flutter: @@ -15,31 +15,15 @@ dependencies: web_socket_channel: ^3.0.1 provider: ^6.1.2 shared_preferences: ^2.3.3 - file_picker: ^8.1.6 - image_picker: ^1.1.2 - permission_handler: ^11.3.1 crypto: ^3.0.6 - path_provider: ^2.1.4 - sqflite: ^2.4.0 - intl: ^0.19.0 - audioplayers: ^6.1.0 - record: ^5.2.0 - video_player: ^2.9.2 - flutter_svg: ^2.0.17 - cached_network_image: ^3.4.1 - photo_view: ^0.15.0 - emoji_picker_flutter: ^4.3.2 - flutter_webrtc: ^0.11.7 + http: ^1.2.2 + http_parser: ^4.0.2 mime: ^2.0.0 - http_parser: ^4.1.0 dev_dependencies: flutter_test: sdk: flutter - flutter_lints: ^5.0.0 + flutter_lints: ^4.0.0 flutter: uses-material-design: true - assets: - - assets/icons/ - - assets/stickers/ diff --git a/client/test/widget_test.dart b/client/test/widget_test.dart new file mode 100644 index 0000000..7d910bb --- /dev/null +++ b/client/test/widget_test.dart @@ -0,0 +1,8 @@ +import 'package:flutter_test/flutter_test.dart'; + +void main() { + testWidgets('App smoke test', (WidgetTester tester) async { + // Placeholder test + expect(true, isTrue); + }); +} diff --git a/client/web/favicon.png b/client/web/favicon.png new file mode 100644 index 0000000..8aaa46a Binary files /dev/null and b/client/web/favicon.png differ diff --git a/client/web/icons/Icon-192.png b/client/web/icons/Icon-192.png new file mode 100644 index 0000000..b749bfe Binary files /dev/null and b/client/web/icons/Icon-192.png differ diff --git a/client/web/icons/Icon-512.png b/client/web/icons/Icon-512.png new file mode 100644 index 0000000..88cfd48 Binary files /dev/null and b/client/web/icons/Icon-512.png differ diff --git a/client/web/icons/Icon-maskable-192.png b/client/web/icons/Icon-maskable-192.png new file mode 100644 index 0000000..eb9b4d7 Binary files /dev/null and b/client/web/icons/Icon-maskable-192.png differ diff --git a/client/web/icons/Icon-maskable-512.png b/client/web/icons/Icon-maskable-512.png new file mode 100644 index 0000000..d69c566 Binary files /dev/null and b/client/web/icons/Icon-maskable-512.png differ diff --git a/client/web/index.html b/client/web/index.html index 064f628..9bcce95 100644 --- a/client/web/index.html +++ b/client/web/index.html @@ -1,62 +1,38 @@ - + + + + - - JustAMessenger + + + + + + + + + + + + + jam_client - - -
- - -
JustAMessenger
-
v0.1.0
-
- - + diff --git a/client/web/manifest.json b/client/web/manifest.json index 3702f0d..4bc0aed 100644 --- a/client/web/manifest.json +++ b/client/web/manifest.json @@ -1,21 +1,35 @@ { - "name": "JustAMessenger", - "short_name": "JAM", - "start_url": ".", - "display": "standalone", - "background_color": "#313338", - "theme_color": "#5865F2", - "description": "Lightweight Decentralized Messenger", - "icons": [ - { - "src": "icons/Icon-192.png", - "sizes": "192x192", - "type": "image/png" - }, - { - "src": "icons/Icon-512.png", - "sizes": "512x512", - "type": "image/png" - } - ] + "name": "jam_client", + "short_name": "jam_client", + "start_url": ".", + "display": "standalone", + "background_color": "#0175C2", + "theme_color": "#0175C2", + "description": "A new Flutter project.", + "orientation": "portrait-primary", + "prefer_related_applications": false, + "icons": [ + { + "src": "icons/Icon-192.png", + "sizes": "192x192", + "type": "image/png" + }, + { + "src": "icons/Icon-512.png", + "sizes": "512x512", + "type": "image/png" + }, + { + "src": "icons/Icon-maskable-192.png", + "sizes": "192x192", + "type": "image/png", + "purpose": "maskable" + }, + { + "src": "icons/Icon-maskable-512.png", + "sizes": "512x512", + "type": "image/png", + "purpose": "maskable" + } + ] } diff --git a/server/config.yaml b/server/config.yaml index a7a86b5..b930481 100644 --- a/server/config.yaml +++ b/server/config.yaml @@ -1,6 +1,6 @@ server_name: "JustAMessenger" -listen_addr: ":8443" -domain: "localhost" +listen_addr: ":7335" +domain: "m.zernmc.ru" data_dir: "./data" max_file_size: 2147483648 federation: false