Haroon6138
/
cloudsolutions-atoms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 25 Wiki Activity

added RSG Logo

Browse Source
main_production_RSG
WaseemAbbasi22 1 month ago
parent 0bdd8d779d
commit d8d51418a7
8 changed files with 52 additions and 43 deletions
Show Stats Download Patch File Download Diff File

2
android/app/src/main/AndroidManifest.xml
Unescape Escape View File

@ -43,7 +43,7 @@
<application
android:name="${applicationName}"
android:icon="@mipmap/ic_launcher"
android:label="ATOMS"
android:label="RSG Atoms"
android:roundIcon="@mipmap/ic_launcher_round"
android:showWhenLocked="true"
android:turnScreenOn="true"

BIN
assets/images/RSG_logo.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 21 KiB

21
assets/images/RSG_logo.svg
Unescape Escape View File

@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg id="uuid-ca551e69-305e-4e64-8f7c-e51c0e65b683" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 370.77 326.55">
<path d="M228.8,125.11c-.45-4.51-3.61-8.57-7.67-9.93,0-1.35,0-3.16-.45-4.96-.45-4.51-4.06-8.57-8.57-9.48,0-.9,0-2.26-.45-3.61-.45-5.87-5.41-10.38-11.28-10.83-4.06,0-9.93-.45-14.44-.45s-10.38.45-14.44.45c-5.87.45-10.83,4.96-11.28,10.83,0,1.35,0,2.26-.45,3.61-4.51,1.35-8.12,4.96-8.57,9.48,0,1.8-.45,3.61-.45,4.96-4.06,1.35-6.77,5.41-7.67,9.93-.45,5.41-1.35,12.63-1.35,18.5s.9,13.09,1.35,18.5c.45,5.87,5.41,10.38,11.28,10.83,9.02.45,21.66,1.35,31.59,1.35s22.56-.9,31.59-1.35c5.87-.45,10.83-4.96,11.28-10.83.45-5.41,1.35-12.63,1.35-18.5s-.9-13.09-1.35-18.5ZM171.94,93.52c4.06,0,9.48-.45,13.99-.45s9.93.45,13.99.45c2.71,0,4.51,2.26,4.96,4.51v2.26c-5.87,0-13.09-.45-18.95-.45s-13.09,0-18.95.45v-2.26c.45-2.71,2.26-4.51,4.96-4.51ZM185.93,112.93c-8.57,0-19.4.45-27.98.9,0-.9,0-1.8.45-3.16.45-2.26,2.26-4.06,4.96-4.06,6.77-.45,15.79-.45,23.01-.45s16.24.45,23.01.45c2.71,0,4.51,1.8,4.96,4.06,0,.9.45,2.26.45,3.16-9.48,0-20.31-.9-28.88-.9Z" fill="#273b4c"/>
<path d="M232.15,231.2c-3.25,0-6.42-1.67-8.19-4.67-2.67-4.52-1.17-10.34,3.35-13.01,19.13-11.31,45.3-31.46,51.59-75.71.74-5.19,5.56-8.81,10.74-8.07,5.19.74,8.81,5.55,8.07,10.74-8.3,58.41-47.77,81.73-60.73,89.39-1.52.9-3.18,1.32-4.82,1.32Z" fill="#e6c7b1"/>
<path d="M260.61,40.76c1.98,3.27,2.02,7.59-.29,11.42-3.47,5.76-10.96,8.23-16.71,5.51-24.38-11.53-63.02-24.09-116.76-.24-6.31,2.8-13.31.42-15.63-5.3-2.32-5.73.91-12.64,7.21-15.44,70.94-31.48,121.23-7.71,137.75.11,1.93.91,3.43,2.3,4.42,3.95Z" fill="#e6c7b1"/>
<path d="M75.54,135.99c1.19-3.03,3.9-5.36,7.34-5.92,5.18-.84,10.06,2.69,10.89,7.87,3.54,21.94,12.75,53.66,51.65,75.67,4.57,2.58,6.17,8.39,3.59,12.95-2.58,4.57-8.38,6.17-12.95,3.59-51.34-29.05-58.65-74.3-61.05-89.18-.28-1.74-.07-3.45.53-4.97Z" fill="#e6c7b1"/>
<circle cx="288.19" cy="98.36" r="10.05" fill="#273b4c"/>
<circle cx="85.57" cy="98.36" r="10.05" fill="#273b4c"/>
<circle cx="187" cy="231.26" r="10.05" fill="#273b4c"/>
<g>
<path d="M46.19,277.64c0,7.02-3.43,11.16-8.45,12.93l6.58,9.5c1.22,1.88,2.82,3.7,4.64,4.7h-10.89c-1.88-.5-3.26-1.93-4.48-3.81l-6.3-9.06h-4.37v6.24c0,2.49.83,6.08,1.93,6.63h-14.09c1.11-.55,1.93-4.14,1.93-6.63v-28.18c0-2.49-.83-6.08-1.93-6.63h19.12c9.28,0,16.3,4.09,16.3,14.31ZM29,284.99c3.43,0,6.74-2.49,6.74-7.35s-3.32-7.4-6.74-7.4h-6.08v14.75h6.08Z" fill="#f1c8b3"/>
<path d="M51.71,301.9v-10.28c2.27,2.93,7.51,7.18,14.37,7.18,5.42,0,8.23-2.15,8.23-5.42,0-7.68-22.21-3.32-22.21-18.95,0-8.23,7.02-12.21,16.52-12.21,5.3,0,10.94,1.49,14.59,3.48v9.84c-2.21-2.87-7.24-6.41-13.1-6.41-4.2,0-6.52,1.88-6.52,4.14,0,7.29,22.16,3.26,22.16,18.9,0,9.34-7.96,13.54-18.46,13.54-5.41,0-11.93-1.82-15.58-3.81Z" fill="#f1c8b3"/>
<path d="M111.67,269.13c-6.69,0-11.82,5.25-11.82,14.64,0,8.84,5.03,14.09,10.94,14.09,2.21,0,3.65-.39,4.42-1.22v-6.58c0-2.15-.88-5.64-1.99-6.19h14.09c-1.11.55-1.93,4.03-1.93,6.19v10.28c-2.21,2.38-7.79,5.25-14.04,5.25-11.99,0-21.88-7.46-21.88-21.72s9.78-21.66,21.44-21.66c4.31,0,9.5,1.05,12.71,3.32v9.84c-3.21-3.87-7.18-6.24-11.94-6.24Z" fill="#f1c8b3"/>
<path d="M188.49,304.71h-14.86c.88-.88.55-4.53-.22-6.91l-1.49-3.87h-13.7l-1.49,3.87c-.83,2.38-1.16,6.02-.28,6.91h-11.27c1.22-.22,3.09-3.32,3.92-5.64l10-28.9c.83-2.32,1.11-6.02.11-6.91h13.04l12.32,35.81c.77,2.32,2.71,5.41,3.92,5.64ZM169.65,286.98l-4.59-12.87-4.59,12.87h9.17Z" fill="#1c3f52"/>
<path d="M211.42,270.24h-4.48v27.9c0,2.49.83,6.08,1.93,6.63h-14.09c1.11-.55,1.93-4.14,1.93-6.63v-27.9h-4.48c-2.87,0-7.24.83-7.96,1.93v-8.84h35.09v8.84c-.72-1.11-5.08-1.93-7.96-1.93Z" fill="#1c3f52"/>
<path d="M264.47,283.99c0,14.31-9.67,21.72-21.33,21.72s-21.33-7.4-21.33-21.72,9.67-21.66,21.33-21.66,21.33,7.4,21.33,21.66ZM243.14,298.8c6.24,0,10.89-5.47,10.89-14.81s-4.64-14.75-10.89-14.75-10.94,5.47-10.94,14.75,4.64,14.81,10.94,14.81Z" fill="#1c3f52"/>
<path d="M317.07,270.24l3.59,28.01c.28,2.38.99,5.08,2.71,6.52h-14.15c.99-.72,1.44-4.37,1.11-6.85l-2.93-22.65-7.96,22.65c-.83,2.27-1.11,5.97-.28,6.85h-11.55c.88-.88.5-4.53-.22-6.85l-8.01-22.65-2.93,22.65c-.33,2.49.11,6.13,1.11,6.85h-11.22c1.66-1.44,2.43-4.09,2.71-6.41l3.54-28.12c.33-2.49,0-6.19-1.05-6.85l16.74-.05c-.88.88-.55,4.53.22,6.91l6.47,17.85,6.46-17.85c.77-2.38,1.05-6.02.06-6.91h16.69c-.99.72-1.38,4.42-1.11,6.91Z" fill="#1c3f52"/>
<path d="M325.97,301.9v-10.28c2.27,2.93,7.51,7.18,14.37,7.18,5.42,0,8.23-2.15,8.23-5.42,0-7.68-22.21-3.32-22.21-18.95,0-8.23,7.02-12.21,16.52-12.21,5.3,0,10.94,1.49,14.59,3.48v9.84c-2.21-2.87-7.24-6.41-13.1-6.41-4.2,0-6.52,1.88-6.52,4.14,0,7.29,22.16,3.26,22.16,18.9,0,9.34-7.96,13.54-18.46,13.54-5.41,0-11.93-1.82-15.58-3.81Z" fill="#1c3f52"/>
</g>
<path d="M185.11,152.83c-3.15,0-7.74-.46-11.56-3.56-3.78-3.07-3.67-7.18-3.62-9.15,0-.23.02-.45.01-.64-.5-2.01.62-4.09,2.62-4.76,2.1-.69,4.36.44,5.06,2.54.36,1.08.33,2.14.3,3.08-.05,1.78.06,2.24.66,2.72,2.42,1.96,6.21,1.81,8.25,1.73.42-.02.78-.03,1.06-.03,2.17,0,5.13,0,6.89-1.61,1.41-1.29,1.52-2.74,1.51-4.12,0-.2,0-.37,0-.51.06-2.21,1.94-3.95,4.11-3.88,2.21.06,3.95,1.91,3.88,4.11v.22c.01,1.55.04,6.28-4.1,10.07-4.05,3.7-9.4,3.71-12.28,3.71-.2,0-.45.01-.75.02-.57.02-1.27.05-2.05.05ZM170.02,139.78s0,0,0,0c0,0,0,0,0,0Z" fill="#fff"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 5.1 KiB

