Skip to content

Commit

Permalink
Theme rename to Carbon
Browse files Browse the repository at this point in the history
  • Loading branch information
@yekta
yekta committed Aug 24, 2021
1 parent 8fd418c commit 0c25821
Show file tree
Hide file tree
Showing 11 changed files with 54 additions and 54 deletions.
24 changes: 12 additions & 12 deletions ios/Runner.xcodeproj/project.pbxproj
View file
Expand Up @@ -20,9 +20,9 @@
39167ED322219A75008D1855 /* In-Icon-App@1x.png in Resources */ = {isa = PBXBuildFile; fileRef = 39167ED022219A74008D1855 /* In-Icon-App@1x.png */; };
39167ED422219A75008D1855 /* In-Icon-App@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 39167ED122219A74008D1855 /* In-Icon-App@3x.png */; };
39167ED522219A75008D1855 /* In-Icon-App@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 39167ED222219A74008D1855 /* In-Icon-App@2x.png */; };
3967CCD426D5518E0038BF52 /* Ra-Icon-App@1x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3967CCD126D5518E0038BF52 /* Ra-Icon-App@1x.png */; };
3967CCD526D5518E0038BF52 /* Ra-Icon-App@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3967CCD226D5518E0038BF52 /* Ra-Icon-App@2x.png */; };
3967CCD626D5518E0038BF52 /* Ra-Icon-App@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3967CCD326D5518E0038BF52 /* Ra-Icon-App@3x.png */; };
39A26A7226D5621E00977C6C /* C-Icon-App@1x.png in Resources */ = {isa = PBXBuildFile; fileRef = 39A26A6F26D5621D00977C6C /* C-Icon-App@1x.png */; };
39A26A7326D5621E00977C6C /* C-Icon-App@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 39A26A7026D5621D00977C6C /* C-Icon-App@2x.png */; };
39A26A7426D5621E00977C6C /* C-Icon-App@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 39A26A7126D5621E00977C6C /* C-Icon-App@3x.png */; };
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
766334D722C3E7DC008DDB1D /* empty.swift in Sources */ = {isa = PBXBuildFile; fileRef = 766334D622C3E7DC008DDB1D /* empty.swift */; };
766B58B8221AFEB4009C8264 /* Icon-App@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 766B58A8221AFEB4009C8264 /* Icon-App@3x.png */; };
Expand Down Expand Up @@ -66,9 +66,9 @@
39167ED022219A74008D1855 /* In-Icon-App@1x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "In-Icon-App@1x.png"; sourceTree = "<group>"; };
39167ED122219A74008D1855 /* In-Icon-App@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "In-Icon-App@3x.png"; sourceTree = "<group>"; };
39167ED222219A74008D1855 /* In-Icon-App@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "In-Icon-App@2x.png"; sourceTree = "<group>"; };
3967CCD126D5518E0038BF52 /* Ra-Icon-App@1x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Ra-Icon-App@1x.png"; path = "../../../../Desktop/Ra-Icon-App@1x.png"; sourceTree = "<group>"; };
3967CCD226D5518E0038BF52 /* Ra-Icon-App@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Ra-Icon-App@2x.png"; path = "../../../../Desktop/Ra-Icon-App@2x.png"; sourceTree = "<group>"; };
3967CCD326D5518E0038BF52 /* Ra-Icon-App@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Ra-Icon-App@3x.png"; path = "../../../../Desktop/Ra-Icon-App@3x.png"; sourceTree = "<group>"; };
39A26A6F26D5621D00977C6C /* C-Icon-App@1x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "C-Icon-App@1x.png"; sourceTree = "<group>"; };
39A26A7026D5621D00977C6C /* C-Icon-App@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "C-Icon-App@2x.png"; sourceTree = "<group>"; };
39A26A7126D5621E00977C6C /* C-Icon-App@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "C-Icon-App@3x.png"; sourceTree = "<group>"; };
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
552E09CE27D49778F805B244 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
766334D522C3E7DC008DDB1D /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -121,9 +121,9 @@
766B589C221AFEB4009C8264 /* resources */ = {
isa = PBXGroup;
children = (
3967CCD126D5518E0038BF52 /* Ra-Icon-App@1x.png */,
3967CCD226D5518E0038BF52 /* Ra-Icon-App@2x.png */,
3967CCD326D5518E0038BF52 /* Ra-Icon-App@3x.png */,
39A26A6F26D5621D00977C6C /* C-Icon-App@1x.png */,
39A26A7026D5621D00977C6C /* C-Icon-App@2x.png */,
39A26A7126D5621E00977C6C /* C-Icon-App@3x.png */,
39167ED022219A74008D1855 /* In-Icon-App@1x.png */,
39167ED222219A74008D1855 /* In-Icon-App@2x.png */,
39167ED122219A74008D1855 /* In-Icon-App@3x.png */,
Expand Down Expand Up @@ -300,15 +300,16 @@
39167EC122218469008D1855 /* Th-Icon-App@3x.png in Resources */,
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
39A26A7426D5621E00977C6C /* C-Icon-App@3x.png in Resources */,
39167EBB22218469008D1855 /* Np-Icon-App@3x.png in Resources */,
39A26A7326D5621E00977C6C /* C-Icon-App@2x.png in Resources */,
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
3967CCD426D5518E0038BF52 /* Ra-Icon-App@1x.png in Resources */,
39A26A7226D5621E00977C6C /* C-Icon-App@1x.png in Resources */,
766B58BA221AFEB4009C8264 /* Icon-App@1x.png in Resources */,
39167ED422219A75008D1855 /* In-Icon-App@3x.png in Resources */,
766B58B9221AFEB4009C8264 /* Icon-App@2x.png in Resources */,
766B58B8221AFEB4009C8264 /* Icon-App@3x.png in Resources */,
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
3967CCD626D5518E0038BF52 /* Ra-Icon-App@3x.png in Resources */,
39167ED522219A75008D1855 /* In-Icon-App@2x.png in Resources */,
39167EB922218469008D1855 /* Np-Icon-App@1x.png in Resources */,
39167EC222218469008D1855 /* Ti-Icon-App@1x.png in Resources */,
Expand All @@ -317,7 +318,6 @@
39167EBE22218469008D1855 /* Th-Icon-App@2x.png in Resources */,
39167EC022218469008D1855 /* Ti-Icon-App@2x.png in Resources */,
39167EBF22218469008D1855 /* Ti-Icon-App@3x.png in Resources */,
3967CCD526D5518E0038BF52 /* Ra-Icon-App@2x.png in Resources */,
39167ED322219A75008D1855 /* In-Icon-App@1x.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down
4 changes: 2 additions & 2 deletions ios/Runner/AppDelegate.m
View file
Expand Up @@ -52,8 +52,8 @@ - (BOOL)application:(UIApplication *)application
[self lc_setAlternateIconName:@"neptunium"];
} else if ([@"thorium" isEqualToString:icon]) {
[self lc_setAlternateIconName:@"thorium"];
} else if ([@"radium" isEqualToString:icon]) {
[self lc_setAlternateIconName:@"radium"];
} else if ([@"carbon" isEqualToString:icon]) {
[self lc_setAlternateIconName:@"carbon"];
}
} else if ([@"setSecureClipboardItem" isEqualToString:call.method]) {
NSDictionary *arguments = [call arguments];
Expand Down
8 changes: 4 additions & 4 deletions ios/Runner/Info.plist
View file
Expand Up @@ -103,11 +103,11 @@
<key>UIPrerenderedIcon</key>
<false/>
</dict>
<key>radium</key>
<key>carbon</key>
<dict>
<key>CFBundleIconFiles</key>
<array>
<string>Ra-Icon-App</string>
<string>C-Icon-App</string>
</array>
<key>UIPrerenderedIcon</key>
<false/>
Expand Down Expand Up @@ -139,11 +139,11 @@
<key>UIPrerenderedIcon</key>
<false/>
</dict>
<key>radium</key>
<key>carbon</key>
<dict>
<key>CFBundleIconFiles</key>
<array>
<string>Ra-Icon-App</string>
<string>C-Icon-App</string>
</array>
<key>UIPrerenderedIcon</key>
<false/>
Expand Down
Binary file added ios/Runner/resources/C-Icon-App@1x.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ios/Runner/resources/C-Icon-App@2x.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ios/Runner/resources/C-Icon-App@3x.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed ios/Runner/resources/Ra-Icon-App@1x.png
View file
Binary file not shown.
Binary file removed ios/Runner/resources/Ra-Icon-App@2x.png
View file
Binary file not shown.
Binary file removed ios/Runner/resources/Ra-Icon-App@3x.png
View file
Binary file not shown.
10 changes: 5 additions & 5 deletions lib/model/available_themes.dart
View file
Expand Up @@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:natrium_wallet_flutter/themes.dart';
import 'package:natrium_wallet_flutter/model/setting_item.dart';

enum ThemeOptions { NATRIUM, TITANIUM, INDIUM, NEPTUNIUM, THORIUM, RADIUM }
enum ThemeOptions { NATRIUM, TITANIUM, INDIUM, NEPTUNIUM, THORIUM, CARBON }

/// Represent notification on/off setting
class ThemeSetting extends SettingSelectionItem {
Expand All @@ -12,8 +12,8 @@ class ThemeSetting extends SettingSelectionItem {

String getDisplayName(BuildContext context) {
switch (theme) {
case ThemeOptions.RADIUM:
return "Radium";
case ThemeOptions.CARBON:
return "Carbon";
case ThemeOptions.THORIUM:
return "Thorium";
case ThemeOptions.NEPTUNIUM:
Expand All @@ -30,8 +30,8 @@ class ThemeSetting extends SettingSelectionItem {

BaseTheme getTheme() {
switch (theme) {
case ThemeOptions.RADIUM:
return RadiumTheme();
case ThemeOptions.CARBON:
return CarbonTheme();
case ThemeOptions.THORIUM:
return ThoriumTheme();
case ThemeOptions.NEPTUNIUM:
Expand Down
62 changes: 31 additions & 31 deletions lib/themes.dart
View file
Expand Up @@ -467,35 +467,35 @@ class ThoriumTheme extends BaseTheme {
AppIconEnum appIcon = AppIconEnum.THORIUM;
}

class RadiumTheme extends BaseTheme {
static const tealishGreen = Color(0xFF77D9A8);
class CarbonTheme extends BaseTheme {
static const brightBlue = Color(0xFF99C1F0);

static const yellowishGreen = Color(0xFFB5D96C);
static const green = Color(0xFF41E099);

static const yellowishGreenDark = Color(0xFF5F7338);
static const greenDark = Color(0xFF148A55);

static const white = Color(0xFFFFFFFF);
static const whiteish = Color(0xFFE9E9F2);

static const black = Color(0xFF000000);
static const blackGreenish = Color(0xFF0E1411);
static const blackLighter = Color(0xFF111112);
static const blackBlueish = Color(0xFF0D1014);
static const blackLighter = Color(0xFF0E0F0F);

Color primary = tealishGreen;
Color primary60 = tealishGreen.withOpacity(0.6);
Color primary45 = tealishGreen.withOpacity(0.45);
Color primary30 = tealishGreen.withOpacity(0.3);
Color primary20 = tealishGreen.withOpacity(0.2);
Color primary15 = tealishGreen.withOpacity(0.15);
Color primary10 = tealishGreen.withOpacity(0.1);
Color primary = brightBlue;
Color primary60 = brightBlue.withOpacity(0.6);
Color primary45 = brightBlue.withOpacity(0.45);
Color primary30 = brightBlue.withOpacity(0.3);
Color primary20 = brightBlue.withOpacity(0.2);
Color primary15 = brightBlue.withOpacity(0.15);
Color primary10 = brightBlue.withOpacity(0.1);

Color success = yellowishGreen;
Color success60 = yellowishGreen.withOpacity(0.6);
Color success30 = yellowishGreen.withOpacity(0.3);
Color success15 = yellowishGreen.withOpacity(0.15);
Color success = green;
Color success60 = green.withOpacity(0.6);
Color success30 = green.withOpacity(0.3);
Color success15 = green.withOpacity(0.15);

Color successDark = yellowishGreenDark;
Color successDark30 = yellowishGreenDark.withOpacity(0.3);
Color successDark = greenDark;
Color successDark30 = greenDark.withOpacity(0.3);

Color background = black;
Color background40 = black.withOpacity(0.4);
Expand Down Expand Up @@ -524,13 +524,13 @@ class RadiumTheme extends BaseTheme {
Color overlay30 = blackLighter.withOpacity(0.3);
Color overlay20 = blackLighter.withOpacity(0.2);

Color barrier = blackGreenish.withOpacity(0.8);
Color barrierWeaker = blackGreenish.withOpacity(0.7);
Color barrierWeakest = blackGreenish.withOpacity(0.35);
Color barrierStronger = blackGreenish.withOpacity(0.9);
Color barrier = blackBlueish.withOpacity(0.8);
Color barrierWeaker = blackBlueish.withOpacity(0.7);
Color barrierWeakest = blackBlueish.withOpacity(0.35);
Color barrierStronger = blackBlueish.withOpacity(0.9);

Color animationOverlayMedium = blackGreenish.withOpacity(0.8);
Color animationOverlayStrong = blackGreenish.withOpacity(0.9);
Color animationOverlayMedium = blackBlueish.withOpacity(0.8);
Color animationOverlayStrong = blackBlueish.withOpacity(0.9);

Brightness brightness = Brightness.dark;
SystemUiOverlayStyle statusBar =
Expand All @@ -543,17 +543,17 @@ class RadiumTheme extends BaseTheme {
spreadRadius: 1,
);
BoxShadow boxShadowButton = BoxShadow(
color: tealishGreen.withOpacity(0.24),
color: brightBlue.withOpacity(0.24),
offset: Offset(0, 0),
blurRadius: 0,
spreadRadius: 0,
);

OverlayTheme qrScanTheme = OverlayTheme.RADIUM;
AppIconEnum appIcon = AppIconEnum.RADIUM;
OverlayTheme qrScanTheme = OverlayTheme.CARBON;
AppIconEnum appIcon = AppIconEnum.CARBON;
}

enum AppIconEnum { NATRIUM, TITANIUM, INDIUM, NEPTUNIUM, THORIUM, RADIUM }
enum AppIconEnum { NATRIUM, TITANIUM, INDIUM, NEPTUNIUM, THORIUM, CARBON }

class AppIcon {
static const _channel = const MethodChannel('fappchannel');
Expand All @@ -576,8 +576,8 @@ class AppIcon {
case AppIconEnum.TITANIUM:
iconStr = "titanium";
break;
case AppIconEnum.RADIUM:
iconStr = "radium";
case AppIconEnum.CARBON:
iconStr = "carbon";
break;
case AppIconEnum.NATRIUM:
default:
Expand Down

0 comments on commit 0c25821

Please sign in to comment.