Bump to 1.2.0

TypeDuck-HK · May 26, 2024 · 03f388e · 03f388e
1 parent 2c97645
commit 03f388e
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 16 deletions.
diff --git a/Preparing/Sources/Preparing/Resources/syllable.txt b/Preparing/Sources/Preparing/Resources/syllable.txt
@@ -48,7 +48,6 @@
 3430	65	ok	ok
 3432	66	om	am
 3433	66	on	on
-3435	67	op	ap
 3437	67	or	o
 3440	68	ou	ou
 3520	72	pa	paa
@@ -61,7 +60,6 @@
 3934	86	to	to
 4030	85	uk	uk
 4032	86	um	am
-4035	87	up	ap
 4220	92	wa	waa
 4224	93	we	we
 4234	96	wo	wo

diff --git a/Preparing/Sources/Preparing/Resources/symbol.txt b/Preparing/Sources/Preparing/Resources/symbol.txt
@@ -423,6 +423,7 @@
 1	1F44C	掂	dim6	1071	518001957
 1	1F44C	可以	ho2 ji5	794660	34726390926
 1	1F44C	可	ho2	1083	794685
+1	1F44C	得	dak1	1071	517983435
 1	1F90C	捏	nip6	1101	523946394
 1	1F90C	意大利手勢	ji3 daai6 lei6 sau2 sai3	18178643164869	-2585678175608709071
 1	1F90F	捏	nip6	1101	523946394
@@ -483,6 +484,7 @@
 1	270D.FE0F	書寫	syu1 se2	808840	19486079883006
 1	270D.FE0F	寫字	se2 zi6	808875	37889481391
 1	270D.FE0F	手寫	sau2 se2	808840	19472636005350
+1	270D.FE0F	寫	se2	1116	808770
 1	1F64F	雙手合十	soeng1 sau2 hap6 sap6	37905122581	4997944007587215088
 1	1F64F	祈禱	kei4 tou2	798565	9565208157899095
 1	1F64F	懇求	han2 kau4	794665	9345454189318910
@@ -866,20 +868,14 @@
 1	1F646.200D.2640.FE0F	准許	zeon2 heoi2	817780	8517846865573295209
 1	1F646.200D.2640.FE0F	肯定	hang2 ding6	794630	3212613561620420424
 1	1F646.200D.2640.FE0F	可以	ho2 ji5	794660	34726390926
-1	1F646.200D.2640.FE0F	可	ho2	1083	794685
-1	1F646.200D.2640.FE0F	得	dak1	1071	517983435
 1	1F646	同意	tung4 ji3	810080	10225626200401495
 1	1F646	准許	zeon2 heoi2	817780	8517846865573295209
 1	1F646	肯定	hang2 ding6	794630	3212613561620420424
 1	1F646	可以	ho2 ji5	794660	34726390926
-1	1F646	可	ho2	1083	794685
-1	1F646	得	dak1	1071	517983435
 1	1F646.200D.2642.FE0F	同意	tung4 ji3	810080	10225626200401495
 1	1F646.200D.2642.FE0F	准許	zeon2 heoi2	817780	8517846865573295209
 1	1F646.200D.2642.FE0F	肯定	hang2 ding6	794630	3212613561620420424
 1	1F646.200D.2642.FE0F	可以	ho2 ji5	794660	34726390926
-1	1F646.200D.2642.FE0F	可	ho2	1083	794685
-1	1F646.200D.2642.FE0F	得	dak1	1071	517983435
 1	1F64B.200D.2640.FE0F	舉手女	geoi2 sau2 neoi5	519808419	-3592794267356664413
 1	1F64B.200D.2640.FE0F	舉手	geoi2 sau2	793420	4877835459130642164
 1	1F64B	舉手	geoi2 sau2	793420	4877835459130642164
@@ -1977,7 +1973,9 @@
 4	1F945	球門	kau4 mun4	798530	9564087125824855
 4	1F945	龍門	lung4 mun4	799815	5065997196488918925
 4	26F3.FE0F	高爾夫球洞	gou1 ji5 fu1 kau4 dung6	17750106418539	1005340864263141110
+4	26F3.FE0F	高爾夫	gou1 ji5 fu1	519787530	4879285127599461120
 4	1FA81	風箏	fung1 zang1	792170	2646569817055007592
+4	1FA81	放風箏	fong3 fung1 zang1	519184017	5407552015054973718
 4	1F6DD	滑梯	waat6 tai1	813985	5471963459392046322
 4	1F3F9	射箭	se6 zin3	808875	19474887465198
 4	1F3A3	釣魚	diu3 jyu2	789520	9056230121280160
@@ -2073,10 +2071,13 @@
 4	1F949	銅牌	tung4 paai4	810110	6769293938962776929
 4	1F3C5	獎牌	zoeng2 paai4	817820	-4354362628976783673
 4	1F396	軍功勳章	gwan1 gung1 fan1 zoeng1	34428822994	-2061090125285925178
