diff --git a/campus/bffs/profile/api/person_client.bal b/campus/bffs/profile/api/person_client.bal index b83e8006..2d1918f9 100644 --- a/campus/bffs/profile/api/person_client.bal +++ b/campus/bffs/profile/api/person_client.bal @@ -36,7 +36,42 @@ public isolated client class GraphqlClient { } remote isolated function getOrganization(int id) returns GetOrganizationResponse|graphql:ClientError { - string query = string `query getOrganization($id:Int!) {organization(id:$id) {id name {name_en} description child_organizations {id name {name_en} description} parent_organizations {id name {name_en} description} people {id preferred_name digital_id}}}`; + string query = string `query getOrganization($id: Int!) { + organization(id: $id) { + id + name { + name_en + } + description + child_organizations { + id + name { + name_en + } + description + child_organizations { + id + name { + name_en + } + description + } + } + parent_organizations { + id + name { + name_en + } + description + } + people { + id + preferred_name + digital_id + } + } +} +`; map variables = {"id": id}; json graphqlResponse = check self.graphqlClient->executeWithType(query, variables); return check performDataBinding(graphqlResponse, GetOrganizationResponse); diff --git a/campus/mobile/android/app/build.gradle b/campus/mobile/android/app/build.gradle index 3a976e6a..3ec464b1 100644 --- a/campus/mobile/android/app/build.gradle +++ b/campus/mobile/android/app/build.gradle @@ -22,13 +22,21 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } +def keystoreProperties = new Properties() +def keystorePropertiesFile = rootProject.file('key.properties') +if (keystorePropertiesFile.exists()) { + keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) +} + + + android { // flavorDimensions "environment" // productFlavors { // development { // dimension "environment" - // applicationId "com.example.mobile" + // applicationId "com.avinya.mobile" // manifestPlaceholders = [ // 'appAuthRedirectScheme': "com.avinyafoundation.campusapp.dev", // 'applicationName': "com.example.mobile" @@ -77,13 +85,20 @@ android { - 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 - } - } + signingConfigs { + release { + keyAlias keystoreProperties['keyAlias'] + keyPassword keystoreProperties['keyPassword'] + storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null + storePassword keystoreProperties['storePassword'] + } + } + buildTypes { + release { + signingConfig signingConfigs.release + } + } + } flutter { diff --git a/campus/mobile/android/app/src/main/AndroidManifest.xml b/campus/mobile/android/app/src/main/AndroidManifest.xml index 9007a132..a5ca4afd 100644 --- a/campus/mobile/android/app/src/main/AndroidManifest.xml +++ b/campus/mobile/android/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleDisplayName - Mobile + Avinya Apps CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier @@ -13,7 +13,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - mobile + Avinya Apps CFBundlePackageType APPL CFBundleShortVersionString diff --git a/campus/mobile/lib/config/app_config.dart b/campus/mobile/lib/config/app_config.dart index 73373be3..8e677aaa 100644 --- a/campus/mobile/lib/config/app_config.dart +++ b/campus/mobile/lib/config/app_config.dart @@ -9,9 +9,11 @@ class AppConfig { static String campusBffApiKey = ''; static String refreshToken = ''; static String choreoSTSEndpoint = ""; - static String choreoSTSClientID = "x23_1tY7kAUtLUH9il9I3YwyrJca"; + // static String choreoSTSClientID = "x23_1tY7kAUtLUH9il9I3YwyrJca"; + static String choreoSTSClientID = "Krjx9Wr0F5eKDYAJQOSVX5rz2aoa"; static String asgardeoTokenEndpoint = ""; - static String asgardeoClientId = "pJ2gM2o6yXN4f60FypEYWWERrAoa"; + // static String asgardeoClientId = "pJ2gM2o6yXN4f60FypEYWWERrAoa"; + static String asgardeoClientId = "6diD3fVU6KfYeokr3BZGoGPioCUa"; static var apiTokens = null; static String applicationName = 'Avinya Campus Apps'; static String applicationVersion = '1.0.0'; diff --git a/campus/mobile/linux/CMakeLists.txt b/campus/mobile/linux/CMakeLists.txt index f8028f9f..09740baa 100644 --- a/campus/mobile/linux/CMakeLists.txt +++ b/campus/mobile/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 "mobile") +set(BINARY_NAME "Avinya Apps") # The unique GTK application identifier for this application. See: # https://wiki.gnome.org/HowDoI/ChooseApplicationID -set(APPLICATION_ID "com.example.mobile") +set(APPLICATION_ID "com.avinya.mobile") # Explicitly opt in to modern CMake behaviors to avoid warnings with recent # versions of CMake. diff --git a/campus/mobile/macos/Runner/Configs/AppInfo.xcconfig b/campus/mobile/macos/Runner/Configs/AppInfo.xcconfig index 047f6261..b219cb32 100644 --- a/campus/mobile/macos/Runner/Configs/AppInfo.xcconfig +++ b/campus/mobile/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 = mobile +PRODUCT_NAME = Avinya Apps; // The application's bundle identifier -PRODUCT_BUNDLE_IDENTIFIER = com.example.mobile +PRODUCT_BUNDLE_IDENTIFIER = com.avinya.mobile; // The copyright displayed in application information PRODUCT_COPYRIGHT = Copyright © 2023 com.example. All rights reserved. diff --git a/campus/mobile/pubspec.yaml b/campus/mobile/pubspec.yaml index 02eabc58..b8411b6c 100644 --- a/campus/mobile/pubspec.yaml +++ b/campus/mobile/pubspec.yaml @@ -71,6 +71,12 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter + flutter_launcher_icons: "^0.13.1" + +flutter_launcher_icons: + android: true + ios: true + image_path: "assets/images/app_logo.png" # The "flutter_lints" package below contains a set of recommended lints to # encourage good coding practices. The lint set provided by the package is diff --git a/campus/mobile/web/index.html b/campus/mobile/web/index.html index 3402a1c5..16f2ef89 100644 --- a/campus/mobile/web/index.html +++ b/campus/mobile/web/index.html @@ -29,7 +29,7 @@ - mobile + Avinya Apps