Skip to content

Commit 173ce8a

Browse files
makjacmakjac
authored
Merge pull request #49 add splash screen and unify hover colors
Makjac/add splash screen and unify hover colors in notes
2 parents e6fe995 + bcde878 commit 173ce8a

File tree

49 files changed

+265
-96
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+265
-96
lines changed

‎android/app/src/main/res/drawable-hdpi/android12splash.png

12 KB
Loading

‎android/app/src/main/res/drawable-hdpi/splash.png

12 KB
Loading

‎android/app/src/main/res/drawable-mdpi/android12splash.png

6.49 KB
Loading

‎android/app/src/main/res/drawable-mdpi/splash.png

6.49 KB
Loading

‎android/app/src/main/res/drawable-night-hdpi/android12splash.png

12 KB
Loading

‎android/app/src/main/res/drawable-night-mdpi/android12splash.png

6.49 KB
Loading

‎android/app/src/main/res/drawable-night-xhdpi/android12splash.png

15.9 KB
Loading

‎android/app/src/main/res/drawable-night-xxhdpi/android12splash.png

36.5 KB
Loading

‎android/app/src/main/res/drawable-night-xxxhdpi/android12splash.png

38.1 KB
Loading

‎android/app/src/main/res/drawable-v21/background.png

69 Bytes
Loading

‎android/app/src/main/res/drawable-v21/launch_background.xml

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- Modify this file to customize your launch splash screen -->
32
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
4-
<item android:drawable="?android:colorBackground" />
5-
<background android:drawable="@mipmap/ic_launcher_adaptive_back"/>
6-
<foreground android:drawable="@mipmap/ic_launcher_adaptive_fore"/>
7-
<monochrome android:drawable="@mipmap/ic_launcher_monochrome"/>
8-
9-
<!-- You can insert your own image assets here -->
10-
<!-- <item>
11-
<bitmap
12-
android:gravity="center"
13-
android:src="@mipmap/launch_image" />
14-
</item> -->
3+
<item>
4+
<bitmap android:gravity="fill" android:src="@drawable/background"/>
5+
</item>
6+
<item>
7+
<bitmap android:gravity="center" android:src="@drawable/splash"/>
8+
</item>
159
</layer-list>

‎android/app/src/main/res/drawable-xhdpi/android12splash.png

15.9 KB
Loading

‎android/app/src/main/res/drawable-xhdpi/splash.png

15.9 KB
Loading

‎android/app/src/main/res/drawable-xxhdpi/android12splash.png

36.5 KB
Loading

‎android/app/src/main/res/drawable-xxhdpi/splash.png

36.5 KB
Loading

‎android/app/src/main/res/drawable-xxxhdpi/android12splash.png

38.1 KB
Loading

‎android/app/src/main/res/drawable-xxxhdpi/splash.png

38.1 KB
Loading

‎android/app/src/main/res/drawable/background.png

69 Bytes
Loading

‎android/app/src/main/res/drawable/launch_background.xml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- Modify this file to customize your launch splash screen -->
32
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
4-
<item android:drawable="@android:color/white" />
5-
6-
<!-- You can insert your own image assets here -->
7-
<!-- <item>
8-
<bitmap
9-
android:gravity="center"
10-
android:src="@mipmap/launch_image" />
11-
</item> -->
3+
<item>
4+
<bitmap android:gravity="fill" android:src="@drawable/background"/>
5+
</item>
6+
<item>
7+
<bitmap android:gravity="center" android:src="@drawable/splash"/>
8+
</item>
129
</layer-list>