+4	1F396	勳章	fan1 zoeng1	792170	2623653344081167968
 4	1F3F5	玫瑰花結	mui4 gwai3 faa1 git3	36160231157	7705758604122307436
 4	1F397	黃絲帶	wong4 si1 daai3	529319385	8126785964388019504
+4	1F397	黃絲	wong4 si1	813980	10442550041241565
 4	1F3AB	門票	mun4 piu3	801115	9715500762683300
 4	1F3AB	票據	piu3 geoi3	804925	5212944180634951545
+4	1F3AB	飛	fei1	1077	519181551
 4	1F39F	入場券	jap6 coeng4 hyun3	521554680	9106624847397072151
 4	1F3AA	馬戲團	maa5 hei3 tyun4	523349676	-2436154964721027009
 4	1F939.200D.2640.FE0F	雜耍女	zaap6 saa2 neoi5	531102798	-2386867390255785833
@@ -2095,6 +2096,7 @@
 4	1F3A8	繪畫	kui2 waa6	798580	9569745139760520
 4	1F3AC	場記板	coeng4 gei3 baan2	517402791	-6541162907688748577
 4	1F3A4	咪	mai1	1098	523333386
+4	1F3A4	話筒	waa6 tung4	813985	5471963459400997374
 4	1F3A4	話筒	waa6 tung2	813985	5471963459400997374
 4	1F3A7	耳機	ji5 gei1	797215	18181432955565
 4	1F3BC	樂譜	ngok6 pou2	802400	5138312258634030090
@@ -2412,26 +2414,38 @@
 6	1F4FC	錄影帶	luk6 jing2 daai2	522759717	4475736793394775950
 6	1F4F7	相機	soeng3 gei1	808780	6467898570687738969
 6	1F4F7	相機	soeng2 gei1	808780	6467898570687738969
+6	1F4F7	影相	jing2 soeng3	797275	-8431510208114850355
+6	1F4F7	影相	jing2 soeng2	797275	-8431510208114850355
+6	1F4F7	影相機	jing2 soeng3 gei1	521591679	6976598696979692293
+6	1F4F7	影相機	jing2 soeng2 gei1	521591679	6976598696979692293
+6	1F4F7	照相機	ziu3 soeng3 gei1	531102735	-4389571555468832076
 6	1F4F7	照相機	ziu3 soeng2 gei1	531102735	-4389571555468832076
 6	1F4F8	閃光燈	sim2 gwong1 dang1	526913865	-4795947196017101295
 6	1F4F9	錄像	luk6 zoeng6	799880	4413438508444217463
 6	1F4F9	錄影	luk6 jing2	799800	5065995514747726971
 6	1F4F9	攝像	sip3 zoeng6	808875	6461072830970458743
+6	1F3A5	錄像機	luk6 zoeng6 gei1	522796752	8669134274971806639
+6	1F3A5	錄影機	luk6 jing2 gei1	522759744	9169679024788684339
 6	1F3A5	攝像機	sip3 zoeng6 gei1	526957839	8878189596870094255
 6	1F3A5	攝影機	sip3 jing2 gei1	526920831	5997631158899064883
 6	1F4FD	放映機	fong3 jing2 gei1	519193098	6208832374269926034
 6	1F39E	膠片	gaau1 pin2	793405	4877249090835653868
+6	1F39E	菲林	fei1 lam2	792100	9200832783075700
 6	1F4DE	聽筒	teng1 tung2	810130	6750960553015228276
+6	1F4DE	電話	din6 waa6	789585	9056222453249530
 6	1F4DE	電話	din6 waa2	789585	9056222453249530
 6	1F4DE	電話聽筒	din6 waa2 teng1 tung2	33581145143	-3089585936830752018
+6	260E.FE0F	電話	din6 waa6	789585	9056222453249530
 6	260E.FE0F	電話	din6 waa2	789585	9056222453249530
+6	260E.FE0F	電話機	din6 waa6 gei1	518034285	7495439645039229106
+6	260E.FE0F	電話機	din6 waa2 gei1	518034285	7495439645039229106
 6	1F4DF	傳呼機	cyun4 fu1 gei1	517400523	-5024766573068846632
 6	1F4E0	傳真	cyun4 zan1	788315	4732052833636998543
 6	1F4FA	電視	din6 si6	789565	17317679192220
 6	1F4FA	電視機	din6 si6 gei1	518025033	2043859303294314836
 6	1F4FB	收音機	sau1 jam1 gei1	526920831	-114814996955603009
 6	1F399	錄音咪	luk6 jam1 mai1	522759798	5604271722697263556
-6	1F399	錄音麥克風	luk6 jam1 mak6 hak1 fung1	18469929266646	-1948565768082363983
+6	1F399	錄音	luk6 jam1	799800	9642622358695690
 6	1F39A	電平滑塊	din6 ping4 waat6 faai3	33573298181	-8971653516827529930
 6	1F39B	控制旋鈕	hung3 zai3 syun4 nau2	34738781495	6217262388808034583
 6	1F9ED	指南針	zi2 naam4 zam1	531091341	-7860795369200468271
