task-me
/
application-old-0.63
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Fix | Add colors from light theme

merge-requests/53/head
Denis Kurmansky 3 years ago
parent
7c35612966
commit
78bb5b4aac
7 changed files with 46 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      ios/File.swift
  2. 4
      ios/taskme-Bridging-Header.h
  3. 12
      ios/taskme.xcodeproj/project.pbxproj
  4. 4
      ios/taskme/LaunchScreen.storyboard
  5. 14
      src/shared/themes/dark/calls.ts
  6. 2
      src/shared/themes/dark/index.ts
  7. 5
      src/shared/themes/dark/shared-components.ts

8
ios/File.swift
Unescape View File

@ -0,0 +1,8 @@ @@ -0,0 +1,8 @@
//
// File.swift
// taskme
//
// Created by Denis Kurmansky on 23.09.2021.
//
import Foundation

4
ios/taskme-Bridging-Header.h
Unescape View File

@ -0,0 +1,4 @@ @@ -0,0 +1,4 @@
//
// Use this file to import your target's public headers that you would like to expose to Swift.
//

12
ios/taskme.xcodeproj/project.pbxproj
Unescape View File

@ -11,6 +11,7 @@ @@ -11,6 +11,7 @@
13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; };
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
1CEA5DFB26FCA6F700BCC3E1 /* File.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CEA5DFA26FCA6F700BCC3E1 /* File.swift */; };
5244945D26B7EA27006A5FAB /* fontello.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5244945C26B7EA27006A5FAB /* fontello.ttf */; };
81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
C7ADD18BD8397A7936258DD8 /* libPods-taskme-taskmeTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 60559287623ADE493014FD74 /* libPods-taskme-taskmeTests.a */; };
@ -38,6 +39,8 @@ @@ -38,6 +39,8 @@
13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = taskme/Images.xcassets; sourceTree = "<group>"; };
13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = taskme/Info.plist; sourceTree = "<group>"; };
13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = taskme/main.m; sourceTree = "<group>"; };
1CEA5DF926FCA6F600BCC3E1 /* taskme-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "taskme-Bridging-Header.h"; sourceTree = "<group>"; };
1CEA5DFA26FCA6F700BCC3E1 /* File.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = File.swift; sourceTree = "<group>"; };
5244945C26B7EA27006A5FAB /* fontello.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = fontello.ttf; path = ../src/assets/fonts/fontello.ttf; sourceTree = "<group>"; };
60559287623ADE493014FD74 /* libPods-taskme-taskmeTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-taskme-taskmeTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = taskme/LaunchScreen.storyboard; sourceTree = "<group>"; };
@ -94,6 +97,8 @@ @@ -94,6 +97,8 @@
13B07FB61A68108700A75B9A /* Info.plist */,
81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */,
13B07FB71A68108700A75B9A /* main.m */,
1CEA5DFA26FCA6F700BCC3E1 /* File.swift */,
1CEA5DF926FCA6F600BCC3E1 /* taskme-Bridging-Header.h */,
);
name = taskme;
sourceTree = "<group>";
@ -210,7 +215,7 @@ @@ -210,7 +215,7 @@
TestTargetID = 13B07F861A680F5B00A75B9A;
};
13B07F861A680F5B00A75B9A = {
LastSwiftMigration = 1120;
LastSwiftMigration = 1300;
};
};
};
@ -415,6 +420,7 @@ @@ -415,6 +420,7 @@
buildActionMask = 2147483647;
files = (
13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */,
1CEA5DFB26FCA6F700BCC3E1 /* File.swift in Sources */,
13B07FC11A68108700A75B9A /* main.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
@ -434,6 +440,7 @@ @@ -434,6 +440,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = B7C72778F15CB549ACBD7D0D /* Pods-taskme-taskmeTests.debug.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
BUNDLE_LOADER = "$(TEST_HOST)";
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
@ -461,6 +468,7 @@ @@ -461,6 +468,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = CDDE2FAA031C2C2D42B6673D /* Pods-taskme-taskmeTests.release.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
BUNDLE_LOADER = "$(TEST_HOST)";
COPY_PHASE_STRIP = NO;
INFOPLIST_FILE = taskmeTests/Info.plist;
@ -506,6 +514,7 @@ @@ -506,6 +514,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.jetup.taskme;
PRODUCT_NAME = taskme;
PROVISIONING_PROFILE_SPECIFIER = taskmejetup;
SWIFT_OBJC_BRIDGING_HEADER = "taskme-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
VALID_ARCHS = "arm64 arm64e armv7 x86_64";
@ -539,6 +548,7 @@ @@ -539,6 +548,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.jetup.taskme;
PRODUCT_NAME = taskme;
PROVISIONING_PROFILE_SPECIFIER = taskmejetup;
SWIFT_OBJC_BRIDGING_HEADER = "taskme-Bridging-Header.h";
SWIFT_VERSION = 5.0;
VALID_ARCHS = "arm64 arm64e armv7 x86_64";
VERSIONING_SYSTEM = "apple-generic";

4
ios/taskme/LaunchScreen.storyboard
Unescape View File

@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19162" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19144"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>

14
src/shared/themes/dark/calls.ts
Unescape View File

@ -0,0 +1,14 @@ @@ -0,0 +1,14 @@
import { CallsColors } from '../interfaces/calls.interface'
export const callsColors: CallsColors = {
calls: {
$callerFullName: '#3B3B3B',
$infoText: '#7F7F7F',
$missedColor: '#DE253B',
$accepted: '#38B362',
deleteBtn: {
$bg: '#E4B9B9',
$text: '#870D0D',
},
},
}

2
src/shared/themes/dark/index.ts
Unescape View File

@ -5,6 +5,7 @@ import { navigation } from './navigation' @@ -5,6 +5,7 @@ import { navigation } from './navigation'
import { settingsColors } from './settings'
import { taskCardColors } from './task-card'
import { contactsColors } from './contacts'
import { callsColors } from './calls'
export const darkTheme: Partial<Theme> = {
...colors,
@ -13,4 +14,5 @@ export const darkTheme: Partial<Theme> = { @@ -13,4 +14,5 @@ export const darkTheme: Partial<Theme> = {
...settingsColors,
...taskCardColors,
...contactsColors,
...callsColors,
}

5
src/shared/themes/dark/shared-components.ts
Unescape View File

@ -26,6 +26,7 @@ export const sharedComponentsColors: SharedComponentsColors = { @@ -26,6 +26,7 @@ export const sharedComponentsColors: SharedComponentsColors = {
},
iconComponent: {
$primaryColor: '#C6C6C6',
$primaryDarker: '#7F7F7F',
$secondaryColor: '#DE253B',
$iconBg: colors.$primary,
$primaryBg: '#EAEAEA',
@ -35,4 +36,8 @@ export const sharedComponentsColors: SharedComponentsColors = { @@ -35,4 +36,8 @@ export const sharedComponentsColors: SharedComponentsColors = {
$icon: '#7F7F7F',
$iconBg: '#EAEAEA',
},
circleCheckBox: {
$bg: '#DE253B',
$icon: '#fff',
},
}

Write Preview
Loading…
Cancel
Save