diff --git a/README.md b/README.md index 3cb70b2..c7fe312 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Friendica Portal +# Relatica A Flutter application for interfacing with the Friendica social network. diff --git a/android/app/build.gradle b/android/app/build.gradle index 232ec3b..87a6244 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -44,7 +44,7 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId "social.myportal.flutter_portal" + applicationId "social.myportal.relatica" // You can update the following values to match your application needs. // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration. minSdkVersion 21 diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml index 5c9e0d1..ef65b33 100644 --- a/android/app/src/debug/AndroidManifest.xml +++ b/android/app/src/debug/AndroidManifest.xml @@ -1,9 +1,9 @@ + package="social.myportal.relatica"> - + diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 831fd53..1595b5c 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,42 +1,42 @@ + package="social.myportal.relatica"> + android:label="relatica" + android:name="${applicationName}" + android:icon="@mipmap/ic_launcher"> + android:name=".MainActivity" + android:exported="true" + android:launchMode="singleTop" + android:theme="@style/LaunchTheme" + android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" + android:hardwareAccelerated="true" + android:windowSoftInputMode="adjustResize"> + android:name="io.flutter.embedding.android.NormalTheme" + android:resource="@style/NormalTheme"/> - - + + + android:name="flutterEmbedding" + android:value="2"/> - - + + - + diff --git a/android/app/src/main/kotlin/social/myportal/flutter_portal/MainActivity.kt b/android/app/src/main/kotlin/social/myportal/flutter_portal/MainActivity.kt index 2668210..cdd39e2 100644 --- a/android/app/src/main/kotlin/social/myportal/flutter_portal/MainActivity.kt +++ b/android/app/src/main/kotlin/social/myportal/flutter_portal/MainActivity.kt @@ -1,6 +1,6 @@ -package social.myportal.flutter_portal +package social.myportal.relatica import io.flutter.embedding.android.FlutterActivity -class MainActivity: FlutterActivity() { +class MainActivity : FlutterActivity() { } diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml index 5c9e0d1..ef65b33 100644 --- a/android/app/src/profile/AndroidManifest.xml +++ b/android/app/src/profile/AndroidManifest.xml @@ -1,9 +1,9 @@ + package="social.myportal.relatica"> - + diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index 00d108b..9d04f67 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -13,7 +13,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - flutter_portal + relatica CFBundlePackageType APPL CFBundleShortVersionString diff --git a/lib/data/objectbox/objectbox_cache.dart b/lib/data/objectbox/objectbox_cache.dart index 29cc714..18724c2 100644 --- a/lib/data/objectbox/objectbox_cache.dart +++ b/lib/data/objectbox/objectbox_cache.dart @@ -16,8 +16,8 @@ class ObjectBoxCache { final path = p.join(docsDir.path, 'objectboxcache'); _logger.info('ObjectBoxCache path: $path'); - final store = await openStore( - directory: path, macosApplicationGroup: 'friendica_portal'); + final store = + await openStore(directory: path, macosApplicationGroup: 'relatica'); return ObjectBoxCache._create(store); } } diff --git a/lib/screens/menus_screen.dart b/lib/screens/menus_screen.dart index 51771a9..0c004e7 100644 --- a/lib/screens/menus_screen.dart +++ b/lib/screens/menus_screen.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; -import 'package:friendica_portal/globals.dart'; -import 'package:friendica_portal/services/auth_service.dart'; import 'package:go_router/go_router.dart'; import '../controls/app_bottom_nav_bar.dart'; +import '../globals.dart'; import '../routes.dart'; +import '../services/auth_service.dart'; class MenusScreen extends StatelessWidget { static const menuButtonWidth = 350.0; diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt index 65d6a0e..39d62c7 100644 --- a/linux/CMakeLists.txt +++ b/linux/CMakeLists.txt @@ -4,10 +4,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 "flutter_portal") +set(BINARY_NAME "relatica") # The unique GTK application identifier for this application. See: # https://wiki.gnome.org/HowDoI/ChooseApplicationID -set(APPLICATION_ID "social.myportal.flutter_portal") +set(APPLICATION_ID "social.myportal.relatica") # Explicitly opt in to modern CMake behaviors to avoid warnings with recent # versions of CMake. diff --git a/linux/my_application.cc b/linux/my_application.cc index 9dc4376..37fa66c 100644 --- a/linux/my_application.cc +++ b/linux/my_application.cc @@ -40,11 +40,11 @@ static void my_application_activate(GApplication* application) { 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, "flutter_portal"); + gtk_header_bar_set_title(header_bar, "relatica"); 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, "flutter_portal"); + gtk_window_set_title(window, "relatica"); } gtk_window_set_default_size(window, 1280, 720); diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj index d86eb09..3357a3a 100644 --- a/macos/Runner.xcodeproj/project.pbxproj +++ b/macos/Runner.xcodeproj/project.pbxproj @@ -55,7 +55,7 @@ /* Begin PBXFileReference section */ 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = ""; }; - 33CC10ED2044A3C60003C045 /* flutter_portal.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = flutter_portal.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 33CC10ED2044A3C60003C045 /* relatica.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = relatica.app; sourceTree = BUILT_PRODUCTS_DIR; }; 33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = ""; }; 33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = ""; }; @@ -113,7 +113,7 @@ 33CC10EE2044A3C60003C045 /* Products */ = { isa = PBXGroup; children = ( - 33CC10ED2044A3C60003C045 /* flutter_portal.app */, + 33CC10ED2044A3C60003C045 /* relatica.app */, ); name = Products; sourceTree = ""; @@ -194,7 +194,7 @@ ); name = Runner; productName = Runner; - productReference = 33CC10ED2044A3C60003C045 /* flutter_portal.app */; + productReference = 33CC10ED2044A3C60003C045 /* relatica.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ diff --git a/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index fc31481..9ebec5d 100644 --- a/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -15,7 +15,7 @@ @@ -31,7 +31,7 @@ @@ -54,7 +54,7 @@ @@ -71,7 +71,7 @@ diff --git a/macos/Runner/Configs/AppInfo.xcconfig b/macos/Runner/Configs/AppInfo.xcconfig index 8ef56ab..3b785cb 100644 --- a/macos/Runner/Configs/AppInfo.xcconfig +++ b/macos/Runner/Configs/AppInfo.xcconfig @@ -5,10 +5,10 @@ // 'flutter create' template. // The application's name. By default this is also the title of the Flutter window. -PRODUCT_NAME = flutter_portal +PRODUCT_NAME = Relatica // The application's bundle identifier -PRODUCT_BUNDLE_IDENTIFIER = social.myportal.flutterPortal +PRODUCT_BUNDLE_IDENTIFIER = social.myportal.relatica // The copyright displayed in application information -PRODUCT_COPYRIGHT = Copyright © 2022 social.myportal. All rights reserved. +PRODUCT_COPYRIGHT = Copyright © 2022 My Social Portal. All rights reserved. diff --git a/macos/Runner/Release.entitlements b/macos/Runner/Release.entitlements index ef5d0fe..ce7e232 100644 --- a/macos/Runner/Release.entitlements +++ b/macos/Runner/Release.entitlements @@ -10,7 +10,7 @@ com.apple.security.application-groups - friendica_portal + relatica diff --git a/macos/Runner/RunnerDebug.entitlements b/macos/Runner/RunnerDebug.entitlements index 2a0b6a2..97c7adb 100644 --- a/macos/Runner/RunnerDebug.entitlements +++ b/macos/Runner/RunnerDebug.entitlements @@ -14,7 +14,7 @@ com.apple.security.application-groups - friendica_portal + relatica diff --git a/pubspec.yaml b/pubspec.yaml index 05b221d..43ee0ea 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,5 +1,5 @@ -name: friendica_portal -description: Friendica Social Network Application +name: relatica +description: A mobile and desktop client for interacting with the Friendica social network publish_to: 'none' # Remove this line if you wish to publish to pub.dev version: 1.0.0+1 diff --git a/test/flattened_tree_item_test.dart b/test/flattened_tree_item_test.dart index 498d235..3234472 100644 --- a/test/flattened_tree_item_test.dart +++ b/test/flattened_tree_item_test.dart @@ -1,8 +1,8 @@ import 'package:flutter_test/flutter_test.dart'; -import 'package:friendica_portal/globals.dart'; -import 'package:friendica_portal/models/entry_tree_item.dart'; -import 'package:friendica_portal/models/timeline_entry.dart'; -import 'package:friendica_portal/utils/entry_tree_item_flattening.dart'; +import 'package:relatica/globals.dart'; +import 'package:relatica/models/entry_tree_item.dart'; +import 'package:relatica/models/timeline_entry.dart'; +import 'package:relatica/utils/entry_tree_item_flattening.dart'; void main() { group('Flattening Tests', () { diff --git a/web/index.html b/web/index.html index 962484e..e4c5119 100644 --- a/web/index.html +++ b/web/index.html @@ -1,58 +1,58 @@ - - + This is a placeholder for base href that will be replaced by the value of + the `--base-href` argument provided to `flutter build`. + --> + - - - + + + - - - - - + + + + + - - + + - flutter_portal - + Relatica + - - - + + + - + diff --git a/web/manifest.json b/web/manifest.json index 6574733..485c8dc 100644 --- a/web/manifest.json +++ b/web/manifest.json @@ -1,35 +1,35 @@ { - "name": "flutter_portal", - "short_name": "flutter_portal", - "start_url": ".", - "display": "standalone", - "background_color": "#0175C2", - "theme_color": "#0175C2", - "description": "Friendica Social Network Application", - "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" - } - ] + "name": "relatica", + "short_name": "relatica", + "start_url": ".", + "display": "standalone", + "background_color": "#0175C2", + "theme_color": "#0175C2", + "description": "Friendica Social Network Client", + "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/windows/CMakeLists.txt b/windows/CMakeLists.txt index fe00ff3..2db24f2 100644 --- a/windows/CMakeLists.txt +++ b/windows/CMakeLists.txt @@ -1,10 +1,10 @@ # Project-level configuration. cmake_minimum_required(VERSION 3.14) -project(flutter_portal LANGUAGES CXX) +project(relatica 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 "flutter_portal") +set(BINARY_NAME "relatica") # Explicitly opt in to modern CMake behaviors to avoid warnings with recent # versions of CMake. diff --git a/windows/runner/Runner.rc b/windows/runner/Runner.rc index e884d19..31c7d2f 100644 --- a/windows/runner/Runner.rc +++ b/windows/runner/Runner.rc @@ -89,13 +89,13 @@ BEGIN BEGIN BLOCK "040904e4" BEGIN - VALUE "CompanyName", "social.myportal" "\0" - VALUE "FileDescription", "flutter_portal" "\0" + VALUE "CompanyName", "My Social Portal" "\0" + VALUE "FileDescription", "Relatica" "\0" VALUE "FileVersion", VERSION_AS_STRING "\0" - VALUE "InternalName", "flutter_portal" "\0" - VALUE "LegalCopyright", "Copyright (C) 2022 social.myportal. All rights reserved." "\0" - VALUE "OriginalFilename", "flutter_portal.exe" "\0" - VALUE "ProductName", "flutter_portal" "\0" + VALUE "InternalName", "relatica" "\0" + VALUE "LegalCopyright", "Copyright (C) 2022 My Social Portal. All rights reserved." "\0" + VALUE "OriginalFilename", "relatica.exe" "\0" + VALUE "ProductName", "relatica" "\0" VALUE "ProductVersion", VERSION_AS_STRING "\0" END END diff --git a/windows/runner/main.cpp b/windows/runner/main.cpp index a16398c..d74a22c 100644 --- a/windows/runner/main.cpp +++ b/windows/runner/main.cpp @@ -27,7 +27,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev, FlutterWindow window(project); Win32Window::Point origin(10, 10); Win32Window::Size size(1280, 720); - if (!window.CreateAndShow(L"flutter_portal", origin, size)) { + if (!window.CreateAndShow(L"relatica", origin, size)) { return EXIT_FAILURE; } window.SetQuitOnClose(true);