From fce055e8fea7cd28d5a43bbd88efcd87f7ab68b2 Mon Sep 17 00:00:00 2001
From: mabdc <747455334@qq.com>
Date: Mon, 1 Mar 2021 13:20:43 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E9=AB=98=E5=BA=A6=20=E5=BF=85=E9=A1=BB?=
=?UTF-8?q?=E5=AF=B9=E9=BD=90=E5=88=B0=E6=95=B4=E6=95=B0=E5=83=8F=E7=B4=A0?=
=?UTF-8?q?=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
example/android/.gitignore | 11 ++
example/android/app/build.gradle | 59 ++++++
.../android/app/src/debug/AndroidManifest.xml | 7 +
.../android/app/src/main/AndroidManifest.xml | 41 ++++
.../com/example/example/MainActivity.kt | 6 +
.../res/drawable-v21/launch_background.xml | 12 ++
.../main/res/drawable/launch_background.xml | 12 ++
.../src/main/res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 544 bytes
.../src/main/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 442 bytes
.../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 721 bytes
.../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 1031 bytes
.../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 1443 bytes
.../app/src/main/res/values-night/styles.xml | 18 ++
.../app/src/main/res/values/styles.xml | 18 ++
.../app/src/profile/AndroidManifest.xml | 7 +
example/android/build.gradle | 31 +++
example/android/gradle.properties | 3 +
.../gradle/wrapper/gradle-wrapper.properties | 6 +
example/android/settings.gradle | 11 ++
example/lib/first_chapter.dart | 4 +-
example/lib/main.dart | 181 ++++++++++++------
example/pubspec.lock | 36 ++--
example/test/widget_test.dart | 30 +++
example/web/favicon.png | Bin 0 -> 917 bytes
example/web/icons/Icon-192.png | Bin 0 -> 5292 bytes
example/web/icons/Icon-512.png | Bin 0 -> 8252 bytes
example/web/index.html | 98 ++++++++++
example/web/manifest.json | 23 +++
.../flutter/generated_plugin_registrant.cc | 2 +
.../flutter/generated_plugin_registrant.h | 2 +
lib/text_composition.dart | 60 ++++--
31 files changed, 584 insertions(+), 94 deletions(-)
create mode 100644 example/android/.gitignore
create mode 100644 example/android/app/build.gradle
create mode 100644 example/android/app/src/debug/AndroidManifest.xml
create mode 100644 example/android/app/src/main/AndroidManifest.xml
create mode 100644 example/android/app/src/main/kotlin/com/example/example/MainActivity.kt
create mode 100644 example/android/app/src/main/res/drawable-v21/launch_background.xml
create mode 100644 example/android/app/src/main/res/drawable/launch_background.xml
create mode 100644 example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
create mode 100644 example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
create mode 100644 example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
create mode 100644 example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
create mode 100644 example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
create mode 100644 example/android/app/src/main/res/values-night/styles.xml
create mode 100644 example/android/app/src/main/res/values/styles.xml
create mode 100644 example/android/app/src/profile/AndroidManifest.xml
create mode 100644 example/android/build.gradle
create mode 100644 example/android/gradle.properties
create mode 100644 example/android/gradle/wrapper/gradle-wrapper.properties
create mode 100644 example/android/settings.gradle
create mode 100644 example/test/widget_test.dart
create mode 100644 example/web/favicon.png
create mode 100644 example/web/icons/Icon-192.png
create mode 100644 example/web/icons/Icon-512.png
create mode 100644 example/web/index.html
create mode 100644 example/web/manifest.json
diff --git a/example/android/.gitignore b/example/android/.gitignore
new file mode 100644
index 0000000..0a741cb
--- /dev/null
+++ b/example/android/.gitignore
@@ -0,0 +1,11 @@
+gradle-wrapper.jar
+/.gradle
+/captures/
+/gradlew
+/gradlew.bat
+/local.properties
+GeneratedPluginRegistrant.java
+
+# Remember to never publicly share your keystore.
+# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
+key.properties
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
new file mode 100644
index 0000000..6ca2344
--- /dev/null
+++ b/example/android/app/build.gradle
@@ -0,0 +1,59 @@
+def localProperties = new Properties()
+def localPropertiesFile = rootProject.file('local.properties')
+if (localPropertiesFile.exists()) {
+ localPropertiesFile.withReader('UTF-8') { reader ->
+ localProperties.load(reader)
+ }
+}
+
+def flutterRoot = localProperties.getProperty('flutter.sdk')
+if (flutterRoot == null) {
+ throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
+}
+
+def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
+if (flutterVersionCode == null) {
+ flutterVersionCode = '1'
+}
+
+def flutterVersionName = localProperties.getProperty('flutter.versionName')
+if (flutterVersionName == null) {
+ flutterVersionName = '1.0'
+}
+
+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
+
+android {
+ compileSdkVersion 30
+
+ sourceSets {
+ main.java.srcDirs += 'src/main/kotlin'
+ }
+
+ defaultConfig {
+ // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
+ applicationId "com.example.example"
+ minSdkVersion 16
+ targetSdkVersion 30
+ versionCode flutterVersionCode.toInteger()
+ versionName flutterVersionName
+ }
+
+ 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
+ }
+ }
+}
+
+flutter {
+ source '../..'
+}
+
+dependencies {
+ implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+}
diff --git a/example/android/app/src/debug/AndroidManifest.xml b/example/android/app/src/debug/AndroidManifest.xml
new file mode 100644
index 0000000..c208884
--- /dev/null
+++ b/example/android/app/src/debug/AndroidManifest.xml
@@ -0,0 +1,7 @@
+
+
+
+
diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..34dd77e
--- /dev/null
+++ b/example/android/app/src/main/AndroidManifest.xml
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/example/android/app/src/main/kotlin/com/example/example/MainActivity.kt b/example/android/app/src/main/kotlin/com/example/example/MainActivity.kt
new file mode 100644
index 0000000..e793a00
--- /dev/null
+++ b/example/android/app/src/main/kotlin/com/example/example/MainActivity.kt
@@ -0,0 +1,6 @@
+package com.example.example
+
+import io.flutter.embedding.android.FlutterActivity
+
+class MainActivity: FlutterActivity() {
+}
diff --git a/example/android/app/src/main/res/drawable-v21/launch_background.xml b/example/android/app/src/main/res/drawable-v21/launch_background.xml
new file mode 100644
index 0000000..f74085f
--- /dev/null
+++ b/example/android/app/src/main/res/drawable-v21/launch_background.xml
@@ -0,0 +1,12 @@
+
+
+
+
.replaceAll(" ", "")
.split("\n")
.where((e) => e.isNotEmpty)
- .map((e) => "[开始]$e[结束]")
+ .map((e) => "[开始${++_paragraph}]$e[结束$_paragraph]")
.toList();
+
+var _paragraph = 0;
diff --git a/example/lib/main.dart b/example/lib/main.dart
index a09771d..541fbc1 100644
--- a/example/lib/main.dart
+++ b/example/lib/main.dart
@@ -1,86 +1,151 @@
+import 'dart:ui';
+
import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
import 'package:text_composition/text_composition.dart';
import 'first_chapter.dart';
main(List args) {
- runApp(MaterialApp(home: Home()));
+ runApp(MaterialApp(home: Setting()));
}
-class Home extends StatelessWidget {
- const Home({Key? key}) : super(key: key);
+class Setting extends StatefulWidget {
+ Setting({Key? key}) : super(key: key);
+
+ @override
+ _SettingState createState() => _SettingState();
+}
+class _SettingState extends State {
+ var size = TextEditingController(text: '16'),
+ height = TextEditingController(text: '1.55'),
+ paragraph = TextEditingController(text: '10'),
+ shouldJustifyHeight = true,
+ start = DateTime.now(),
+ end = DateTime.now();
+ TextComposition? tc;
@override
Widget build(BuildContext context) {
+ final pwidth = window.physicalSize.width;
+ final pheight = window.physicalSize.height;
+ final ratio = window.devicePixelRatio;
return Scaffold(
- body: TextButton(
- child: Text("开"),
- onPressed: () => Navigator.of(context).push(
- MaterialPageRoute(builder: (BuildContext context) => Page()),
- ),
+ body: ListView(
+ padding: EdgeInsets.all(30),
+ children: [
+ Text("width / ratio: $pwidth / $ratio = ${pwidth / ratio}"),
+ Text("height / ratio: $pheight / $ratio = ${pheight / ratio}"),
+ OutlinedButton(
+ child: Text("重新获取屏幕大小"),
+ onPressed: () => setState(() {}),
+ ),
+ TextField(
+ decoration: InputDecoration(labelText: "字号 size"),
+ controller: size,
+ keyboardType: TextInputType.number,
+ ),
+ TextField(
+ decoration: InputDecoration(labelText: "行高 height"),
+ controller: height,
+ keyboardType: TextInputType.number,
+ ),
+ TextField(
+ decoration: InputDecoration(labelText: "段高 paragraph"),
+ controller: paragraph,
+ keyboardType: TextInputType.number,
+ ),
+ SwitchListTile(
+ title: Text("是否底栏对齐"),
+ subtitle: Text("shouldJustifyHeight"),
+ value: shouldJustifyHeight,
+ onChanged: (bool value) => setState(() {
+ shouldJustifyHeight = !shouldJustifyHeight;
+ }),
+ ),
+ Text("排版开始 $start"),
+ Text("排版结束 $end"),
+ OutlinedButton(
+ child: Text("开始或重新排版"),
+ onPressed: () {
+ start = DateTime.now();
+ tc = TextComposition(
+ paragraphs: first_chapter,
+ size: double.tryParse(size.text) ?? 16.0,
+ height: double.tryParse(height.text) ?? 1.55,
+ paragraph: int.tryParse(paragraph.text) ?? 10,
+ boxWidth: pwidth / ratio - 30,
+ boxHeight: pheight / ratio,
+ shouldJustifyHeight: shouldJustifyHeight,
+ );
+ end = DateTime.now();
+ setState(() {});
+ },
+ ),
+ OutlinedButton(
+ child: Text("预览"),
+ onPressed: () {
+ if (tc == null) {
+ ScaffoldMessenger.of(context).showSnackBar(SnackBar(
+ content: Text('先排版才能预览'),
+ ));
+ } else {
+ Navigator.of(context)
+ .push(MaterialPageRoute(
+ builder: (BuildContext context) => Page(tc: tc!)))
+ .then((value) => SystemChrome.setEnabledSystemUIOverlays(SystemUiOverlay.values));
+ }
+ },
+ ),
+ ],
),
);
}
}
class Page extends StatelessWidget {
- const Page({Key? key}) : super(key: key);
+ final TextComposition tc;
+ const Page({required this.tc, Key? key}) : super(key: key);
@override
Widget build(BuildContext context) {
- final start = DateTime.now();
- final tc = TextComposition(
- paragraphs: first_chapter,
- boxHeight: 500,
- boxWidth: 320,
- );
- final end = DateTime.now();
+ SystemChrome.setEnabledSystemUIOverlays([]);
final style = TextStyle(color: Colors.white);
return Scaffold(
- body: Container(
- color: Colors.deepPurple,
- width: 320 + 30,
- child: Column(
- children: [
- Text("开始时间 $start", style: style),
- Text("结束时间 $end", style: style),
- Expanded(
- child: ListView.separated(
- separatorBuilder: (context, index) => Container(
- height: 20,
- color: Colors.teal,
- child: Text("页数 ${index + 1} / ${tc.pageCount}", style: style),
- ),
- itemCount: tc.pageCount,
- itemBuilder: (BuildContext context, int index) {
- return SizedBox(
- height: 500,
- child: Row(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- Column(
- children: List.generate(
- 500 ~/ 20,
- (index) => Container(
- height: 20,
- width: 30,
- color: Colors.primaries[index % Colors.primaries.length],
- child: Text(
- ((index + 1) * 20).toString(),
- textAlign: TextAlign.end,
- style: TextStyle(color: Colors.white),
- ),
- ),
- )),
- Expanded(child: RichText(text: tc.getPageView(tc.pages[index]))),
- ],
+ body: ListView.separated(
+ separatorBuilder: (context, index) => Container(
+ height: 20,
+ color: Colors.teal,
+ child: Text("页数 ${index + 1} / ${tc.pageCount}", style: style),
+ ),
+ itemCount: tc.pageCount,
+ itemBuilder: (BuildContext context, int index) {
+ return Container(
+ height: tc.boxHeight,
+ color: Colors.deepPurple,
+ width: tc.boxWidth + 30,
+ child: Row(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ Column(
+ children: List.generate(
+ tc.boxHeight ~/ 20,
+ (index) => Container(
+ height: 20,
+ width: 30,
+ color: Colors.primaries[index % Colors.primaries.length],
+ child: Text(
+ ((index + 1) * 20).toString(),
+ textAlign: TextAlign.end,
+ style: TextStyle(color: Colors.white),
),
- );
- },
- ),
+ ),
+ )),
+ tc.getPageWidget(tc.pages[index]),
+ ],
),
- ],
- ),
+ );
+ },
),
);
}
diff --git a/example/pubspec.lock b/example/pubspec.lock
index d0b0fa3..e4f63dc 100644
--- a/example/pubspec.lock
+++ b/example/pubspec.lock
@@ -7,49 +7,49 @@ packages:
name: async
url: "https://pub.flutter-io.cn"
source: hosted
- version: "2.5.0-nullsafety.3"
+ version: "2.5.0"
boolean_selector:
dependency: transitive
description:
name: boolean_selector
url: "https://pub.flutter-io.cn"
source: hosted
- version: "2.1.0-nullsafety.3"
+ version: "2.1.0"
characters:
dependency: transitive
description:
name: characters
url: "https://pub.flutter-io.cn"
source: hosted
- version: "1.1.0-nullsafety.5"
+ version: "1.1.0"
charcode:
dependency: transitive
description:
name: charcode
url: "https://pub.flutter-io.cn"
source: hosted
- version: "1.2.0-nullsafety.3"
+ version: "1.2.0"
clock:
dependency: transitive
description:
name: clock
url: "https://pub.flutter-io.cn"
source: hosted
- version: "1.1.0-nullsafety.3"
+ version: "1.1.0"
collection:
dependency: transitive
description:
name: collection
url: "https://pub.flutter-io.cn"
source: hosted
- version: "1.15.0-nullsafety.5"
+ version: "1.15.0"
fake_async:
dependency: transitive
description:
name: fake_async
url: "https://pub.flutter-io.cn"
source: hosted
- version: "1.2.0-nullsafety.3"
+ version: "1.2.0"
flutter:
dependency: "direct main"
description: flutter
@@ -66,21 +66,21 @@ packages:
name: matcher
url: "https://pub.flutter-io.cn"
source: hosted
- version: "0.12.10-nullsafety.3"
+ version: "0.12.10"
meta:
dependency: transitive
description:
name: meta
url: "https://pub.flutter-io.cn"
source: hosted
- version: "1.3.0-nullsafety.6"
+ version: "1.3.0"
path:
dependency: transitive
description:
name: path
url: "https://pub.flutter-io.cn"
source: hosted
- version: "1.8.0-nullsafety.3"
+ version: "1.8.0"
sky_engine:
dependency: transitive
description: flutter
@@ -92,42 +92,42 @@ packages:
name: source_span
url: "https://pub.flutter-io.cn"
source: hosted
- version: "1.8.0-nullsafety.4"
+ version: "1.8.1"
stack_trace:
dependency: transitive
description:
name: stack_trace
url: "https://pub.flutter-io.cn"
source: hosted
- version: "1.10.0-nullsafety.6"
+ version: "1.10.0"
stream_channel:
dependency: transitive
description:
name: stream_channel
url: "https://pub.flutter-io.cn"
source: hosted
- version: "2.1.0-nullsafety.3"
+ version: "2.1.0"
string_scanner:
dependency: transitive
description:
name: string_scanner
url: "https://pub.flutter-io.cn"
source: hosted
- version: "1.1.0-nullsafety.3"
+ version: "1.1.0"
term_glyph:
dependency: transitive
description:
name: term_glyph
url: "https://pub.flutter-io.cn"
source: hosted
- version: "1.2.0-nullsafety.3"
+ version: "1.2.0"
test_api:
dependency: transitive
description:
name: test_api
url: "https://pub.flutter-io.cn"
source: hosted
- version: "0.2.19-nullsafety.6"
+ version: "0.2.19"
text_composition:
dependency: "direct main"
description:
@@ -141,14 +141,14 @@ packages:
name: typed_data
url: "https://pub.flutter-io.cn"
source: hosted
- version: "1.3.0-nullsafety.5"
+ version: "1.3.0"
vector_math:
dependency: transitive
description:
name: vector_math
url: "https://pub.flutter-io.cn"
source: hosted
- version: "2.1.0-nullsafety.5"
+ version: "2.1.0"
sdks:
dart: ">=2.12.0-0.0 <3.0.0"
flutter: ">=1.17.0"
diff --git a/example/test/widget_test.dart b/example/test/widget_test.dart
new file mode 100644
index 0000000..747db1d
--- /dev/null
+++ b/example/test/widget_test.dart
@@ -0,0 +1,30 @@
+// This is a basic Flutter widget test.
+//
+// To perform an interaction with a widget in your test, use the WidgetTester
+// utility that Flutter provides. For example, you can send tap and scroll
+// gestures. You can also use WidgetTester to find child widgets in the widget
+// tree, read text, and verify that the values of widget properties are correct.
+
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+import 'package:example/main.dart';
+
+void main() {
+ testWidgets('Counter increments smoke test', (WidgetTester tester) async {
+ // Build our app and trigger a frame.
+ await tester.pumpWidget(MyApp());
+
+ // Verify that our counter starts at 0.
+ expect(find.text('0'), findsOneWidget);
+ expect(find.text('1'), findsNothing);
+
+ // Tap the '+' icon and trigger a frame.
+ await tester.tap(find.byIcon(Icons.add));
+ await tester.pump();
+
+ // Verify that our counter has incremented.
+ expect(find.text('0'), findsNothing);
+ expect(find.text('1'), findsOneWidget);
+ });
+}
diff --git a/example/web/favicon.png b/example/web/favicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..8aaa46ac1ae21512746f852a42ba87e4165dfdd1
GIT binary patch
literal 917
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|I14-?iy0X7
zltGxWVyS%@P(fs7NJL45ua8x7ey(0(N`6wRUPW#JP&EUCO@$SZnVVXYs8ErclUHn2
zVXFjIVFhG^g!Ppaz)DK8ZIvQ?0~DO|i&7O#^-S~(l1AfjnEK
zjFOT9D}DX)@^Za$W4-*MbbUihOG|wNBYh(yU7!lx;>x^|#0uTKVr7USFmqf|i<65o
z3raHc^AtelCMM;Vme?vOfh>Xph&xL%(-1c06+^uR^q@XSM&D4+Kp$>4P^%3{)XKjo
zGZknv$b36P8?Z_gF{nK@`XI}Z90TzwSQO}0J1!f2c(B=V`5aP@1P1a|PZ!4!3&Gl8
zTYqUsf!gYFyJnXpu0!n&N*SYAX-%d(5gVjrHJWqXQshj@!Zm{!01WsQrH~9=kTxW#6SvuapgMqt>$=j#%eyGrQzr
zP{L-3gsMA^$I1&gsBAEL+vxi1*Igl=8#8`5?A-T5=z-sk46WA1IUT)AIZHx1rdUrf
zVJrJn<74DDw`j)Ki#gt}mIT-Q`XRa2-jQXQoI%w`nb|XblvzK${ZzlV)m-XcwC(od
z71_OEC5Bt9GEXosOXaPTYOia#R4ID2TiU~`zVMl08TV_C%DnU4^+HE>9(CE4D6?Fz
oujB08i7adh9xk7*FX66dWH6F5TM;?E2b5PlUHx3vIVCg!0Dx9vYXATM
literal 0
HcmV?d00001
diff --git a/example/web/icons/Icon-192.png b/example/web/icons/Icon-192.png
new file mode 100644
index 0000000000000000000000000000000000000000..b749bfef07473333cf1dd31e9eed89862a5d52aa
GIT binary patch
literal 5292
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
literal 0
HcmV?d00001
diff --git a/example/web/icons/Icon-512.png b/example/web/icons/Icon-512.png
new file mode 100644
index 0000000000000000000000000000000000000000..88cfd48dff1169879ba46840804b412fe02fefd6
GIT binary patch
literal 8252
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
literal 0
HcmV?d00001
diff --git a/example/web/index.html b/example/web/index.html
new file mode 100644
index 0000000..9058a56
--- /dev/null
+++ b/example/web/index.html
@@ -0,0 +1,98 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ example
+
+
+
+
+
+
+
diff --git a/example/web/manifest.json b/example/web/manifest.json
new file mode 100644
index 0000000..8c01291
--- /dev/null
+++ b/example/web/manifest.json
@@ -0,0 +1,23 @@
+{
+ "name": "example",
+ "short_name": "example",
+ "start_url": ".",
+ "display": "standalone",
+ "background_color": "#0175C2",
+ "theme_color": "#0175C2",
+ "description": "A new Flutter project.",
+ "orientation": "portrait-primary",
+ "prefer_related_applications": false,
+ "icons": [
+ {
+ "src": "icons/Icon-192.png",
+ "sizes": "192x192",
+ "type": "image/png"
+ },
+ {
+ "src": "icons/Icon-512.png",
+ "sizes": "512x512",
+ "type": "image/png"
+ }
+ ]
+}
diff --git a/example/windows/flutter/generated_plugin_registrant.cc b/example/windows/flutter/generated_plugin_registrant.cc
index 4bfa0f3..8b6d468 100644
--- a/example/windows/flutter/generated_plugin_registrant.cc
+++ b/example/windows/flutter/generated_plugin_registrant.cc
@@ -2,6 +2,8 @@
// Generated file. Do not edit.
//
+// clang-format off
+
#include "generated_plugin_registrant.h"
diff --git a/example/windows/flutter/generated_plugin_registrant.h b/example/windows/flutter/generated_plugin_registrant.h
index 9846246..dc139d8 100644
--- a/example/windows/flutter/generated_plugin_registrant.h
+++ b/example/windows/flutter/generated_plugin_registrant.h
@@ -2,6 +2,8 @@
// Generated file. Do not edit.
//
+// clang-format off
+
#ifndef GENERATED_PLUGIN_REGISTRANT_
#define GENERATED_PLUGIN_REGISTRANT_
diff --git a/lib/text_composition.dart b/lib/text_composition.dart
index 2744685..66cad9b 100644
--- a/lib/text_composition.dart
+++ b/lib/text_composition.dart
@@ -31,8 +31,8 @@ class TextComposition {
/// 行高
final double height;
- /// 段高
- late final double paragraph;
+ /// 段间距
+ late final int paragraph;
/// 是否底栏对齐
final bool shouldJustifyHeight;
@@ -60,16 +60,16 @@ class TextComposition {
/// * [family] 字体
/// * [boxWidth] 容器宽度
/// * [boxHeight] 容器高度
- /// * [paragraph] 段高
+ /// * [paragraph] 段间距
/// * [shouldJustifyHeight] 是否底栏对齐
TextComposition({
List? paragraphs,
this.text,
- this.size = 16,
- this.height = 1.5,
+ this.size = 16.0,
+ this.height = 1.55,
this.family,
- this.boxWidth = double.infinity,
- this.boxHeight = double.infinity,
+ required this.boxWidth,
+ required this.boxHeight,
this.paragraph = 10,
this.shouldJustifyHeight = true,
}) {
@@ -81,20 +81,21 @@ class TextComposition {
final tp = TextPainter(textDirection: TextDirection.ltr, maxLines: 1);
final offset = Offset(boxWidth, 1);
final style = TextStyle(fontSize: size, fontFamily: family, height: height);
- final _height = size * height;
+ // final _height = size * height; //这个结果不行
+ final _height = (size * height).ceil(); //pixel用整数 向上取整就对了
final _boxHeight = boxHeight - _height;
final _boxHeight2 = _boxHeight - paragraph;
final _boxWidth = boxWidth - size;
var paragraphCount = 0;
- var pageHeight = 0.0;
+ var pageHeight = 0;
var startLine = 0;
/// 下一页
void newPage() {
_pages.add(TextPage(startLine, lines.length, pageHeight, paragraphCount));
paragraphCount = 0;
- pageHeight = 0.0;
+ pageHeight = 0;
startLine = lines.length;
}
@@ -146,7 +147,7 @@ class TextComposition {
return TextSpan(
text: line.text,
style: TextStyle(
- letterSpacing: (boxWidth - 2 - tp.width) / line.textCount,
+ letterSpacing: (boxWidth - 1 - tp.width) / line.textCount,
),
);
}
@@ -154,9 +155,13 @@ class TextComposition {
}
TextSpan getPageView(TextPage page) {
- final paragraphHeight = shouldJustifyHeight && page.shouldJustifyHeight
- ? paragraph + (boxHeight - page.height) / page.paragraphCount
- : paragraph;
+ var paragraphJustifyHeight = paragraph.toDouble();
+ var restJustifyHeight = 0;
+ if (shouldJustifyHeight && page.shouldJustifyHeight) {
+ final rest = boxHeight.ceil() - page.height;
+ restJustifyHeight = rest % page.paragraphCount;
+ paragraphJustifyHeight += rest ~/ page.paragraphCount;
+ }
final style = TextStyle(
height: height,
fontSize: size,
@@ -166,25 +171,46 @@ class TextComposition {
return TextSpan(
style: style,
children: lines.sublist(page.startLine, page.endLine).map((line) {
- if (line.paragraphGap)
+ if (line.paragraphGap) {
+ /// restJustifyHeight趋于0
+ if (restJustifyHeight-->0) {
+ return TextSpan(
+ text: "\n \n",
+ style: TextStyle(
+ fontSize: paragraphJustifyHeight + 1,
+ height: 1,
+ ),
+ );
+ }
return TextSpan(
text: "\n \n",
style: TextStyle(
- fontSize: paragraphHeight,
+ fontSize: paragraphJustifyHeight,
height: 1,
),
);
+ }
return getLineView(line, tp, style);
}).toList(),
);
}
+
+ Widget getPageWidget(TextPage page) {
+ return Container(
+ width: boxWidth,
+ height: boxHeight,
+ child: RichText(
+ text: getPageView(page),
+ ),
+ );
+ }
}
class TextPage {
final int startLine;
final int endLine;
final int paragraphCount;
- final double height;
+ final int height;
final bool shouldJustifyHeight;
TextPage(this.startLine, this.endLine, this.height, this.paragraphCount,
[this.shouldJustifyHeight = true]);