From d6379a9189c605fdce05e380d94ac46c2cec74a2 Mon Sep 17 00:00:00 2001 From: Inex Code Date: Sat, 13 Jun 2020 22:37:40 +0300 Subject: [PATCH] Fork chores --- Dockerfile | 28 ++++++++++++++++++++ README.md | 21 ++++++--------- android/app/build.gradle | 2 +- lib/components/theme_switcher.dart | 2 ++ lib/l10n/l10n.dart | 4 ++- pubspec.lock | 41 +++++++++++++++++------------- pubspec.yaml | 4 +-- 7 files changed, 66 insertions(+), 36 deletions(-) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..4c65a90 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,28 @@ +FROM ubuntu:18.04 + +ENV ANDROID_HOME="/opt/android-sdk" \ + PATH="/opt/android-sdk/tools/bin:/home/inex/flutter/bin:/home/inex/flutter/bin/cache/dart-sdk/bin:$PATH" \ + PUB_CACHE="/home/inex/.pub-cache" + +RUN apt-get update > /dev/null \ + && apt-get -y install --no-install-recommends curl git lib32stdc++6 openjdk-8-jdk-headless cmake unzip ninja-build usbutils android-tools-adb > /dev/null \ + && apt-get --purge autoremove > /dev/null \ + && apt-get autoclean > /dev/null \ + && rm -rf /var/lib/apt/lists/* + +RUN git clone -b dev https://github.com/flutter/flutter.git /home/inex/flutter + +RUN curl -s -O https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip \ + && mkdir /opt/android-sdk \ + && unzip sdk-tools-linux-4333796.zip -d /opt/android-sdk > /dev/null \ + && rm sdk-tools-linux-4333796.zip + +RUN mkdir ~/.android \ + && echo 'count=0' > ~/.android/repositories.cfg \ + && yes | sdkmanager --licenses > /dev/null \ + && sdkmanager "tools" "build-tools;29.0.0" "platforms;android-29" "platform-tools" "ndk-bundle" \ + && yes | sdkmanager --licenses > /dev/null \ + && flutter doctor -v + # && chown -R root:root /opt + + EXPOSE 41905 \ No newline at end of file diff --git a/README.md b/README.md index 5a29150..08de7c0 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,6 @@ -![](https://i.imgur.com/wi7RlVt.png) +# FurryChat -

- - - - - - -
- Open FluffyChat in the browser - Join the community - Follow me on Mastodon - Translate the website - FAQ - Website -

-
-
+An experimental fork of FluffyChat. # Features * Single and group chats @@ -64,6 +53,12 @@ sudo apt install ninja-build 5. `flutter run` +### Docker + +Don't even ask. + +`docker run -ti --privileged -v /dev/bus/usb:/dev/bus/usb -v ${PWD}:/build -v /home/inex/.pub-cache:/home/inex/.pub-cache -v /home/inex/flutter:/home/inex/flutter -d flutter-fluffy:1.0` + ## How to add translations for your language 1. Replace the non-translated string in the codebase: diff --git a/android/app/build.gradle b/android/app/build.gradle index 2255470..d9dc5de 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -100,4 +100,4 @@ dependencies { androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' } -apply plugin: "com.google.gms.google-services" +//apply plugin: "com.google.gms.google-services" diff --git a/lib/components/theme_switcher.dart b/lib/components/theme_switcher.dart index 4226653..a86c266 100644 --- a/lib/components/theme_switcher.dart +++ b/lib/components/theme_switcher.dart @@ -214,6 +214,8 @@ class ThemeSwitcherWidgetState extends State { break; } + theme = theme.copyWith(accentColor: Colors.amber, primaryColor: Colors.deepOrange); + await saveThemeValue(matrix, newTheme); await saveAmoledEnabledValue(matrix, amoled_enabled); setState(() { diff --git a/lib/l10n/l10n.dart b/lib/l10n/l10n.dart index 24c72f5..1a189ca 100644 --- a/lib/l10n/l10n.dart +++ b/lib/l10n/l10n.dart @@ -336,7 +336,7 @@ class L10n extends MatrixLocalizations { String get fileSize => Intl.message("File size"); - String get fluffychat => Intl.message("FluffyChat"); + String get fluffychat => Intl.message("FurryChat"); String get forward => Intl.message('Forward'); @@ -374,6 +374,8 @@ class L10n extends MatrixLocalizations { String get help => Intl.message("Help"); + String get homeserverOrMXID => Intl.message("Homeserver or MXID"); + String get homeserverIsNotCompatible => Intl.message("Homeserver is not compatible"); diff --git a/pubspec.lock b/pubspec.lock index 550ac2b..cde821b 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -71,6 +71,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.1.3" + clock: + dependency: transitive + description: + name: clock + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.1" collection: dependency: transitive description: @@ -129,14 +136,19 @@ packages: url: "https://github.com/simolus3/moor.git" source: git version: "1.0.0" + fake_async: + dependency: transitive + description: + name: fake_async + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.0" famedlysdk: dependency: "direct main" description: - path: "." - ref: "857775cf37804440717ce797e0ed63fd39066904" - resolved-ref: "857775cf37804440717ce797e0ed63fd39066904" - url: "https://gitlab.com/famedly/famedlysdk.git" - source: git + path: "../famedlysdk" + relative: true + source: path version: "0.0.1" ffi: dependency: transitive @@ -469,7 +481,7 @@ packages: name: package_config url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.9.3" package_resolver: dependency: transitive description: @@ -483,7 +495,7 @@ packages: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.6.4" + version: "1.7.0" path_drawing: dependency: transitive description: @@ -561,13 +573,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.4.2" - quiver: - dependency: transitive - description: - name: quiver - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.3" random_string: dependency: "direct main" description: @@ -628,7 +633,7 @@ packages: name: source_map_stack_trace url: "https://pub.dartlang.org" source: hosted - version: "1.1.5" + version: "2.0.0" source_maps: dependency: transitive description: @@ -705,21 +710,21 @@ packages: name: test url: "https://pub.dartlang.org" source: hosted - version: "1.13.0" + version: "1.14.7" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.2.15" + version: "0.2.16" test_core: dependency: transitive description: name: test_core url: "https://pub.dartlang.org" source: hosted - version: "0.3.1" + version: "0.3.7" typed_data: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 8b4e637..65bcd6b 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -25,9 +25,7 @@ dependencies: cupertino_icons: ^0.1.2 famedlysdk: - git: - url: https://gitlab.com/famedly/famedlysdk.git - ref: 857775cf37804440717ce797e0ed63fd39066904 + path: ../famedlysdk localstorage: ^3.0.1+4 bubble: ^1.1.9+1