@@ -2594,6 +2608,7 @@
 6	1F9EB	培養皿	pui4 joeng5 ming5	525137562	-5423462348279044072
 6	1F9EA	試管	si3 gun2	808780	19477086800523
 6	1F321	溫度計	wan1 dou6 gai3	529284717	-4599831397017709112
+6	1F321	探熱針	taam3 jit6 zam1	527515443	-4906204147997863876
 6	1F9F9	掃把	sou3 baa2	808755	10151057470719425
 6	1F9F9	掃帚	sou3 zau2	808875	10151057573757165
 6	1FAA0	馬桶吸	maa5 tung2 kap1	523377351	-2362906189193224909
@@ -3902,19 +3917,23 @@
 9	2190	向左箭頭	hoeng3 zo2 zin3 tau4	34738812180	7461332408542766242
 9	2190	左箭頭	zo2 zin3 tau4	531119043	8529354226234841228
 9	2190	向左	hoeng3 zo2	794740	4916445780372583809
+9	2190	左	zo2	1137	817815
 9	2190	後退	hau6 teoi3	794710	4914429991895559414
 9	2191	向上箭頭	hoeng3 soeng6 zin3 tau4	34730952349	-5788367882608871208
 9	2191	上箭頭	soeng6 zin3 tau4	526957956	8714914083999653826
 9	2191	向上	hoeng3 soeng6	794705	-2341581664338374857
+9	2191	上	soeng6	1116	19480443351105
 9	2192	向右箭頭	hoeng3 jau6 zin3 tau4	34720846852	-4950866668465007110
 9	2192	右箭頭	jau6 zin3 tau4	521607987	5328873031722429156
 9	2192	向右	hoeng3 jau6	794660	3228615297819355481
+9	2192	右	jau6	1089	521550171
 9	2192	箭頭	zin3 tau4	817840	10659473937442785
 9	2192	箭嘴	zin3 zeoi2	817870	5584636764624094095
 9	2192	前進	cin4 zeon3	788315	4729734856725164157
 9	2193	向下箭頭	hoeng3 haa6 zin3 tau4	34718601186	-8884121014915019292
 9	2193	下箭頭	haa6 zin3 tau4	520419105	-1705751402103130418
 9	2193	向下	hoeng3 haa6	794650	3228615297785401155
+9	2193	下	haa6	1083	520361109
 9	2194	左右箭頭	zo2 jau6 zin3 tau4	39915072310	8072460368747294415
 9	2194	左右	zo2 jau6	817790	20488184802030
 9	2195	上下箭頭	soeng6 haa6 zin3 tau4	37892850077	-505603791718605585

diff --git a/TypeDuck.xcodeproj/project.pbxproj b/TypeDuck.xcodeproj/project.pbxproj
@@ -674,7 +674,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 15;
+				CURRENT_PROJECT_VERSION = 16;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"TypeDuck/Preview Content\"";
 				DEVELOPMENT_TEAM = "";
@@ -692,7 +692,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 12.0;
-				MARKETING_VERSION = 1.1.1;
+				MARKETING_VERSION = 1.2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = hk.eduhk.inputmethod.TypeDuck;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -711,7 +711,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 15;
+				CURRENT_PROJECT_VERSION = 16;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"TypeDuck/Preview Content\"";
 				DEVELOPMENT_TEAM = "";
@@ -729,7 +729,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 12.0;
-				MARKETING_VERSION = 1.1.1;
+				MARKETING_VERSION = 1.2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = hk.eduhk.inputmethod.TypeDuck;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;

diff --git a/TypeDuck/TypeDuckInputController.swift b/TypeDuck/TypeDuckInputController.swift
@@ -104,8 +104,8 @@ final class TypeDuckInputController: IMKInputController {
         private(set) lazy var currentClient: InputClient? = nil {
                 didSet {
                         guard let origin = currentClient?.position else { return }
-                        let isRegularHorizontal: Bool = (origin.x - screenOrigin.x) < (screenSize.width - 400)
-                        let isRegularVertical: Bool = (origin.y - screenOrigin.y) > 400
+                        let isRegularHorizontal: Bool = (origin.x - screenOrigin.x) < (screenSize.width - 300)
+                        let isRegularVertical: Bool = (origin.y - screenOrigin.y) > 300
                         let newPattern: WindowPattern = {
                                 switch (isRegularHorizontal, isRegularVertical) {
                                 case (true, true):

diff --git a/packaging/pack.sh b/packaging/pack.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 BUNDLE_IDENTIFIER='hk.eduhk.inputmethod.TypeDuck'
-APP_VERSION='1.1.1'
+APP_VERSION='1.2.0'
 INSTALL_LOCATION='/Library/Input Methods'
 
 pkgbuild \