From 000bd9a41372df6a49a0e24c5e2a63a6b6e60bac Mon Sep 17 00:00:00 2001 From: Marco Date: Tue, 11 Jun 2024 19:32:25 +0200 Subject: [PATCH] change name from kalodings to calodiary --- README.md | 4 ++-- android/app/build.gradle | 4 ++-- android/app/src/main/AndroidManifest.xml | 2 +- .../com/example/kalodings/MainActivity.kt | 5 ----- ios/Runner.xcodeproj/project.pbxproj | 12 ++++++------ ios/Runner/Info.plist | 4 ++-- lib/enter_food_widget.dart | 4 ++-- lib/food_entry_bloc.dart | 2 +- lib/food_entry_widget.dart | 4 ++-- lib/main.dart | 8 ++++---- lib/perdate_widget.dart | 14 +++++++------- lib/settings.dart | 6 +++--- lib/settings_bloc.dart | 2 +- lib/storage/storage.dart | 2 +- lib/sum_widget.dart | 6 +++--- linux/CMakeLists.txt | 4 ++-- linux/my_application.cc | 4 ++-- macos/Runner.xcodeproj/project.pbxproj | 18 +++++++++--------- .../xcshareddata/xcschemes/Runner.xcscheme | 8 ++++---- macos/Runner/Configs/AppInfo.xcconfig | 4 ++-- pubspec.yaml | 2 +- web/index.html | 4 ++-- web/manifest.json | 4 ++-- windows/CMakeLists.txt | 4 ++-- windows/runner/Runner.rc | 8 ++++---- windows/runner/main.cpp | 2 +- 26 files changed, 68 insertions(+), 73 deletions(-) delete mode 100644 android/app/src/main/kotlin/com/example/kalodings/MainActivity.kt diff --git a/README.md b/README.md index 24c1d8f..b5acb9b 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ -# kalodings +# Calodiary - Diary for your calorie intake -A new Flutter project. +Track your calories you fat little bitch! diff --git a/android/app/build.gradle b/android/app/build.gradle index ede45b8..c1c7a43 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -6,7 +6,7 @@ plugins { } android { - namespace = "com.example.kalodings" + namespace = "com.example.calodiary" compileSdk = flutter.compileSdkVersion ndkVersion = flutter.ndkVersion @@ -21,7 +21,7 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId = "com.example.kalodings" + applicationId = "com.example.calodiary" // You can update the following values to match your application needs. // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. minSdk = flutter.minSdkVersion diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index e095c8d..c6d3d0c 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleDisplayName - Kalodings + Calodiary CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier @@ -13,7 +13,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - kalodings + calodiary CFBundlePackageType APPL CFBundleShortVersionString diff --git a/lib/enter_food_widget.dart b/lib/enter_food_widget.dart index bf1f8dd..56f91a2 100644 --- a/lib/enter_food_widget.dart +++ b/lib/enter_food_widget.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:kalodings/food_entry_bloc.dart'; -import 'package:kalodings/row_with_spacers_widget.dart'; +import 'package:calodiary/food_entry_bloc.dart'; +import 'package:calodiary/row_with_spacers_widget.dart'; class EnterFoodWidget extends StatefulWidget { final Function(BuildContext context, FoodEntry entry) onAdd; diff --git a/lib/food_entry_bloc.dart b/lib/food_entry_bloc.dart index 7162e2f..fee871f 100644 --- a/lib/food_entry_bloc.dart +++ b/lib/food_entry_bloc.dart @@ -1,5 +1,5 @@ import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:kalodings/storage/storage.dart'; +import 'package:calodiary/storage/storage.dart'; import 'package:uuid/uuid.dart'; class FoodEntryBloc extends Bloc { diff --git a/lib/food_entry_widget.dart b/lib/food_entry_widget.dart index f9f7dbf..cb06921 100644 --- a/lib/food_entry_widget.dart +++ b/lib/food_entry_widget.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:kalodings/food_entry_bloc.dart'; -import 'package:kalodings/row_with_spacers_widget.dart'; +import 'package:calodiary/food_entry_bloc.dart'; +import 'package:calodiary/row_with_spacers_widget.dart'; class FoodEntryWidget extends StatelessWidget { final FoodEntry entry; diff --git a/lib/main.dart b/lib/main.dart index b9e97de..cc245bb 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -2,10 +2,10 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_localizations/flutter_localizations.dart'; import 'package:go_router/go_router.dart'; -import 'package:kalodings/settings_bloc.dart'; -import 'package:kalodings/perdate_widget.dart'; -import 'package:kalodings/settings.dart'; -import 'package:kalodings/storage/storage.dart'; +import 'package:calodiary/settings_bloc.dart'; +import 'package:calodiary/perdate_widget.dart'; +import 'package:calodiary/settings.dart'; +import 'package:calodiary/storage/storage.dart'; void main() async { WidgetsFlutterBinding.ensureInitialized(); diff --git a/lib/perdate_widget.dart b/lib/perdate_widget.dart index 4da71d0..56a83dc 100644 --- a/lib/perdate_widget.dart +++ b/lib/perdate_widget.dart @@ -1,13 +1,13 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:intl/intl.dart'; -import 'package:kalodings/app_drawer.dart'; -import 'package:kalodings/calendar_floating_button.dart'; -import 'package:kalodings/enter_food_widget.dart'; -import 'package:kalodings/food_entry_bloc.dart'; -import 'package:kalodings/food_entry_widget.dart'; -import 'package:kalodings/storage/storage.dart'; -import 'package:kalodings/sum_widget.dart'; +import 'package:calodiary/app_drawer.dart'; +import 'package:calodiary/calendar_floating_button.dart'; +import 'package:calodiary/enter_food_widget.dart'; +import 'package:calodiary/food_entry_bloc.dart'; +import 'package:calodiary/food_entry_widget.dart'; +import 'package:calodiary/storage/storage.dart'; +import 'package:calodiary/sum_widget.dart'; class PerDateWidget extends StatefulWidget { final DateTime date; diff --git a/lib/settings.dart b/lib/settings.dart index 8f9cb35..4bf1c40 100644 --- a/lib/settings.dart +++ b/lib/settings.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:go_router/go_router.dart'; -import 'package:kalodings/app_drawer.dart'; -import 'package:kalodings/calendar_floating_button.dart'; -import 'package:kalodings/settings_bloc.dart'; +import 'package:calodiary/app_drawer.dart'; +import 'package:calodiary/calendar_floating_button.dart'; +import 'package:calodiary/settings_bloc.dart'; import 'package:settings_ui/settings_ui.dart'; class SettingsWidget extends StatefulWidget { diff --git a/lib/settings_bloc.dart b/lib/settings_bloc.dart index 624ce9f..ac88d5c 100644 --- a/lib/settings_bloc.dart +++ b/lib/settings_bloc.dart @@ -1,5 +1,5 @@ import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:kalodings/storage/storage.dart'; +import 'package:calodiary/storage/storage.dart'; class SettingsDataBloc extends Bloc { final FoodStorage storage; diff --git a/lib/storage/storage.dart b/lib/storage/storage.dart index 93b60ee..f6a9096 100644 --- a/lib/storage/storage.dart +++ b/lib/storage/storage.dart @@ -1,6 +1,6 @@ import 'dart:io'; -import 'package:kalodings/food_entry_bloc.dart'; +import 'package:calodiary/food_entry_bloc.dart'; import 'package:path_provider/path_provider.dart'; class FoodStorage { diff --git a/lib/sum_widget.dart b/lib/sum_widget.dart index 4ee58e7..d9b2c1e 100644 --- a/lib/sum_widget.dart +++ b/lib/sum_widget.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:kalodings/food_entry_bloc.dart'; -import 'package:kalodings/settings_bloc.dart'; -import 'package:kalodings/row_with_spacers_widget.dart'; +import 'package:calodiary/food_entry_bloc.dart'; +import 'package:calodiary/settings_bloc.dart'; +import 'package:calodiary/row_with_spacers_widget.dart'; class SumWidget extends StatefulWidget { final List foodEntries; diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt index 3930743..7f33c0f 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 "kalodings") +set(BINARY_NAME "calodiary") # The unique GTK application identifier for this application. See: # https://wiki.gnome.org/HowDoI/ChooseApplicationID -set(APPLICATION_ID "com.example.kalodings") +set(APPLICATION_ID "com.example.calodiary") # 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 7e348ca..62f5ae4 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, "kalodings"); + gtk_header_bar_set_title(header_bar, "calodiary"); 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, "kalodings"); + gtk_window_set_title(window, "calodiary"); } gtk_window_set_default_size(window, 1280, 720); diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj index 9f1ef24..b6086bd 100644 --- a/macos/Runner.xcodeproj/project.pbxproj +++ b/macos/Runner.xcodeproj/project.pbxproj @@ -64,7 +64,7 @@ 331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; 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 /* kalodings.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "kalodings.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 33CC10ED2044A3C60003C045 /* calodiary.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "calodiary.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 = ""; }; @@ -131,7 +131,7 @@ 33CC10EE2044A3C60003C045 /* Products */ = { isa = PBXGroup; children = ( - 33CC10ED2044A3C60003C045 /* kalodings.app */, + 33CC10ED2044A3C60003C045 /* calodiary.app */, 331C80D5294CF71000263BE5 /* RunnerTests.xctest */, ); name = Products; @@ -217,7 +217,7 @@ ); name = Runner; productName = Runner; - productReference = 33CC10ED2044A3C60003C045 /* kalodings.app */; + productReference = 33CC10ED2044A3C60003C045 /* calodiary.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -385,10 +385,10 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.example.kalodings.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = com.example.calodiary.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/kalodings.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/kalodings"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/calodiary.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/calodiary"; }; name = Debug; }; @@ -399,10 +399,10 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.example.kalodings.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = com.example.calodiary.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/kalodings.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/kalodings"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/calodiary.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/calodiary"; }; name = Release; }; @@ -413,10 +413,10 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.example.kalodings.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = com.example.calodiary.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/kalodings.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/kalodings"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/calodiary.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/calodiary"; }; name = Profile; }; diff --git a/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index b481902..0df2c4b 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 @@ @@ -65,7 +65,7 @@ @@ -82,7 +82,7 @@ diff --git a/macos/Runner/Configs/AppInfo.xcconfig b/macos/Runner/Configs/AppInfo.xcconfig index 7e5bbc6..9149f88 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 = kalodings +PRODUCT_NAME = calodiary // The application's bundle identifier -PRODUCT_BUNDLE_IDENTIFIER = com.example.kalodings +PRODUCT_BUNDLE_IDENTIFIER = com.example.calodiary // The copyright displayed in application information PRODUCT_COPYRIGHT = Copyright © 2024 com.example. All rights reserved. diff --git a/pubspec.yaml b/pubspec.yaml index 4f4465b..323e73a 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,4 +1,4 @@ -name: kalodings +name: calodiary description: "A new Flutter project." publish_to: 'none' version: 0.1.0 diff --git a/web/index.html b/web/index.html index 8fd67f6..f5673e8 100644 --- a/web/index.html +++ b/web/index.html @@ -23,13 +23,13 @@ - + - kalodings + calodiary diff --git a/web/manifest.json b/web/manifest.json index 0561a33..dc49bba 100644 --- a/web/manifest.json +++ b/web/manifest.json @@ -1,6 +1,6 @@ { - "name": "kalodings", - "short_name": "kalodings", + "name": "calodiary", + "short_name": "calodiary", "start_url": ".", "display": "standalone", "background_color": "#0175C2", diff --git a/windows/CMakeLists.txt b/windows/CMakeLists.txt index e2aa470..062efeb 100644 --- a/windows/CMakeLists.txt +++ b/windows/CMakeLists.txt @@ -1,10 +1,10 @@ # Project-level configuration. cmake_minimum_required(VERSION 3.14) -project(kalodings LANGUAGES CXX) +project(calodiary 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 "kalodings") +set(BINARY_NAME "calodiary") # 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 24154ed..5eb7873 100644 --- a/windows/runner/Runner.rc +++ b/windows/runner/Runner.rc @@ -90,12 +90,12 @@ BEGIN BLOCK "040904e4" BEGIN VALUE "CompanyName", "com.example" "\0" - VALUE "FileDescription", "kalodings" "\0" + VALUE "FileDescription", "calodiary" "\0" VALUE "FileVersion", VERSION_AS_STRING "\0" - VALUE "InternalName", "kalodings" "\0" + VALUE "InternalName", "calodiary" "\0" VALUE "LegalCopyright", "Copyright (C) 2024 com.example. All rights reserved." "\0" - VALUE "OriginalFilename", "kalodings.exe" "\0" - VALUE "ProductName", "kalodings" "\0" + VALUE "OriginalFilename", "calodiary.exe" "\0" + VALUE "ProductName", "calodiary" "\0" VALUE "ProductVersion", VERSION_AS_STRING "\0" END END diff --git a/windows/runner/main.cpp b/windows/runner/main.cpp index 9c47793..0128d39 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.Create(L"kalodings", origin, size)) { + if (!window.Create(L"calodiary", origin, size)) { return EXIT_FAILURE; } window.SetQuitOnClose(true);