Showing
3 changed files
with
57 additions
and
62 deletions
| @@ -6,20 +6,8 @@ | @@ -6,20 +6,8 @@ | ||
| 6 | </configurations> | 6 | </configurations> |
| 7 | </component> | 7 | </component> |
| 8 | <component name="ChangeListManager"> | 8 | <component name="ChangeListManager"> |
| 9 | - <list default="true" id="4b1e7c8a-90e5-4705-b34f-bcaa595e12fe" name="Default" comment="添加文字适配"> | ||
| 10 | - <change afterPath="$PROJECT_DIR$/demo_en.png" afterDir="false" /> | ||
| 11 | - <change afterPath="$PROJECT_DIR$/demo_zh.png" afterDir="false" /> | ||
| 12 | - <change afterPath="$PROJECT_DIR$/example/lib/main_zh.dart" afterDir="false" /> | ||
| 13 | - <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> | ||
| 14 | - <change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" /> | 9 | + <list default="true" id="4b1e7c8a-90e5-4705-b34f-bcaa595e12fe" name="Default" comment=""> |
| 15 | <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" /> | 10 | <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" /> |
| 16 | - <change beforePath="$PROJECT_DIR$/README_CN.md" beforeDir="false" afterPath="$PROJECT_DIR$/README_CN.md" afterDir="false" /> | ||
| 17 | - <change beforePath="$PROJECT_DIR$/demo.PNG" beforeDir="false" /> | ||
| 18 | - <change beforePath="$PROJECT_DIR$/effect.png" beforeDir="false" /> | ||
| 19 | - <change beforePath="$PROJECT_DIR$/example/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/example/README.md" afterDir="false" /> | ||
| 20 | - <change beforePath="$PROJECT_DIR$/example/lib/main.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/lib/main.dart" afterDir="false" /> | ||
| 21 | - <change beforePath="$PROJECT_DIR$/lib/flutter_screenutil.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/flutter_screenutil.dart" afterDir="false" /> | ||
| 22 | - <change beforePath="$PROJECT_DIR$/pubspec.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/pubspec.yaml" afterDir="false" /> | ||
| 23 | </list> | 11 | </list> |
| 24 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> | 12 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> |
| 25 | <option name="TRACKING_ENABLED" value="true" /> | 13 | <option name="TRACKING_ENABLED" value="true" /> |
| @@ -30,11 +18,11 @@ | @@ -30,11 +18,11 @@ | ||
| 30 | </component> | 18 | </component> |
| 31 | <component name="FileEditorManager"> | 19 | <component name="FileEditorManager"> |
| 32 | <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> | 20 | <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> |
| 33 | - <file leaf-file-name="main.dart" pinned="false" current-in-tab="true"> | 21 | + <file leaf-file-name="main.dart" pinned="false" current-in-tab="false"> |
| 34 | <entry file="file://$PROJECT_DIR$/example/lib/main.dart"> | 22 | <entry file="file://$PROJECT_DIR$/example/lib/main.dart"> |
| 35 | <provider selected="true" editor-type-id="text-editor"> | 23 | <provider selected="true" editor-type-id="text-editor"> |
| 36 | - <state relative-caret-position="285"> | ||
| 37 | - <caret line="29" column="2" selection-start-line="29" selection-start-column="2" selection-end-line="29" selection-end-column="2" /> | 24 | + <state relative-caret-position="258"> |
| 25 | + <caret line="28" column="50" lean-forward="true" selection-start-line="28" selection-start-column="50" selection-end-line="28" selection-end-column="50" /> | ||
| 38 | <folding> | 26 | <folding> |
| 39 | <element signature="e#0#39#0" expanded="true" /> | 27 | <element signature="e#0#39#0" expanded="true" /> |
| 40 | </folding> | 28 | </folding> |
| @@ -45,8 +33,8 @@ | @@ -45,8 +33,8 @@ | ||
| 45 | <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="false"> | 33 | <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="false"> |
| 46 | <entry file="file://$PROJECT_DIR$/pubspec.yaml"> | 34 | <entry file="file://$PROJECT_DIR$/pubspec.yaml"> |
| 47 | <provider selected="true" editor-type-id="text-editor"> | 35 | <provider selected="true" editor-type-id="text-editor"> |
| 48 | - <state relative-caret-position="54"> | ||
| 49 | - <caret line="2" column="14" lean-forward="true" selection-start-line="2" selection-start-column="14" selection-end-line="2" selection-end-column="14" /> | 36 | + <state relative-caret-position="27"> |
| 37 | + <caret line="1" column="107" lean-forward="true" selection-start-line="1" selection-start-column="13" selection-end-line="1" selection-end-column="107" /> | ||
| 50 | </state> | 38 | </state> |
| 51 | </provider> | 39 | </provider> |
| 52 | </entry> | 40 | </entry> |
| @@ -54,8 +42,8 @@ | @@ -54,8 +42,8 @@ | ||
| 54 | <file leaf-file-name="main_zh.dart" pinned="false" current-in-tab="false"> | 42 | <file leaf-file-name="main_zh.dart" pinned="false" current-in-tab="false"> |
| 55 | <entry file="file://$PROJECT_DIR$/example/lib/main_zh.dart"> | 43 | <entry file="file://$PROJECT_DIR$/example/lib/main_zh.dart"> |
| 56 | <provider selected="true" editor-type-id="text-editor"> | 44 | <provider selected="true" editor-type-id="text-editor"> |
| 57 | - <state relative-caret-position="69"> | ||
| 58 | - <caret line="29" selection-start-line="29" selection-end-line="29" /> | 45 | + <state relative-caret-position="42"> |
| 46 | + <caret line="28" column="50" lean-forward="true" selection-start-line="28" selection-start-column="50" selection-end-line="28" selection-end-column="50" /> | ||
| 59 | <folding> | 47 | <folding> |
| 60 | <element signature="e#0#39#0" expanded="true" /> | 48 | <element signature="e#0#39#0" expanded="true" /> |
| 61 | </folding> | 49 | </folding> |
| @@ -72,11 +60,11 @@ | @@ -72,11 +60,11 @@ | ||
| 72 | </provider> | 60 | </provider> |
| 73 | </entry> | 61 | </entry> |
| 74 | </file> | 62 | </file> |
| 75 | - <file leaf-file-name="README.md" pinned="false" current-in-tab="false"> | 63 | + <file leaf-file-name="README.md" pinned="false" current-in-tab="true"> |
| 76 | <entry file="file://$PROJECT_DIR$/README.md"> | 64 | <entry file="file://$PROJECT_DIR$/README.md"> |
| 77 | <provider selected="true" editor-type-id="text-editor"> | 65 | <provider selected="true" editor-type-id="text-editor"> |
| 78 | - <state relative-caret-position="42"> | ||
| 79 | - <caret line="89" column="10" lean-forward="true" selection-start-line="89" selection-start-column="10" selection-end-line="89" selection-end-column="10" /> | 66 | + <state relative-caret-position="54"> |
| 67 | + <caret line="2" column="96" selection-start-line="2" selection-start-column="96" selection-end-line="2" selection-end-column="96" /> | ||
| 80 | </state> | 68 | </state> |
| 81 | </provider> | 69 | </provider> |
| 82 | </entry> | 70 | </entry> |
| @@ -84,8 +72,8 @@ | @@ -84,8 +72,8 @@ | ||
| 84 | <file leaf-file-name="README_CN.md" pinned="false" current-in-tab="false"> | 72 | <file leaf-file-name="README_CN.md" pinned="false" current-in-tab="false"> |
| 85 | <entry file="file://$PROJECT_DIR$/README_CN.md"> | 73 | <entry file="file://$PROJECT_DIR$/README_CN.md"> |
| 86 | <provider selected="true" editor-type-id="text-editor"> | 74 | <provider selected="true" editor-type-id="text-editor"> |
| 87 | - <state relative-caret-position="183"> | ||
| 88 | - <caret line="47" column="24" lean-forward="true" selection-start-line="47" selection-start-column="24" selection-end-line="47" selection-end-column="24" /> | 75 | + <state relative-caret-position="81"> |
| 76 | + <caret line="3" lean-forward="true" selection-start-line="3" selection-end-line="3" /> | ||
| 89 | </state> | 77 | </state> |
| 90 | </provider> | 78 | </provider> |
| 91 | </entry> | 79 | </entry> |
| @@ -93,8 +81,8 @@ | @@ -93,8 +81,8 @@ | ||
| 93 | <file leaf-file-name="README.md" pinned="false" current-in-tab="false"> | 81 | <file leaf-file-name="README.md" pinned="false" current-in-tab="false"> |
| 94 | <entry file="file://$PROJECT_DIR$/example/README.md"> | 82 | <entry file="file://$PROJECT_DIR$/example/README.md"> |
| 95 | <provider selected="true" editor-type-id="text-editor"> | 83 | <provider selected="true" editor-type-id="text-editor"> |
| 96 | - <state relative-caret-position="54"> | ||
| 97 | - <caret line="2" column="23" lean-forward="true" selection-start-line="2" selection-start-column="23" selection-end-line="2" selection-end-column="23" /> | 84 | + <state relative-caret-position="297"> |
| 85 | + <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" /> | ||
| 98 | </state> | 86 | </state> |
| 99 | </provider> | 87 | </provider> |
| 100 | </entry> | 88 | </entry> |
| @@ -143,11 +131,11 @@ | @@ -143,11 +131,11 @@ | ||
| 143 | <option value="$PROJECT_DIR$/lib/flutter_screenutil.dart" /> | 131 | <option value="$PROJECT_DIR$/lib/flutter_screenutil.dart" /> |
| 144 | <option value="$PROJECT_DIR$/example/lib/main_en.dart" /> | 132 | <option value="$PROJECT_DIR$/example/lib/main_en.dart" /> |
| 145 | <option value="$PROJECT_DIR$/example/README.md" /> | 133 | <option value="$PROJECT_DIR$/example/README.md" /> |
| 146 | - <option value="$PROJECT_DIR$/README.md" /> | ||
| 147 | <option value="$PROJECT_DIR$/README_CN.md" /> | 134 | <option value="$PROJECT_DIR$/README_CN.md" /> |
| 148 | <option value="$PROJECT_DIR$/pubspec.yaml" /> | 135 | <option value="$PROJECT_DIR$/pubspec.yaml" /> |
| 149 | - <option value="$PROJECT_DIR$/example/lib/main_zh.dart" /> | ||
| 150 | <option value="$PROJECT_DIR$/example/lib/main.dart" /> | 136 | <option value="$PROJECT_DIR$/example/lib/main.dart" /> |
| 137 | + <option value="$PROJECT_DIR$/example/lib/main_zh.dart" /> | ||
| 138 | + <option value="$PROJECT_DIR$/README.md" /> | ||
| 151 | </list> | 139 | </list> |
| 152 | </option> | 140 | </option> |
| 153 | </component> | 141 | </component> |
| @@ -484,7 +472,14 @@ | @@ -484,7 +472,14 @@ | ||
| 484 | <option name="project" value="LOCAL" /> | 472 | <option name="project" value="LOCAL" /> |
| 485 | <updated>1539242077642</updated> | 473 | <updated>1539242077642</updated> |
| 486 | </task> | 474 | </task> |
| 487 | - <option name="localTasksCounter" value="25" /> | 475 | + <task id="LOCAL-00025" summary="添加文字适配"> |
| 476 | + <created>1539677763871</created> | ||
| 477 | + <option name="number" value="00025" /> | ||
| 478 | + <option name="presentableId" value="LOCAL-00025" /> | ||
| 479 | + <option name="project" value="LOCAL" /> | ||
| 480 | + <updated>1539677763871</updated> | ||
| 481 | + </task> | ||
| 482 | + <option name="localTasksCounter" value="26" /> | ||
| 488 | <servers /> | 483 | <servers /> |
| 489 | </component> | 484 | </component> |
| 490 | <component name="TodoView" selected-index="4"> | 485 | <component name="TodoView" selected-index="4"> |
| @@ -500,19 +495,19 @@ | @@ -500,19 +495,19 @@ | ||
| 500 | <frame x="-9" y="0" width="1540" height="1045" extended-state="0" /> | 495 | <frame x="-9" y="0" width="1540" height="1045" extended-state="0" /> |
| 501 | <editor active="true" /> | 496 | <editor active="true" /> |
| 502 | <layout> | 497 | <layout> |
| 503 | - <window_info active="true" anchor="bottom" id="TODO" order="6" visible="true" weight="0.3289183" /> | 498 | + <window_info anchor="bottom" id="TODO" order="6" weight="0.3289183" /> |
| 504 | <window_info anchor="right" id="Palette	" order="4" /> | 499 | <window_info anchor="right" id="Palette	" order="4" /> |
| 505 | <window_info id="Image Layers" order="3" /> | 500 | <window_info id="Image Layers" order="3" /> |
| 506 | <window_info anchor="right" id="Capture Analysis" order="4" /> | 501 | <window_info anchor="right" id="Capture Analysis" order="4" /> |
| 507 | <window_info anchor="bottom" id="Event Log" order="8" sideWeight="0.5042644" side_tool="true" weight="0.3297062" /> | 502 | <window_info anchor="bottom" id="Event Log" order="8" sideWeight="0.5042644" side_tool="true" weight="0.3297062" /> |
| 508 | <window_info anchor="bottom" id="Dart Analysis" order="8" weight="0.3297062" /> | 503 | <window_info anchor="bottom" id="Dart Analysis" order="8" weight="0.3297062" /> |
| 509 | - <window_info anchor="bottom" id="Run" order="2" weight="0.3289183" /> | 504 | + <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.3289183" /> |
| 510 | <window_info anchor="bottom" id="Version Control" order="8" weight="0.32861805" /> | 505 | <window_info anchor="bottom" id="Version Control" order="8" weight="0.32861805" /> |
| 511 | - <window_info anchor="bottom" id="Terminal" order="8" sideWeight="0.49573562" weight="0.32824427" /> | 506 | + <window_info anchor="bottom" id="Terminal" order="8" sideWeight="0.49573562" weight="0.32781458" /> |
| 512 | <window_info anchor="right" id="Flutter Outline" order="4" /> | 507 | <window_info anchor="right" id="Flutter Outline" order="4" /> |
| 513 | <window_info id="Capture Tool" order="3" /> | 508 | <window_info id="Capture Tool" order="3" /> |
| 514 | <window_info id="Designer" order="3" /> | 509 | <window_info id="Designer" order="3" /> |
| 515 | - <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.31689188" /> | 510 | + <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.31689188" /> |
| 516 | <window_info anchor="bottom" id="Find" order="1" weight="0.3289183" /> | 511 | <window_info anchor="bottom" id="Find" order="1" weight="0.3289183" /> |
| 517 | <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> | 512 | <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> |
| 518 | <window_info anchor="right" id="Fabric" order="4" /> | 513 | <window_info anchor="right" id="Fabric" order="4" /> |
| @@ -835,58 +830,58 @@ | @@ -835,58 +830,58 @@ | ||
| 835 | </state> | 830 | </state> |
| 836 | </provider> | 831 | </provider> |
| 837 | </entry> | 832 | </entry> |
| 838 | - <entry file="file://$PROJECT_DIR$/example/README.md"> | 833 | + <entry file="file://$PROJECT_DIR$/lib/flutter_screenutil.dart"> |
| 839 | <provider selected="true" editor-type-id="text-editor"> | 834 | <provider selected="true" editor-type-id="text-editor"> |
| 840 | - <state relative-caret-position="54"> | ||
| 841 | - <caret line="2" column="23" lean-forward="true" selection-start-line="2" selection-start-column="23" selection-end-line="2" selection-end-column="23" /> | 835 | + <state relative-caret-position="194"> |
| 836 | + <caret line="69" column="17" lean-forward="true" selection-start-line="69" selection-start-column="17" selection-end-line="69" selection-end-column="17" /> | ||
| 842 | </state> | 837 | </state> |
| 843 | </provider> | 838 | </provider> |
| 844 | </entry> | 839 | </entry> |
| 845 | - <entry file="file://$PROJECT_DIR$/lib/flutter_screenutil.dart"> | 840 | + <entry file="file://$PROJECT_DIR$/example/lib/main.dart"> |
| 846 | <provider selected="true" editor-type-id="text-editor"> | 841 | <provider selected="true" editor-type-id="text-editor"> |
| 847 | - <state relative-caret-position="194"> | ||
| 848 | - <caret line="69" column="17" lean-forward="true" selection-start-line="69" selection-start-column="17" selection-end-line="69" selection-end-column="17" /> | 842 | + <state relative-caret-position="258"> |
| 843 | + <caret line="28" column="50" lean-forward="true" selection-start-line="28" selection-start-column="50" selection-end-line="28" selection-end-column="50" /> | ||
| 844 | + <folding> | ||
| 845 | + <element signature="e#0#39#0" expanded="true" /> | ||
| 846 | + </folding> | ||
| 849 | </state> | 847 | </state> |
| 850 | </provider> | 848 | </provider> |
| 851 | </entry> | 849 | </entry> |
| 852 | - <entry file="file://$PROJECT_DIR$/README.md"> | 850 | + <entry file="file://$PROJECT_DIR$/example/lib/main_zh.dart"> |
| 853 | <provider selected="true" editor-type-id="text-editor"> | 851 | <provider selected="true" editor-type-id="text-editor"> |
| 854 | <state relative-caret-position="42"> | 852 | <state relative-caret-position="42"> |
| 855 | - <caret line="89" column="10" lean-forward="true" selection-start-line="89" selection-start-column="10" selection-end-line="89" selection-end-column="10" /> | 853 | + <caret line="28" column="50" lean-forward="true" selection-start-line="28" selection-start-column="50" selection-end-line="28" selection-end-column="50" /> |
| 854 | + <folding> | ||
| 855 | + <element signature="e#0#39#0" expanded="true" /> | ||
| 856 | + </folding> | ||
| 856 | </state> | 857 | </state> |
| 857 | </provider> | 858 | </provider> |
| 858 | </entry> | 859 | </entry> |
| 859 | - <entry file="file://$PROJECT_DIR$/README_CN.md"> | 860 | + <entry file="file://$PROJECT_DIR$/example/README.md"> |
| 860 | <provider selected="true" editor-type-id="text-editor"> | 861 | <provider selected="true" editor-type-id="text-editor"> |
| 861 | - <state relative-caret-position="183"> | ||
| 862 | - <caret line="47" column="24" lean-forward="true" selection-start-line="47" selection-start-column="24" selection-end-line="47" selection-end-column="24" /> | 862 | + <state relative-caret-position="297"> |
| 863 | + <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" /> | ||
| 863 | </state> | 864 | </state> |
| 864 | </provider> | 865 | </provider> |
| 865 | </entry> | 866 | </entry> |
| 866 | - <entry file="file://$PROJECT_DIR$/pubspec.yaml"> | 867 | + <entry file="file://$PROJECT_DIR$/README_CN.md"> |
| 867 | <provider selected="true" editor-type-id="text-editor"> | 868 | <provider selected="true" editor-type-id="text-editor"> |
| 868 | - <state relative-caret-position="54"> | ||
| 869 | - <caret line="2" column="14" lean-forward="true" selection-start-line="2" selection-start-column="14" selection-end-line="2" selection-end-column="14" /> | 869 | + <state relative-caret-position="81"> |
| 870 | + <caret line="3" lean-forward="true" selection-start-line="3" selection-end-line="3" /> | ||
| 870 | </state> | 871 | </state> |
| 871 | </provider> | 872 | </provider> |
| 872 | </entry> | 873 | </entry> |
| 873 | - <entry file="file://$PROJECT_DIR$/example/lib/main_zh.dart"> | 874 | + <entry file="file://$PROJECT_DIR$/pubspec.yaml"> |
| 874 | <provider selected="true" editor-type-id="text-editor"> | 875 | <provider selected="true" editor-type-id="text-editor"> |
| 875 | - <state relative-caret-position="69"> | ||
| 876 | - <caret line="29" selection-start-line="29" selection-end-line="29" /> | ||
| 877 | - <folding> | ||
| 878 | - <element signature="e#0#39#0" expanded="true" /> | ||
| 879 | - </folding> | 876 | + <state relative-caret-position="27"> |
| 877 | + <caret line="1" column="107" lean-forward="true" selection-start-line="1" selection-start-column="13" selection-end-line="1" selection-end-column="107" /> | ||
| 880 | </state> | 878 | </state> |
| 881 | </provider> | 879 | </provider> |
| 882 | </entry> | 880 | </entry> |
| 883 | - <entry file="file://$PROJECT_DIR$/example/lib/main.dart"> | 881 | + <entry file="file://$PROJECT_DIR$/README.md"> |
| 884 | <provider selected="true" editor-type-id="text-editor"> | 882 | <provider selected="true" editor-type-id="text-editor"> |
| 885 | - <state relative-caret-position="285"> | ||
| 886 | - <caret line="29" column="2" selection-start-line="29" selection-start-column="2" selection-end-line="29" selection-end-column="2" /> | ||
| 887 | - <folding> | ||
| 888 | - <element signature="e#0#39#0" expanded="true" /> | ||
| 889 | - </folding> | 883 | + <state relative-caret-position="54"> |
| 884 | + <caret line="2" column="96" selection-start-line="2" selection-start-column="96" selection-end-line="2" selection-end-column="96" /> | ||
| 890 | </state> | 885 | </state> |
| 891 | </provider> | 886 | </provider> |
| 892 | </entry> | 887 | </entry> |
| @@ -16,7 +16,7 @@ dependencies: | @@ -16,7 +16,7 @@ dependencies: | ||
| 16 | flutter: | 16 | flutter: |
| 17 | sdk: flutter | 17 | sdk: flutter |
| 18 | # add flutter_ScreenUtil | 18 | # add flutter_ScreenUtil |
| 19 | - flutter_screenutil: ^0.2.3 | 19 | + flutter_screenutil: ^0.3.0 |
| 20 | ``` | 20 | ``` |
| 21 | 21 | ||
| 22 | ### Add the following imports to your Dart code: | 22 | ### Add the following imports to your Dart code: |
-
Please register or login to post a comment