‎android/app/src/main/res/values-night-v31/styles.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
4+
<style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
5+
<item name="android:forceDarkAllowed">false</item>
6+
<item name="android:windowFullscreen">false</item>
7+
<item name="android:windowDrawsSystemBarBackgrounds">false</item>
8+
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
9+
<item name="android:windowSplashScreenBackground">#ffffff</item>
10+
<item name="android:windowSplashScreenAnimatedIcon">@drawable/android12splash</item>
11+
</style>
12+
<!-- Theme applied to the Android Window as soon as the process has started.
13+
This theme determines the color of the Android Window while your
14+
Flutter UI initializes, as well as behind your Flutter UI while its
15+
running.
16+
17+
This Theme is only used starting with V2 of Flutter's Android embedding. -->
18+
<style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
19+
<item name="android:windowBackground">?android:colorBackground</item>
20+
</style>
21+
</resources>

‎android/app/src/main/res/values-night/styles.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
<!-- Show a splash screen on the activity. Automatically removed when
66
the Flutter engine draws its first frame -->
77
<item name="android:windowBackground">@drawable/launch_background</item>
8+
<item name="android:forceDarkAllowed">false</item>
9+
<item name="android:windowFullscreen">false</item>
10+
<item name="android:windowDrawsSystemBarBackgrounds">false</item>
11+
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
812
</style>
913
<!-- Theme applied to the Android Window as soon as the process has started.
1014
This theme determines the color of the Android Window while your

‎android/app/src/main/res/values-v31/styles.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
4+
<style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
5+
<item name="android:forceDarkAllowed">false</item>
6+
<item name="android:windowFullscreen">false</item>
7+
<item name="android:windowDrawsSystemBarBackgrounds">false</item>
8+
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
9+
<item name="android:windowSplashScreenBackground">#ffffff</item>
10+
<item name="android:windowSplashScreenAnimatedIcon">@drawable/android12splash</item>
11+
</style>
12+
<!-- Theme applied to the Android Window as soon as the process has started.
13+
This theme determines the color of the Android Window while your
14+
Flutter UI initializes, as well as behind your Flutter UI while its
15+
running.
16+
17+
This Theme is only used starting with V2 of Flutter's Android embedding. -->
18+
<style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
19+
<item name="android:windowBackground">?android:colorBackground</item>
20+
</style>
21+
</resources>

‎android/app/src/main/res/values/styles.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
<!-- Show a splash screen on the activity. Automatically removed when
66
the Flutter engine draws its first frame -->
77
<item name="android:windowBackground">@drawable/launch_background</item>
8+
<item name="android:forceDarkAllowed">false</item>
9+
<item name="android:windowFullscreen">false</item>
10+
<item name="android:windowDrawsSystemBarBackgrounds">false</item>
11+
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
812
</style>
913
<!-- Theme applied to the Android Window as soon as the process has started.
1014
This theme determines the color of the Android Window while your

‎assets/splash_screen/quick_note.png

40.2 KB
Loading

‎flutter_native_splash.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
flutter_native_splash:
2+
color: "#ffffff"
3+
image: assets/splash_screen/quick_note.png
4+
5+
android_12:
6+
color: "#ffffff"
7+
image: assets/splash_screen/quick_note.png

‎installers/windows/innosetup/qicknote_innosetup.iss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
33

44
#define MyAppName "QuickNote"
5-
#define MyAppVersion "1.2.2+11"
5+
#define MyAppVersion "1.2.3+12"
66
#define MyAppPublisher "ecoala.eu sp. z.o.o"
77
#define MyAppURL "https://github.com/makjac/quick_note"
88
#define MyAppExeName "quick_note.exe"

‎ios/Runner/Assets.xcassets/LaunchBackground.imageset/Contents.json

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "background.png",
5+
"idiom" : "universal",
6+
"scale" : "1x"
7+
},
8+
{
9+
"idiom" : "universal",
10+
"scale" : "2x"
11+
},
12+
{
13+
"idiom" : "universal",
14+
"scale" : "3x"
15+
}
16+
],
17+
"info" : {
18+
"author" : "xcode",
19+
"version" : 1
20+
}
21+
}

‎ios/Runner/Assets.xcassets/LaunchBackground.imageset/background.png

69 Bytes
Loading