4
ios/Runner/Info.plist
Unescape Escape View File

@ -7,7 +7,7 @@
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleDisplayName</key>
<string>Atoms</string>
<string>RSG Atoms</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
@ -15,7 +15,7 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>Atoms</string>
<string>RSG Atoms</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>NFCReaderUsageDescription</key>

2
lib/new_views/pages/login_page.dart
Unescape Escape View File

@ -91,7 +91,7 @@ class _LoginPageState extends State<LoginPage> {
SizedBox(
height: 100.toScreenHeight,
),
"logo_white".toPngAsset(width: 110),
"RSG_logo".toSvgAsset(width: 110),
25.height,
context.translation.signInToYour.customHeadingText(context).custom(color: Colors.white, fontSize: 27, fontWeight: FontWeight.w500),
context.translation.account.customHeadingText(context).custom(color: Colors.white, fontSize: 27, fontWeight: FontWeight.w500),

60
lib/new_views/pages/splash_page.dart
Unescape Escape View File

@ -3,7 +3,6 @@ import 'dart:io';
import 'package:firebase_core/firebase_core.dart';
import 'package:firebase_messaging/firebase_messaging.dart';
import 'package:flare_flutter/flare_actor.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:local_auth/local_auth.dart';
@ -14,6 +13,7 @@ import 'package:test_sa/controllers/api_routes/urls.dart';
import 'package:test_sa/controllers/notification/firebase_notification_manger.dart';
import 'package:test_sa/controllers/providers/api/user_provider.dart';
import 'package:test_sa/controllers/providers/settings/setting_provider.dart';
import 'package:test_sa/extensions/text_extensions.dart';
import 'package:test_sa/extensions/widget_extensions.dart';
import 'package:test_sa/new_views/app_style/app_color.dart';
import 'package:test_sa/new_views/common_widgets/app_lazy_loading.dart';
@ -184,27 +184,11 @@ class _SplashPageState extends State<SplashPage> {
SizeConfig.init(context);
_settingProvider = Provider.of<SettingProvider>(context, listen: false);
_userProvider = Provider.of<UserProvider>(context, listen: false);
return Scaffold(
body: Stack(
alignment: Alignment.center,
children: [
if (loading)
Positioned(
bottom: 100,
child: SizedBox(
width: 36,
height: 36,
child: CircularProgressIndicator(color: AppColor.loadingColor(context), strokeWidth: 3),
)),
SizedBox(
width: MediaQuery.of(context).size.width / 1.1,
child: Hero(
tag: "logo",
child: FlareActor(
"assets/rives/atoms_splash.flr",
fit: BoxFit.contain,
animation: "splash",
callback: (animation) async {
// Start splash logic after a delay
Future.delayed(const Duration(seconds: 2), () async {
if (!mounted) return;
bool isSafe = await checkDeviceSafety();
if (!isSafe) {
@ -216,22 +200,26 @@ class _SplashPageState extends State<SplashPage> {
Navigator.of(context).pushNamedAndRemoveUntil(LoginPage.routeName, (routes) => true);
}
}
});
// if (_settingProvider.isLoaded && (_settingProvider.user?.isLiveToken ?? false)) {
// _userProvider.user = _settingProvider.user;
// Navigator.of(context).pushNamedAndRemoveUntil(LandPage.routeName, (routes) => true);
// // if(isnotificationCame)
// // Navigator.of(context).push(MaterialPageRoute(
// // builder: (_) => ServiceRequestDetailsPage(
// // serviceRequest: ServiceRequest(id: "72348"),
// // )));
// /// The below line for the new design
// // Navigator.of(context).pushNamedAndRemoveUntil(LandPage.routeName, (routes) => true);
// }
},
),
),
return Scaffold(
body: Stack(
alignment: Alignment.center,
children: [
// RSG Logo
Hero(
tag: "logo",
child: "RSG_logo".toSvgAsset(height: 100),
).center,
// Loading indicator
if (loading)
Positioned(
bottom: 100,
child: SizedBox(
width: 36,
height: 36,
child: CircularProgressIndicator(color: AppColor.loadingColor(context), strokeWidth: 3),
)),
],
),
);

2
lib/new_views/pages/unsafe_device_view.dart
Unescape Escape View File

@ -30,7 +30,7 @@ class _UnsafeDeviceScreenState extends State<UnsafeDeviceScreen> {
children: [
21.height,
// Center(child: Image.asset("assets/images/logos/main_mohemm_logo.png", width: 200, height: 50)),
"logo".toSvgAsset(height: 64),
"RSG_logo".toSvgAsset(height: 64),
50.height,
"Sorry".heading5(context).custom(color: AppColor.textStyleColor(context)),
21.height,

2
lib/views/update_available_screen.dart
Unescape Escape View File

@ -21,7 +21,7 @@ class UpdateAvailableScreen extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Hero(tag: "logo", child: "logo".toSvgAsset(height: 64)),
Hero(tag: "logo", child: "RSG_logo".toSvgAsset(height: 64)),
48.height,
Text(
"Update Available",

Write Preview
Loading…
Cancel
Save