diff --git a/README.md b/README.md index efa5513..4151388 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,8 @@ +<<<<<<< HEAD # ULAK +======= +# Ulak +>>>>>>> update Arslanşah Ulak Uygulaması Android, IOS, Linux, Windows ve Web uyumlu olarak yayınlanacaktır. Uzak depolama ile saklanan mesajlar kolaylıkla ulaşılabilir, sade ve kolay kullanım sunacaktır. diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index c2003e0..4e2aab6 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -6,7 +6,7 @@ plugins { } android { - namespace = "com.example.version_01" + namespace = "com.example.Ulak" 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.version_01" + applicationId = "com.example.Ulak" // 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 diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index eccf16b..0413de5 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - version_01 + Ulak CFBundlePackageType APPL CFBundleShortVersionString diff --git a/lib/core/app_bindings.dart b/lib/core/app_bindings.dart index 117d023..6a11d14 100644 --- a/lib/core/app_bindings.dart +++ b/lib/core/app_bindings.dart @@ -1,7 +1,7 @@ import 'package:get/instance_manager.dart'; -import 'package:version_01/services/api_services.dart'; -import 'package:version_01/services/auth_service.dart'; -import 'package:version_01/services/storage_service.dart'; +import 'package:Ulak/services/api_services.dart'; +import 'package:Ulak/services/auth_service.dart'; +import 'package:Ulak/services/storage_service.dart'; class AppBindings extends Bindings { @override diff --git a/lib/core/base_controller.dart b/lib/core/base_controller.dart index 5690d9c..194cd7c 100644 --- a/lib/core/base_controller.dart +++ b/lib/core/base_controller.dart @@ -1,4 +1,3 @@ -import 'package:get/get_state_manager/get_state_manager.dart'; import 'package:get/state_manager.dart'; class BaseController extends GetxController { diff --git a/lib/main.dart b/lib/main.dart index c763b29..6f2c205 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:get/get_navigation/src/root/get_material_app.dart'; -import 'package:version_01/core/app_bindings.dart'; -import 'package:version_01/routes/app_pages.dart'; +import 'package:Ulak/core/app_bindings.dart'; +import 'package:Ulak/routes/app_pages.dart'; void main() { runApp(const MainApp()); diff --git a/lib/models/chat_model.dart b/lib/models/chat_model.dart new file mode 100644 index 0000000..dc5c8da --- /dev/null +++ b/lib/models/chat_model.dart @@ -0,0 +1,13 @@ +class ChatModel { + final int id; + final String title; + final bool type; + + ChatModel({required this.id, required this.title, required this.type}); + + ChatModel copyWith({int? id, String? title, bool? type}) => ChatModel( + id: id ?? this.id, + title: title ?? this.title, + type: type ?? this.type, + ); +} diff --git a/lib/models/message_model.dart b/lib/models/message_model.dart index 049e5df..75c8501 100644 --- a/lib/models/message_model.dart +++ b/lib/models/message_model.dart @@ -12,10 +12,10 @@ class MessageModel { } Map toJson() { - final Map data = new Map(); - data['sender'] = this.sender; - data['time'] = this.time; - data['text'] = this.text; + final Map data = {}; + data['sender'] = sender; + data['time'] = time; + data['text'] = text; return data; } } diff --git a/lib/modules/home/home_bindings.dart b/lib/modules/home/home_bindings.dart index 80fe305..bdcac4e 100644 --- a/lib/modules/home/home_bindings.dart +++ b/lib/modules/home/home_bindings.dart @@ -1,7 +1,7 @@ import 'package:get/instance_manager.dart'; -import 'package:version_01/modules/home/home_controller.dart'; -import 'package:version_01/modules/messages/messages_controller.dart'; -import 'package:version_01/modules/profile/profile_controller.dart'; +import 'package:Ulak/modules/home/home_controller.dart'; +import 'package:Ulak/modules/messages/messages_controller.dart'; +import 'package:Ulak/modules/profile/profile_controller.dart'; class HomeBindings extends Bindings { @override diff --git a/lib/modules/home/home_controller.dart b/lib/modules/home/home_controller.dart index 279bd50..563762b 100644 --- a/lib/modules/home/home_controller.dart +++ b/lib/modules/home/home_controller.dart @@ -1,8 +1,8 @@ import 'package:get/get_instance/get_instance.dart'; import 'package:get/state_manager.dart'; -import 'package:version_01/core/base_controller.dart'; -import 'package:version_01/models/account_model.dart'; -import 'package:version_01/services/auth_service.dart'; +import 'package:Ulak/core/base_controller.dart'; +import 'package:Ulak/models/account_model.dart'; +import 'package:Ulak/services/auth_service.dart'; class HomeController extends BaseController { final AuthService _authService = Get.find(); @@ -10,7 +10,7 @@ class HomeController extends BaseController { Rx get account => _authService.currentAccount; final currentIndex = 0.obs; - changePage(int index) { + void changePage(int index) { currentIndex.value = index; } } diff --git a/lib/modules/home/home_page.dart b/lib/modules/home/home_page.dart index 7382e52..dd52368 100644 --- a/lib/modules/home/home_page.dart +++ b/lib/modules/home/home_page.dart @@ -2,9 +2,9 @@ import 'package:animated_bottom_navigation_bar/animated_bottom_navigation_bar.da import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; import 'package:get/get_state_manager/get_state_manager.dart'; -import 'package:version_01/modules/home/home_controller.dart'; -import 'package:version_01/modules/messages/messages_page.dart'; -import 'package:version_01/modules/profile/profile_page.dart'; +import 'package:Ulak/modules/home/home_controller.dart'; +import 'package:Ulak/modules/messages/messages_page.dart'; +import 'package:Ulak/modules/profile/profile_page.dart'; class HomePage extends GetView { const HomePage({super.key}); @@ -22,8 +22,8 @@ class HomePage extends GetView { floatingActionButton: FloatingActionButton( onPressed: () {}, shape: CircleBorder(), - child: Icon(Icons.add_comment, color: Colors.amber), backgroundColor: Colors.black, + child: Icon(Icons.comment_rounded, color: Colors.amber), ), floatingActionButtonLocation: FloatingActionButtonLocation.centerDocked, bottomNavigationBar: Obx( @@ -38,7 +38,7 @@ class HomePage extends GetView { leftCornerRadius: 32, rightCornerRadius: 32, notchSmoothness: NotchSmoothness.softEdge, - onTap: controller.currentIndex, + onTap: controller.currentIndex.call, ), ), ); diff --git a/lib/modules/login/login_bindings.dart b/lib/modules/login/login_bindings.dart index 0e8da64..03fe45e 100644 --- a/lib/modules/login/login_bindings.dart +++ b/lib/modules/login/login_bindings.dart @@ -1,6 +1,6 @@ import 'package:get/instance_manager.dart'; -import 'package:version_01/modules/login/login_controller.dart'; -import 'package:version_01/services/storage_service.dart'; +import 'package:Ulak/modules/login/login_controller.dart'; +import 'package:Ulak/services/storage_service.dart'; class LoginBindings extends Bindings { @override diff --git a/lib/modules/login/login_controller.dart b/lib/modules/login/login_controller.dart index a28b3bb..3a4a368 100644 --- a/lib/modules/login/login_controller.dart +++ b/lib/modules/login/login_controller.dart @@ -1,10 +1,10 @@ import 'package:get/get_instance/get_instance.dart'; import 'package:get/get_navigation/get_navigation.dart'; import 'package:get/state_manager.dart'; -import 'package:version_01/core/base_controller.dart'; -import 'package:version_01/routes/app_pages.dart'; -import 'package:version_01/services/auth_service.dart'; -import 'package:version_01/services/storage_service.dart'; +import 'package:Ulak/core/base_controller.dart'; +import 'package:Ulak/routes/app_pages.dart'; +import 'package:Ulak/services/auth_service.dart'; +import 'package:Ulak/services/storage_service.dart'; class LoginController extends BaseController { late final AuthService _authService; @@ -18,11 +18,11 @@ class LoginController extends BaseController { await _storageService.init(); } - loginWithArslansah() async { + Future loginWithArslansah() async { await _authService.signIn(); final token = _storageService.getValue(StorageKeys.userToken); print(token); - if (!token.toString().isEmpty) { + if (token.toString().isNotEmpty) { _authService.getAccount(); Get.offAllNamed(AppRoutes.HOME); } diff --git a/lib/modules/login/login_page.dart b/lib/modules/login/login_page.dart index 6f1ef88..19b6bac 100644 --- a/lib/modules/login/login_page.dart +++ b/lib/modules/login/login_page.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:get/state_manager.dart'; -import 'package:version_01/modules/login/login_controller.dart'; +import 'package:Ulak/modules/login/login_controller.dart'; class LoginPage extends GetView { const LoginPage({super.key}); diff --git a/lib/modules/messages/messages_bindings.dart b/lib/modules/messages/messages_bindings.dart index cd8059f..c40dfd0 100644 --- a/lib/modules/messages/messages_bindings.dart +++ b/lib/modules/messages/messages_bindings.dart @@ -1,6 +1,9 @@ import 'package:get/instance_manager.dart'; +import 'package:Ulak/modules/messages/messages_controller.dart'; class MessagesBindings extends Bindings { @override - void dependencies() {} + void dependencies() { + Get.lazyPut(() => MessagesController()); + } } diff --git a/lib/modules/messages/messages_controller.dart b/lib/modules/messages/messages_controller.dart index 9cba967..f66bcf7 100644 --- a/lib/modules/messages/messages_controller.dart +++ b/lib/modules/messages/messages_controller.dart @@ -1,3 +1,20 @@ -import 'package:version_01/core/base_controller.dart'; +import 'package:Ulak/core/base_controller.dart'; +import 'package:Ulak/services/api_services.dart'; +import 'package:get/get.dart'; +import 'package:get/state_manager.dart'; -class MessagesController extends BaseController {} +class MessagesController extends BaseController { + final ApiServices _apiServices = Get.find(); + var chats = [].obs; + + @override + void onReady() async { + super.onReady(); + await getChats(); + } + + Future getChats() async { + final result = await _apiServices.get(':4242/api/v1/get/chats'); + chats.value = result.data; + } +} diff --git a/lib/modules/messages/messages_page.dart b/lib/modules/messages/messages_page.dart index b5a34ea..ac4810c 100644 --- a/lib/modules/messages/messages_page.dart +++ b/lib/modules/messages/messages_page.dart @@ -1,48 +1,58 @@ +import 'package:Ulak/models/chat_model.dart'; +import 'package:Ulak/modules/messages/messages_controller.dart'; import 'package:flutter/material.dart'; import 'package:get/get_navigation/src/extension_navigation.dart'; import 'package:get/state_manager.dart'; -import 'package:version_01/routes/app_pages.dart'; +import 'package:Ulak/routes/app_pages.dart'; -class MessagesPage extends StatelessWidget { +class MessagesPage extends GetView { const MessagesPage({super.key}); @override Widget build(BuildContext context) { return Scaffold( - body: ListView( - children: [ - MessageBox(), - MessageBox(), - MessageBox(), - MessageBox(), - MessageBox(), - MessageBox(), - MessageBox(), - ], + body: ListView.builder( + itemCount: controller.chats.length, + itemBuilder: (context, index) { + final chat = ChatModel( + id: controller.chats[0]['id'], + title: controller.chats[0]['title'], + type: controller.chats[0]['type'], + ); + return MessageBox(data: chat); + }, ), ); } } -class MessageBox extends StatelessWidget { - const MessageBox({super.key}); +class MessageBox extends GetView { + final data; + MessageBox({super.key, required this.data}); @override Widget build(BuildContext context) { return Card( child: ListTile( - onTap: () => Get.toNamed(AppRoutes.CHAT), + onTap: () => { + Get.toNamed( + AppRoutes.CHAT, + parameters: {"chatId": data.id.toString(), "chatTitle": data.title}, + ), + controller.getChats(), + }, title: Text( - "Barbaros Arslanşah", + '${data.title}', style: TextStyle(fontWeight: FontWeight.bold), ), - subtitle: Text( - "Batuxan Coşkun: Allah'ın izniyle bağımsızlık hareketimiz sonuca varacak.", - ), + // subtitle: Text( + // "Batuxan Coşkun: Allah'ın izniyle bağımsızlık hareketimiz sonuca varacak.", + // ), leading: CircleAvatar( - backgroundImage: NetworkImage( - "https://mastodon.tn/system/accounts/avatars/114/399/394/324/031/602/original/85d840449fbc65db.png", - ), + child: Text(data.id.toString()), + // backgroundImage: NetworkImage( + // "https://mastodon.tn/system/accounts/avatars/114/399/394/324/031/602/original/85d840449fbc65db.png", + // ), ), ), ); diff --git a/lib/modules/messages/pages/chat_bindings.dart b/lib/modules/messages/pages/chat_bindings.dart index de137d6..2592140 100644 --- a/lib/modules/messages/pages/chat_bindings.dart +++ b/lib/modules/messages/pages/chat_bindings.dart @@ -1,5 +1,5 @@ import 'package:get/instance_manager.dart'; -import 'package:version_01/modules/messages/pages/chat_controller.dart'; +import 'package:Ulak/modules/messages/pages/chat_controller.dart'; class ChatBindings extends Bindings { @override diff --git a/lib/modules/messages/pages/chat_controller.dart b/lib/modules/messages/pages/chat_controller.dart index 0ef88f2..9df4bc3 100644 --- a/lib/modules/messages/pages/chat_controller.dart +++ b/lib/modules/messages/pages/chat_controller.dart @@ -1,5 +1,5 @@ import 'package:get/state_manager.dart'; -import 'package:version_01/models/message_model.dart'; +import 'package:Ulak/models/message_model.dart'; class ChatController extends GetxController { final messages = [].obs; diff --git a/lib/modules/messages/pages/chat_page.dart b/lib/modules/messages/pages/chat_page.dart index a23ffd0..d5cd7bb 100644 --- a/lib/modules/messages/pages/chat_page.dart +++ b/lib/modules/messages/pages/chat_page.dart @@ -1,8 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; -import 'package:flutter/widgets.dart'; import 'package:get/get.dart'; -import 'package:version_01/modules/messages/pages/chat_controller.dart'; +import 'package:Ulak/modules/messages/pages/chat_controller.dart'; class ChatPage extends GetView { const ChatPage({super.key}); @@ -11,20 +9,16 @@ class ChatPage extends GetView { Widget build(BuildContext context) { return Scaffold( appBar: AppBar( - title: Text("Barbaros Arslanşah"), + title: Text("${Get.parameters['chatTitle']}"), backgroundColor: Colors.amber, ), body: Column( children: [ - IconButton( - onPressed: () => controller.newMessages(), - icon: Icon(Icons.abc), + ChatZone(messages: "controller.messages.value"), + MessageWriteBox( + messages: "controller.messages.value", + onChanged: (value) => {}, ), - // ChatZone(messages: controller.messages.value), - // MessageWriteBox( - // messages: controller.messages.value, - // onChanged: (value) => controller.updateMessages(value), - // ), ], ), ); @@ -47,6 +41,10 @@ class ChatZone extends StatelessWidget { children: [ Text(messages), SendMessageBox(), + MyMessageBox(), + SendMessageBox(), + MyMessageBox(), + SendMessageBox(), SendMessageBox(), MyMessageBox(), ], diff --git a/lib/modules/profile/profile_bindings.dart b/lib/modules/profile/profile_bindings.dart index 0957243..c2737cb 100644 --- a/lib/modules/profile/profile_bindings.dart +++ b/lib/modules/profile/profile_bindings.dart @@ -1,5 +1,5 @@ import 'package:get/instance_manager.dart'; -import 'package:version_01/modules/profile/profile_controller.dart'; +import 'package:Ulak/modules/profile/profile_controller.dart'; class ProfileBindings extends Bindings { @override diff --git a/lib/modules/profile/profile_controller.dart b/lib/modules/profile/profile_controller.dart index c797c6c..3104610 100644 --- a/lib/modules/profile/profile_controller.dart +++ b/lib/modules/profile/profile_controller.dart @@ -1,14 +1,14 @@ import 'package:get/get_instance/get_instance.dart'; import 'package:get/get_state_manager/get_state_manager.dart'; import 'package:get/state_manager.dart'; -import 'package:version_01/models/account_model.dart'; -import 'package:version_01/services/auth_service.dart'; +import 'package:Ulak/models/account_model.dart'; +import 'package:Ulak/services/auth_service.dart'; class ProfileController extends GetxController { final AuthService _authService = Get.find(); Rx get account => _authService.currentAccount; - AccountSignOut() async { + Future AccountSignOut() async { _authService.signOut(); } } diff --git a/lib/modules/profile/profile_page.dart b/lib/modules/profile/profile_page.dart index b8b6cd3..94d5589 100644 --- a/lib/modules/profile/profile_page.dart +++ b/lib/modules/profile/profile_page.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; import 'package:get/get_state_manager/src/simple/get_view.dart'; -import 'package:version_01/modules/profile/profile_controller.dart'; +import 'package:Ulak/modules/profile/profile_controller.dart'; class ProfilePage extends GetView { const ProfilePage({super.key}); @@ -35,8 +35,8 @@ class ProfilePage extends GetView { ), ElevatedButton( onPressed: () => controller.AccountSignOut(), - child: Text("Çıkış Yap"), style: ElevatedButton.styleFrom(backgroundColor: Colors.amber), + child: Text("Çıkış Yap"), ), ], ), diff --git a/lib/modules/splash/splash_bindings.dart b/lib/modules/splash/splash_bindings.dart index 8df4c66..2d9e9d6 100644 --- a/lib/modules/splash/splash_bindings.dart +++ b/lib/modules/splash/splash_bindings.dart @@ -1,5 +1,5 @@ import 'package:get/instance_manager.dart'; -import 'package:version_01/modules/splash/splash_controller.dart'; +import 'package:Ulak/modules/splash/splash_controller.dart'; class SplashBindings extends Bindings { @override diff --git a/lib/modules/splash/splash_controller.dart b/lib/modules/splash/splash_controller.dart index a3d8aa9..6051ae1 100644 --- a/lib/modules/splash/splash_controller.dart +++ b/lib/modules/splash/splash_controller.dart @@ -1,11 +1,11 @@ import 'package:get/get_instance/get_instance.dart'; import 'package:get/route_manager.dart'; import 'package:get/state_manager.dart'; -import 'package:version_01/core/base_controller.dart'; -import 'package:version_01/routes/app_pages.dart'; -import 'package:version_01/services/api_services.dart'; -import 'package:version_01/services/auth_service.dart'; -import 'package:version_01/services/storage_service.dart'; +import 'package:Ulak/core/base_controller.dart'; +import 'package:Ulak/routes/app_pages.dart'; +import 'package:Ulak/services/api_services.dart'; +import 'package:Ulak/services/auth_service.dart'; +import 'package:Ulak/services/storage_service.dart'; class SplashController extends BaseController { late final isServicesWait = false.obs; @@ -40,8 +40,8 @@ class SplashController extends BaseController { } Future checkTokenAndRedirect() async { - final _authService = Get.find(); - final isAuthenticated = await _authService.isAuthenticated(); + final authService = Get.find(); + final isAuthenticated = await authService.isAuthenticated(); if (isAuthenticated == true) { // final account = await _authService.getAccount(); Get.offAllNamed(AppRoutes.HOME); diff --git a/lib/routes/app_pages.dart b/lib/routes/app_pages.dart index 6abc800..e4761da 100644 --- a/lib/routes/app_pages.dart +++ b/lib/routes/app_pages.dart @@ -1,14 +1,14 @@ import 'package:get/get.dart'; -import 'package:version_01/modules/home/home_bindings.dart'; -import 'package:version_01/modules/home/home_page.dart'; -import 'package:version_01/modules/login/login_bindings.dart'; -import 'package:version_01/modules/login/login_page.dart'; -import 'package:version_01/modules/messages/messages_bindings.dart'; -import 'package:version_01/modules/messages/messages_page.dart'; -import 'package:version_01/modules/messages/pages/chat_bindings.dart'; -import 'package:version_01/modules/messages/pages/chat_page.dart'; -import 'package:version_01/modules/splash/splash_bindings.dart'; -import 'package:version_01/modules/splash/splash_pages.dart'; +import 'package:Ulak/modules/home/home_bindings.dart'; +import 'package:Ulak/modules/home/home_page.dart'; +import 'package:Ulak/modules/login/login_bindings.dart'; +import 'package:Ulak/modules/login/login_page.dart'; +import 'package:Ulak/modules/messages/messages_bindings.dart'; +import 'package:Ulak/modules/messages/messages_page.dart'; +import 'package:Ulak/modules/messages/pages/chat_bindings.dart'; +import 'package:Ulak/modules/messages/pages/chat_page.dart'; +import 'package:Ulak/modules/splash/splash_bindings.dart'; +import 'package:Ulak/modules/splash/splash_pages.dart'; abstract class AppRoutes { static const INITIAL = SPLASH; diff --git a/lib/services/api_services.dart b/lib/services/api_services.dart index c9c2e0b..3f649ca 100644 --- a/lib/services/api_services.dart +++ b/lib/services/api_services.dart @@ -1,11 +1,10 @@ import 'package:dio/dio.dart'; import 'package:get/get_instance/get_instance.dart'; -import 'package:get/get_state_manager/get_state_manager.dart'; import 'package:get/state_manager.dart'; -import 'package:version_01/services/storage_service.dart'; +import 'package:Ulak/services/storage_service.dart'; abstract class ApiConstants { - static const baseUrl = "http://192.168.1.27:5000"; + static const baseUrl = "http://192.168.1.27"; } class ApiServices extends GetxService { diff --git a/lib/services/auth_service.dart b/lib/services/auth_service.dart index a429cd3..b4f5de3 100644 --- a/lib/services/auth_service.dart +++ b/lib/services/auth_service.dart @@ -1,10 +1,10 @@ import 'package:get/get_instance/get_instance.dart'; import 'package:get/route_manager.dart'; import 'package:get/state_manager.dart'; -import 'package:version_01/models/account_model.dart'; -import 'package:version_01/routes/app_pages.dart'; -import 'package:version_01/services/api_services.dart'; -import 'package:version_01/services/storage_service.dart'; +import 'package:Ulak/models/account_model.dart'; +import 'package:Ulak/routes/app_pages.dart'; +import 'package:Ulak/services/api_services.dart'; +import 'package:Ulak/services/storage_service.dart'; class AuthService extends GetxService { late final StorageService _storageService; @@ -21,7 +21,7 @@ class AuthService extends GetxService { Future signIn() async { final res = await _apiServices.post( - '/api/v1/login', + ':5000/api/v1/login', data: {'email': 'batuhancoskun@yaani.com', 'password': 'Batuhan1428'}, ); await _storageService.setValue( @@ -32,7 +32,7 @@ class AuthService extends GetxService { Future isAuthenticated() async { try { - final token = await _apiServices.get('/api/v1/login'); + final token = await _apiServices.get(':5000/api/v1/login'); if (token.data) { return true; } else { @@ -51,7 +51,7 @@ class AuthService extends GetxService { Future getAccount() async { try { - final response = await _apiServices.get('/api/v1/account'); + final response = await _apiServices.get(':5000/api/v1/account'); if (response.statusCode == 200) { currentAccount.value = AccountModel.fromJson(response.data); return AccountModel.fromJson(response.data); diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt index 70abeec..500ff12 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 "version_01") +set(BINARY_NAME "Ulak") # The unique GTK application identifier for this application. See: # https://wiki.gnome.org/HowDoI/ChooseApplicationID -set(APPLICATION_ID "com.example.version_01") +set(APPLICATION_ID "com.example.Ulak") # Explicitly opt in to modern CMake behaviors to avoid warnings with recent # versions of CMake. diff --git a/linux/runner/my_application.cc b/linux/runner/my_application.cc index 844d4da..2f576b1 100644 --- a/linux/runner/my_application.cc +++ b/linux/runner/my_application.cc @@ -45,11 +45,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, "version_01"); + gtk_header_bar_set_title(header_bar, "Ulak"); 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, "version_01"); + gtk_window_set_title(window, "Ulak"); } gtk_window_set_default_size(window, 1280, 720); diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj index 9e26099..c2cafc7 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 /* version_01.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "version_01.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 33CC10ED2044A3C60003C045 /* Ulak.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Ulak.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 /* version_01.app */, + 33CC10ED2044A3C60003C045 /* Ulak.app */, 331C80D5294CF71000263BE5 /* RunnerTests.xctest */, ); name = Products; @@ -217,7 +217,7 @@ ); name = Runner; productName = Runner; - productReference = 33CC10ED2044A3C60003C045 /* version_01.app */; + productReference = 33CC10ED2044A3C60003C045 /* Ulak.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -388,7 +388,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.example.version01.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/version_01.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/version_01"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Ulak.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Ulak"; }; name = Debug; }; @@ -402,7 +402,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.example.version01.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/version_01.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/version_01"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Ulak.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Ulak"; }; name = Release; }; @@ -416,7 +416,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.example.version01.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/version_01.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/version_01"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Ulak.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Ulak"; }; name = Profile; }; diff --git a/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 61abab2..4b66e93 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 @@ @@ -66,7 +66,7 @@ @@ -83,7 +83,7 @@ diff --git a/macos/Runner/Configs/AppInfo.xcconfig b/macos/Runner/Configs/AppInfo.xcconfig index 2d84c57..e4d631e 100644 --- a/macos/Runner/Configs/AppInfo.xcconfig +++ b/macos/Runner/Configs/AppInfo.xcconfig @@ -5,7 +5,7 @@ // 'flutter create' template. // The application's name. By default this is also the title of the Flutter window. -PRODUCT_NAME = version_01 +PRODUCT_NAME = Ulak // The application's bundle identifier PRODUCT_BUNDLE_IDENTIFIER = com.example.version01 diff --git a/pubspec.yaml b/pubspec.yaml index c7ab4a6..c038bd9 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,4 +1,4 @@ -name: version_01 +name: Ulak description: "A new Flutter project." publish_to: 'none' version: 0.1.0+1 diff --git a/web/index.html b/web/index.html index cd93b07..b7394ad 100644 --- a/web/index.html +++ b/web/index.html @@ -23,13 +23,13 @@ - + - version_01 + Ulak diff --git a/web/manifest.json b/web/manifest.json index 78d43ec..81ff4f9 100644 --- a/web/manifest.json +++ b/web/manifest.json @@ -1,6 +1,6 @@ { - "name": "version_01", - "short_name": "version_01", + "name": "Ulak", + "short_name": "Ulak", "start_url": ".", "display": "standalone", "background_color": "#0175C2", diff --git a/windows/CMakeLists.txt b/windows/CMakeLists.txt index 5a95cb1..4ced02a 100644 --- a/windows/CMakeLists.txt +++ b/windows/CMakeLists.txt @@ -1,10 +1,10 @@ # Project-level configuration. cmake_minimum_required(VERSION 3.14) -project(version_01 LANGUAGES CXX) +project(Ulak 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 "version_01") +set(BINARY_NAME "Ulak") # 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 f900c50..3062681 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", "version_01" "\0" + VALUE "FileDescription", "Ulak" "\0" VALUE "FileVersion", VERSION_AS_STRING "\0" - VALUE "InternalName", "version_01" "\0" + VALUE "InternalName", "Ulak" "\0" VALUE "LegalCopyright", "Copyright (C) 2026 com.example. All rights reserved." "\0" - VALUE "OriginalFilename", "version_01.exe" "\0" - VALUE "ProductName", "version_01" "\0" + VALUE "OriginalFilename", "Ulak.exe" "\0" + VALUE "ProductName", "Ulak" "\0" VALUE "ProductVersion", VERSION_AS_STRING "\0" END END diff --git a/windows/runner/main.cpp b/windows/runner/main.cpp index 7ab9c1c..e004084 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"version_01", origin, size)) { + if (!window.Create(L"Ulak", origin, size)) { return EXIT_FAILURE; } window.SetQuitOnClose(true);