‎ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
{
22
"images" : [
33
{
4-
"idiom" : "universal",
54
"filename" : "LaunchImage.png",
5+
"idiom" : "universal",
66
"scale" : "1x"
77
},
88
{
9-
"idiom" : "universal",
109
"filename" : "[email protected]",
10+
"idiom" : "universal",
1111
"scale" : "2x"
1212
},
1313
{
14-
"idiom" : "universal",
1514
"filename" : "[email protected]",
15+
"idiom" : "universal",
1616
"scale" : "3x"
1717
}
1818
],
1919
"info" : {
20-
"version" : 1,
21-
"author" : "xcode"
20+
"author" : "xcode",
21+
"version" : 1
2222
}
2323
}

‎ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png

6.42 KB
Loading

‎ios/Runner/Assets.xcassets/LaunchImage.imageset/[email protected]

15.8 KB
Loading

‎ios/Runner/Assets.xcassets/LaunchImage.imageset/[email protected]

36.4 KB
Loading

‎ios/Runner/Base.lproj/LaunchScreen.storyboard

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,19 @@
1616
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
1717
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
1818
<subviews>
19-
<imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="LaunchImage" translatesAutoresizingMaskIntoConstraints="NO" id="YRO-k0-Ey4">
20-
</imageView>
19+
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" image="LaunchBackground" translatesAutoresizingMaskIntoConstraints="NO" id="tWc-Dq-wcI"/>
20+
<imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="LaunchImage" translatesAutoresizingMaskIntoConstraints="NO" id="YRO-k0-Ey4"></imageView>
2121
</subviews>
2222
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
2323
<constraints>
24-
<constraint firstItem="YRO-k0-Ey4" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="1a2-6s-vTC"/>
25-
<constraint firstItem="YRO-k0-Ey4" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="4X2-HB-R7a"/>
24+
<constraint firstItem="YRO-k0-Ey4" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="3T2-ad-Qdv"/>
25+
<constraint firstItem="tWc-Dq-wcI" firstAttribute="bottom" secondItem="Ze5-6b-2t3" secondAttribute="bottom" id="RPx-PI-7Xg"/>
26+
<constraint firstItem="tWc-Dq-wcI" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="SdS-ul-q2q"/>
27+
<constraint firstAttribute="trailing" secondItem="tWc-Dq-wcI" secondAttribute="trailing" id="Swv-Gf-Rwn"/>
28+
<constraint firstAttribute="trailing" secondItem="YRO-k0-Ey4" secondAttribute="trailing" id="TQA-XW-tRk"/>
29+
<constraint firstItem="YRO-k0-Ey4" firstAttribute="bottom" secondItem="Ze5-6b-2t3" secondAttribute="bottom" id="duK-uY-Gun"/>
30+
<constraint firstItem="tWc-Dq-wcI" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="kV7-tw-vXt"/>
31+
<constraint firstItem="YRO-k0-Ey4" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="xPn-NY-SIU"/>
2632
</constraints>
2733
</view>
2834
</viewController>
@@ -32,6 +38,7 @@
3238
</scene>
3339
</scenes>
3440
<resources>
35-
<image name="LaunchImage" width="168" height="185"/>
41+
<image name="LaunchImage" width="300" height="300"/>
42+
<image name="LaunchBackground" width="1" height="1"/>
3643
</resources>
3744
</document>

‎ios/Runner/Info.plist

Lines changed: 47 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,51 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
4-
<dict>
5-
<key>CFBundleDevelopmentRegion</key>
6-
<string>$(DEVELOPMENT_LANGUAGE)</string>
7-
<key>CFBundleDisplayName</key>
8-
<string>Quick Note</string>
9-
<key>CFBundleExecutable</key>
10-
<string>$(EXECUTABLE_NAME)</string>
11-
<key>CFBundleIdentifier</key>
12-
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
13-
<key>CFBundleInfoDictionaryVersion</key>
14-
<string>6.0</string>
15-
<key>CFBundleName</key>
16-
<string>quick_note</string>
17-
<key>CFBundlePackageType</key>
18-
<string>APPL</string>
19-
<key>CFBundleShortVersionString</key>
20-
<string>$(FLUTTER_BUILD_NAME)</string>
21-
<key>CFBundleSignature</key>
22-
<string>????</string>
23-
<key>CFBundleVersion</key>
24-
<string>$(FLUTTER_BUILD_NUMBER)</string>
25-
<key>LSRequiresIPhoneOS</key>
26-
<true/>
27-
<key>UILaunchStoryboardName</key>
28-
<string>LaunchScreen</string>
29-
<key>UIMainStoryboardFile</key>
30-
<string>Main</string>
31-
<key>UISupportedInterfaceOrientations</key>
32-
<array>
33-
<string>UIInterfaceOrientationPortrait</string>
34-
<string>UIInterfaceOrientationLandscapeLeft</string>
35-
<string>UIInterfaceOrientationLandscapeRight</string>
36-
</array>
37-
<key>UISupportedInterfaceOrientations~ipad</key>
38-
<array>
39-
<string>UIInterfaceOrientationPortrait</string>
40-
<string>UIInterfaceOrientationPortraitUpsideDown</string>
41-
<string>UIInterfaceOrientationLandscapeLeft</string>
42-
<string>UIInterfaceOrientationLandscapeRight</string>
43-
</array>
44-
<key>CADisableMinimumFrameDurationOnPhone</key>
45-
<true/>
46-
<key>UIApplicationSupportsIndirectInputEvents</key>
47-
<true/>
48-
</dict>
4+
<dict>
5+
<key>CFBundleDevelopmentRegion</key>
6+
<string>$(DEVELOPMENT_LANGUAGE)</string>
7+
<key>CFBundleDisplayName</key>
8+
<string>Quick Note</string>
9+
<key>CFBundleExecutable</key>
10+
<string>$(EXECUTABLE_NAME)</string>
11+
<key>CFBundleIdentifier</key>
12+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
13+
<key>CFBundleInfoDictionaryVersion</key>
14+
<string>6.0</string>
15+
<key>CFBundleName</key>
16+
<string>quick_note</string>
17+
<key>CFBundlePackageType</key>
18+
<string>APPL</string>
19+
<key>CFBundleShortVersionString</key>
20+
<string>$(FLUTTER_BUILD_NAME)</string>
21+
<key>CFBundleSignature</key>
22+
<string>????</string>
23+
<key>CFBundleVersion</key>
24+
<string>$(FLUTTER_BUILD_NUMBER)</string>
25+
<key>LSRequiresIPhoneOS</key>
26+
<true/>
27+
<key>UILaunchStoryboardName</key>
28+
<string>LaunchScreen</string>
29+
<key>UIMainStoryboardFile</key>
30+
<string>Main</string>
31+
<key>UISupportedInterfaceOrientations</key>
32+
<array>
33+
<string>UIInterfaceOrientationPortrait</string>
34+
<string>UIInterfaceOrientationLandscapeLeft</string>
35+
<string>UIInterfaceOrientationLandscapeRight</string>
36+
</array>
37+
<key>UISupportedInterfaceOrientations~ipad</key>
38+
<array>
39+
<string>UIInterfaceOrientationPortrait</string>
40+
<string>UIInterfaceOrientationPortraitUpsideDown</string>
41+
<string>UIInterfaceOrientationLandscapeLeft</string>
42+
<string>UIInterfaceOrientationLandscapeRight</string>
43+
</array>
44+
<key>CADisableMinimumFrameDurationOnPhone</key>
45+
<true/>
46+
<key>UIApplicationSupportsIndirectInputEvents</key>
47+
<true/>
48+
<key>UIStatusBarHidden</key>
49+
<false/>
50+
</dict>
4951
</plist>

‎lib/feature/notebook/presentation/widget/note_block/blocks/bookmarks/bookmarks_grid_widget.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class BookmarksGridWidget extends StatelessWidget {
4848
),
4949
child: Container(
5050
decoration: BoxDecoration(
51-
color: Colors.white24,
51+
color: Colors.white12,
5252
borderRadius: BorderRadius.circular(Insets.xs),
5353
),
5454
child: child,

‎lib/feature/notebook/presentation/widget/note_block/blocks/todo/todo_block_check_list_item.dart

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,7 @@ class _TodoBlockCheckListItem extends State<TodoBlockCheckListItem> {
7575

7676
BoxDecoration _buildContainerDecoration(BuildContext context) {
7777
return BoxDecoration(
78-
color: _isHovered
79-
? Theme.of(context).todoTaskHoverColor
80-
: Colors.transparent,
78+
color: _isHovered ? Theme.of(context).hoverColor : Colors.transparent,
8179
borderRadius: BorderRadius.circular(Insets.xs),
8280
);
8381
}

‎lib/feature/notebook/presentation/widget/note_block/blocks/todo/todo_block_list.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class TodoBlockList extends StatelessWidget {
5858
return Transform.scale(
5959
scale: scale,
6060
child: Card(
61-
color: Colors.white24,
61+
color: Colors.white12,
6262
shadowColor: Colors.transparent,
6363
child: child,
6464
),

‎lib/preferences/theme/app_custom_colors.dart

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ extension AppColors on ThemeData {
4848
brightness == Brightness.dark ? Colors.black87 : Colors.white70;
4949
Color get todoAddTaskForegroundButtonColor =>
5050
brightness == Brightness.dark ? Colors.white60 : Colors.black54;
51-
Color get todoTaskHoverColor =>
52-
brightness == Brightness.dark ? Colors.white12 : Colors.black12;
5351
// Bookmark
5452
Color get bookmarkDragIconColor =>
5553
brightness == Brightness.dark ? Colors.white30 : Colors.black38;
@@ -59,6 +57,4 @@ extension AppColors on ThemeData {
5957
brightness == Brightness.dark ? Colors.white : Colors.white70;
6058
Color get bookmarkFullUrlColor =>
6159
brightness == Brightness.dark ? Colors.white54 : Colors.black54;
62-
Color get bookmarkHoverColor =>
63-
brightness == Brightness.dark ? Colors.white12 : Colors.black12;
6460
}

‎pubspec.lock

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,14 @@ packages:
2525
url: "https://pub.dev"
2626
source: hosted
2727
version: "6.4.1"
28+
ansicolor:
29+
dependency: transitive
30+
description:
31+
name: ansicolor
32+
sha256: "50e982d500bc863e1d703448afdbf9e5a72eb48840a4f766fa361ffd6877055f"
33+
url: "https://pub.dev"
34+
source: hosted
35+
version: "2.0.3"
2836
archive:
2937
dependency: transitive
3038
description:
@@ -427,6 +435,14 @@ packages:
427435
description: flutter
428436
source: sdk
429437
version: "0.0.0"
438+
flutter_native_splash:
439+
dependency: "direct main"
440+
description:
441+
name: flutter_native_splash
442+
sha256: aa06fec78de2190f3db4319dd60fdc8d12b2626e93ef9828633928c2dcaea840
443+
url: "https://pub.dev"
444+
source: hosted
445+
version: "2.4.1"
430446
flutter_staggered_grid_view:
431447
dependency: "direct main"
432448
description:
@@ -1130,6 +1146,14 @@ packages:
11301146
url: "https://pub.dev"
11311147
source: hosted
11321148
version: "1.3.2"
1149+
universal_io:
1150+
dependency: transitive
1151+
description:
1152+
name: universal_io
1153+
sha256: "1722b2dcc462b4b2f3ee7d188dad008b6eb4c40bbd03a3de451d82c78bba9aad"
1154+
url: "https://pub.dev"
1155+
source: hosted
1156+
version: "2.2.2"
11331157
url_launcher:
11341158
dependency: "direct main"
11351159
description:

0 commit comments

Comments
 (0)