mirror of
				https://github.com/InsanusMokrassar/MicroUtils.git
				synced 2025-10-31 04:05:32 +00:00 
			
		
		
		
	Compare commits
	
		
			471 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| a6905e73cb | |||
| 93b054d55e | |||
| 5db4c5c717 | |||
| 5e04521929 | |||
| 30440b4ed1 | |||
| 09bb90604d | |||
| 4d55ec6f36 | |||
| f373524f34 | |||
| 0398a7bebd | |||
| fa8a5bcd97 | |||
| 758a92410b | |||
| 77f56c5dda | |||
| 72f2fe3cc3 | |||
| 7e0e520f03 | |||
| 92c4784e42 | |||
| a634229dc0 | |||
| de3f36ef2a | |||
| c623a265ee | |||
| e75125f6df | |||
| 4901a8844c | |||
| a1854b68d8 | |||
| aee4a6243b | |||
| 4c0cb73d69 | |||
| c6eab182f6 | |||
| 3e3fbd97eb | |||
| feb695caa7 | |||
| 1bd46d9651 | |||
| 32eabb6b36 | |||
| 9bfe6dc6d8 | |||
| 3f366aeea4 | |||
| 4338fd46f2 | |||
| 36974f5b49 | |||
| d48f767408 | |||
| bd2558e852 | |||
| 9f7c963cd5 | |||
| 2db0eadbfe | |||
| 580c7b8842 | |||
| 88fba347ea | |||
| c8c5255e62 | |||
| 01a1a2760a | |||
| 6d34df8d48 | |||
| b124ea65e1 | |||
| f3214347a9 | |||
| 6b8724b59f | |||
| ac3e378edf | |||
| 5d31fd1c91 | |||
| 046fe1ec08 | |||
| 721873c843 | |||
| f6ffbfc10a | |||
| 4e91649e0a | |||
| 4f7f8abec4 | |||
| 6370562dbc | |||
| 94e2e67522 | |||
| 1d8330015d | |||
| e5017b0258 | |||
| cd412ca31b | |||
| d2b6473095 | |||
| ab42507275 | |||
| dcef844e20 | |||
| 3244708c1b | |||
| 73ac1f1741 | |||
| f104e9f352 | |||
| 393c9a7d06 | |||
| ea497ea488 | |||
|  | 5add89cad0 | ||
| 2db447d2ef | |||
| 31c83813e6 | |||
| 27483a282d | |||
| 48b816aa22 | |||
| 0065f94f52 | |||
| ccc0002eb2 | |||
| 15a2eee141 | |||
| b9faac71e5 | |||
| 0a4465de33 | |||
| f9dfd09628 | |||
| 8638d7afce | |||
| 8311793a43 | |||
| 0d552cfcd2 | |||
| 4b0f20dbd1 | |||
| cf531c949d | |||
| ba5c5f17d5 | |||
| 35825ad9b7 | |||
| b1eb26a89e | |||
| c9d04b6698 | |||
| 496133e014 | |||
| f2857ee2be | |||
| 22541f2d5e | |||
| e235c52b6c | |||
| e89b8c72dd | |||
| a374e53a3a | |||
| afb066c4ee | |||
| f05761d4a5 | |||
| 76adc9ea33 | |||
| 99dd291413 | |||
| f904eb27e1 | |||
| eeb8214812 | |||
| f7215b039e | |||
| c07fe5a0f9 | |||
| 0d28cb6e20 | |||
| a1a17bfd1f | |||
| f386f09592 | |||
| a47e17fe6e | |||
| 01dc3b63ff | |||
| 2d97e0699e | |||
| 75f514d99b | |||
| 9a687cfc1c | |||
| 14edf8b6b7 | |||
| 23aa2d8917 | |||
| 7651388b5c | |||
| 805ab32b24 | |||
| cc623b1097 | |||
| 1420416b3e | |||
| 9a0b67f938 | |||
| 303e1e6281 | |||
| ff59b0cc9c | |||
| be5d2ee715 | |||
| 8dd2e3f6f9 | |||
| 2eedd196d2 | |||
| 759a3f2784 | |||
| 386fa830c3 | |||
| c382423d77 | |||
| bb466ce66c | |||
| 72cd3dd8a1 | |||
|  | 595cedaaf1 | ||
| eeaceb6cf5 | |||
| 1bd671685b | |||
| 48d3fe41f2 | |||
| 7ab21871cd | |||
| 65d01b1fb3 | |||
| 6230accb68 | |||
| c6ed821934 | |||
| 10e03bb951 | |||
| aa4f392948 | |||
| f51b59ec02 | |||
| 8c76834ae4 | |||
| 4a454f3d67 | |||
| 151aa1863d | |||
| 3bf6896296 | |||
| 0d01561476 | |||
| f6ded92251 | |||
| d01b735cc6 | |||
| 6c12001080 | |||
| 1afbf03606 | |||
| f6ef5c61c5 | |||
| c18fee8107 | |||
| d9df7a4384 | |||
| 87c2230e8e | |||
| da7eb6de0a | |||
| ed3815118f | |||
| be726f42bd | |||
| a91006132f | |||
| 9a9f741a0b | |||
| 5028f130e9 | |||
| 77fa019651 | |||
| 9715da9384 | |||
| f6d5035c1a | |||
| 43e782ab6f | |||
| f3f9920bfb | |||
| 2bfd615812 | |||
| ebfacb3659 | |||
| c71d557eec | |||
| e0398cef21 | |||
| f91599e9c6 | |||
| f8f9f93c97 | |||
| a8a5340d8b | |||
| 871b27f37d | |||
| 6f174cae1d | |||
| 22d7ac3e22 | |||
| 9b30c3a155 | |||
| 915bac64b1 | |||
| 9d2b50e55d | |||
| bde100f63d | |||
| 05b035a13d | |||
| eefb56bed7 | |||
| fcc0dc4189 | |||
| 47ff20317f | |||
| 1558b9103d | |||
| 7a78742162 | |||
| c01e240f66 | |||
| fef4fcbac6 | |||
| 5ab18bce4b | |||
| 24aec7271a | |||
| 9b19a2cb95 | |||
| efdd7b8a57 | |||
| 6df4cc9c3b | |||
| b9d93db0f5 | |||
| d7ee45ca64 | |||
| d7c31b1b22 | |||
| 7d6794a358 | |||
| 473eb87346 | |||
| 8b18b07790 | |||
| ab3c80a5ec | |||
| 075b93ecd6 | |||
| f6d0f72e49 | |||
| fcda3af862 | |||
| d5c7a589b1 | |||
| 86e099ed25 | |||
| ebd7befe73 | |||
| b8c7e581a1 | |||
| 8281259179 | |||
| d3e06b07df | |||
| 4967018418 | |||
| 537a3c38fa | |||
| 0124957833 | |||
| f0420e2d61 | |||
| 7090566041 | |||
| f0d5035cd0 | |||
| 0fb9b8dc30 | |||
| eef6e81134 | |||
| 1593159a3f | |||
| 3da9eb9dbe | |||
| f17613f3fb | |||
| 14337ccb46 | |||
| 1a3913b09c | |||
| 039aed2747 | |||
| 173991e3cb | |||
| 8b3f8cab01 | |||
| 2a20d24589 | |||
| 53c2d552ec | |||
| af11c1a83d | |||
| a65cf1481c | |||
| 0318716236 | |||
| 88eb4b3342 | |||
| 4810d1ef6a | |||
| f2a9514d89 | |||
| 925ba6ac24 | |||
|  | ef407268a2 | ||
| cd6c4bbe38 | |||
| c058e18408 | |||
| 6d3ca565ca | |||
| 236a7b4fd2 | |||
| e1f387dbf7 | |||
| 3d113dd31e | |||
| e0e57f0336 | |||
| e775b58d41 | |||
| 5b070a8478 | |||
| 8a61193500 | |||
| fad522b8fe | |||
| 0acac205af | |||
| 069d4c61b7 | |||
| 7c113f5700 | |||
| dfdaf4225b | |||
| bd39ab2467 | |||
| 6ce1eb3f2d | |||
| ce7d4fe9a2 | |||
| a65bb2f419 | |||
| cbc868448b | |||
| 9c336a0b56 | |||
| 0f0d09399e | |||
| e13a1162a9 | |||
| 57ebed903f | |||
| 4478193d8a | |||
| ee948395e3 | |||
| 0616b051ae | |||
| 4d155d0505 | |||
| a169e733d9 | |||
| f081e237c8 | |||
| f412d387fa | |||
| 67354b43e2 | |||
| 39135a4000 | |||
| eaa014cebd | |||
| 856e657f81 | |||
| 3a609e5b66 | |||
| d0022dd599 | |||
| 7ba6eed453 | |||
| beeb6ecc0a | |||
| 7cdc17a714 | |||
| 4765a950a9 | |||
| 65e8137e08 | |||
| ae546dd9ad | |||
| 8110c42be0 | |||
| bd2b5ae5fc | |||
| 2ddfffa6a9 | |||
| a4b54e861d | |||
| c6785f1a4f | |||
| 83fe621c56 | |||
| b3a93e17eb | |||
| 546a391af3 | |||
| 786cf9bd8b | |||
| dfd6fe062d | |||
| b6ef818613 | |||
| b0f9e9c30a | |||
| 7e5c88ddc3 | |||
| 9824c3e00f | |||
| 9171d5ed11 | |||
| a1830ebb82 | |||
| 22d2a3d9bf | |||
| c9b97fc965 | |||
| 51f85becd5 | |||
| a8a281cfb4 | |||
| ddd1304949 | |||
| 86d70b6c02 | |||
| a22bdb39e7 | |||
| 7ae4d5ef95 | |||
| a2038cbefa | |||
| 992091eade | |||
| e3bfead0c5 | |||
| 0de96141fd | |||
| fa18d15c3c | |||
| ea9dbf2371 | |||
| d34e3ec7a9 | |||
| c8833a36af | |||
| a067cb0c0f | |||
| 999c8327bd | |||
| c2ec73c70a | |||
| 702f782fc1 | |||
| 25dbcaaf83 | |||
| b00d454a24 | |||
| dbc921d56d | |||
| 438fefa7a3 | |||
| 5d74eac814 | |||
| 9fb62e1e25 | |||
| 3e366ea73b | |||
| 0ff895bffa | |||
| c5bb120280 | |||
| 4b26a92b37 | |||
| 0a8453b4d2 | |||
| c9872a61b6 | |||
| 149a1aa278 | |||
| 13d0e1b682 | |||
| 6f9be2a9f8 | |||
| 93ba98d993 | |||
| 940ee3df06 | |||
| 2e7bab10fd | |||
|  | 3ed70a37ea | ||
| fe8f80b9d9 | |||
| d81fb32fb9 | |||
| 2877b5532c | |||
| b938b21395 | |||
| 58836359cc | |||
| 5edb0e1331 | |||
| 0f0d0b5d58 | |||
| 46c1887cbe | |||
| 5f231c2212 | |||
| 4e97ce86aa | |||
| 315a7cb29e | |||
| aa7cc503f2 | |||
| 4bbe7e5a80 | |||
| d9c05f38d2 | |||
| cd0c4c9650 | |||
| fc3407f104 | |||
| 3a5544206b | |||
| e17e2f7fb8 | |||
|  | d32c95f143 | ||
| 6d8a8ab018 | |||
| a7dce8fa78 | |||
| ca73ff8e19 | |||
| d01ad10d7d | |||
| 81041ee43c | |||
|  | 6e004c2ae4 | ||
| 0e2fac5b22 | |||
| 269da7f155 | |||
| 3cb6b73ee0 | |||
| a938ee1efb | |||
| 6ea5e2e5a6 | |||
| 617dfb54e0 | |||
| d23e005985 | |||
| e5207f5bc5 | |||
| c96cea8db0 | |||
| 0a8e71d76a | |||
| cf1fd32b08 | |||
| cc4224ea1f | |||
| f4c148bc58 | |||
| 022297ad3f | |||
| 5180d6fc3e | |||
| eeebbff70d | |||
| afc6aeea15 | |||
| 486515eddd | |||
| 0e21699cd1 | |||
| f1678ef7cf | |||
| cea65fc76e | |||
| c9e320b72a | |||
| 555956087d | |||
| b3f468f901 | |||
| f5f7511781 | |||
| 4be1d93f60 | |||
| 7d684608ef | |||
| 2c7fd320eb | |||
| 88ee82e1c6 | |||
| d6402c624e | |||
| 8b9c93bc10 | |||
| 4f5e261d01 | |||
| cf455aebe6 | |||
| 1380d5f8e1 | |||
| 5f65260bfe | |||
| 11f0dcfc01 | |||
| 555b7886a4 | |||
| 3707a6c0ce | |||
| 4c8d92b4c3 | |||
| 8bbd33c896 | |||
| ac33a3580f | |||
| a64a32fbe6 | |||
| 9493e97a38 | |||
| 88bd770260 | |||
| a7bd33b7bf | |||
| 73c724a2e5 | |||
| d8cf3c6726 | |||
| 15dee238b5 | |||
| c70626734e | |||
| 5a765ea1bc | |||
| 8215f9d2c6 | |||
| d2e6d2ec80 | |||
| 3718181e8f | |||
| 0d825cf424 | |||
| 28a804d988 | |||
| 9e4bb9d678 | |||
| 9c40d7da3d | |||
| 2b76ad0aa9 | |||
| e4b619e050 | |||
| 36c09feaf2 | |||
| 2d68321503 | |||
| 85455ab21c | |||
| 18d63eb980 | |||
| 2e429e9704 | |||
| f4af28059b | |||
| c1476bd075 | |||
| 16c720fddd | |||
| 8b4b4a5eca | |||
| 32e6e5b7e2 | |||
| a9f7fd8e32 | |||
| 95be1a26f2 | |||
| ef9b31aee0 | |||
| df3c01ff0a | |||
| 4704c5a33d | |||
| 225c06550a | |||
| f0987614c6 | |||
| 269c2876f3 | |||
| 168d6acf7c | |||
| a5f718e257 | |||
| 4f68459582 | |||
| 442db122cf | |||
| 580d757be2 | |||
| 47b0f6d2d8 | |||
| 3f6f6ebc2b | |||
| 2645ea29d6 | |||
| 79f2041565 | |||
| 4a7567f288 | |||
| 8a890ed6ed | |||
| 3d90df6897 | |||
| 681c13144a | |||
| b64f2e6d32 | |||
| 428eabb1bd | |||
| 2162e83bce | |||
| 6142022283 | |||
| e6d9c8250f | |||
| 46178e723b | |||
| 605f55acd2 | |||
| 0f8b69aa60 | |||
| 551d8ec480 | |||
| fc48446ec4 | |||
| 3644b83ac6 | |||
| cd73791b6f | |||
| 03de71df2e | |||
| 83d5d3faf4 | |||
| 0c8bec4c89 | |||
| 7fc93817c1 | |||
| d0a00031a1 | |||
| 6ebc5aa0c2 | |||
| 8a6b4bb49e | |||
| 20799b9a3e | |||
| ec3afc615c | |||
| da692ccfc3 | |||
| 53b89f3a18 | |||
| 58cded28d3 | |||
| 592c5f3732 | |||
| f44a78a5f5 | |||
| e0bdd5dfdc | |||
| 99c0f06b72 | |||
| 66fc6df3d7 | |||
| a36425a905 | |||
| d920fee6d4 | 
							
								
								
									
										2
									
								
								.github/workflows/build.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/build.yml
									
									
									
									
										vendored
									
									
								
							| @@ -8,7 +8,7 @@ jobs: | |||||||
|       - uses: actions/checkout@v2 |       - uses: actions/checkout@v2 | ||||||
|       - uses: actions/setup-java@v1 |       - uses: actions/setup-java@v1 | ||||||
|         with: |         with: | ||||||
|           java-version: 11 |           java-version: 17 | ||||||
|       - name: Rewrite version |       - name: Rewrite version | ||||||
|         run: | |         run: | | ||||||
|           branch="`echo "${{ github.ref }}" | grep -o "[^/]*$"`" |           branch="`echo "${{ github.ref }}" | grep -o "[^/]*$"`" | ||||||
|   | |||||||
							
								
								
									
										2
									
								
								.github/workflows/dokka_push.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/dokka_push.yml
									
									
									
									
										vendored
									
									
								
							| @@ -10,7 +10,7 @@ jobs: | |||||||
|       - uses: actions/checkout@v2 |       - uses: actions/checkout@v2 | ||||||
|       - uses: actions/setup-java@v1 |       - uses: actions/setup-java@v1 | ||||||
|         with: |         with: | ||||||
|           java-version: 11 |           java-version: 17 | ||||||
|       - name: Build |       - name: Build | ||||||
|         run: ./gradlew build && ./gradlew dokkaHtml |         run: ./gradlew build && ./gradlew dokkaHtml | ||||||
|       - name: Publish KDocs |       - name: Publish KDocs | ||||||
|   | |||||||
							
								
								
									
										5
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										5
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							| @@ -14,3 +14,8 @@ local.properties | |||||||
| kotlin-js-store | kotlin-js-store | ||||||
|  |  | ||||||
| publishing.sh | publishing.sh | ||||||
|  |  | ||||||
|  | local.* | ||||||
|  | local/ | ||||||
|  |  | ||||||
|  | .kotlin/ | ||||||
|   | |||||||
							
								
								
									
										656
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										656
									
								
								CHANGELOG.md
									
									
									
									
									
								
							| @@ -1,5 +1,661 @@ | |||||||
| # Changelog | # Changelog | ||||||
|  |  | ||||||
|  | ## 0.20.53 | ||||||
|  |  | ||||||
|  | ## 0.20.52 | ||||||
|  |  | ||||||
|  | * `Coroutines`: | ||||||
|  |     * Small rework of weak jobs: add `WeakScope` factory, rename old weal extensions and add kdocs | ||||||
|  |  | ||||||
|  | ## 0.20.51 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Android Fragment`: `1.7.0` -> `1.7.1` | ||||||
|  | * `Pagination`: | ||||||
|  |     * Add `Pagination.nextPageIfTrue` and `Pagination.thisPageIftrue` extensions to get the page according to condition | ||||||
|  |     pass status | ||||||
|  |     * Add `PaginationResult.nextPageIfNotEmptyOrLastPage` and `PaginationResult.thisPageIfNotEmptyOrLastPage` | ||||||
|  |     * Change all `doForAll` and `getAll` extensions fo pagination to work basing on `nextPageIfNotEmptyOrLastPage` and | ||||||
|  |     `thisPageIfNotEmptyOrLastPage` | ||||||
|  |  | ||||||
|  | ## 0.20.50 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Coroutines`: `1.8.0` -> `1.8.1` | ||||||
|  |     * `KSLog`: `1.3.3` -> `1.3.4` | ||||||
|  |     * `Exposed`: `0.50.0` -> `0.50.1` | ||||||
|  |     * `Ktor`: `2.3.10` -> `2.3.11` | ||||||
|  | * A lot of inline functions became common functions due to inline with only noinline callbacks in arguments leads to | ||||||
|  | low performance | ||||||
|  | * `Coroutines`: | ||||||
|  |     * `SmartMutex`, `SmartSemaphore` and `SmartRWLocker` as their user changed their state flow to `SpecialMutableStateFlow` | ||||||
|  |  | ||||||
|  | ## 0.20.49 | ||||||
|  |  | ||||||
|  | * `Repos`: | ||||||
|  |     * `Common`: | ||||||
|  |         * All `Repo`s get `diff` extensions | ||||||
|  |         * `KeyValueRepo` and `KeyValuesRepo` get `applyDiff` extension | ||||||
|  |         * Add new extensions `on*` flows for crud repos | ||||||
|  |  | ||||||
|  | ## 0.20.48 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Android Core KTX`: `1.13.0` -> `1.13.1` | ||||||
|  |     * `AndroidX Fragment`: `1.6.2` -> `1.7.0` | ||||||
|  |  | ||||||
|  | ## 0.20.47 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Exposed`: `0.49.0` -> `0.50.0` | ||||||
|  |  | ||||||
|  | ## 0.20.46 | ||||||
|  |  | ||||||
|  | * `Common`: | ||||||
|  |     * Now this repo depends on `klock` | ||||||
|  |     * Add new object-serializer `DateTimeSerializer` for `klock` serializer | ||||||
|  |  | ||||||
|  | ## 0.20.45 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Android Core KTX`: `1.12.0` -> `1.13.0` | ||||||
|  |  | ||||||
|  | ## 0.20.44 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Compose`: `1.6.1` -> `1.6.2` | ||||||
|  |     * `Koin`: `3.5.4` -> `3.5.6` | ||||||
|  |  | ||||||
|  | ## 0.20.43 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Ktor`: `2.3.9` -> `2.3.10` | ||||||
|  |     * `Koin`: `3.5.3` -> `3.5.4` | ||||||
|  |  | ||||||
|  | ## 0.20.42 | ||||||
|  |  | ||||||
|  | * `Repos`: | ||||||
|  |     * `Generator`: | ||||||
|  |         * Improvements | ||||||
|  |  | ||||||
|  | ## 0.20.41 | ||||||
|  |  | ||||||
|  | * `Repos`: | ||||||
|  |     * `Exposed`: | ||||||
|  |         * `AbstractExposedKeyValueRepo`, `ExposedKeyValueRepo`, `AbstractExposedKeyValuesRepo`, `ExposedKeyValuesRepo` got opportunity to setup some part of their flows | ||||||
|  |  | ||||||
|  | ## 0.20.40 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `KSLog`: `1.3.2` -> `1.3.3` | ||||||
|  |     * `Exposed`: `0.48.0` -> `0.49.0` | ||||||
|  |     * `UUID`: `0.8.2` -> `0.8.4` | ||||||
|  |  | ||||||
|  | ## 0.20.39 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Kotlin`: `1.9.22` -> `1.9.23` | ||||||
|  |     * `Korlibs`: `5.3.2` -> `5.4.0` | ||||||
|  |     * `Okio`: `3.8.0` -> `3.9.0` | ||||||
|  |     * `Compose`: `1.6.0` -> `1.6.1` | ||||||
|  |     * `ComposeMaterial3`: `1.2.0` -> `1.2.1` | ||||||
|  |  | ||||||
|  | ## 0.20.38 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Ktor`: `2.3.8` -> `2.3.9` | ||||||
|  |  | ||||||
|  | ## 0.20.37 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Compose`: `1.5.12` -> `1.6.0` | ||||||
|  |     * `Exposed`: `0.47.0` -> `0.48.0` | ||||||
|  |  | ||||||
|  | ## 0.20.36 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Serialization`: `1.6.2` -> `1.6.3` | ||||||
|  |     * `Korlibs`: `5.3.1` -> `5.3.2` | ||||||
|  | * `Repos`: | ||||||
|  |     * `Cache`: | ||||||
|  |         * Improve work and functionality of `actualizeAll` and subsequent functions | ||||||
|  |         * All internal repos `invalidate`/`actualizeAll` now use common `actualizeAll` functions | ||||||
|  |  | ||||||
|  | ## 0.20.35 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Coroutines`: `1.7.3` -> `1.8.0` | ||||||
|  |     * `Material3`: `1.1.2` -> `1.2.0` | ||||||
|  |  | ||||||
|  | ## 0.20.34 | ||||||
|  |  | ||||||
|  | * `Repos`: | ||||||
|  |     * `Common`: | ||||||
|  |         * Improve default `set` realization of `KeyValuesRepo` | ||||||
|  |  | ||||||
|  | ## 0.20.33 | ||||||
|  |  | ||||||
|  | * `Colors` | ||||||
|  |     * `Common`: | ||||||
|  |         * Add opportunity to use `HEXAColor` with `ahex` colors | ||||||
|  |  | ||||||
|  | ## 0.20.32 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Okio`: `3.7.0` -> `3.8.0` | ||||||
|  | * `Resources`: | ||||||
|  |     * Make `StringResource` serializable | ||||||
|  |     * Add several variants of builder usages | ||||||
|  |  | ||||||
|  | ## 0.20.31 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Ktor`: `2.3.7` -> `2.3.8` | ||||||
|  |  | ||||||
|  | ## 0.20.30 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Exposed`: `0.46.0` -> `0.47.0` | ||||||
|  |  | ||||||
|  | ## 0.20.29 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Kotlin`: `1.9.21` -> `1.9.22` | ||||||
|  |     * `Compose`: `1.5.11` -> `1.5.12` | ||||||
|  |     * `Korlibs`: `5.3.0` -> `5.3.1` | ||||||
|  |  | ||||||
|  | ## 0.20.28 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Kotlin`: `1.9.22` -> `1.9.21` (downgrade) | ||||||
|  |     * `Compose`: `1.6.0-dev13691` -> `1.5.11` (downgrade) | ||||||
|  |  | ||||||
|  | ## 0.20.27 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Kotlin`: `1.9.21` -> `1.9.22` | ||||||
|  |     * `Compose`: `1.5.11` -> `1.6.0-dev13691` | ||||||
|  |  | ||||||
|  | ## 0.20.26 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Exposed`: `0.45.0` -> `0.46.0`. **This update brinds new api deprecations in exposed** | ||||||
|  | * `Resources`: | ||||||
|  |     * Add opportunity to get default translation by passing `null` as `IetfLang` argument | ||||||
|  |     * Add several useful extensions to get translations in `JS` target | ||||||
|  |  | ||||||
|  | ## 0.20.25 | ||||||
|  |  | ||||||
|  | * `Colors`: | ||||||
|  |     * `Common`: | ||||||
|  |         * Module inited | ||||||
|  |  | ||||||
|  | ## 0.20.24 | ||||||
|  |  | ||||||
|  | **Since this version depdendencies of klock and krypto replaced with `com.soywiz.korge:korlibs-time` and `com.soywiz.korge:korlibs-crypto`** | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Klock` (since now `KorlibsTime`): `4.0.10` -> `5.3.0` | ||||||
|  |     * `Krypto` (since now `KorlibsCrypto`): `4.0.10` -> `5.3.0` | ||||||
|  | * `Serialization`: | ||||||
|  |     * `Mapper`: | ||||||
|  |         * `Mapper` pass decoder into callback of deserialization strategy | ||||||
|  |         * `Mapper` pass encoder into callback of serialization strategy | ||||||
|  |  | ||||||
|  | ## 0.20.23 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Koin`: `3.5.0` -> `3.5.3` | ||||||
|  |     * `Okio`: `3.6.0` -> `3.7.0` | ||||||
|  | * `LanguageCodes`: | ||||||
|  |     * Fixes in intermediate language codes (like `Chinese.Hans`) | ||||||
|  |     * Rename `IetfLanguageCode` to `IetfLang` | ||||||
|  |         * Rename all subsequent functions (including serializer) | ||||||
|  |     * New lazy properties `knownLanguageCodesMap`, `knownLanguageCodesMapByLowerCasedKeys` and several others | ||||||
|  |  | ||||||
|  | ## 0.20.22 | ||||||
|  |  | ||||||
|  | * `Common`: | ||||||
|  |     * Add opportunity to create own `Diff` with base constructor | ||||||
|  |  | ||||||
|  | ## 0.20.21 | ||||||
|  |  | ||||||
|  | * `Resources`: | ||||||
|  |     * Inited | ||||||
|  |  | ||||||
|  | ## 0.20.20 | ||||||
|  |  | ||||||
|  | * `Repos`: | ||||||
|  |     * `Exposed`: | ||||||
|  |         * Add opportunity for setup flows in `AbstractExposedCRUDRepo` | ||||||
|  |  | ||||||
|  | ## 0.20.19 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Ktor`: `2.3.6` -> `2.3.7` | ||||||
|  |  | ||||||
|  | ## 0.20.18 | ||||||
|  |  | ||||||
|  | * `Coroutines`: | ||||||
|  |     * `SpecialMutableStateFlow` now extends `MutableStateFlow` | ||||||
|  |     * `Compose`: | ||||||
|  |         * Deprecate `FlowState` due to its complexity in fixes | ||||||
|  |  | ||||||
|  | ## 0.20.17 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Serialization`: `1.6.1` -> `1.6.2` | ||||||
|  |  | ||||||
|  | ## 0.20.16 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Exposed`: `0.44.1` -> `0.45.0` | ||||||
|  | * `Coroutines`: | ||||||
|  |     * Add `SpecialMutableStateFlow` | ||||||
|  |     * `Compose`: | ||||||
|  |         * Add `FlowState` | ||||||
|  |  | ||||||
|  | ## 0.20.15 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Kotlin`: `1.9.20` -> `1.9.21` | ||||||
|  |     * `KSLog`: `1.3.0` -> `1.3.1` | ||||||
|  |     * `Compose`: `1.5.10` -> `1.5.11` | ||||||
|  |  | ||||||
|  | ## 0.20.14 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Serialization`: `1.6.0` -> `1.6.1` | ||||||
|  |     * `KSLog`: `1.2.4` -> `1.3.0` | ||||||
|  |  | ||||||
|  | ## 0.20.13 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Ktor`: `2.3.5` -> `2.3.6` | ||||||
|  |     * `UUID`: `0.8.1` -> `0.8.2` | ||||||
|  |  | ||||||
|  | ## 0.20.12 | ||||||
|  |  | ||||||
|  | **It is experimental migration onto new gradle version. Be careful in use of this version** | ||||||
|  |  | ||||||
|  | **This update have JDK 17 in `compatibility` and `target` versions** | ||||||
|  |  | ||||||
|  | ## 0.20.11 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Kotlin`: `1.9.20-RC2` -> `1.9.20` | ||||||
|  |     * `Exposed`: `0.44.0` -> `0.44.1` | ||||||
|  |     * `Compose`: `1.5.10-rc02` -> `1.5.10` | ||||||
|  | * `Coroutines`: | ||||||
|  |     * `SmartRWLocker` now will wait first unlock of write mutex for acquiring read | ||||||
|  |  | ||||||
|  | ## 0.20.10 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Kotlin`: `1.9.20-RC` -> `1.9.20-RC1` | ||||||
|  |     * `KSLog`: `1.2.1` -> `1.2.2` | ||||||
|  |     * `Compose`: `1.5.10-rc01` -> `1.5.10-rc02` | ||||||
|  |     * `RecyclerView`: `1.3.1` -> `1.3.2` | ||||||
|  |  | ||||||
|  | ## 0.20.9 | ||||||
|  |  | ||||||
|  | * Most of common modules now supports `linuxArm64` target | ||||||
|  |  | ||||||
|  | ## 0.20.8 | ||||||
|  |  | ||||||
|  | **THIS VERSION CONTAINS UPDATES OF DEPENDENCIES UP TO RC VERSIONS. USE WITH CAUTION** | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Kotlin`: `1.9.20-Beta2` -> `1.9.20-RC` | ||||||
|  |     * `Compose`: `1.5.10-beta02` -> `1.5.10-rc01` | ||||||
|  |  | ||||||
|  | ## 0.20.7 | ||||||
|  |  | ||||||
|  | **THIS VERSION CONTAINS UPDATES OF DEPENDENCIES UP TO BETA VERSIONS. USE WITH CAUTION** | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Kotlin`: `1.9.10` -> `1.9.20-Beta2` | ||||||
|  |     * `Compose`: `1.5.1` -> `1.5.10-beta02` | ||||||
|  |     * `Exposed`: `0.43.0` -> `0.44.0` | ||||||
|  |     * `Ktor`: `2.3.4` -> `2.3.5` | ||||||
|  |     * `Koin`: `3.4.3` -> `3.5.0` | ||||||
|  |     * `Okio`: `3.5.0` -> `3.6.0` | ||||||
|  |     * `Android Core`: `1.10.1` -> `1.12.0` | ||||||
|  |     * `Android Compose Material`: `1.1.1` -> `1.1.2` | ||||||
|  |  | ||||||
|  | ## 0.20.6 | ||||||
|  |  | ||||||
|  | * `Repos`: | ||||||
|  |     * `Exposed` | ||||||
|  |         * Fixes in exposed key-values repos | ||||||
|  |  | ||||||
|  | ## 0.20.5 | ||||||
|  |  | ||||||
|  | * `Coroutines`: | ||||||
|  |     * Fixes in `SmartRWLocker` | ||||||
|  |  | ||||||
|  | ## 0.20.4 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Kotlin`: `1.9.0` -> `1.9.10` | ||||||
|  |     * `KSLog`: `1.2.0` -> `1.2.1` | ||||||
|  |     * `Compose`: `1.5.0` -> `1.5.1` | ||||||
|  |     * `UUID`: `0.8.0` -> `0.8.1` | ||||||
|  |  | ||||||
|  | ## 0.20.3 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Compose`: `1.4.3` -> `1.5.0` | ||||||
|  |     * `Exposed`: `0.42.1` -> `0.43.0` | ||||||
|  |     * `Ktor`: `2.3.3` -> `2.3.4` | ||||||
|  | * `Repos`: | ||||||
|  |     * `Cache`: | ||||||
|  |         * Fixes in locks of caches | ||||||
|  |  | ||||||
|  | ## 0.20.2 | ||||||
|  |  | ||||||
|  | * All main repos uses `SmartRWLocker` | ||||||
|  | * `Versions`: | ||||||
|  |     * `Serialization`: `1.5.1` -> `1.6.0` | ||||||
|  |     * `Exposed`: `0.42.0` -> `0.42.1` | ||||||
|  |     * `Korlibs`: `4.0.9` -> `4.0.10` | ||||||
|  | * `Androis SDK`: `33` -> `34` | ||||||
|  |  | ||||||
|  | ## 0.20.1 | ||||||
|  |  | ||||||
|  | * `SmallTextField`: | ||||||
|  |     * Module is initialized | ||||||
|  | * `Pickers`: | ||||||
|  |     * Module is initialized | ||||||
|  | * `Coroutines`: | ||||||
|  |     * Add `SmartSemaphore` | ||||||
|  |     * Add `SmartRWLocker` | ||||||
|  |  | ||||||
|  | ## 0.20.0 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Kotlin`: `1.8.22` -> `1.9.0` | ||||||
|  |     * `KSLog`: `1.1.1` -> `1.2.0` | ||||||
|  |     * `Exposed`: `0.41.1` -> `0.42.0` | ||||||
|  |     * `UUID`: `0.7.1` -> `0.8.0` | ||||||
|  |     * `Korlibs`: `4.0.3` -> `4.0.9` | ||||||
|  |     * `Ktor`: `2.3.2` -> `2.3.3` | ||||||
|  |     * `Okio`: `3.4.0` -> `3.5.0` | ||||||
|  |  | ||||||
|  | ## 0.19.9 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Koin`: `3.4.2` -> `3.4.3` | ||||||
|  | * `Startup`: | ||||||
|  |     * Now it is possible to start application in synchronous way | ||||||
|  |  | ||||||
|  | ## 0.19.8 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Coroutines`: `1.7.2` -> `1.7.3` | ||||||
|  |     * `Kotlin`: `1.8.20` -> `1.8.22` | ||||||
|  |     * `Compose`: `1.4.1` -> `1.4.3` | ||||||
|  |     * `Okio`: `3.3.0` -> `3.4.0` | ||||||
|  |     * `RecyclerView`: `1.3.0` -> `1.3.1` | ||||||
|  |     * `Fragment`: `1.6.0` -> `1.6.1` | ||||||
|  | * `Repos`: | ||||||
|  |     * Fixes In `KeyValueRepo.clear()` of almost all inheritors of `KeyValueRepo` | ||||||
|  |     * `Cache`: | ||||||
|  |         * All full caches got `skipStartInvalidate` property. By default, this property is `false` and fully caching repos | ||||||
|  |           will be automatically invalidated on start of their work | ||||||
|  |  | ||||||
|  | ## 0.19.7 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Coroutines`: `1.7.1` -> `1.7.2` | ||||||
|  |  | ||||||
|  | ## 0.19.6 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Coroutines`: `1.6.4` -> `1.7.1` | ||||||
|  |     * `Ktor`: `2.3.1` -> `2.3.2` | ||||||
|  |     * `Compose`: `1.4.0` -> `1.4.1` | ||||||
|  |  | ||||||
|  | ## 0.19.5 | ||||||
|  |  | ||||||
|  | * `Repos`: | ||||||
|  |     * `Generator`: | ||||||
|  |         * Fixes in new type generation | ||||||
|  |  | ||||||
|  | ## 0.19.4 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Koin`: `3.4.1` -> `3.4.2` | ||||||
|  |     * `Android Fragments`: `1.5.7` -> `1.6.0` | ||||||
|  | * `Koin` | ||||||
|  |     * `Generator` | ||||||
|  |         * Fixes in new generic generator part | ||||||
|  |  | ||||||
|  | ## 0.19.3 | ||||||
|  |  | ||||||
|  | * `Koin` | ||||||
|  |     * `Generator` | ||||||
|  |         * New getter methods now available with opportunity to use parameters | ||||||
|  |         * Old notation `*Single` and `*Factory` is deprecated since this release. With old | ||||||
|  |           will be generated new `single*` and `factory*` notations for new generations | ||||||
|  |         * Add opportunity to use generic-oriented koin definitions | ||||||
|  |  | ||||||
|  | ## 0.19.2 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Ktor`: `2.3.0` -> `2.3.1` | ||||||
|  |     * `Koin`: `3.4.0` -> `3.4.1` | ||||||
|  |     * `Uuid`: `0.7.0` -> `0.7.1` | ||||||
|  |  | ||||||
|  | ## 0.19.1 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Korlibs`: `4.0.1` -> `4.0.3` | ||||||
|  |     * `Kotlin Poet`: `1.13.2` -> `1.14.0` | ||||||
|  |  | ||||||
|  | ## 0.19.0 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Korlibs`: `3.4.0` -> `4.0.1` | ||||||
|  |  | ||||||
|  | ## 0.18.4 | ||||||
|  |  | ||||||
|  | * `Koin`: | ||||||
|  |     * New extension `lazyInject` | ||||||
|  |  | ||||||
|  | ## 0.18.3 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Serialization`: `1.5.0` -> `1.5.1` | ||||||
|  |     * `Android Cor Ktx`: `1.10.0` -> `1.10.1` | ||||||
|  |  | ||||||
|  | ## 0.18.2 | ||||||
|  |  | ||||||
|  | * `Startup`: | ||||||
|  |     * Now internal `Json` is fully customizable | ||||||
|  |  | ||||||
|  | ## 0.18.1 | ||||||
|  |  | ||||||
|  | * `Common`: | ||||||
|  |     * Add `MapDiff` | ||||||
|  | * `Coroutines`: | ||||||
|  |     * Add `SmartMutex` | ||||||
|  |  | ||||||
|  | ## 0.18.0 | ||||||
|  |  | ||||||
|  | **ALL PREVIOUSLY DEPRECATED FUNCTIONALITY HAVE BEEN REMOVED** | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Android Fragments`: `1.5.6` -> `1.5.7` | ||||||
|  | * `Ktor`: | ||||||
|  |     * `Server`: | ||||||
|  |         * Now it is possible to take query parameters as list | ||||||
|  | * `Repos`: | ||||||
|  |     * `Common`: | ||||||
|  |         * New `WriteKeyValuesRepo.removeWithValue` | ||||||
|  |     * `Cache`: | ||||||
|  |         * Rename full caching factories functions to `fullyCached` | ||||||
|  |  | ||||||
|  | ## 0.17.8 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Ktor`: `2.2.4` -> `2.3.0` | ||||||
|  |  | ||||||
|  | ## 0.17.7 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Android CoreKtx`: `1.9.0` -> `1.10.0` | ||||||
|  | * `Startup`: | ||||||
|  |     * Add support of `linuxX64` and `mingwX64` platforms | ||||||
|  |  | ||||||
|  | ## 0.17.6 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Kotlin`: `1.8.10` -> `1.8.20` | ||||||
|  |     * `KSLog`: `1.0.0` -> `1.1.1` | ||||||
|  |     * `Compose`: `1.3.1` -> `1.4.0` | ||||||
|  |     * `Koin`: `3.3.2` -> `3.4.0` | ||||||
|  |     * `RecyclerView`: `1.2.1` -> `1.3.0` | ||||||
|  |     * `Fragment`: `1.5.5` -> `1.5.6` | ||||||
|  | * Experimentally (`!!!`) add `linuxX64` and `mingwX64` targets | ||||||
|  |  | ||||||
|  | ## 0.17.5 | ||||||
|  |  | ||||||
|  | * `Common`: | ||||||
|  |     * Conversations of number primitives with bounds care | ||||||
|  | * `Repos`: | ||||||
|  |     * `Common`: | ||||||
|  |         * By default, `getAll` for repos will take all the size of repo as page size | ||||||
|  |         * New extension for all built-in repos `maxPagePagination` | ||||||
|  |     * All the repos got `getAll` functions | ||||||
|  |  | ||||||
|  | ## 0.17.4 | ||||||
|  |  | ||||||
|  | * `Serialization`: | ||||||
|  |     * `Mapper`: | ||||||
|  |         * Module inited | ||||||
|  | * `Versions`: | ||||||
|  |     * `Compose`: `1.3.1-rc02` -> `1.3.1` | ||||||
|  |  | ||||||
|  | ## 0.17.3 | ||||||
|  |  | ||||||
|  | * `Common`: | ||||||
|  |     * Add `fixed` extensions for `Float` and `Double` | ||||||
|  |     * New function `emptyDiff` | ||||||
|  |     * Now you may pass custom `comparisonFun` to all `diff` functions | ||||||
|  |  | ||||||
|  | ## 0.17.2 | ||||||
|  |  | ||||||
|  | * `FSM`: | ||||||
|  |     * `DefaultStatesManager.onUpdateContextsConflictResolver` and `DefaultStatesManager.onStartContextsConflictResolver` now return `false` by default | ||||||
|  |  | ||||||
|  | ## 0.17.1 | ||||||
|  |  | ||||||
|  | * **Hotfix** for absence of jvm dependencies in android modules | ||||||
|  | * `Versions`: | ||||||
|  |     * `Ktor`: `2.2.3` -> `2.2.4` | ||||||
|  |  | ||||||
|  | ## 0.17.0 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Kotlin`: `1.7.20` -> `1.8.10` | ||||||
|  |     * `Serialization`: `1.4.1` -> `1.5.0` | ||||||
|  |     * `KSLog`: `0.5.4` -> `1.0.0` | ||||||
|  |     * `AppCompat`: `1.6.0` -> `1.6.1` | ||||||
|  |  | ||||||
|  | ## 0.16.13 | ||||||
|  |  | ||||||
|  | * `Repos`: | ||||||
|  |     * `Generator`: | ||||||
|  |         * Module has been created | ||||||
|  |  | ||||||
|  | ## 0.16.12 | ||||||
|  |  | ||||||
|  | * `Repos`: | ||||||
|  |     * `Exposed`: | ||||||
|  |         * `CommonExposedRepo.selectByIds` uses `foldRight` by default instead of raw foreach | ||||||
|  | * `Koin`: | ||||||
|  |     * `Generator`: | ||||||
|  |         * Module has been created | ||||||
|  |  | ||||||
|  | ## 0.16.11 | ||||||
|  |  | ||||||
|  | * `LanguageCodes`: | ||||||
|  |     * In android and JVM targets now available `toJavaLocale` and from Java `Locale` conversations from/to | ||||||
|  |       `IetfLanguageCode` | ||||||
|  |  | ||||||
|  | ## 0.16.10 | ||||||
|  |  | ||||||
|  | * `Repos`: | ||||||
|  |     * `Cache`: | ||||||
|  |         * New transformer type: `ReadCRUDFromKeyValueRepo` | ||||||
|  |         * New transformer type: `ReadKeyValueFromCRUDRepo` | ||||||
|  | * `Pagination`: | ||||||
|  |     * New `paginate` extensions with `reversed` support for `List`/`Set` | ||||||
|  |  | ||||||
|  | ## 0.16.9 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Koin`: `3.2.2` -> `3.3.2` | ||||||
|  |     * `AppCompat`: `1.5.1` -> `1.6.0` | ||||||
|  | * `Ktor`: | ||||||
|  |     * `Client` | ||||||
|  |         * `HttpResponse.bodyOrNull` now retrieve callback to check if body should be received or null | ||||||
|  |         * New extension `HttpResponse.bodyOrNullOnNoContent` | ||||||
|  |  | ||||||
|  | ## 0.16.8 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Ktor`: `2.2.2` -> `2.2.3` | ||||||
|  | * `Ktor`: | ||||||
|  |     * `Client` | ||||||
|  |         * Fixes in `HttpClient.uniUpload` | ||||||
|  |     * `Server` | ||||||
|  |         * Fixes in `PartData.FileItem.download` | ||||||
|  | * `Repos`: | ||||||
|  |     * `Cache`: | ||||||
|  |         * New type of caches: `FallbackCacheRepo` | ||||||
|  |         * Fixes in `Write*` variants of cached repos | ||||||
|  |         * New type `ActionWrapper` | ||||||
|  |         * New `AutoRecache*` classes for all types of repos as `FallbackCacheRepo`s | ||||||
|  |     * `Common`: | ||||||
|  |         * New transformations for key-value and key-values vice-verse | ||||||
|  |         * Fixes in `FileReadKeyValueRepo` | ||||||
|  |  | ||||||
|  | ## 0.16.7 | ||||||
|  |  | ||||||
|  | * `Common`: | ||||||
|  |     * New extensions `ifTrue`/`ifFalse`/`alsoIfTrue`/`alsoIfFalse`/`letIfTrue`/`letIfFalse` | ||||||
|  |     * `Diff` now is serializable | ||||||
|  |     * Add `IndexedValue` serializer | ||||||
|  |     * `repeatOnFailure` extending: now you may pass any lambda to check if continue to try/do something | ||||||
|  |     * `Compose`: | ||||||
|  |         * New extension `MutableState.asState` | ||||||
|  | * `Coroutines`: | ||||||
|  |     * `Compose`: | ||||||
|  |         * All the `Flow` conversations to compose `State`/`MutableState`/`SnapshotStateList`/`List` got several new | ||||||
|  |         parameters | ||||||
|  |         * `Flow.toMutableState` now is deprecated in favor to `asMutableComposeState` | ||||||
|  | * `Repos`: | ||||||
|  |     * `Cache`: | ||||||
|  |         * New type `FullCacheRepo` | ||||||
|  |         * New type `CommonCacheRepo` | ||||||
|  |         * `CacheRepo` got `invalidate` method. It will fully reload `FullCacheRepo` and just clear `CommonCacheRepo` | ||||||
|  |         * New extensions `KVCache.actualizeAll` | ||||||
|  |  | ||||||
|  | ## 0.16.6 | ||||||
|  |  | ||||||
|  | * `Startup`: | ||||||
|  |     * `Launcher`: | ||||||
|  |         * Improvements in `StartLauncherPlugin#start` methods | ||||||
|  |         * Add opportunity to pass second argument on `JVM` platform as log level | ||||||
|  | * `Repos`: | ||||||
|  |     * `Ktor`: | ||||||
|  |         * `Client`: | ||||||
|  |             * All clients repos got opportunity to customize their flows | ||||||
|  |     * `Exposed`: | ||||||
|  |         * Extensions `eqOrIsNull` and `neqOrIsNotNull` for `Column` | ||||||
|  |  | ||||||
| ## 0.16.5 | ## 0.16.5 | ||||||
|  |  | ||||||
| * `Versions`: | * `Versions`: | ||||||
|   | |||||||
| @@ -0,0 +1 @@ | |||||||
|  | <manifest/> | ||||||
| @@ -1 +0,0 @@ | |||||||
| <manifest package="dev.inmo.micro_utils.android.alerts.common"/> |  | ||||||
| @@ -0,0 +1 @@ | |||||||
|  | <manifest/> | ||||||
| @@ -1 +0,0 @@ | |||||||
| <manifest package="dev.inmo.micro_utils.android.alerts.recyclerview"/> |  | ||||||
							
								
								
									
										18
									
								
								android/pickers/build.gradle
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										18
									
								
								android/pickers/build.gradle
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,18 @@ | |||||||
|  | plugins { | ||||||
|  |     id "org.jetbrains.kotlin.multiplatform" | ||||||
|  |     id "org.jetbrains.kotlin.plugin.serialization" | ||||||
|  |     id "com.android.library" | ||||||
|  |     alias(libs.plugins.jb.compose) | ||||||
|  | } | ||||||
|  |  | ||||||
|  | apply from: "$mppProjectWithSerializationAndComposePresetPath" | ||||||
|  |  | ||||||
|  | kotlin { | ||||||
|  |     sourceSets { | ||||||
|  |         androidMain { | ||||||
|  |             dependencies { | ||||||
|  |                 api project(":micro_utils.android.smalltextfield") | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										1
									
								
								android/pickers/src/androidMain/AndroidManifest.xml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								android/pickers/src/androidMain/AndroidManifest.xml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1 @@ | |||||||
|  | <manifest/> | ||||||
							
								
								
									
										27
									
								
								android/pickers/src/androidMain/kotlin/Fling.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										27
									
								
								android/pickers/src/androidMain/kotlin/Fling.kt
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,27 @@ | |||||||
|  | package dev.inmo.micro_utils.android.pickers | ||||||
|  |  | ||||||
|  | import androidx.compose.animation.core.* | ||||||
|  |  | ||||||
|  | internal suspend fun Animatable<Float, AnimationVector1D>.fling( | ||||||
|  |     initialVelocity: Float, | ||||||
|  |     animationSpec: DecayAnimationSpec<Float>, | ||||||
|  |     adjustTarget: ((Float) -> Float)?, | ||||||
|  |     block: (Animatable<Float, AnimationVector1D>.() -> Unit)? = null, | ||||||
|  | ): AnimationResult<Float, AnimationVector1D> { | ||||||
|  |     val targetValue = animationSpec.calculateTargetValue(value, initialVelocity) | ||||||
|  |     val adjustedTarget = adjustTarget?.invoke(targetValue) | ||||||
|  |  | ||||||
|  |     return if (adjustedTarget != null) { | ||||||
|  |         animateTo( | ||||||
|  |             targetValue = adjustedTarget, | ||||||
|  |             initialVelocity = initialVelocity, | ||||||
|  |             block = block | ||||||
|  |         ) | ||||||
|  |     } else { | ||||||
|  |         animateDecay( | ||||||
|  |             initialVelocity = initialVelocity, | ||||||
|  |             animationSpec = animationSpec, | ||||||
|  |             block = block, | ||||||
|  |         ) | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										219
									
								
								android/pickers/src/androidMain/kotlin/NumberPicker.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										219
									
								
								android/pickers/src/androidMain/kotlin/NumberPicker.kt
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,219 @@ | |||||||
|  | package dev.inmo.micro_utils.android.pickers | ||||||
|  |  | ||||||
|  | import androidx.compose.animation.core.Animatable | ||||||
|  | import androidx.compose.animation.core.exponentialDecay | ||||||
|  | import androidx.compose.foundation.clickable | ||||||
|  | import androidx.compose.foundation.gestures.* | ||||||
|  | import androidx.compose.foundation.layout.* | ||||||
|  | import androidx.compose.foundation.text.KeyboardActions | ||||||
|  | import androidx.compose.foundation.text.KeyboardOptions | ||||||
|  | import androidx.compose.material.icons.Icons | ||||||
|  | import androidx.compose.material.icons.filled.KeyboardArrowDown | ||||||
|  | import androidx.compose.material.icons.filled.KeyboardArrowUp | ||||||
|  | import androidx.compose.material3.* | ||||||
|  | import androidx.compose.runtime.* | ||||||
|  | import androidx.compose.ui.Alignment | ||||||
|  | import androidx.compose.ui.ExperimentalComposeUiApi | ||||||
|  | import androidx.compose.ui.Modifier | ||||||
|  | import androidx.compose.ui.draw.alpha | ||||||
|  | import androidx.compose.ui.focus.FocusRequester | ||||||
|  | import androidx.compose.ui.focus.focusRequester | ||||||
|  | import androidx.compose.ui.geometry.Offset | ||||||
|  | import androidx.compose.ui.graphics.Color | ||||||
|  | import androidx.compose.ui.input.pointer.PointerInputScope | ||||||
|  | import androidx.compose.ui.input.pointer.pointerInput | ||||||
|  | import androidx.compose.ui.platform.LocalDensity | ||||||
|  | import androidx.compose.ui.text.ExperimentalTextApi | ||||||
|  | import androidx.compose.ui.text.TextStyle | ||||||
|  | import androidx.compose.ui.text.input.KeyboardType | ||||||
|  | import androidx.compose.ui.unit.IntOffset | ||||||
|  | import androidx.compose.ui.unit.center | ||||||
|  | import androidx.compose.ui.unit.dp | ||||||
|  | import dev.inmo.micro_utils.android.smalltextfield.SmallTextField | ||||||
|  | import kotlinx.coroutines.launch | ||||||
|  | import kotlin.math.abs | ||||||
|  | import kotlin.math.absoluteValue | ||||||
|  | import kotlin.math.roundToInt | ||||||
|  |  | ||||||
|  | private inline fun PointerInputScope.checkContains(offset: Offset): Boolean { | ||||||
|  |     return ((size.center.x - offset.x).absoluteValue < size.width / 2) && ((size.center.y - offset.y).absoluteValue < size.height / 2) | ||||||
|  | } | ||||||
|  |  | ||||||
|  | // src: https://gist.github.com/vganin/a9a84653a9f48a2d669910fbd48e32d5 | ||||||
|  |  | ||||||
|  | @OptIn(ExperimentalTextApi::class, ExperimentalComposeUiApi::class) | ||||||
|  | @Composable | ||||||
|  | fun NumberPicker( | ||||||
|  |     number: Int, | ||||||
|  |     modifier: Modifier = Modifier, | ||||||
|  |     range: IntRange? = null, | ||||||
|  |     textStyle: TextStyle = LocalTextStyle.current, | ||||||
|  |     arrowsColor: Color = MaterialTheme.colorScheme.primary, | ||||||
|  |     allowUseManualInput: Boolean = true, | ||||||
|  |     onStateChanged: (Int) -> Unit = {}, | ||||||
|  | ) { | ||||||
|  |     val coroutineScope = rememberCoroutineScope() | ||||||
|  |     val numbersColumnHeight = 36.dp | ||||||
|  |     val halvedNumbersColumnHeight = numbersColumnHeight / 2 | ||||||
|  |     val halvedNumbersColumnHeightPx = with(LocalDensity.current) { halvedNumbersColumnHeight.toPx() } | ||||||
|  |  | ||||||
|  |     fun animatedStateValue(offset: Float): Int = number - (offset / halvedNumbersColumnHeightPx).toInt() | ||||||
|  |  | ||||||
|  |     val animatedOffset = remember { Animatable(0f) }.apply { | ||||||
|  |         if (range != null) { | ||||||
|  |             val offsetRange = remember(number, range) { | ||||||
|  |                 val value = number | ||||||
|  |                 val first = -(range.last - value) * halvedNumbersColumnHeightPx | ||||||
|  |                 val last = -(range.first - value) * halvedNumbersColumnHeightPx | ||||||
|  |                 first..last | ||||||
|  |             } | ||||||
|  |             updateBounds(offsetRange.start, offsetRange.endInclusive) | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |     val coercedAnimatedOffset = animatedOffset.value % halvedNumbersColumnHeightPx | ||||||
|  |     val animatedStateValue = animatedStateValue(animatedOffset.value) | ||||||
|  |     val disabledArrowsColor = arrowsColor.copy(alpha = 0f) | ||||||
|  |  | ||||||
|  |     val inputFieldShown = if (allowUseManualInput) { | ||||||
|  |         remember { mutableStateOf(false) } | ||||||
|  |     } else { | ||||||
|  |         null | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     Column( | ||||||
|  |         modifier = modifier | ||||||
|  |             .wrapContentSize() | ||||||
|  |             .draggable( | ||||||
|  |                 orientation = Orientation.Vertical, | ||||||
|  |                 state = rememberDraggableState { deltaY -> | ||||||
|  |                     if (inputFieldShown ?.value != true) { | ||||||
|  |                         coroutineScope.launch { | ||||||
|  |                             animatedOffset.snapTo(animatedOffset.value + deltaY) | ||||||
|  |                         } | ||||||
|  |                     } | ||||||
|  |                 }, | ||||||
|  |                 onDragStopped = { velocity -> | ||||||
|  |                     if (inputFieldShown ?.value != true) { | ||||||
|  |                         coroutineScope.launch { | ||||||
|  |                             val endValue = animatedOffset.fling( | ||||||
|  |                                 initialVelocity = velocity, | ||||||
|  |                                 animationSpec = exponentialDecay(frictionMultiplier = 20f), | ||||||
|  |                                 adjustTarget = { target -> | ||||||
|  |                                     val coercedTarget = target % halvedNumbersColumnHeightPx | ||||||
|  |                                     val coercedAnchors = | ||||||
|  |                                         listOf(-halvedNumbersColumnHeightPx, 0f, halvedNumbersColumnHeightPx) | ||||||
|  |                                     val coercedPoint = coercedAnchors.minByOrNull { abs(it - coercedTarget) }!! | ||||||
|  |                                     val base = | ||||||
|  |                                         halvedNumbersColumnHeightPx * (target / halvedNumbersColumnHeightPx).toInt() | ||||||
|  |                                     coercedPoint + base | ||||||
|  |                                 } | ||||||
|  |                             ).endState.value | ||||||
|  |  | ||||||
|  |                             onStateChanged(animatedStateValue(endValue)) | ||||||
|  |                             animatedOffset.snapTo(0f) | ||||||
|  |                         } | ||||||
|  |                     } | ||||||
|  |                 } | ||||||
|  |             ), | ||||||
|  |         horizontalAlignment = Alignment.CenterHorizontally | ||||||
|  |     ) { | ||||||
|  |         val spacing = 4.dp | ||||||
|  |  | ||||||
|  |         val upEnabled = range == null || range.first < number | ||||||
|  |         IconButton( | ||||||
|  |             { | ||||||
|  |                 onStateChanged(number - 1) | ||||||
|  |                 inputFieldShown ?.value = false | ||||||
|  |             }, | ||||||
|  |             enabled = upEnabled | ||||||
|  |         ) { | ||||||
|  |             Icon(Icons.Default.KeyboardArrowUp, "", tint = if (upEnabled) arrowsColor else disabledArrowsColor) | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         Spacer(modifier = Modifier.height(spacing)) | ||||||
|  |         Box( | ||||||
|  |             modifier = Modifier | ||||||
|  |                 .offset { IntOffset(x = 0, y = coercedAnimatedOffset.roundToInt()) }, | ||||||
|  |             contentAlignment = Alignment.Center | ||||||
|  |         ) { | ||||||
|  |             val baseLabelModifier = Modifier.align(Alignment.Center) | ||||||
|  |             ProvideTextStyle(textStyle) { | ||||||
|  |                 Text( | ||||||
|  |                     text = (animatedStateValue - 1).toString(), | ||||||
|  |                     modifier = baseLabelModifier | ||||||
|  |                         .offset(y = -halvedNumbersColumnHeight) | ||||||
|  |                         .alpha(coercedAnimatedOffset / halvedNumbersColumnHeightPx) | ||||||
|  |                 ) | ||||||
|  |  | ||||||
|  |                 if (inputFieldShown ?.value == true) { | ||||||
|  |                     val currentValue = remember { mutableStateOf(number.toString()) } | ||||||
|  |  | ||||||
|  |                     val focusRequester = remember { FocusRequester() } | ||||||
|  |                     SmallTextField( | ||||||
|  |                         currentValue.value, | ||||||
|  |                         { | ||||||
|  |                             val asDigit = it.toIntOrNull() | ||||||
|  |                             when { | ||||||
|  |                                 (asDigit == null && it.isEmpty()) -> currentValue.value = (range ?.first ?: 0).toString() | ||||||
|  |                                 (asDigit != null && (range == null || asDigit in range)) -> currentValue.value = it | ||||||
|  |                                 else -> { /* do nothing */ } | ||||||
|  |                             } | ||||||
|  |                         }, | ||||||
|  |                         baseLabelModifier.focusRequester(focusRequester).width(IntrinsicSize.Min).pointerInput(number) { | ||||||
|  |                             detectTapGestures { | ||||||
|  |                                 if (!checkContains(it)) { | ||||||
|  |                                     currentValue.value.toIntOrNull() ?.let(onStateChanged) | ||||||
|  |                                     inputFieldShown.value = false | ||||||
|  |                                 } | ||||||
|  |                             } | ||||||
|  |                         }, | ||||||
|  |                         keyboardOptions = KeyboardOptions( | ||||||
|  |                             keyboardType = KeyboardType.Number | ||||||
|  |                         ), | ||||||
|  |                         keyboardActions = KeyboardActions { | ||||||
|  |                             currentValue.value.toIntOrNull() ?.let(onStateChanged) | ||||||
|  |                             inputFieldShown.value = false | ||||||
|  |                         }, | ||||||
|  |                         singleLine = true, | ||||||
|  |                         textStyle = textStyle | ||||||
|  |                     ) | ||||||
|  |                     LaunchedEffect(Unit) { | ||||||
|  |                         focusRequester.requestFocus() | ||||||
|  |                     } | ||||||
|  |                 } else { | ||||||
|  |                     Text( | ||||||
|  |                         text = animatedStateValue.toString(), | ||||||
|  |                         modifier = baseLabelModifier | ||||||
|  |                             .alpha(1 - abs(coercedAnimatedOffset) / halvedNumbersColumnHeightPx) | ||||||
|  |                             .clickable { | ||||||
|  |                                 if (inputFieldShown ?.value == false) { | ||||||
|  |                                     inputFieldShown.value = true | ||||||
|  |                                 } | ||||||
|  |                             } | ||||||
|  |                     ) | ||||||
|  |                 } | ||||||
|  |                 Text( | ||||||
|  |                     text = (animatedStateValue + 1).toString(), | ||||||
|  |                     modifier = baseLabelModifier | ||||||
|  |                         .offset(y = halvedNumbersColumnHeight) | ||||||
|  |                         .alpha(-coercedAnimatedOffset / halvedNumbersColumnHeightPx) | ||||||
|  |                 ) | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |  | ||||||
|  |         Spacer(modifier = Modifier.height(spacing)) | ||||||
|  |  | ||||||
|  |         val downEnabled = range == null || range.last > number | ||||||
|  |         IconButton( | ||||||
|  |             { | ||||||
|  |                 onStateChanged(number + 1) | ||||||
|  |                 inputFieldShown ?.value = false | ||||||
|  |             }, | ||||||
|  |             enabled = downEnabled | ||||||
|  |         ) { | ||||||
|  |             Icon(Icons.Default.KeyboardArrowDown, "", tint = if (downEnabled) arrowsColor else disabledArrowsColor) | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
							
								
								
									
										153
									
								
								android/pickers/src/androidMain/kotlin/SetPicker.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										153
									
								
								android/pickers/src/androidMain/kotlin/SetPicker.kt
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,153 @@ | |||||||
|  | package dev.inmo.micro_utils.android.pickers | ||||||
|  |  | ||||||
|  | import androidx.compose.animation.core.Animatable | ||||||
|  | import androidx.compose.animation.core.exponentialDecay | ||||||
|  | import androidx.compose.foundation.gestures.* | ||||||
|  | import androidx.compose.foundation.layout.* | ||||||
|  | import androidx.compose.foundation.rememberScrollState | ||||||
|  | import androidx.compose.material.icons.Icons | ||||||
|  | import androidx.compose.material.icons.filled.KeyboardArrowDown | ||||||
|  | import androidx.compose.material.icons.filled.KeyboardArrowUp | ||||||
|  | import androidx.compose.material3.* | ||||||
|  | import androidx.compose.runtime.* | ||||||
|  | import androidx.compose.ui.Alignment | ||||||
|  | import androidx.compose.ui.ExperimentalComposeUiApi | ||||||
|  | import androidx.compose.ui.Modifier | ||||||
|  | import androidx.compose.ui.draw.alpha | ||||||
|  | import androidx.compose.ui.graphics.Color | ||||||
|  | import androidx.compose.ui.platform.LocalDensity | ||||||
|  | import androidx.compose.ui.text.ExperimentalTextApi | ||||||
|  | import androidx.compose.ui.text.TextStyle | ||||||
|  | import androidx.compose.ui.unit.dp | ||||||
|  | import kotlinx.coroutines.launch | ||||||
|  | import kotlin.math.* | ||||||
|  |  | ||||||
|  | @OptIn(ExperimentalTextApi::class, ExperimentalComposeUiApi::class) | ||||||
|  | @Composable | ||||||
|  | fun <T> SetPicker( | ||||||
|  |     current: T, | ||||||
|  |     dataList: List<T>, | ||||||
|  |     modifier: Modifier = Modifier, | ||||||
|  |     textStyle: TextStyle = LocalTextStyle.current, | ||||||
|  |     arrowsColor: Color = MaterialTheme.colorScheme.primary, | ||||||
|  |     dataToString: @Composable (T) -> String = { it.toString() }, | ||||||
|  |     onStateChanged: (T) -> Unit = {}, | ||||||
|  | ) { | ||||||
|  |     val coroutineScope = rememberCoroutineScope() | ||||||
|  |     val numbersColumnHeight = 8.dp + with(LocalDensity.current) { | ||||||
|  |         textStyle.lineHeight.toDp() | ||||||
|  |     } | ||||||
|  |     val numbersColumnHeightPx = with(LocalDensity.current) { numbersColumnHeight.toPx() } | ||||||
|  |     val halvedNumbersColumnHeight = numbersColumnHeight / 2 | ||||||
|  |     val halvedNumbersColumnHeightPx = with(LocalDensity.current) { halvedNumbersColumnHeight.toPx() } | ||||||
|  |  | ||||||
|  |     val index = dataList.indexOfFirst { it === current }.takeIf { it > -1 } ?: dataList.indexOf(current) | ||||||
|  |     val lastIndex = dataList.size - 1 | ||||||
|  |  | ||||||
|  |     fun animatedStateValue(offset: Float): Int = index - (offset / halvedNumbersColumnHeightPx).toInt() | ||||||
|  |  | ||||||
|  |     val animatedOffset = remember { Animatable(0f) }.apply { | ||||||
|  |         val offsetRange = remember(index, lastIndex) { | ||||||
|  |             val value = index | ||||||
|  |             val first = -(lastIndex - value) * halvedNumbersColumnHeightPx | ||||||
|  |             val last = value * halvedNumbersColumnHeightPx | ||||||
|  |             first..last | ||||||
|  |         } | ||||||
|  |         updateBounds(offsetRange.start, offsetRange.endInclusive) | ||||||
|  |     } | ||||||
|  |     val indexAnimatedOffset = if (animatedOffset.value > 0) { | ||||||
|  |         (index - floor(animatedOffset.value / halvedNumbersColumnHeightPx).toInt()) | ||||||
|  |     } else { | ||||||
|  |         (index - ceil(animatedOffset.value / halvedNumbersColumnHeightPx).toInt()) | ||||||
|  |     } | ||||||
|  |     val coercedAnimatedOffset = animatedOffset.value % halvedNumbersColumnHeightPx | ||||||
|  |     val disabledArrowsColor = arrowsColor.copy(alpha = 0f) | ||||||
|  |  | ||||||
|  |     Column( | ||||||
|  |         modifier = modifier | ||||||
|  |             .wrapContentSize() | ||||||
|  |             .draggable( | ||||||
|  |                 orientation = Orientation.Vertical, | ||||||
|  |                 state = rememberDraggableState { deltaY -> | ||||||
|  |                     coroutineScope.launch { | ||||||
|  |                         animatedOffset.snapTo(animatedOffset.value + deltaY) | ||||||
|  |                     } | ||||||
|  |                 }, | ||||||
|  |                 onDragStopped = { velocity -> | ||||||
|  |                     coroutineScope.launch { | ||||||
|  |                         val endValue = animatedOffset.fling( | ||||||
|  |                             initialVelocity = velocity, | ||||||
|  |                             animationSpec = exponentialDecay(frictionMultiplier = 20f), | ||||||
|  |                             adjustTarget = { target -> | ||||||
|  |                                 val coercedTarget = target % halvedNumbersColumnHeightPx | ||||||
|  |                                 val coercedAnchors = | ||||||
|  |                                     listOf(-halvedNumbersColumnHeightPx, 0f, halvedNumbersColumnHeightPx) | ||||||
|  |                                 val coercedPoint = coercedAnchors.minByOrNull { abs(it - coercedTarget) }!! | ||||||
|  |                                 val base = | ||||||
|  |                                     halvedNumbersColumnHeightPx * (target / halvedNumbersColumnHeightPx).toInt() | ||||||
|  |                                 coercedPoint + base | ||||||
|  |                             } | ||||||
|  |                         ).endState.value | ||||||
|  |  | ||||||
|  |                         onStateChanged(dataList.elementAt(animatedStateValue(endValue))) | ||||||
|  |                         animatedOffset.snapTo(0f) | ||||||
|  |                     } | ||||||
|  |                 } | ||||||
|  |             ), | ||||||
|  |         horizontalAlignment = Alignment.CenterHorizontally | ||||||
|  |     ) { | ||||||
|  |         val spacing = 4.dp | ||||||
|  |  | ||||||
|  |         val upEnabled = index > 0 | ||||||
|  |         IconButton( | ||||||
|  |             { | ||||||
|  |                 onStateChanged(dataList.elementAt(index - 1)) | ||||||
|  |             }, | ||||||
|  |             enabled = upEnabled | ||||||
|  |         ) { | ||||||
|  |             Icon(Icons.Default.KeyboardArrowUp, "", tint = if (upEnabled) arrowsColor else disabledArrowsColor) | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         Spacer(modifier = Modifier.height(spacing)) | ||||||
|  |         Box( | ||||||
|  |             modifier = Modifier, | ||||||
|  |             contentAlignment = Alignment.Center | ||||||
|  |         ) { | ||||||
|  |             ProvideTextStyle(textStyle) { | ||||||
|  |                 dataList.forEachIndexed { i, t -> | ||||||
|  |                     val alpha = when { | ||||||
|  |                         i == indexAnimatedOffset - 1 -> coercedAnimatedOffset / halvedNumbersColumnHeightPx | ||||||
|  |                         i == indexAnimatedOffset -> 1 - (abs(coercedAnimatedOffset) / halvedNumbersColumnHeightPx) | ||||||
|  |                         i == indexAnimatedOffset + 1 -> -coercedAnimatedOffset / halvedNumbersColumnHeightPx | ||||||
|  |                         else -> return@forEachIndexed | ||||||
|  |                     } | ||||||
|  |                     val offset = when { | ||||||
|  |                         i == indexAnimatedOffset - 1 && coercedAnimatedOffset > 0 -> coercedAnimatedOffset - halvedNumbersColumnHeightPx | ||||||
|  |                         i == indexAnimatedOffset -> coercedAnimatedOffset | ||||||
|  |                         i == indexAnimatedOffset + 1 && coercedAnimatedOffset < 0 -> coercedAnimatedOffset + halvedNumbersColumnHeightPx | ||||||
|  |                         else -> return@forEachIndexed | ||||||
|  |                     } | ||||||
|  |                     Text( | ||||||
|  |                         text = dataToString(t), | ||||||
|  |                         modifier = Modifier | ||||||
|  |                             .alpha(alpha) | ||||||
|  |                             .offset(y = with(LocalDensity.current) { offset.toDp() }) | ||||||
|  |                     ) | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |  | ||||||
|  |         Spacer(modifier = Modifier.height(spacing)) | ||||||
|  |  | ||||||
|  |         val downEnabled = index < lastIndex | ||||||
|  |         IconButton( | ||||||
|  |             { | ||||||
|  |                 onStateChanged(dataList.elementAt(index + 1)) | ||||||
|  |             }, | ||||||
|  |             enabled = downEnabled | ||||||
|  |         ) { | ||||||
|  |             Icon(Icons.Default.KeyboardArrowDown, "", tint = if (downEnabled) arrowsColor else disabledArrowsColor) | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										1
									
								
								android/recyclerview/src/androidMain/AndroidManifest.xml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								android/recyclerview/src/androidMain/AndroidManifest.xml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1 @@ | |||||||
|  | <manifest/> | ||||||
| @@ -1 +0,0 @@ | |||||||
| <manifest package="dev.inmo.micro_utils.android.recyclerview"/> |  | ||||||
							
								
								
									
										18
									
								
								android/smalltextfield/build.gradle
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										18
									
								
								android/smalltextfield/build.gradle
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,18 @@ | |||||||
|  | plugins { | ||||||
|  |     id "org.jetbrains.kotlin.multiplatform" | ||||||
|  |     id "org.jetbrains.kotlin.plugin.serialization" | ||||||
|  |     id "com.android.library" | ||||||
|  |     alias(libs.plugins.jb.compose) | ||||||
|  | } | ||||||
|  |  | ||||||
|  | apply from: "$mppProjectWithSerializationAndComposePresetPath" | ||||||
|  |  | ||||||
|  | kotlin { | ||||||
|  |     sourceSets { | ||||||
|  |         androidMain { | ||||||
|  |             dependencies { | ||||||
|  |                 api libs.android.compose.material3 | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -0,0 +1 @@ | |||||||
|  | <manifest/> | ||||||
| @@ -0,0 +1,66 @@ | |||||||
|  | package dev.inmo.micro_utils.android.smalltextfield | ||||||
|  |  | ||||||
|  | import androidx.compose.foundation.interaction.MutableInteractionSource | ||||||
|  | import androidx.compose.foundation.layout.Box | ||||||
|  | import androidx.compose.foundation.layout.Row | ||||||
|  | import androidx.compose.foundation.layout.defaultMinSize | ||||||
|  | import androidx.compose.foundation.text.BasicTextField | ||||||
|  | import androidx.compose.foundation.text.KeyboardActions | ||||||
|  | import androidx.compose.foundation.text.KeyboardOptions | ||||||
|  | import androidx.compose.foundation.text.selection.LocalTextSelectionColors | ||||||
|  | import androidx.compose.material3.* | ||||||
|  | import androidx.compose.runtime.Composable | ||||||
|  | import androidx.compose.runtime.CompositionLocalProvider | ||||||
|  | import androidx.compose.runtime.remember | ||||||
|  | import androidx.compose.ui.Alignment | ||||||
|  | import androidx.compose.ui.Modifier | ||||||
|  | import androidx.compose.ui.graphics.Color | ||||||
|  | import androidx.compose.ui.graphics.Shape | ||||||
|  | import androidx.compose.ui.graphics.SolidColor | ||||||
|  | import androidx.compose.ui.graphics.takeOrElse | ||||||
|  | import androidx.compose.ui.text.TextStyle | ||||||
|  | import androidx.compose.ui.text.input.VisualTransformation | ||||||
|  |  | ||||||
|  | @OptIn(ExperimentalMaterial3Api::class) | ||||||
|  | @Composable | ||||||
|  | fun SmallTextField( | ||||||
|  |     value: String, | ||||||
|  |     onValueChange: (String) -> Unit, | ||||||
|  |     modifier: Modifier = Modifier, | ||||||
|  |     enabled: Boolean = true, | ||||||
|  |     readOnly: Boolean = false, | ||||||
|  |     textStyle: TextStyle = LocalTextStyle.current, | ||||||
|  |     textColor: Color = textStyle.color.takeOrElse { | ||||||
|  |         LocalContentColor.current | ||||||
|  |     }, | ||||||
|  |     visualTransformation: VisualTransformation = VisualTransformation.None, | ||||||
|  |     keyboardOptions: KeyboardOptions = KeyboardOptions.Default, | ||||||
|  |     keyboardActions: KeyboardActions = KeyboardActions.Default, | ||||||
|  |     singleLine: Boolean = false, | ||||||
|  |     maxLines: Int = if (singleLine) 1 else Int.MAX_VALUE, | ||||||
|  |     minLines: Int = 1, | ||||||
|  |     interactionSource: MutableInteractionSource = remember { MutableInteractionSource() }, | ||||||
|  | ) { | ||||||
|  |     BasicTextField( | ||||||
|  |         value = value, | ||||||
|  |         modifier = modifier, | ||||||
|  |         onValueChange = onValueChange, | ||||||
|  |         enabled = enabled, | ||||||
|  |         readOnly = readOnly, | ||||||
|  |         textStyle = textStyle.copy( | ||||||
|  |             color = textColor | ||||||
|  |         ), | ||||||
|  |         visualTransformation = visualTransformation, | ||||||
|  |         keyboardOptions = keyboardOptions, | ||||||
|  |         keyboardActions = keyboardActions, | ||||||
|  |         interactionSource = interactionSource, | ||||||
|  |         singleLine = singleLine, | ||||||
|  |         maxLines = maxLines, | ||||||
|  |         minLines = minLines, | ||||||
|  |         cursorBrush = SolidColor( | ||||||
|  |             textStyle.color.takeOrElse { | ||||||
|  |                 LocalContentColor.current | ||||||
|  |             } | ||||||
|  |         ) | ||||||
|  |     ) | ||||||
|  | } | ||||||
| @@ -9,6 +9,7 @@ buildscript { | |||||||
|     dependencies { |     dependencies { | ||||||
|         classpath libs.buildscript.kt.gradle |         classpath libs.buildscript.kt.gradle | ||||||
|         classpath libs.buildscript.kt.serialization |         classpath libs.buildscript.kt.serialization | ||||||
|  |         classpath libs.buildscript.kt.ksp | ||||||
|         classpath libs.buildscript.jb.dokka |         classpath libs.buildscript.jb.dokka | ||||||
|         classpath libs.buildscript.gh.release |         classpath libs.buildscript.gh.release | ||||||
|         classpath libs.buildscript.android.gradle |         classpath libs.buildscript.android.gradle | ||||||
| @@ -16,12 +17,17 @@ buildscript { | |||||||
|     } |     } | ||||||
| } | } | ||||||
|  |  | ||||||
|  | plugins { | ||||||
|  |     alias(libs.plugins.versions) | ||||||
|  | } | ||||||
|  |  | ||||||
| allprojects { | allprojects { | ||||||
|     repositories { |     repositories { | ||||||
|         mavenLocal() |         mavenLocal() | ||||||
|         mavenCentral() |         mavenCentral() | ||||||
|         google() |         google() | ||||||
|         maven { url "https://maven.pkg.jetbrains.space/public/p/compose/dev" } |         maven { url "https://maven.pkg.jetbrains.space/public/p/compose/dev" } | ||||||
|  |         maven { url "https://nexus.inmo.dev/repository/maven-releases/" } | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     // temporal crutch until legacy tests will be stabled or legacy target will be removed |     // temporal crutch until legacy tests will be stabled or legacy target will be removed | ||||||
| @@ -36,3 +42,4 @@ allprojects { | |||||||
|  |  | ||||||
| apply from: "./extensions.gradle" | apply from: "./extensions.gradle" | ||||||
| apply from: "./github_release.gradle" | apply from: "./github_release.gradle" | ||||||
|  | apply from: "./versions_plugin_setup.gradle" | ||||||
|   | |||||||
							
								
								
									
										7
									
								
								colors/common/build.gradle
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										7
									
								
								colors/common/build.gradle
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,7 @@ | |||||||
|  | plugins { | ||||||
|  |     id "org.jetbrains.kotlin.multiplatform" | ||||||
|  |     id "org.jetbrains.kotlin.plugin.serialization" | ||||||
|  |     id "com.android.library" | ||||||
|  | } | ||||||
|  |  | ||||||
|  | apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath" | ||||||
							
								
								
									
										174
									
								
								colors/common/src/commonMain/kotlin/HEXAColor.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										174
									
								
								colors/common/src/commonMain/kotlin/HEXAColor.kt
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,174 @@ | |||||||
|  | package dev.inmo.micro_utils.colors.common | ||||||
|  |  | ||||||
|  | import kotlinx.serialization.Serializable | ||||||
|  | import kotlin.jvm.JvmInline | ||||||
|  | import kotlin.math.floor | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Wrapper for RGBA colors. Receiving [UInt] in main constructor. Each part in main constructor | ||||||
|  |  * configured with `0x00 - 0xff` range. Examples: | ||||||
|  |  * | ||||||
|  |  * * Red: `0xff0000ffu` | ||||||
|  |  * * Red (0.5 capacity): `0xff000088u` | ||||||
|  |  * | ||||||
|  |  * Anyway it is recommended to use | ||||||
|  |  * | ||||||
|  |  * @param hexaUInt rgba [UInt] in format `0xFFEEBBAA` where FF - red, EE - green, BB - blue` and AA - alpha | ||||||
|  |  */ | ||||||
|  | @Serializable | ||||||
|  | @JvmInline | ||||||
|  | value class HEXAColor ( | ||||||
|  |     val hexaUInt: UInt | ||||||
|  | ) : Comparable<HEXAColor> { | ||||||
|  |     /** | ||||||
|  |      * @returns [hexaUInt] as a string with format `#FFEEBBAA` where FF - red, EE - green, BB - blue and AA - alpha | ||||||
|  |      */ | ||||||
|  |     val hexa: String | ||||||
|  |         get() = "#${hexaUInt.toString(16).padStart(8, '0')}" | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * @returns [hexaUInt] as a string with format `#FFEEBB` where FF - red, EE - green and BB - blue | ||||||
|  |      */ | ||||||
|  |     val hex: String | ||||||
|  |         get() = hexa.take(7) | ||||||
|  |     /** | ||||||
|  |      * @returns [hexaUInt] as a string with format `#AAFFEEBB` where AA - alpha, FF - red, EE - green and BB - blue | ||||||
|  |      */ | ||||||
|  |     val ahex: String | ||||||
|  |         get() = "#${a.toString(16).padStart(2, '2')}${hex.drop(1)}" | ||||||
|  |     val rgba: String | ||||||
|  |         get() = "rgba($r,$g,$b,${aOfOne.toString().take(5)})" | ||||||
|  |     val rgb: String | ||||||
|  |         get() = "rgb($r,$g,$b)" | ||||||
|  |     val shortHex: String | ||||||
|  |         get() = "#${r.shortPart()}${g.shortPart()}${b.shortPart()}" | ||||||
|  |     val shortHexa: String | ||||||
|  |         get() = "$shortHex${a.shortPart()}" | ||||||
|  |     val rgbUInt: UInt | ||||||
|  |         get() = (hexaUInt / 256u) | ||||||
|  |     val rgbInt: Int | ||||||
|  |         get() = rgbUInt.toInt() | ||||||
|  |     val ahexUInt | ||||||
|  |         get() = (a * 0x1000000).toUInt() + rgbUInt | ||||||
|  |  | ||||||
|  |     val r: Int | ||||||
|  |         get() = ((hexaUInt and 0xff000000u) / 0x1000000u).toInt() | ||||||
|  |     val g: Int | ||||||
|  |         get() = ((hexaUInt and 0x00ff0000u) / 0x10000u).toInt() | ||||||
|  |     val b: Int | ||||||
|  |         get() = ((hexaUInt and 0x0000ff00u) / 0x100u).toInt() | ||||||
|  |     val a: Int | ||||||
|  |         get() = ((hexaUInt and 0x000000ffu)).toInt() | ||||||
|  |     val aOfOne: Float | ||||||
|  |         get() = a.toFloat() / (0xff) | ||||||
|  |     init { | ||||||
|  |         require(hexaUInt in 0u ..0xffffffffu) | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     constructor(r: Int, g: Int, b: Int, a: Int) : this( | ||||||
|  |         ((r * 0x1000000).toLong() + g * 0x10000 + b * 0x100 + a).toUInt() | ||||||
|  |     ) { | ||||||
|  |         require(r in 0 ..0xff) | ||||||
|  |         require(g in 0 ..0xff) | ||||||
|  |         require(b in 0 ..0xff) | ||||||
|  |         require(a in 0 ..0xff) | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     constructor(r: Int, g: Int, b: Int, aOfOne: Float = 1f) : this( | ||||||
|  |         r = r, g = g, b = b, a = (aOfOne * 0xff).toInt() | ||||||
|  |     ) | ||||||
|  |  | ||||||
|  |     override fun toString(): String { | ||||||
|  |         return hexa | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     override fun compareTo(other: HEXAColor): Int = (hexaUInt - other.hexaUInt).coerceIn(Int.MIN_VALUE.toUInt(), Int.MAX_VALUE.toLong().toUInt()).toInt() | ||||||
|  |  | ||||||
|  |     fun copy( | ||||||
|  |         r: Int = this.r, | ||||||
|  |         g: Int = this.g, | ||||||
|  |         b: Int = this.b, | ||||||
|  |         aOfOne: Float = this.aOfOne | ||||||
|  |     ) = HEXAColor(r = r, g = g, b = b, aOfOne = aOfOne) | ||||||
|  |     fun copy( | ||||||
|  |         r: Int = this.r, | ||||||
|  |         g: Int = this.g, | ||||||
|  |         b: Int = this.b, | ||||||
|  |         a: Int | ||||||
|  |     ) = HEXAColor(r = r, g = g, b = b, a = a) | ||||||
|  |  | ||||||
|  |     companion object { | ||||||
|  |         /** | ||||||
|  |          * Parsing color from [color] | ||||||
|  |          * | ||||||
|  |          * Supported formats samples (on Red color based): | ||||||
|  |          * | ||||||
|  |          * * `#f00` | ||||||
|  |          * * `#f00f` | ||||||
|  |          * * `#ff0000` | ||||||
|  |          * * `#ff0000ff` | ||||||
|  |          * * `rgb(255, 0, 0)` | ||||||
|  |          * * `rgba(255, 0, 0, 1)` | ||||||
|  |          */ | ||||||
|  |         fun parseStringColor(color: String): HEXAColor = when { | ||||||
|  |             color.startsWith("#") -> color.removePrefix("#").let { color -> | ||||||
|  |                 when (color.length) { | ||||||
|  |                     3 -> color.map { "$it$it" }.joinToString(separator = "", postfix = "ff") | ||||||
|  |                     4 -> color.take(3).map { "$it$it" }.joinToString(separator = "", postfix = color.takeLast(1).let { "${it}0" }) | ||||||
|  |                     6 -> "${color}ff" | ||||||
|  |                     8 -> color | ||||||
|  |                     else -> error("Malfurmed color string: $color. It is expected that color started with # will contains 3, 6 or 8 valuable parts") | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |             color.startsWith("rgb(") -> color | ||||||
|  |                 .removePrefix("rgb(") | ||||||
|  |                 .removeSuffix(")") | ||||||
|  |                 .replace(Regex("\\s"), "") | ||||||
|  |                 .split(",") | ||||||
|  |                 .joinToString("", postfix = "ff") { | ||||||
|  |                     it.toInt().toString(16).padStart(2, '0') | ||||||
|  |                 } | ||||||
|  |             color.startsWith("rgba(") -> color | ||||||
|  |                 .removePrefix("rgba(") | ||||||
|  |                 .removeSuffix(")") | ||||||
|  |                 .replace(Regex("\\s"), "") | ||||||
|  |                 .split(",").let { | ||||||
|  |                     it.take(3).map { it.toInt().toString(16).padStart(2, '0') } + (it.last().toFloat() * 0xff).toInt().toString(16).padStart(2, '0') | ||||||
|  |                 } | ||||||
|  |                 .joinToString("") | ||||||
|  |             else -> color | ||||||
|  |         }.lowercase().toUInt(16).let(::HEXAColor) | ||||||
|  |  | ||||||
|  |         /** | ||||||
|  |          * Creates [HEXAColor] from [uint] presume it is in format `0xFFEEBBAA` where FF - red, EE - green, BB - blue` and AA - alpha | ||||||
|  |          */ | ||||||
|  |         fun fromHexa(uint: UInt) = HEXAColor(uint) | ||||||
|  |  | ||||||
|  |         /** | ||||||
|  |          * Creates [HEXAColor] from [uint] presume it is in format `0xAAFFEEBB` where AA - alpha, FF - red, EE - green and BB - blue` | ||||||
|  |          */ | ||||||
|  |         fun fromAhex(uint: UInt) = HEXAColor( | ||||||
|  |             a = ((uint and 0xff000000u) / 0x1000000u).toInt(), | ||||||
|  |             r = ((uint and 0x00ff0000u) / 0x10000u).toInt(), | ||||||
|  |             g = ((uint and 0x0000ff00u) / 0x100u).toInt(), | ||||||
|  |             b = ((uint and 0x000000ffu)).toInt() | ||||||
|  |         ) | ||||||
|  |  | ||||||
|  |         /** | ||||||
|  |          * Parsing color from [color] | ||||||
|  |          * | ||||||
|  |          * Supported formats samples (on Red color based): | ||||||
|  |          * | ||||||
|  |          * * `#f00` | ||||||
|  |          * * `#ff0000` | ||||||
|  |          * * `#ff0000ff` | ||||||
|  |          * * `rgb(255, 0, 0)` | ||||||
|  |          * * `rgba(255, 0, 0, 1)` | ||||||
|  |          */ | ||||||
|  |         operator fun invoke(color: String) = parseStringColor(color) | ||||||
|  |  | ||||||
|  |         private fun Int.shortPart(): String { | ||||||
|  |             return (floor(toFloat() / 16)).toInt().toString(16) | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										209
									
								
								colors/common/src/commonTest/kotlin/HexColorTests.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										209
									
								
								colors/common/src/commonTest/kotlin/HexColorTests.kt
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,209 @@ | |||||||
|  | package dev.inmo.micro_utils.colors.common | ||||||
|  |  | ||||||
|  | import kotlin.math.floor | ||||||
|  | import kotlin.test.Test | ||||||
|  | import kotlin.test.assertEquals | ||||||
|  | import kotlin.test.assertTrue | ||||||
|  |  | ||||||
|  | class HexColorTests { | ||||||
|  |     val alphaRgbaPrecision = 5 | ||||||
|  |     class TestColor( | ||||||
|  |         val color: HEXAColor, | ||||||
|  |         val shortHex: String, | ||||||
|  |         val shortHexa: String, | ||||||
|  |         val hex: String, | ||||||
|  |         val hexa: String, | ||||||
|  |         val ahex: String, | ||||||
|  |         val ahexUInt: UInt, | ||||||
|  |         val rgbUInt: UInt, | ||||||
|  |         val rgb: String, | ||||||
|  |         val rgba: String, | ||||||
|  |         val r: Int, | ||||||
|  |         val g: Int, | ||||||
|  |         val b: Int, | ||||||
|  |         val a: Int, | ||||||
|  |         vararg val additionalRGBAVariants: String | ||||||
|  |     ) | ||||||
|  |     val testColors: List<TestColor> | ||||||
|  |         get() = listOf( | ||||||
|  |             TestColor( | ||||||
|  |                 color = HEXAColor(hexaUInt = 0xff0000ffu), | ||||||
|  |                 shortHex = "#f00", | ||||||
|  |                 shortHexa = "#f00f", | ||||||
|  |                 hex = "#ff0000", | ||||||
|  |                 hexa = "#ff0000ff", | ||||||
|  |                 ahex = "#ffff0000", | ||||||
|  |                 ahexUInt = 0xffff0000u, | ||||||
|  |                 rgbUInt = 0xff0000u, | ||||||
|  |                 rgb = "rgb(255,0,0)", | ||||||
|  |                 rgba = "rgba(255,0,0,1.0)", | ||||||
|  |                 r = 0xff, | ||||||
|  |                 g = 0x00, | ||||||
|  |                 b = 0x00, | ||||||
|  |                 a = 0xff, | ||||||
|  |                 "rgba(255,0,0,1)", | ||||||
|  |             ), | ||||||
|  |             TestColor( | ||||||
|  |                 color = HEXAColor(hexaUInt = 0x00ff00ffu), | ||||||
|  |                 shortHex = "#0f0", | ||||||
|  |                 shortHexa = "#0f0f", | ||||||
|  |                 hex = "#00ff00", | ||||||
|  |                 hexa = "#00ff00ff", | ||||||
|  |                 ahex = "#ff00ff00", | ||||||
|  |                 ahexUInt = 0xff00ff00u, | ||||||
|  |                 rgbUInt = 0x00ff00u, | ||||||
|  |                 rgb = "rgb(0,255,0)", | ||||||
|  |                 rgba = "rgba(0,255,0,1.0)", | ||||||
|  |                 r = 0x00, | ||||||
|  |                 g = 0xff, | ||||||
|  |                 b = 0x00, | ||||||
|  |                 a = 0xff, | ||||||
|  |                 "rgba(0,255,0,1)" | ||||||
|  |             ), | ||||||
|  |             TestColor( | ||||||
|  |                 color = HEXAColor(0x0000ffffu), | ||||||
|  |                 shortHex = "#00f", | ||||||
|  |                 shortHexa = "#00ff", | ||||||
|  |                 hex = "#0000ff", | ||||||
|  |                 hexa = "#0000ffff", | ||||||
|  |                 ahex = "#ff0000ff", | ||||||
|  |                 ahexUInt = 0xff0000ffu, | ||||||
|  |                 rgbUInt = 0x0000ffu, | ||||||
|  |                 rgb = "rgb(0,0,255)", | ||||||
|  |                 rgba = "rgba(0,0,255,1.0)", | ||||||
|  |                 r = 0x00, | ||||||
|  |                 g = 0x00, | ||||||
|  |                 b = 0xff, | ||||||
|  |                 a = 0xff, | ||||||
|  |                 "rgba(0,0,255,1)" | ||||||
|  |             ), | ||||||
|  |             TestColor( | ||||||
|  |                 color = HEXAColor(0xff000088u), | ||||||
|  |                 shortHex = "#f00", | ||||||
|  |                 shortHexa = "#f008", | ||||||
|  |                 hex = "#ff0000", | ||||||
|  |                 hexa = "#ff000088", | ||||||
|  |                 ahex = "#88ff0000", | ||||||
|  |                 ahexUInt = 0x88ff0000u, | ||||||
|  |                 rgbUInt = 0xff0000u, | ||||||
|  |                 rgb = "rgb(255,0,0)", | ||||||
|  |                 rgba = "rgba(255,0,0,0.533)", | ||||||
|  |                 r = 0xff, | ||||||
|  |                 g = 0x00, | ||||||
|  |                 b = 0x00, | ||||||
|  |                 a = 0x88, | ||||||
|  |             ), | ||||||
|  |             TestColor( | ||||||
|  |                 color = HEXAColor(0x00ff0088u), | ||||||
|  |                 shortHex = "#0f0", | ||||||
|  |                 shortHexa = "#0f08", | ||||||
|  |                 hex = "#00ff00", | ||||||
|  |                 hexa = "#00ff0088", | ||||||
|  |                 ahex = "#8800ff00", | ||||||
|  |                 ahexUInt = 0x8800ff00u, | ||||||
|  |                 rgbUInt = 0x00ff00u, | ||||||
|  |                 rgb = "rgb(0,255,0)", | ||||||
|  |                 rgba = "rgba(0,255,0,0.533)", | ||||||
|  |                 r = 0x00, | ||||||
|  |                 g = 0xff, | ||||||
|  |                 b = 0x00, | ||||||
|  |                 a = 0x88, | ||||||
|  |             ), | ||||||
|  |             TestColor( | ||||||
|  |                 color = HEXAColor(0x0000ff88u), | ||||||
|  |                 shortHex = "#00f", | ||||||
|  |                 shortHexa = "#00f8", | ||||||
|  |                 hex = "#0000ff", | ||||||
|  |                 hexa = "#0000ff88", | ||||||
|  |                 ahex = "#880000ff", | ||||||
|  |                 ahexUInt = 0x880000ffu, | ||||||
|  |                 rgbUInt = 0x0000ffu, | ||||||
|  |                 rgb = "rgb(0,0,255)", | ||||||
|  |                 rgba = "rgba(0,0,255,0.533)", | ||||||
|  |                 r = 0x00, | ||||||
|  |                 g = 0x00, | ||||||
|  |                 b = 0xff, | ||||||
|  |                 a = 0x88, | ||||||
|  |             ), | ||||||
|  |             TestColor( | ||||||
|  |                 color = HEXAColor(0xff000022u), | ||||||
|  |                 shortHex = "#f00", | ||||||
|  |                 shortHexa = "#f002", | ||||||
|  |                 hex = "#ff0000", | ||||||
|  |                 hexa = "#ff000022", | ||||||
|  |                 ahex = "#22ff0000", | ||||||
|  |                 ahexUInt = 0x22ff0000u, | ||||||
|  |                 rgbUInt = 0xff0000u, | ||||||
|  |                 rgb = "rgb(255,0,0)", | ||||||
|  |                 rgba = "rgba(255,0,0,0.133)", | ||||||
|  |                 r = 0xff, | ||||||
|  |                 g = 0x00, | ||||||
|  |                 b = 0x00, | ||||||
|  |                 a = 0x22, | ||||||
|  |             ), | ||||||
|  |             TestColor( | ||||||
|  |                 color = HEXAColor(0x00ff0022u), | ||||||
|  |                 shortHex = "#0f0", | ||||||
|  |                 shortHexa = "#0f02", | ||||||
|  |                 hex = "#00ff00", | ||||||
|  |                 hexa = "#00ff0022", | ||||||
|  |                 ahex = "#2200ff00", | ||||||
|  |                 ahexUInt = 0x2200ff00u, | ||||||
|  |                 rgbUInt = 0x00ff00u, | ||||||
|  |                 rgb = "rgb(0,255,0)", | ||||||
|  |                 rgba = "rgba(0,255,0,0.133)", | ||||||
|  |                 r = 0x00, | ||||||
|  |                 g = 0xff, | ||||||
|  |                 b = 0x00, | ||||||
|  |                 a = 0x22, | ||||||
|  |             ), | ||||||
|  |             TestColor( | ||||||
|  |                 color = HEXAColor(0x0000ff22u), | ||||||
|  |                 shortHex = "#00f", | ||||||
|  |                 shortHexa = "#00f2", | ||||||
|  |                 hex = "#0000ff", | ||||||
|  |                 hexa = "#0000ff22", | ||||||
|  |                 ahex = "#220000ff", | ||||||
|  |                 ahexUInt = 0x220000ffu, | ||||||
|  |                 rgbUInt = 0x0000ffu, | ||||||
|  |                 rgb = "rgb(0,0,255)", | ||||||
|  |                 rgba = "rgba(0,0,255,0.133)", | ||||||
|  |                 r = 0x00, | ||||||
|  |                 g = 0x00, | ||||||
|  |                 b = 0xff, | ||||||
|  |                 a = 0x22, | ||||||
|  |             ), | ||||||
|  |         ) | ||||||
|  |  | ||||||
|  |     @Test | ||||||
|  |     fun baseTest() { | ||||||
|  |         testColors.forEach { | ||||||
|  |             assertEquals(it.hex, it.color.hex) | ||||||
|  |             assertEquals(it.hexa, it.color.hexa) | ||||||
|  |             assertEquals(it.ahex, it.color.ahex) | ||||||
|  |             assertEquals(it.rgbUInt, it.color.rgbUInt) | ||||||
|  |             assertEquals(it.ahexUInt, it.color.ahexUInt) | ||||||
|  |             assertEquals(it.shortHex, it.color.shortHex) | ||||||
|  |             assertEquals(it.shortHexa, it.color.shortHexa) | ||||||
|  |             assertEquals(it.rgb, it.color.rgb) | ||||||
|  |             assertTrue(it.rgba == it.color.rgba || it.color.rgba in it.additionalRGBAVariants) | ||||||
|  |             assertEquals(it.r, it.color.r) | ||||||
|  |             assertEquals(it.g, it.color.g) | ||||||
|  |             assertEquals(it.b, it.color.b) | ||||||
|  |             assertEquals(it.a, it.color.a) | ||||||
|  |             assertEquals(it.color, HEXAColor.fromAhex(it.ahexUInt)) | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     @Test | ||||||
|  |     fun testHexParseColor() { | ||||||
|  |         testColors.forEach { | ||||||
|  |             assertEquals(it.color.copy(aOfOne = 1f), HEXAColor.parseStringColor(it.hex)) | ||||||
|  |             assertEquals(it.color, HEXAColor.parseStringColor(it.hexa)) | ||||||
|  |             assertEquals(it.color.copy(aOfOne = 1f), HEXAColor.parseStringColor(it.rgb)) | ||||||
|  |             assertTrue(it.color.hexaUInt.toInt() - HEXAColor.parseStringColor(it.rgba).hexaUInt.toInt() in -0x1 .. 0x1, ) | ||||||
|  |             assertEquals(it.color.copy(aOfOne = 1f), HEXAColor.parseStringColor(it.shortHex)) | ||||||
|  |             assertEquals(it.color.copy(a = floor(it.color.a.toFloat() / 16).toInt() * 0x10), HEXAColor.parseStringColor(it.shortHexa)) | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -4,10 +4,15 @@ plugins { | |||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppProjectWithSerializationPresetPath" | apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath" | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     sourceSets { |     sourceSets { | ||||||
|  |         commonMain { | ||||||
|  |             dependencies { | ||||||
|  |                 api libs.klock | ||||||
|  |             } | ||||||
|  |         } | ||||||
|         jvmMain { |         jvmMain { | ||||||
|             dependencies { |             dependencies { | ||||||
|                 api project(":micro_utils.coroutines") |                 api project(":micro_utils.coroutines") | ||||||
| @@ -15,9 +20,14 @@ kotlin { | |||||||
|         } |         } | ||||||
|         androidMain { |         androidMain { | ||||||
|             dependencies { |             dependencies { | ||||||
|                 api project(":micro_utils.coroutines") |  | ||||||
|                 api libs.android.fragment |                 api libs.android.fragment | ||||||
|             } |             } | ||||||
|         } |         } | ||||||
|  |  | ||||||
|  |         nativeMain { | ||||||
|  |             dependencies { | ||||||
|  |                 api libs.okio | ||||||
|  |             } | ||||||
|  |         } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|   | |||||||
							
								
								
									
										1
									
								
								common/compose/src/androidMain/AndroidManifest.xml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								common/compose/src/androidMain/AndroidManifest.xml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1 @@ | |||||||
|  | <manifest/> | ||||||
| @@ -0,0 +1,10 @@ | |||||||
|  | package dev.inmo.micro_utils.common.compose | ||||||
|  |  | ||||||
|  | import androidx.compose.runtime.MutableState | ||||||
|  | import androidx.compose.runtime.State | ||||||
|  | import androidx.compose.runtime.derivedStateOf | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Converts current [MutableState] to immutable [State] using [derivedStateOf] | ||||||
|  |  */ | ||||||
|  | fun <T> MutableState<T>.asState(): State<T> = derivedStateOf { this.value } | ||||||
| @@ -1 +0,0 @@ | |||||||
| <manifest package="dev.inmo.micro_utils.common.compose"/> |  | ||||||
| @@ -0,0 +1,25 @@ | |||||||
|  | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | import korlibs.time.DateTime | ||||||
|  | import kotlinx.serialization.KSerializer | ||||||
|  | import kotlinx.serialization.Serializer | ||||||
|  | import kotlinx.serialization.builtins.serializer | ||||||
|  | import kotlinx.serialization.descriptors.SerialDescriptor | ||||||
|  | import kotlinx.serialization.encoding.Decoder | ||||||
|  | import kotlinx.serialization.encoding.Encoder | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Serializes [DateTime] as its raw [DateTime.unixMillis] and deserializes in the same way | ||||||
|  |  */ | ||||||
|  | object DateTimeSerializer : KSerializer<DateTime> { | ||||||
|  |     override val descriptor: SerialDescriptor | ||||||
|  |         get() = Double.serializer().descriptor | ||||||
|  |  | ||||||
|  |     override fun deserialize(decoder: Decoder): DateTime { | ||||||
|  |         return DateTime(decoder.decodeDouble()) | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     override fun serialize(encoder: Encoder, value: DateTime) { | ||||||
|  |         encoder.encodeDouble(value.unixMillis) | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -2,6 +2,8 @@ | |||||||
|  |  | ||||||
| package dev.inmo.micro_utils.common | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | import kotlinx.serialization.Serializable | ||||||
|  |  | ||||||
| private inline fun <T> getObject( | private inline fun <T> getObject( | ||||||
|     additional: MutableList<T>, |     additional: MutableList<T>, | ||||||
|     iterator: Iterator<T> |     iterator: Iterator<T> | ||||||
| @@ -24,14 +26,23 @@ private inline fun <T> getObject( | |||||||
|  * |  * | ||||||
|  * @see calculateDiff |  * @see calculateDiff | ||||||
|  */ |  */ | ||||||
| data class Diff<T> internal constructor( | @Serializable | ||||||
|     val removed: List<IndexedValue<T>>, | data class Diff<T> @Warning(warning) constructor( | ||||||
|  |     val removed: List<@Serializable(IndexedValueSerializer::class) IndexedValue<T>>, | ||||||
|     /** |     /** | ||||||
|      * Old-New values pairs |      * Old-New values pairs | ||||||
|      */ |      */ | ||||||
|     val replaced: List<Pair<IndexedValue<T>, IndexedValue<T>>>, |     val replaced: List<Pair<@Serializable(IndexedValueSerializer::class) IndexedValue<T>, @Serializable(IndexedValueSerializer::class) IndexedValue<T>>>, | ||||||
|     val added: List<IndexedValue<T>> |     val added: List<@Serializable(IndexedValueSerializer::class) IndexedValue<T>> | ||||||
| ) | ) { | ||||||
|  |     fun isEmpty(): Boolean = removed.isEmpty() && replaced.isEmpty() && added.isEmpty() | ||||||
|  |  | ||||||
|  |     companion object { | ||||||
|  |         private const val warning = "This feature can be changed without any warranties. Use with caution and only in case you know what you are doing" | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | fun <T> emptyDiff(): Diff<T> = Diff(emptyList(), emptyList(), emptyList()) | ||||||
|  |  | ||||||
| private inline fun <T> performChanges( | private inline fun <T> performChanges( | ||||||
|     potentialChanges: MutableList<Pair<IndexedValue<T>?, IndexedValue<T>?>>, |     potentialChanges: MutableList<Pair<IndexedValue<T>?, IndexedValue<T>?>>, | ||||||
| @@ -40,14 +51,14 @@ private inline fun <T> performChanges( | |||||||
|     changedList: MutableList<Pair<IndexedValue<T>, IndexedValue<T>>>, |     changedList: MutableList<Pair<IndexedValue<T>, IndexedValue<T>>>, | ||||||
|     removedList: MutableList<IndexedValue<T>>, |     removedList: MutableList<IndexedValue<T>>, | ||||||
|     addedList: MutableList<IndexedValue<T>>, |     addedList: MutableList<IndexedValue<T>>, | ||||||
|     strictComparison: Boolean |     comparisonFun: (T?, T?) -> Boolean | ||||||
| ) { | ) { | ||||||
|     var i = -1 |     var i = -1 | ||||||
|     val (oldObject, newObject) = potentialChanges.lastOrNull() ?: return |     val (oldObject, newObject) = potentialChanges.lastOrNull() ?: return | ||||||
|     for ((old, new) in potentialChanges.take(potentialChanges.size - 1)) { |     for ((old, new) in potentialChanges.take(potentialChanges.size - 1)) { | ||||||
|         i++ |         i++ | ||||||
|         val oldOneEqualToNewObject = old ?.value === newObject ?.value || (old ?.value == newObject ?.value && !strictComparison) |         val oldOneEqualToNewObject = comparisonFun(old ?.value, newObject ?.value) | ||||||
|         val newOneEqualToOldObject = new ?.value === oldObject ?.value || (new ?.value == oldObject ?.value && !strictComparison) |         val newOneEqualToOldObject = comparisonFun(new ?.value, oldObject ?.value) | ||||||
|         if (oldOneEqualToNewObject || newOneEqualToOldObject) { |         if (oldOneEqualToNewObject || newOneEqualToOldObject) { | ||||||
|             changedList.addAll( |             changedList.addAll( | ||||||
|                 potentialChanges.take(i).mapNotNull { |                 potentialChanges.take(i).mapNotNull { | ||||||
| @@ -101,7 +112,7 @@ private inline fun <T> performChanges( | |||||||
|  */ |  */ | ||||||
| fun <T> Iterable<T>.calculateDiff( | fun <T> Iterable<T>.calculateDiff( | ||||||
|     other: Iterable<T>, |     other: Iterable<T>, | ||||||
|     strictComparison: Boolean = false |     comparisonFun: (T?, T?) -> Boolean | ||||||
| ): Diff<T> { | ): Diff<T> { | ||||||
|     var i = -1 |     var i = -1 | ||||||
|     var j = -1 |     var j = -1 | ||||||
| @@ -129,7 +140,7 @@ fun <T> Iterable<T>.calculateDiff( | |||||||
|         } |         } | ||||||
|  |  | ||||||
|         when { |         when { | ||||||
|             oldObject === newObject || (oldObject == newObject && !strictComparison) -> { |             comparisonFun(oldObject, newObject) -> { | ||||||
|                 changedObjects.addAll(potentiallyChangedObjects.map { |                 changedObjects.addAll(potentiallyChangedObjects.map { | ||||||
|                     @Suppress("UNCHECKED_CAST") |                     @Suppress("UNCHECKED_CAST") | ||||||
|                     it as Pair<IndexedValue<T>, IndexedValue<T>> |                     it as Pair<IndexedValue<T>, IndexedValue<T>> | ||||||
| @@ -140,23 +151,49 @@ fun <T> Iterable<T>.calculateDiff( | |||||||
|                 potentiallyChangedObjects.add(oldObject ?.let { IndexedValue(i, oldObject) } to newObject ?.let { IndexedValue(j, newObject) }) |                 potentiallyChangedObjects.add(oldObject ?.let { IndexedValue(i, oldObject) } to newObject ?.let { IndexedValue(j, newObject) }) | ||||||
|                 val previousOldsAdditionsSize = additionalInOld.size |                 val previousOldsAdditionsSize = additionalInOld.size | ||||||
|                 val previousNewsAdditionsSize = additionalInNew.size |                 val previousNewsAdditionsSize = additionalInNew.size | ||||||
|                 performChanges(potentiallyChangedObjects, additionalInOld, additionalInNew, changedObjects, removedObjects, addedObjects, strictComparison) |                 performChanges(potentiallyChangedObjects, additionalInOld, additionalInNew, changedObjects, removedObjects, addedObjects, comparisonFun) | ||||||
|                 i -= (additionalInOld.size - previousOldsAdditionsSize) |                 i -= (additionalInOld.size - previousOldsAdditionsSize) | ||||||
|                 j -= (additionalInNew.size - previousNewsAdditionsSize) |                 j -= (additionalInNew.size - previousNewsAdditionsSize) | ||||||
|             } |             } | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
|     potentiallyChangedObjects.add(null to null) |     potentiallyChangedObjects.add(null to null) | ||||||
|     performChanges(potentiallyChangedObjects, additionalInOld, additionalInNew, changedObjects, removedObjects, addedObjects, strictComparison) |     performChanges(potentiallyChangedObjects, additionalInOld, additionalInNew, changedObjects, removedObjects, addedObjects, comparisonFun) | ||||||
|  |  | ||||||
|     return Diff(removedObjects.toList(), changedObjects.toList(), addedObjects.toList()) |     return Diff(removedObjects.toList(), changedObjects.toList(), addedObjects.toList()) | ||||||
| } | } | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Calculating [Diff] object | ||||||
|  |  * | ||||||
|  |  * @param strictComparison If this parameter set to true, objects which are not equal by links will be used as different | ||||||
|  |  * objects. For example, in case of two "Example" string they will be equal by value, but CAN be different by links | ||||||
|  |  */ | ||||||
|  | fun <T> Iterable<T>.calculateDiff( | ||||||
|  |     other: Iterable<T>, | ||||||
|  |     strictComparison: Boolean = false | ||||||
|  | ): Diff<T> = calculateDiff( | ||||||
|  |     other, | ||||||
|  |     comparisonFun = if (strictComparison) { | ||||||
|  |         { t1, t2 -> | ||||||
|  |             t1 === t2 | ||||||
|  |         } | ||||||
|  |     } else { | ||||||
|  |         { t1, t2 -> | ||||||
|  |             t1 === t2 || t1 == t2 // small optimization for cases when t1 and t2 are the same - comparison will be faster potentially | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | ) | ||||||
| inline fun <T> Iterable<T>.diff( | inline fun <T> Iterable<T>.diff( | ||||||
|     other: Iterable<T>, |     other: Iterable<T>, | ||||||
|     strictComparison: Boolean = false |     strictComparison: Boolean = false | ||||||
| ): Diff<T> = calculateDiff(other, strictComparison) | ): Diff<T> = calculateDiff(other, strictComparison) | ||||||
|  | inline fun <T> Iterable<T>.diff( | ||||||
|  |     other: Iterable<T>, | ||||||
|  |     noinline comparisonFun: (T?, T?) -> Boolean | ||||||
|  | ): Diff<T> = calculateDiff(other, comparisonFun) | ||||||
|  |  | ||||||
| inline fun <T> Diff(old: Iterable<T>, new: Iterable<T>) = old.calculateDiff(new) | inline fun <T> Diff(old: Iterable<T>, new: Iterable<T>) = old.calculateDiff(new, strictComparison = false) | ||||||
| inline fun <T> StrictDiff(old: Iterable<T>, new: Iterable<T>) = old.calculateDiff(new, true) | inline fun <T> StrictDiff(old: Iterable<T>, new: Iterable<T>) = old.calculateDiff(new, true) | ||||||
|  |  | ||||||
| /** | /** | ||||||
| @@ -166,6 +203,23 @@ inline fun <T> Iterable<T>.calculateStrictDiff( | |||||||
|     other: Iterable<T> |     other: Iterable<T> | ||||||
| ) = calculateDiff(other, strictComparison = true) | ) = calculateDiff(other, strictComparison = true) | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Applies [diff] to [this] [MutableList] | ||||||
|  |  */ | ||||||
|  | fun <T> MutableList<T>.applyDiff( | ||||||
|  |     diff: Diff<T> | ||||||
|  | ) { | ||||||
|  |     for (i in diff.removed.indices.sortedDescending()) { | ||||||
|  |         removeAt(diff.removed[i].index) | ||||||
|  |     } | ||||||
|  |     diff.added.forEach { (i, t) -> | ||||||
|  |         add(i, t) | ||||||
|  |     } | ||||||
|  |     diff.replaced.forEach { (_, new) -> | ||||||
|  |         set(new.index, new.value) | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
| /** | /** | ||||||
|  * This method call [calculateDiff] with strict mode [strictComparison] and then apply differences to [this] |  * This method call [calculateDiff] with strict mode [strictComparison] and then apply differences to [this] | ||||||
|  * mutable list |  * mutable list | ||||||
| @@ -174,13 +228,26 @@ fun <T> MutableList<T>.applyDiff( | |||||||
|     source: Iterable<T>, |     source: Iterable<T>, | ||||||
|     strictComparison: Boolean = false |     strictComparison: Boolean = false | ||||||
| ): Diff<T> = calculateDiff(source, strictComparison).also { | ): Diff<T> = calculateDiff(source, strictComparison).also { | ||||||
|     for (i in it.removed.indices.sortedDescending()) { |     applyDiff(it) | ||||||
|         removeAt(it.removed[i].index) |  | ||||||
|     } |  | ||||||
|     it.added.forEach { (i, t) -> |  | ||||||
|         add(i, t) |  | ||||||
|     } |  | ||||||
|     it.replaced.forEach { (_, new) -> |  | ||||||
|         set(new.index, new.value) |  | ||||||
|     } |  | ||||||
| } | } | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * This method call [calculateDiff] and then apply differences to [this] | ||||||
|  |  * mutable list | ||||||
|  |  */ | ||||||
|  | fun <T> MutableList<T>.applyDiff( | ||||||
|  |     source: Iterable<T>, | ||||||
|  |     comparisonFun: (T?, T?) -> Boolean | ||||||
|  | ): Diff<T> = calculateDiff(source, comparisonFun).also { | ||||||
|  |     applyDiff(it) | ||||||
|  | } | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Reverse [this] [Diff]. Result will contain [Diff.added] on [Diff.removed] (and vice-verse), all the | ||||||
|  |  * [Diff.replaced] values will be reversed too | ||||||
|  |  */ | ||||||
|  | fun <T> Diff<T>.reversed() = Diff( | ||||||
|  |     removed = added, | ||||||
|  |     replaced = replaced.map { it.second to it.first }, | ||||||
|  |     added = removed | ||||||
|  | ) | ||||||
|   | |||||||
| @@ -0,0 +1,43 @@ | |||||||
|  | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | inline fun <T> Boolean.letIfTrue(block: () -> T): T? { | ||||||
|  |     return if (this) { | ||||||
|  |         block() | ||||||
|  |     } else { | ||||||
|  |         null | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | inline fun <T> Boolean.letIfFalse(block: () -> T): T? { | ||||||
|  |     return if (this) { | ||||||
|  |         null | ||||||
|  |     } else { | ||||||
|  |         block() | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | inline fun Boolean.alsoIfTrue(block: () -> Unit): Boolean { | ||||||
|  |     letIfTrue(block) | ||||||
|  |     return this | ||||||
|  | } | ||||||
|  |  | ||||||
|  | inline fun Boolean.alsoIfFalse(block: () -> Unit): Boolean { | ||||||
|  |     letIfFalse(block) | ||||||
|  |     return this | ||||||
|  | } | ||||||
|  |  | ||||||
|  | inline fun <T> Boolean.ifTrue(block: () -> T): T? { | ||||||
|  |     return if (this) { | ||||||
|  |         block() | ||||||
|  |     } else { | ||||||
|  |         null | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | inline fun <T> Boolean.ifFalse(block: () -> T): T? { | ||||||
|  |     return if (this) { | ||||||
|  |         null | ||||||
|  |     } else { | ||||||
|  |         block() | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -0,0 +1,30 @@ | |||||||
|  | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | import kotlinx.serialization.KSerializer | ||||||
|  | import kotlinx.serialization.Serializer | ||||||
|  | import kotlinx.serialization.builtins.PairSerializer | ||||||
|  | import kotlinx.serialization.builtins.serializer | ||||||
|  | import kotlinx.serialization.descriptors.SerialDescriptor | ||||||
|  | import kotlinx.serialization.encoding.Decoder | ||||||
|  | import kotlinx.serialization.encoding.Encoder | ||||||
|  |  | ||||||
|  | class IndexedValueSerializer<T>(private val subSerializer: KSerializer<T>) : KSerializer<IndexedValue<T>> { | ||||||
|  |     private val originalSerializer = PairSerializer(Int.serializer(), subSerializer) | ||||||
|  |     override val descriptor: SerialDescriptor | ||||||
|  |         get() = originalSerializer.descriptor | ||||||
|  |  | ||||||
|  |     override fun deserialize(decoder: Decoder): IndexedValue<T> { | ||||||
|  |         val pair = originalSerializer.deserialize(decoder) | ||||||
|  |         return IndexedValue( | ||||||
|  |             pair.first, | ||||||
|  |             pair.second | ||||||
|  |         ) | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     override fun serialize(encoder: Encoder, value: IndexedValue<T>) { | ||||||
|  |         originalSerializer.serialize( | ||||||
|  |             encoder, | ||||||
|  |             Pair(value.index, value.value) | ||||||
|  |         ) | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -0,0 +1,135 @@ | |||||||
|  | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Contains diff based on the comparison of objects with the same [K]. | ||||||
|  |  * | ||||||
|  |  * @param removed Contains map with keys removed from parent map | ||||||
|  |  * @param changed Contains map with keys values changed new map in comparison with old one | ||||||
|  |  * @param added Contains map with new keys and values | ||||||
|  |  */ | ||||||
|  | data class MapDiff<K, V> @Warning(warning) constructor( | ||||||
|  |     val removed: Map<K, V>, | ||||||
|  |     val changed: Map<K, Pair<V, V>>, | ||||||
|  |     val added: Map<K, V> | ||||||
|  | ) { | ||||||
|  |     fun isEmpty() = removed.isEmpty() && changed.isEmpty() && added.isEmpty() | ||||||
|  |     inline fun isNotEmpty() = !isEmpty() | ||||||
|  |  | ||||||
|  |     companion object { | ||||||
|  |         private const val warning = "This feature can be changed without any warranties. Use with caution and only in case you know what you are doing" | ||||||
|  |         fun <K, V> empty() = MapDiff<K, V>(emptyMap(), emptyMap(), emptyMap()) | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | private inline fun <K, V> createCompareFun( | ||||||
|  |     strictComparison: Boolean | ||||||
|  | ): (K, V, V) -> Boolean = if (strictComparison) { | ||||||
|  |     { _, first, second -> first === second } | ||||||
|  | } else { | ||||||
|  |     { _, first, second -> first == second } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Compare [this] [Map] with the [other] one in principle when [other] is newer than [this] | ||||||
|  |  * | ||||||
|  |  * @param compareFun Will be used to determine changed values | ||||||
|  |  */ | ||||||
|  | fun <K, V> Map<K, V>.diff( | ||||||
|  |     other: Map<K, V>, | ||||||
|  |     compareFun: (K, V, V) -> Boolean | ||||||
|  | ): MapDiff<K, V> { | ||||||
|  |     val removed: Map<K, V> = (keys - other.keys).associateWith { | ||||||
|  |         getValue(it) | ||||||
|  |     } | ||||||
|  |     val added: Map<K, V> = (other.keys - keys).associateWith { | ||||||
|  |         other.getValue(it) | ||||||
|  |     } | ||||||
|  |     val changed = keys.intersect(other.keys).mapNotNull { | ||||||
|  |         val old = getValue(it) | ||||||
|  |         val new = other.getValue(it) | ||||||
|  |         if (compareFun(it, old, new)) { | ||||||
|  |             return@mapNotNull null | ||||||
|  |         } else { | ||||||
|  |             it to (old to new) | ||||||
|  |         } | ||||||
|  |     }.toMap() | ||||||
|  |  | ||||||
|  |     return MapDiff( | ||||||
|  |         removed, | ||||||
|  |         changed, | ||||||
|  |         added | ||||||
|  |     ) | ||||||
|  | } | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Compare [this] [Map] with the [other] one in principle when [other] is newer than [this] | ||||||
|  |  * | ||||||
|  |  * @param strictComparison If true, will use strict (===) comparison for the values' comparison. Otherwise, standard | ||||||
|  |  * `equals` will be used | ||||||
|  |  */ | ||||||
|  | fun <K, V> Map<K, V>.diff( | ||||||
|  |     other: Map<K, V>, | ||||||
|  |     strictComparison: Boolean = false | ||||||
|  | ): MapDiff<K, V> = diff( | ||||||
|  |     other, | ||||||
|  |     compareFun = createCompareFun(strictComparison) | ||||||
|  | ) | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Will apply [mapDiff] to [this] [MutableMap] | ||||||
|  |  */ | ||||||
|  | fun <K, V> MutableMap<K, V>.applyDiff( | ||||||
|  |     mapDiff: MapDiff<K, V> | ||||||
|  | ) { | ||||||
|  |     mapDiff.apply { | ||||||
|  |         removed.keys.forEach { remove(it) } | ||||||
|  |         changed.forEach { (k, oldNew) -> | ||||||
|  |             put(k, oldNew.second) | ||||||
|  |         } | ||||||
|  |         added.forEach { (k, new) -> | ||||||
|  |             put(k, new) | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Will apply changes with [from] map into [this] one | ||||||
|  |  * | ||||||
|  |  * @param compareFun Will be used to determine changed values | ||||||
|  |  * | ||||||
|  |  * @return [MapDiff] applied to [this] [MutableMap] | ||||||
|  |  */ | ||||||
|  | fun <K, V> MutableMap<K, V>.applyDiff( | ||||||
|  |     from: Map<K, V>, | ||||||
|  |     compareFun: (K, V, V) -> Boolean | ||||||
|  | ): MapDiff<K, V> { | ||||||
|  |     return diff(from, compareFun).also { | ||||||
|  |         applyDiff(it) | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Will apply changes with [from] map into [this] one | ||||||
|  |  * | ||||||
|  |  * @param strictComparison If true, will use strict (===) comparison for the values' comparison. Otherwise, standard | ||||||
|  |  * `equals` will be used | ||||||
|  |  * | ||||||
|  |  * @return [MapDiff] applied to [this] [MutableMap] | ||||||
|  |  */ | ||||||
|  | fun <K, V> MutableMap<K, V>.applyDiff( | ||||||
|  |     from: Map<K, V>, | ||||||
|  |     strictComparison: Boolean = false | ||||||
|  | ): MapDiff<K, V> = applyDiff( | ||||||
|  |     from, | ||||||
|  |     compareFun = createCompareFun(strictComparison) | ||||||
|  | ) | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Reverse [this] [MapDiff]. Result will contain [MapDiff.added] on [MapDiff.removed] (and vice-verse), all the | ||||||
|  |  * [MapDiff.changed] values will be reversed too | ||||||
|  |  */ | ||||||
|  | fun <K, V> MapDiff<K, V>.reversed(): MapDiff<K, V> = MapDiff( | ||||||
|  |     removed = added, | ||||||
|  |     changed = changed.mapValues { (_, oldNew) -> oldNew.second to oldNew.first }, | ||||||
|  |     added = removed | ||||||
|  | ) | ||||||
| @@ -0,0 +1,28 @@ | |||||||
|  | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Convert [this] [Long] to [Int] with bounds of [Int.MIN_VALUE] and [Int.MAX_VALUE] | ||||||
|  |  */ | ||||||
|  | fun Long.toCoercedInt(): Int = coerceIn(Int.MIN_VALUE.toLong(), Int.MAX_VALUE.toLong()).toInt() | ||||||
|  | /** | ||||||
|  |  * Convert [this] [Long] to [Short] with bounds of [Short.MIN_VALUE] and [Short.MAX_VALUE] | ||||||
|  |  */ | ||||||
|  | fun Long.toCoercedShort(): Short = coerceIn(Short.MIN_VALUE.toLong(), Short.MAX_VALUE.toLong()).toShort() | ||||||
|  | /** | ||||||
|  |  * Convert [this] [Long] to [Byte] with bounds of [Byte.MIN_VALUE] and [Byte.MAX_VALUE] | ||||||
|  |  */ | ||||||
|  | fun Long.toCoercedByte(): Byte = coerceIn(Byte.MIN_VALUE.toLong(), Byte.MAX_VALUE.toLong()).toByte() | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Convert [this] [Int] to [Short] with bounds of [Short.MIN_VALUE] and [Short.MAX_VALUE] | ||||||
|  |  */ | ||||||
|  | fun Int.toCoercedShort(): Short = coerceIn(Short.MIN_VALUE.toInt(), Short.MAX_VALUE.toInt()).toShort() | ||||||
|  | /** | ||||||
|  |  * Convert [this] [Int] to [Byte] with bounds of [Byte.MIN_VALUE] and [Byte.MAX_VALUE] | ||||||
|  |  */ | ||||||
|  | fun Int.toCoercedByte(): Byte = coerceIn(Byte.MIN_VALUE.toInt(), Byte.MAX_VALUE.toInt()).toByte() | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Convert [this] [Short] to [Byte] with bounds of [Byte.MIN_VALUE] and [Byte.MAX_VALUE] | ||||||
|  |  */ | ||||||
|  | fun Short.toCoercedByte(): Byte = coerceIn(Byte.MIN_VALUE.toShort(), Byte.MAX_VALUE.toShort()).toByte() | ||||||
| @@ -1,5 +1,27 @@ | |||||||
| package dev.inmo.micro_utils.common | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Executes the given [action] until getting of successful result specified number of [times]. | ||||||
|  |  * | ||||||
|  |  * A zero-based index of current iteration is passed as a parameter to [action]. | ||||||
|  |  */ | ||||||
|  | inline fun <R> repeatOnFailure( | ||||||
|  |     onFailure: (Throwable) -> Boolean, | ||||||
|  |     action: () -> R | ||||||
|  | ): Result<R> { | ||||||
|  |     do { | ||||||
|  |         runCatching { | ||||||
|  |             action() | ||||||
|  |         }.onFailure { | ||||||
|  |             if (!onFailure(it)) { | ||||||
|  |                 return Result.failure(it) | ||||||
|  |             } | ||||||
|  |         }.onSuccess { | ||||||
|  |             return Result.success(it) | ||||||
|  |         } | ||||||
|  |     } while (true) | ||||||
|  | } | ||||||
|  |  | ||||||
| /** | /** | ||||||
|  * Executes the given [action] until getting of successful result specified number of [times]. |  * Executes the given [action] until getting of successful result specified number of [times]. | ||||||
|  * |  * | ||||||
| @@ -10,12 +32,23 @@ inline fun <R> repeatOnFailure( | |||||||
|     onEachFailure: (Throwable) -> Unit = {}, |     onEachFailure: (Throwable) -> Unit = {}, | ||||||
|     action: (Int) -> R |     action: (Int) -> R | ||||||
| ): Optional<R> { | ): Optional<R> { | ||||||
|     repeat(times) { |     var i = 0 | ||||||
|         runCatching { |     val result = repeatOnFailure( | ||||||
|             action(it) |         { | ||||||
|         }.onFailure(onEachFailure).onSuccess { |             onEachFailure(it) | ||||||
|             return Optional.presented(it) |             if (i < times) { | ||||||
|  |                 i++ | ||||||
|  |                 true | ||||||
|  |             } else { | ||||||
|  |                 false | ||||||
|  |             } | ||||||
|         } |         } | ||||||
|  |     ) { | ||||||
|  |         action(i) | ||||||
|  |     } | ||||||
|  |     return if (result.isSuccess) { | ||||||
|  |         Optional.presented(result.getOrThrow()) | ||||||
|  |     } else { | ||||||
|  |         Optional.absent() | ||||||
|     } |     } | ||||||
|     return Optional.absent() |  | ||||||
| } | } | ||||||
|   | |||||||
| @@ -0,0 +1,6 @@ | |||||||
|  | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | val FixedSignsRange = 0 .. 100 | ||||||
|  |  | ||||||
|  | expect fun Float.fixed(signs: Int): Float | ||||||
|  | expect fun Double.fixed(signs: Int): Double | ||||||
| @@ -0,0 +1,4 @@ | |||||||
|  | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | actual fun Float.fixed(signs: Int): Float = this.asDynamic().toFixed(signs.coerceIn(FixedSignsRange)).unsafeCast<String>().toFloat() | ||||||
|  | actual fun Double.fixed(signs: Int): Double = this.asDynamic().toFixed(signs.coerceIn(FixedSignsRange)).unsafeCast<String>().toDouble() | ||||||
| @@ -0,0 +1,12 @@ | |||||||
|  | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | import java.math.BigDecimal | ||||||
|  | import java.math.RoundingMode | ||||||
|  |  | ||||||
|  | actual fun Float.fixed(signs: Int): Float = BigDecimal.valueOf(this.toDouble()) | ||||||
|  |     .setScale(signs.coerceIn(FixedSignsRange), RoundingMode.HALF_UP) | ||||||
|  |     .toFloat(); | ||||||
|  |  | ||||||
|  | actual fun Double.fixed(signs: Int): Double = BigDecimal.valueOf(this) | ||||||
|  |     .setScale(signs.coerceIn(FixedSignsRange), RoundingMode.HALF_UP) | ||||||
|  |     .toDouble(); | ||||||
| @@ -1 +0,0 @@ | |||||||
| <manifest package="dev.inmo.micro_utils.common"/> |  | ||||||
							
								
								
									
										36
									
								
								common/src/nativeMain/kotlin/ActualMPPFile.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										36
									
								
								common/src/nativeMain/kotlin/ActualMPPFile.kt
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,36 @@ | |||||||
|  | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | import okio.FileSystem | ||||||
|  | import okio.Path | ||||||
|  | import okio.use | ||||||
|  |  | ||||||
|  | actual typealias MPPFile = Path | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * @suppress | ||||||
|  |  */ | ||||||
|  | actual val MPPFile.filename: FileName | ||||||
|  |     get() = FileName(toString()) | ||||||
|  | /** | ||||||
|  |  * @suppress | ||||||
|  |  */ | ||||||
|  | actual val MPPFile.filesize: Long | ||||||
|  |     get() = FileSystem.SYSTEM.openReadOnly(this).use { | ||||||
|  |         it.size() | ||||||
|  |     } | ||||||
|  | /** | ||||||
|  |  * @suppress | ||||||
|  |  */ | ||||||
|  | actual val MPPFile.bytesAllocatorSync: ByteArrayAllocator | ||||||
|  |     get() = { | ||||||
|  |         FileSystem.SYSTEM.read(this) { | ||||||
|  |             readByteArray() | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | /** | ||||||
|  |  * @suppress | ||||||
|  |  */ | ||||||
|  | actual val MPPFile.bytesAllocator: SuspendByteArrayAllocator | ||||||
|  |     get() = { | ||||||
|  |         bytesAllocatorSync() | ||||||
|  |     } | ||||||
							
								
								
									
										25
									
								
								common/src/nativeMain/kotlin/fixed.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										25
									
								
								common/src/nativeMain/kotlin/fixed.kt
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,25 @@ | |||||||
|  | package dev.inmo.micro_utils.common | ||||||
|  |  | ||||||
|  | import kotlinx.cinterop.* | ||||||
|  | import platform.posix.snprintf | ||||||
|  | import platform.posix.sprintf | ||||||
|  |  | ||||||
|  | @OptIn(ExperimentalForeignApi::class) | ||||||
|  | actual fun Float.fixed(signs: Int): Float { | ||||||
|  |     return memScoped { | ||||||
|  |         val buff = allocArray<ByteVar>(Float.SIZE_BYTES * 2) | ||||||
|  |  | ||||||
|  |         sprintf(buff, "%.${signs}f", this@fixed) | ||||||
|  |         buff.toKString().toFloat() | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | @OptIn(ExperimentalForeignApi::class) | ||||||
|  | actual fun Double.fixed(signs: Int): Double { | ||||||
|  |     return memScoped { | ||||||
|  |         val buff = allocArray<ByteVar>(Double.SIZE_BYTES * 2) | ||||||
|  |  | ||||||
|  |         sprintf(buff, "%.${signs}f", this@fixed) | ||||||
|  |         buff.toKString().toDouble() | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -4,7 +4,7 @@ plugins { | |||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppProjectWithSerializationPresetPath" | apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath" | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     sourceSets { |     sourceSets { | ||||||
| @@ -22,7 +22,6 @@ kotlin { | |||||||
|             dependencies { |             dependencies { | ||||||
|                 api libs.kt.coroutines.android |                 api libs.kt.coroutines.android | ||||||
|             } |             } | ||||||
|             dependsOn(jvmMain) |  | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -3,24 +3,58 @@ package dev.inmo.micro_utils.coroutines.compose | |||||||
| import androidx.compose.runtime.* | import androidx.compose.runtime.* | ||||||
| import androidx.compose.runtime.snapshots.SnapshotStateList | import androidx.compose.runtime.snapshots.SnapshotStateList | ||||||
| import dev.inmo.micro_utils.common.applyDiff | import dev.inmo.micro_utils.common.applyDiff | ||||||
|  | import dev.inmo.micro_utils.coroutines.ExceptionHandler | ||||||
|  | import dev.inmo.micro_utils.coroutines.defaultSafelyWithoutExceptionHandlerWithNull | ||||||
| import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions | import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions | ||||||
| import kotlinx.coroutines.CoroutineScope | import kotlinx.coroutines.CoroutineScope | ||||||
|  | import kotlinx.coroutines.Dispatchers | ||||||
| import kotlinx.coroutines.flow.Flow | import kotlinx.coroutines.flow.Flow | ||||||
| import kotlinx.coroutines.flow.StateFlow | import kotlinx.coroutines.flow.StateFlow | ||||||
|  | import kotlinx.coroutines.withContext | ||||||
|  | import kotlin.coroutines.CoroutineContext | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Each value of [this] [Flow] will trigger [applyDiff] to the result [SnapshotStateList] | ||||||
|  |  * | ||||||
|  |  * @param scope Will be used to [subscribeSafelyWithoutExceptions] on [this] to update returned [SnapshotStateList] | ||||||
|  |  * @param useContextOnChange Will be used to change context inside of [subscribeSafelyWithoutExceptions] to ensure that | ||||||
|  |  * change will happen in the required [CoroutineContext]. [Dispatchers.Main] by default | ||||||
|  |  * @param onException Will be passed to the [subscribeSafelyWithoutExceptions] as uncaught exceptions handler | ||||||
|  |  */ | ||||||
| @Suppress("NOTHING_TO_INLINE") | @Suppress("NOTHING_TO_INLINE") | ||||||
| inline fun <reified T> Flow<List<T>>.asMutableComposeListState( | inline fun <reified T> Flow<List<T>>.asMutableComposeListState( | ||||||
|     scope: CoroutineScope |     scope: CoroutineScope, | ||||||
|  |     useContextOnChange: CoroutineContext? = Dispatchers.Main, | ||||||
|  |     noinline onException: ExceptionHandler<List<T>?> = defaultSafelyWithoutExceptionHandlerWithNull, | ||||||
| ): SnapshotStateList<T> { | ): SnapshotStateList<T> { | ||||||
|     val state = mutableStateListOf<T>() |     val state = mutableStateListOf<T>() | ||||||
|     subscribeSafelyWithoutExceptions(scope) { |     val changeBlock: suspend (List<T>) -> Unit = useContextOnChange ?.let { | ||||||
|  |         { | ||||||
|  |             withContext(useContextOnChange) { | ||||||
|  |                 state.applyDiff(it) | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } ?: { | ||||||
|         state.applyDiff(it) |         state.applyDiff(it) | ||||||
|     } |     } | ||||||
|  |     subscribeSafelyWithoutExceptions(scope, onException, changeBlock) | ||||||
|     return state |     return state | ||||||
| } | } | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * In fact, it is just classcast of [asMutableComposeListState] to [List] | ||||||
|  |  * | ||||||
|  |  * @param scope Will be used to [subscribeSafelyWithoutExceptions] on [this] to update returned [List] | ||||||
|  |  * @param useContextOnChange Will be used to change context inside of [subscribeSafelyWithoutExceptions] to ensure that | ||||||
|  |  * change will happen in the required [CoroutineContext]. [Dispatchers.Main] by default | ||||||
|  |  * @param onException Will be passed to the [subscribeSafelyWithoutExceptions] as uncaught exceptions handler | ||||||
|  |  * | ||||||
|  |  * @return Changing in time [List] which follow [Flow] values | ||||||
|  |  */ | ||||||
| @Suppress("NOTHING_TO_INLINE") | @Suppress("NOTHING_TO_INLINE") | ||||||
| inline fun <reified T> Flow<List<T>>.asComposeList( | inline fun <reified T> Flow<List<T>>.asComposeList( | ||||||
|     scope: CoroutineScope |     scope: CoroutineScope, | ||||||
| ): List<T> = asMutableComposeListState(scope) |     useContextOnChange: CoroutineContext? = Dispatchers.Main, | ||||||
|  |     noinline onException: ExceptionHandler<List<T>?> = defaultSafelyWithoutExceptionHandlerWithNull, | ||||||
|  | ): List<T> = asMutableComposeListState(scope, useContextOnChange, onException) | ||||||
|  |  | ||||||
|   | |||||||
| @@ -1,35 +1,94 @@ | |||||||
| package dev.inmo.micro_utils.coroutines.compose | package dev.inmo.micro_utils.coroutines.compose | ||||||
|  |  | ||||||
| import androidx.compose.runtime.* | import androidx.compose.runtime.* | ||||||
|  | import dev.inmo.micro_utils.common.compose.asState | ||||||
|  | import dev.inmo.micro_utils.coroutines.ExceptionHandler | ||||||
|  | import dev.inmo.micro_utils.coroutines.defaultSafelyWithoutExceptionHandlerWithNull | ||||||
|  | import dev.inmo.micro_utils.coroutines.doInUI | ||||||
| import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions | import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions | ||||||
| import kotlinx.coroutines.CoroutineScope | import kotlinx.coroutines.CoroutineScope | ||||||
|  | import kotlinx.coroutines.Dispatchers | ||||||
| import kotlinx.coroutines.flow.Flow | import kotlinx.coroutines.flow.Flow | ||||||
| import kotlinx.coroutines.flow.StateFlow | import kotlinx.coroutines.flow.StateFlow | ||||||
|  | import kotlinx.coroutines.withContext | ||||||
|  | import kotlin.coroutines.CoroutineContext | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Will map [this] [Flow] as [MutableState]. Returned [MutableState] WILL NOT change source [Flow] | ||||||
|  |  * | ||||||
|  |  * @param initial First value which will be passed to the result [MutableState] | ||||||
|  |  * @param scope Will be used to [subscribeSafelyWithoutExceptions] on [this] to update returned [MutableState] | ||||||
|  |  * @param useContextOnChange Will be used to change context inside of [subscribeSafelyWithoutExceptions] to ensure that | ||||||
|  |  * change will happen in the required [CoroutineContext]. [Dispatchers.Main] by default | ||||||
|  |  * @param onException Will be passed to the [subscribeSafelyWithoutExceptions] as uncaught exceptions handler | ||||||
|  |  */ | ||||||
| fun <T> Flow<T>.asMutableComposeState( | fun <T> Flow<T>.asMutableComposeState( | ||||||
|     initial: T, |     initial: T, | ||||||
|     scope: CoroutineScope |     scope: CoroutineScope, | ||||||
|  |     useContextOnChange: CoroutineContext? = Dispatchers.Main, | ||||||
|  |     onException: ExceptionHandler<T?> = defaultSafelyWithoutExceptionHandlerWithNull, | ||||||
| ): MutableState<T> { | ): MutableState<T> { | ||||||
|     val state = mutableStateOf(initial) |     val state = mutableStateOf(initial) | ||||||
|     subscribeSafelyWithoutExceptions(scope) { state.value = it } |     val changeBlock: suspend (T) -> Unit = useContextOnChange ?.let { | ||||||
|  |         { | ||||||
|  |             withContext(useContextOnChange) { | ||||||
|  |                 state.value = it | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } ?: { | ||||||
|  |         state.value = it | ||||||
|  |     } | ||||||
|  |     subscribeSafelyWithoutExceptions(scope, onException, block = changeBlock) | ||||||
|     return state |     return state | ||||||
| } | } | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Will map [this] [StateFlow] as [MutableState]. Returned [MutableState] WILL NOT change source [StateFlow]. | ||||||
|  |  * This conversation will pass its [StateFlow.value] as the first value | ||||||
|  |  * | ||||||
|  |  * @param scope Will be used to [subscribeSafelyWithoutExceptions] on [this] to update returned [MutableState] | ||||||
|  |  * @param useContextOnChange Will be used to change context inside of [subscribeSafelyWithoutExceptions] to ensure that | ||||||
|  |  * change will happen in the required [CoroutineContext]. [Dispatchers.Main] by default | ||||||
|  |  * @param onException Will be passed to the [subscribeSafelyWithoutExceptions] as uncaught exceptions handler | ||||||
|  |  */ | ||||||
| @Suppress("NOTHING_TO_INLINE") | @Suppress("NOTHING_TO_INLINE") | ||||||
| inline fun <T> StateFlow<T>.asMutableComposeState( | inline fun <T> StateFlow<T>.asMutableComposeState( | ||||||
|     scope: CoroutineScope |     scope: CoroutineScope, | ||||||
| ): MutableState<T> = asMutableComposeState(value, scope) |     useContextOnChange: CoroutineContext? = Dispatchers.Main, | ||||||
|  |     noinline onException: ExceptionHandler<T?> = defaultSafelyWithoutExceptionHandlerWithNull, | ||||||
|  | ): MutableState<T> = asMutableComposeState(value, scope, useContextOnChange, onException) | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Will create [MutableState] using [asMutableComposeState] and use [asState] to convert it as immutable state | ||||||
|  |  * | ||||||
|  |  * @param initial First value which will be passed to the result [State] | ||||||
|  |  * @param scope Will be used to [subscribeSafelyWithoutExceptions] on [this] to update returned [State] | ||||||
|  |  * @param useContextOnChange Will be used to change context inside of [subscribeSafelyWithoutExceptions] to ensure that | ||||||
|  |  * change will happen in the required [CoroutineContext]. [Dispatchers.Main] by default | ||||||
|  |  * @param onException Will be passed to the [subscribeSafelyWithoutExceptions] as uncaught exceptions handler | ||||||
|  |  */ | ||||||
| fun <T> Flow<T>.asComposeState( | fun <T> Flow<T>.asComposeState( | ||||||
|     initial: T, |     initial: T, | ||||||
|     scope: CoroutineScope |     scope: CoroutineScope, | ||||||
|  |     useContextOnChange: CoroutineContext? = Dispatchers.Main, | ||||||
|  |     onException: ExceptionHandler<T?> = defaultSafelyWithoutExceptionHandlerWithNull, | ||||||
| ): State<T> { | ): State<T> { | ||||||
|     val state = asMutableComposeState(initial, scope) |     val state = asMutableComposeState(initial, scope, useContextOnChange, onException) | ||||||
|     return derivedStateOf { state.value } |     return state.asState() | ||||||
| } | } | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Will map [this] [StateFlow] as [State]. This conversation will pass its [StateFlow.value] as the first value | ||||||
|  |  * | ||||||
|  |  * @param scope Will be used to [subscribeSafelyWithoutExceptions] on [this] to update returned [State] | ||||||
|  |  * @param useContextOnChange Will be used to change context inside of [subscribeSafelyWithoutExceptions] to ensure that | ||||||
|  |  * change will happen in the required [CoroutineContext]. [Dispatchers.Main] by default | ||||||
|  |  * @param onException Will be passed to the [subscribeSafelyWithoutExceptions] as uncaught exceptions handler | ||||||
|  |  */ | ||||||
| @Suppress("NOTHING_TO_INLINE") | @Suppress("NOTHING_TO_INLINE") | ||||||
| inline fun <T> StateFlow<T>.asComposeState( | inline fun <T> StateFlow<T>.asComposeState( | ||||||
|     scope: CoroutineScope |     scope: CoroutineScope, | ||||||
| ): State<T> = asComposeState(value, scope) |     useContextOnChange: CoroutineContext? = Dispatchers.Main, | ||||||
|  |     noinline onException: ExceptionHandler<T?> = defaultSafelyWithoutExceptionHandlerWithNull, | ||||||
|  | ): State<T> = asComposeState(value, scope, useContextOnChange, onException) | ||||||
|  |  | ||||||
|   | |||||||
| @@ -1,23 +0,0 @@ | |||||||
| package dev.inmo.micro_utils.coroutines.compose |  | ||||||
|  |  | ||||||
| import androidx.compose.runtime.MutableState |  | ||||||
| import androidx.compose.runtime.mutableStateOf |  | ||||||
| import dev.inmo.micro_utils.coroutines.subscribeSafelyWithoutExceptions |  | ||||||
| import kotlinx.coroutines.CoroutineScope |  | ||||||
| import kotlinx.coroutines.flow.Flow |  | ||||||
| import kotlinx.coroutines.flow.StateFlow |  | ||||||
|  |  | ||||||
| fun <T> Flow<T>.toMutableState( |  | ||||||
|     initial: T, |  | ||||||
|     scope: CoroutineScope |  | ||||||
| ): MutableState<T> { |  | ||||||
|     val state = mutableStateOf(initial) |  | ||||||
|     subscribeSafelyWithoutExceptions(scope) { state.value = it } |  | ||||||
|     return state |  | ||||||
| } |  | ||||||
|  |  | ||||||
| @Suppress("NOTHING_TO_INLINE") |  | ||||||
| inline fun <T> StateFlow<T>.toMutableState( |  | ||||||
|     scope: CoroutineScope |  | ||||||
| ): MutableState<T> = toMutableState(value, scope) |  | ||||||
|  |  | ||||||
							
								
								
									
										24
									
								
								coroutines/compose/src/jvmTest/kotlin/FlowStateTests.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										24
									
								
								coroutines/compose/src/jvmTest/kotlin/FlowStateTests.kt
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,24 @@ | |||||||
|  | import androidx.compose.material.Button | ||||||
|  | import androidx.compose.material.Text | ||||||
|  | import androidx.compose.runtime.collectAsState | ||||||
|  | import androidx.compose.ui.test.* | ||||||
|  | import dev.inmo.micro_utils.coroutines.SpecialMutableStateFlow | ||||||
|  | import org.jetbrains.annotations.TestOnly | ||||||
|  | import kotlin.test.Test | ||||||
|  |  | ||||||
|  | class FlowStateTests { | ||||||
|  |     @OptIn(ExperimentalTestApi::class) | ||||||
|  |     @Test | ||||||
|  |     @TestOnly | ||||||
|  |     fun simpleTest() = runComposeUiTest { | ||||||
|  |         val flowState = SpecialMutableStateFlow(0) | ||||||
|  |         setContent { | ||||||
|  |             Button({ flowState.value++ }) { Text("Click") } | ||||||
|  |             Text(flowState.collectAsState().value.toString()) | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         onNodeWithText(0.toString()).assertExists() | ||||||
|  |         onNodeWithText("Click").performClick() | ||||||
|  |         onNodeWithText(1.toString()).assertExists() | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -1 +0,0 @@ | |||||||
| <manifest package="dev.inmo.micro_utils.coroutines.compose"/> |  | ||||||
							
								
								
									
										1
									
								
								coroutines/src/androidMain/AndroidManifest.xml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								coroutines/src/androidMain/AndroidManifest.xml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1 @@ | |||||||
|  | <manifest/> | ||||||
| @@ -0,0 +1,44 @@ | |||||||
|  | package dev.inmo.micro_utils.coroutines | ||||||
|  |  | ||||||
|  | import kotlin.coroutines.CoroutineContext | ||||||
|  | import kotlin.coroutines.coroutineContext | ||||||
|  |  | ||||||
|  | typealias ExceptionHandler<T> = suspend (Throwable) -> T | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * This instance will be used in all calls of [safely] where exception handler has not been passed | ||||||
|  |  */ | ||||||
|  | var defaultSafelyExceptionHandler: ExceptionHandler<Nothing> = { throw it } | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * This instance will be used in all calls of [safelyWithoutExceptions] as an exception handler for [safely] call | ||||||
|  |  */ | ||||||
|  | var defaultSafelyWithoutExceptionHandler: ExceptionHandler<Unit> = { | ||||||
|  |     try { | ||||||
|  |         defaultSafelyExceptionHandler(it) | ||||||
|  |     } catch (e: Throwable) { | ||||||
|  |         // do nothing | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * This key can (and will) be used to get [ContextSafelyExceptionHandler] from [coroutineContext] of suspend functions | ||||||
|  |  * and in [ContextSafelyExceptionHandler] for defining of its [CoroutineContext.Element.key] | ||||||
|  |  * | ||||||
|  |  * @see safelyWithContextExceptionHandler | ||||||
|  |  * @see ContextSafelyExceptionHandler | ||||||
|  |  */ | ||||||
|  | object ContextSafelyExceptionHandlerKey : CoroutineContext.Key<ContextSafelyExceptionHandler> | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * [ExceptionHandler] wrapper which was created to make possible to use [handler] across all coroutines calls | ||||||
|  |  * | ||||||
|  |  * @see safelyWithContextExceptionHandler | ||||||
|  |  * @see ContextSafelyExceptionHandlerKey | ||||||
|  |  */ | ||||||
|  | class ContextSafelyExceptionHandler( | ||||||
|  |     val handler: ExceptionHandler<Unit> | ||||||
|  | ) : CoroutineContext.Element { | ||||||
|  |     override val key: CoroutineContext.Key<*> | ||||||
|  |         get() = ContextSafelyExceptionHandlerKey | ||||||
|  | } | ||||||
| @@ -16,8 +16,8 @@ class DoWithFirstBuilder<T>( | |||||||
|     operator fun plus(block: suspend CoroutineScope.() -> T) { |     operator fun plus(block: suspend CoroutineScope.() -> T) { | ||||||
|         deferreds.add(scope.async(start = CoroutineStart.LAZY, block = block)) |         deferreds.add(scope.async(start = CoroutineStart.LAZY, block = block)) | ||||||
|     } |     } | ||||||
|     inline fun add(noinline block: suspend CoroutineScope.() -> T) = plus(block) |     fun add(block: suspend CoroutineScope.() -> T) = plus(block) | ||||||
|     inline fun include(noinline block: suspend CoroutineScope.() -> T) = plus(block) |     fun include(block: suspend CoroutineScope.() -> T) = plus(block) | ||||||
|  |  | ||||||
|     fun build() = deferreds.toList() |     fun build() = deferreds.toList() | ||||||
| } | } | ||||||
|   | |||||||
| @@ -85,32 +85,32 @@ fun <T, M> Flow<T>.subscribeAsync( | |||||||
|     return job |     return job | ||||||
| } | } | ||||||
|  |  | ||||||
| inline fun <T, M> Flow<T>.subscribeSafelyAsync( | fun <T, M> Flow<T>.subscribeSafelyAsync( | ||||||
|     scope: CoroutineScope, |     scope: CoroutineScope, | ||||||
|     noinline markerFactory: suspend (T) -> M, |     markerFactory: suspend (T) -> M, | ||||||
|     noinline onException: ExceptionHandler<Unit> = defaultSafelyExceptionHandler, |     onException: ExceptionHandler<Unit> = defaultSafelyExceptionHandler, | ||||||
|     noinline block: suspend (T) -> Unit |     block: suspend (T) -> Unit | ||||||
| ) = subscribeAsync(scope, markerFactory) { | ) = subscribeAsync(scope, markerFactory) { | ||||||
|     safely(onException) { |     safely(onException) { | ||||||
|         block(it) |         block(it) | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  |  | ||||||
| inline fun <T, M> Flow<T>.subscribeSafelyWithoutExceptionsAsync( | fun <T, M> Flow<T>.subscribeSafelyWithoutExceptionsAsync( | ||||||
|     scope: CoroutineScope, |     scope: CoroutineScope, | ||||||
|     noinline markerFactory: suspend (T) -> M, |     markerFactory: suspend (T) -> M, | ||||||
|     noinline onException: ExceptionHandler<T?> = defaultSafelyWithoutExceptionHandlerWithNull, |     onException: ExceptionHandler<T?> = defaultSafelyWithoutExceptionHandlerWithNull, | ||||||
|     noinline block: suspend (T) -> Unit |     block: suspend (T) -> Unit | ||||||
| ) = subscribeAsync(scope, markerFactory) { | ) = subscribeAsync(scope, markerFactory) { | ||||||
|     safelyWithoutExceptions(onException) { |     safelyWithoutExceptions(onException) { | ||||||
|         block(it) |         block(it) | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  |  | ||||||
| inline fun <T, M> Flow<T>.subscribeSafelySkippingExceptionsAsync( | fun <T, M> Flow<T>.subscribeSafelySkippingExceptionsAsync( | ||||||
|     scope: CoroutineScope, |     scope: CoroutineScope, | ||||||
|     noinline markerFactory: suspend (T) -> M, |     markerFactory: suspend (T) -> M, | ||||||
|     noinline block: suspend (T) -> Unit |     block: suspend (T) -> Unit | ||||||
| ) = subscribeAsync(scope, markerFactory) { | ) = subscribeAsync(scope, markerFactory) { | ||||||
|     safelyWithoutExceptions({ /* do nothing */}) { |     safelyWithoutExceptions({ /* do nothing */}) { | ||||||
|         block(it) |         block(it) | ||||||
|   | |||||||
| @@ -4,45 +4,44 @@ import kotlinx.coroutines.* | |||||||
| import kotlin.coroutines.CoroutineContext | import kotlin.coroutines.CoroutineContext | ||||||
| import kotlin.coroutines.coroutineContext | import kotlin.coroutines.coroutineContext | ||||||
|  |  | ||||||
| typealias ExceptionHandler<T> = suspend (Throwable) -> T |  | ||||||
|  |  | ||||||
| /** | /** | ||||||
|  * This instance will be used in all calls of [safely] where exception handler has not been passed |  * Launching [block] in [runCatching]. In case of failure, it will: | ||||||
|  |  * | ||||||
|  |  * * Try to get [ContextSafelyExceptionHandler] from current [coroutineContext] and call its | ||||||
|  |  * [ContextSafelyExceptionHandler.handler] invoke. **Thrown exception from its handler | ||||||
|  |  * will pass out of [runCatchingSafely]** | ||||||
|  |  * * Execute [onException] inside of new [runCatching] and return its result. Throws exception | ||||||
|  |  * will be caught by [runCatching] and wrapped in [Result] | ||||||
|  |  * | ||||||
|  |  * @return [Result] with result of [block] if no exceptions or [Result] from [onException] execution | ||||||
|  */ |  */ | ||||||
| var defaultSafelyExceptionHandler: ExceptionHandler<Nothing> = { throw it } | suspend inline fun <T> runCatchingSafely( | ||||||
|  |     onException: ExceptionHandler<T>, | ||||||
| /** |     block: suspend () -> T | ||||||
|  * This instance will be used in all calls of [safelyWithoutExceptions] as an exception handler for [safely] call | ): Result<T> { | ||||||
|  */ |     return runCatching { | ||||||
| var defaultSafelyWithoutExceptionHandler: ExceptionHandler<Unit> = { |         block() | ||||||
|     try { |     }.onFailure { | ||||||
|         defaultSafelyExceptionHandler(it) |         coroutineContext[ContextSafelyExceptionHandlerKey] ?.handler ?.invoke(it) | ||||||
|     } catch (e: Throwable) { |         return runCatching { | ||||||
|          // do nothing |             onException(it) | ||||||
|  |         } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  |  | ||||||
| /** | /** | ||||||
|  * This key can (and will) be used to get [ContextSafelyExceptionHandler] from [coroutineContext] of suspend functions |  * Launching [runCatchingSafely] with [defaultSafelyExceptionHandler] as `onException` parameter | ||||||
|  * and in [ContextSafelyExceptionHandler] for defining of its [CoroutineContext.Element.key] |  | ||||||
|  * |  | ||||||
|  * @see safelyWithContextExceptionHandler |  | ||||||
|  * @see ContextSafelyExceptionHandler |  | ||||||
|  */ |  */ | ||||||
| object ContextSafelyExceptionHandlerKey : CoroutineContext.Key<ContextSafelyExceptionHandler> | suspend inline fun <T> runCatchingSafely( | ||||||
|  |     block: suspend () -> T | ||||||
|  | ): Result<T> = runCatchingSafely(defaultSafelyExceptionHandler, block) | ||||||
|  |  | ||||||
| /** | //suspend inline fun <T, R> T.runCatchingSafely( | ||||||
|  * [ExceptionHandler] wrapper which was created to make possible to use [handler] across all coroutines calls | //    onException: ExceptionHandler<R>, | ||||||
|  * | //    block: suspend T.() -> R | ||||||
|  * @see safelyWithContextExceptionHandler | //): Result<R> = runCatchingSafely(onException) { | ||||||
|  * @see ContextSafelyExceptionHandlerKey | //    block() | ||||||
|  */ | //} | ||||||
| class ContextSafelyExceptionHandler( |  | ||||||
|     val handler: ExceptionHandler<Unit> |  | ||||||
| ) : CoroutineContext.Element { |  | ||||||
|     override val key: CoroutineContext.Key<*> |  | ||||||
|         get() = ContextSafelyExceptionHandlerKey |  | ||||||
| } |  | ||||||
|  |  | ||||||
| /** | /** | ||||||
|  * @return [ContextSafelyExceptionHandler] from [coroutineContext] by key [ContextSafelyExceptionHandlerKey] if |  * @return [ContextSafelyExceptionHandler] from [coroutineContext] by key [ContextSafelyExceptionHandlerKey] if | ||||||
| @@ -51,7 +50,7 @@ class ContextSafelyExceptionHandler( | |||||||
|  * @see ContextSafelyExceptionHandler |  * @see ContextSafelyExceptionHandler | ||||||
|  * @see ContextSafelyExceptionHandlerKey |  * @see ContextSafelyExceptionHandlerKey | ||||||
|  */ |  */ | ||||||
| suspend inline fun contextSafelyExceptionHandler() = coroutineContext[ContextSafelyExceptionHandlerKey] | suspend fun contextSafelyExceptionHandler() = coroutineContext[ContextSafelyExceptionHandlerKey] | ||||||
|  |  | ||||||
| /** | /** | ||||||
|  * This method will set new [coroutineContext] with [ContextSafelyExceptionHandler]. In case if [coroutineContext] |  * This method will set new [coroutineContext] with [ContextSafelyExceptionHandler]. In case if [coroutineContext] | ||||||
| @@ -64,7 +63,7 @@ suspend inline fun contextSafelyExceptionHandler() = coroutineContext[ContextSaf | |||||||
| suspend fun <T> safelyWithContextExceptionHandler( | suspend fun <T> safelyWithContextExceptionHandler( | ||||||
|     contextExceptionHandler: ExceptionHandler<Unit>, |     contextExceptionHandler: ExceptionHandler<Unit>, | ||||||
|     safelyExceptionHandler: ExceptionHandler<T> = defaultSafelyExceptionHandler, |     safelyExceptionHandler: ExceptionHandler<T> = defaultSafelyExceptionHandler, | ||||||
|     block: suspend CoroutineScope.() -> T |     block: suspend () -> T | ||||||
| ): T { | ): T { | ||||||
|     val contextSafelyExceptionHandler = contextSafelyExceptionHandler() ?.handler ?.let { oldHandler -> |     val contextSafelyExceptionHandler = contextSafelyExceptionHandler() ?.handler ?.let { oldHandler -> | ||||||
|         ContextSafelyExceptionHandler { |         ContextSafelyExceptionHandler { | ||||||
| @@ -78,58 +77,29 @@ suspend fun <T> safelyWithContextExceptionHandler( | |||||||
| } | } | ||||||
|  |  | ||||||
| /** | /** | ||||||
|  * It will run [block] inside of [supervisorScope] to avoid problems with catching of exceptions |  * Calls [runCatchingSafely] and getting the result via [Result.getOrThrow] | ||||||
|  * |  * | ||||||
|  * Priorities of [ExceptionHandler]s: |  * @see runCatchingSafely | ||||||
|  * |  | ||||||
|  * * [onException] In case if custom (will be used anyway if not [defaultSafelyExceptionHandler]) |  | ||||||
|  * * [CoroutineContext.get] with [SafelyExceptionHandlerKey] as key |  | ||||||
|  * * [defaultSafelyExceptionHandler] |  | ||||||
|  * |  | ||||||
|  * Remember, that [ExceptionHandler] from [CoroutineContext.get] will be used anyway if it is available. After it will |  | ||||||
|  * be called [onException] |  | ||||||
|  * |  | ||||||
|  * @param [onException] Will be called when happen exception inside of [block]. By default will throw exception - this |  | ||||||
|  * exception will be available for catching |  | ||||||
|  * |  | ||||||
|  * @see defaultSafelyExceptionHandler |  | ||||||
|  * @see safelyWithoutExceptions |  | ||||||
|  * @see safelyWithContextExceptionHandler |  | ||||||
|  */ |  */ | ||||||
| suspend inline fun <T> safely( | suspend inline fun <T> safely( | ||||||
|     noinline onException: ExceptionHandler<T> = defaultSafelyExceptionHandler, |     onException: ExceptionHandler<T>, | ||||||
|     noinline block: suspend CoroutineScope.() -> T |     block: suspend () -> T | ||||||
| ): T { | ): T = runCatchingSafely(onException, block).getOrThrow() | ||||||
|     return try { |  | ||||||
|         supervisorScope(block) |  | ||||||
|     } catch (e: Throwable) { |  | ||||||
|         coroutineContext[ContextSafelyExceptionHandlerKey] ?.handler ?.invoke(e) |  | ||||||
|         onException(e) |  | ||||||
|     } |  | ||||||
| } |  | ||||||
|  |  | ||||||
| suspend inline fun <T> runCatchingSafely( | /** | ||||||
|     noinline onException: ExceptionHandler<T> = defaultSafelyExceptionHandler, |  * Calls [safely] with passing of [defaultSafelyExceptionHandler] as `onException` | ||||||
|     noinline block: suspend CoroutineScope.() -> T |  * | ||||||
| ): Result<T> = runCatching { |  * @see runCatchingSafely | ||||||
|     safely(onException, block) |  */ | ||||||
| } | suspend inline fun <T> safely( | ||||||
|  |     block: suspend () -> T | ||||||
|  | ): T = safely(defaultSafelyExceptionHandler, block) | ||||||
|  |  | ||||||
| suspend inline fun <T, R> T.runCatchingSafely( | @Deprecated("Renamed", ReplaceWith("runCatchingSafely(block)", "dev.inmo.micro_utils.coroutines.runCatchingSafely")) | ||||||
|     noinline onException: ExceptionHandler<R> = defaultSafelyExceptionHandler, | suspend fun <T> safelyWithResult( | ||||||
|     noinline block: suspend T.() -> R |     block: suspend () -> T | ||||||
| ): Result<R> = runCatching { |  | ||||||
|     safely(onException) { block() } |  | ||||||
| } |  | ||||||
|  |  | ||||||
| suspend inline fun <T> safelyWithResult( |  | ||||||
|     noinline block: suspend CoroutineScope.() -> T |  | ||||||
| ): Result<T> = runCatchingSafely(defaultSafelyExceptionHandler, block) | ): Result<T> = runCatchingSafely(defaultSafelyExceptionHandler, block) | ||||||
|  |  | ||||||
| suspend inline fun <T, R> T.safelyWithResult( |  | ||||||
|     noinline block: suspend T.() -> R |  | ||||||
| ): Result<R> = runCatchingSafely(defaultSafelyExceptionHandler, block) |  | ||||||
|  |  | ||||||
| /** | /** | ||||||
|  * Use this handler in cases you wish to include handling of exceptions by [defaultSafelyWithoutExceptionHandler] and |  * Use this handler in cases you wish to include handling of exceptions by [defaultSafelyWithoutExceptionHandler] and | ||||||
|  * returning null at one time |  * returning null at one time | ||||||
| @@ -147,21 +117,23 @@ val defaultSafelyWithoutExceptionHandlerWithNull: ExceptionHandler<Nothing?> = { | |||||||
|  * Shortcut for [safely] with exception handler, that as expected must return null in case of impossible creating of |  * Shortcut for [safely] with exception handler, that as expected must return null in case of impossible creating of | ||||||
|  * result from exception (instead of throwing it, by default always returns null) |  * result from exception (instead of throwing it, by default always returns null) | ||||||
|  */ |  */ | ||||||
| suspend inline fun <T> safelyWithoutExceptions( | suspend fun <T> safelyWithoutExceptions( | ||||||
|     noinline onException: ExceptionHandler<T?> = defaultSafelyWithoutExceptionHandlerWithNull, |     onException: ExceptionHandler<T> = defaultSafelyExceptionHandler, | ||||||
|     noinline block: suspend CoroutineScope.() -> T |     block: suspend () -> T | ||||||
| ): T? = safely(onException, block) | ): T? = runCatchingSafely(onException, block).getOrNull() | ||||||
|  |  | ||||||
| suspend inline fun <T> runCatchingSafelyWithoutExceptions( | suspend fun <T> runCatchingSafelyWithoutExceptions( | ||||||
|     noinline onException: ExceptionHandler<T?> = defaultSafelyWithoutExceptionHandlerWithNull, |     onException: ExceptionHandler<T?> = defaultSafelyExceptionHandler, | ||||||
|     noinline block: suspend CoroutineScope.() -> T |     block: suspend () -> T | ||||||
| ): Result<T?> = runCatching { | ): Result<T?> = runCatchingSafely(onException, block).let { | ||||||
|     safelyWithoutExceptions(onException, block) |     if (it.isFailure) return Result.success<T?>(null) | ||||||
|  |  | ||||||
|  |     it | ||||||
| } | } | ||||||
|  |  | ||||||
| inline fun CoroutineScope( | fun CoroutineScopeWithDefaultFallback( | ||||||
|     context: CoroutineContext, |     context: CoroutineContext, | ||||||
|     noinline defaultExceptionsHandler: ExceptionHandler<Unit> |     defaultExceptionsHandler: ExceptionHandler<Unit> | ||||||
| ) = CoroutineScope( | ) = CoroutineScope( | ||||||
|     context + ContextSafelyExceptionHandler(defaultExceptionsHandler) |     context + ContextSafelyExceptionHandler(defaultExceptionsHandler) | ||||||
| ) | ) | ||||||
|   | |||||||
| @@ -4,38 +4,38 @@ import kotlinx.coroutines.* | |||||||
| import kotlin.coroutines.CoroutineContext | import kotlin.coroutines.CoroutineContext | ||||||
| import kotlin.coroutines.EmptyCoroutineContext | import kotlin.coroutines.EmptyCoroutineContext | ||||||
|  |  | ||||||
| inline fun CoroutineScope.launchSafely( | fun CoroutineScope.launchSafely( | ||||||
|     context: CoroutineContext = EmptyCoroutineContext, |     context: CoroutineContext = EmptyCoroutineContext, | ||||||
|     start: CoroutineStart = CoroutineStart.DEFAULT, |     start: CoroutineStart = CoroutineStart.DEFAULT, | ||||||
|     noinline onException: ExceptionHandler<Unit> = defaultSafelyExceptionHandler, |     onException: ExceptionHandler<Unit> = defaultSafelyExceptionHandler, | ||||||
|     noinline block: suspend CoroutineScope.() -> Unit |     block: suspend () -> Unit | ||||||
| ) = launch(context, start) { | ) = launch(context, start) { | ||||||
|     safely(onException, block) |     runCatchingSafely(onException, block = block) | ||||||
| } | } | ||||||
|  |  | ||||||
| inline fun CoroutineScope.launchSafelyWithoutExceptions( | fun CoroutineScope.launchSafelyWithoutExceptions( | ||||||
|     context: CoroutineContext = EmptyCoroutineContext, |     context: CoroutineContext = EmptyCoroutineContext, | ||||||
|     start: CoroutineStart = CoroutineStart.DEFAULT, |     start: CoroutineStart = CoroutineStart.DEFAULT, | ||||||
|     noinline onException: ExceptionHandler<Unit?> = defaultSafelyWithoutExceptionHandlerWithNull, |     onException: ExceptionHandler<Unit?> = defaultSafelyWithoutExceptionHandlerWithNull, | ||||||
|     noinline block: suspend CoroutineScope.() -> Unit |     block: suspend () -> Unit | ||||||
| ) = launch(context, start) { | ) = launch(context, start) { | ||||||
|     safelyWithoutExceptions(onException, block) |     runCatchingSafelyWithoutExceptions(onException, block = block) | ||||||
| } | } | ||||||
|  |  | ||||||
| inline fun <T> CoroutineScope.asyncSafely( | fun <T> CoroutineScope.asyncSafely( | ||||||
|     context: CoroutineContext = EmptyCoroutineContext, |     context: CoroutineContext = EmptyCoroutineContext, | ||||||
|     start: CoroutineStart = CoroutineStart.DEFAULT, |     start: CoroutineStart = CoroutineStart.DEFAULT, | ||||||
|     noinline onException: ExceptionHandler<T> = defaultSafelyExceptionHandler, |     onException: ExceptionHandler<T> = defaultSafelyExceptionHandler, | ||||||
|     noinline block: suspend CoroutineScope.() -> T |     block: suspend () -> T | ||||||
| ) = async(context, start) { | ) = async(context, start) { | ||||||
|     safely(onException, block) |     runCatchingSafely(onException, block = block) | ||||||
| } | } | ||||||
|  |  | ||||||
| inline fun <T> CoroutineScope.asyncSafelyWithoutExceptions( | fun <T> CoroutineScope.asyncSafelyWithoutExceptions( | ||||||
|     context: CoroutineContext = EmptyCoroutineContext, |     context: CoroutineContext = EmptyCoroutineContext, | ||||||
|     start: CoroutineStart = CoroutineStart.DEFAULT, |     start: CoroutineStart = CoroutineStart.DEFAULT, | ||||||
|     noinline onException: ExceptionHandler<T?> = defaultSafelyWithoutExceptionHandlerWithNull, |     onException: ExceptionHandler<T?> = defaultSafelyWithoutExceptionHandlerWithNull, | ||||||
|     noinline block: suspend CoroutineScope.() -> T |     block: suspend () -> T | ||||||
| ) = async(context, start) { | ) = async(context, start) { | ||||||
|     safelyWithoutExceptions(onException, block) |     runCatchingSafelyWithoutExceptions(onException, block = block) | ||||||
| } | } | ||||||
|   | |||||||
| @@ -0,0 +1,136 @@ | |||||||
|  | package dev.inmo.micro_utils.coroutines | ||||||
|  |  | ||||||
|  | import kotlinx.coroutines.currentCoroutineContext | ||||||
|  | import kotlinx.coroutines.flow.MutableStateFlow | ||||||
|  | import kotlinx.coroutines.flow.StateFlow | ||||||
|  | import kotlinx.coroutines.flow.asStateFlow | ||||||
|  | import kotlinx.coroutines.flow.first | ||||||
|  | import kotlinx.coroutines.isActive | ||||||
|  | import kotlinx.coroutines.sync.Mutex | ||||||
|  | import kotlinx.coroutines.sync.withLock | ||||||
|  | import kotlin.contracts.ExperimentalContracts | ||||||
|  | import kotlin.contracts.InvocationKind | ||||||
|  | import kotlin.contracts.contract | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * It is interface which will work like classic [Mutex], but in difference have [lockStateFlow] for listening of the | ||||||
|  |  * [SmartMutex] state. | ||||||
|  |  * | ||||||
|  |  * There is [Mutable] and [Immutable] realizations. In case you are owner and manager current state of lock, you need | ||||||
|  |  * [Mutable] [SmartMutex]. Otherwise, [Immutable]. | ||||||
|  |  * | ||||||
|  |  * Any [Mutable] [SmartMutex] may produce its [Immutable] variant which will contains [lockStateFlow] equal to its | ||||||
|  |  * [Mutable] creator | ||||||
|  |  */ | ||||||
|  | sealed interface SmartMutex { | ||||||
|  |     val lockStateFlow: StateFlow<Boolean> | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * * True - locked | ||||||
|  |      * * False - unlocked | ||||||
|  |      */ | ||||||
|  |     val isLocked: Boolean | ||||||
|  |         get() = lockStateFlow.value | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * Immutable variant of [SmartMutex]. In fact will depend on the owner of [lockStateFlow] | ||||||
|  |      */ | ||||||
|  |     class Immutable(override val lockStateFlow: StateFlow<Boolean>) : SmartMutex | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * Mutable variant of [SmartMutex]. With that variant you may [lock] and [unlock]. Besides, you may create | ||||||
|  |      * [Immutable] variant of [this] instance with [immutable] factory | ||||||
|  |      * | ||||||
|  |      * @param locked Preset state of [isLocked] and its internal [_lockStateFlow] | ||||||
|  |      */ | ||||||
|  |     class Mutable(locked: Boolean = false) : SmartMutex { | ||||||
|  |         private val _lockStateFlow = SpecialMutableStateFlow<Boolean>(locked) | ||||||
|  |         override val lockStateFlow: StateFlow<Boolean> = _lockStateFlow.asStateFlow() | ||||||
|  |  | ||||||
|  |         private val internalChangesMutex = Mutex() | ||||||
|  |  | ||||||
|  |         fun immutable() = Immutable(lockStateFlow) | ||||||
|  |  | ||||||
|  |         /** | ||||||
|  |          * Holds call until this [SmartMutex] will be re-locked. That means that while [isLocked] == true, [holds] will | ||||||
|  |          * wait for [isLocked] == false and then try to lock | ||||||
|  |          */ | ||||||
|  |         suspend fun lock() { | ||||||
|  |             do { | ||||||
|  |                 waitUnlock() | ||||||
|  |                 val shouldContinue = internalChangesMutex.withLock { | ||||||
|  |                     if (_lockStateFlow.value) { | ||||||
|  |                         true | ||||||
|  |                     } else { | ||||||
|  |                         _lockStateFlow.value = true | ||||||
|  |                         false | ||||||
|  |                     } | ||||||
|  |                 } | ||||||
|  |             } while (shouldContinue && currentCoroutineContext().isActive) | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         /** | ||||||
|  |          * Will try to lock this [SmartMutex] immediataly | ||||||
|  |          * | ||||||
|  |          * @return True if lock was successful. False otherwise | ||||||
|  |          */ | ||||||
|  |         suspend fun tryLock(): Boolean { | ||||||
|  |             return if (!_lockStateFlow.value) { | ||||||
|  |                 internalChangesMutex.withLock { | ||||||
|  |                     if (!_lockStateFlow.value) { | ||||||
|  |                         _lockStateFlow.value = true | ||||||
|  |                         true | ||||||
|  |                     } else { | ||||||
|  |                         false | ||||||
|  |                     } | ||||||
|  |                 } | ||||||
|  |             } else { | ||||||
|  |                 false | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         /** | ||||||
|  |          * If [isLocked] == true - will change it to false and return true. If current call will not unlock this | ||||||
|  |          * [SmartMutex] - false | ||||||
|  |          */ | ||||||
|  |         suspend fun unlock(): Boolean { | ||||||
|  |             return if (_lockStateFlow.value) { | ||||||
|  |                 internalChangesMutex.withLock { | ||||||
|  |                     if (_lockStateFlow.value) { | ||||||
|  |                         _lockStateFlow.value = false | ||||||
|  |                         true | ||||||
|  |                     } else { | ||||||
|  |                         false | ||||||
|  |                     } | ||||||
|  |                 } | ||||||
|  |             } else { | ||||||
|  |                 false | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Will call [SmartMutex.Mutable.lock], then execute [action] and return the result after [SmartMutex.Mutable.unlock] | ||||||
|  |  */ | ||||||
|  | @OptIn(ExperimentalContracts::class) | ||||||
|  | suspend inline fun <T> SmartMutex.Mutable.withLock(action: () -> T): T { | ||||||
|  |     contract { | ||||||
|  |         callsInPlace(action, InvocationKind.EXACTLY_ONCE) | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     lock() | ||||||
|  |     try { | ||||||
|  |         return action() | ||||||
|  |     } finally { | ||||||
|  |         unlock() | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Will wait until the [SmartMutex.lockStateFlow] of [this] instance will be false. | ||||||
|  |  * | ||||||
|  |  * Anyway, after the end of this block there are no any guaranties that [SmartMutex.isLocked] == false due to the fact | ||||||
|  |  * that some other parties may lock it again | ||||||
|  |  */ | ||||||
|  | suspend fun SmartMutex.waitUnlock() = lockStateFlow.first { !it } | ||||||
| @@ -0,0 +1,105 @@ | |||||||
|  | package dev.inmo.micro_utils.coroutines | ||||||
|  |  | ||||||
|  | import kotlin.contracts.ExperimentalContracts | ||||||
|  | import kotlin.contracts.InvocationKind | ||||||
|  | import kotlin.contracts.contract | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Composite mutex which works with next rules: | ||||||
|  |  * | ||||||
|  |  * * [acquireRead] require to [writeMutex] be free. Then it will take one lock from [readSemaphore] | ||||||
|  |  * * [releaseRead] will just free up one permit in [readSemaphore] | ||||||
|  |  * * [lockWrite] will lock [writeMutex] and then await while all [readSemaphore] will be freed | ||||||
|  |  * * [unlockWrite] will just unlock [writeMutex] | ||||||
|  |  */ | ||||||
|  | class SmartRWLocker(private val readPermits: Int = Int.MAX_VALUE, writeIsLocked: Boolean = false) { | ||||||
|  |     private val _readSemaphore = SmartSemaphore.Mutable(permits = readPermits, acquiredPermits = 0) | ||||||
|  |     private val _writeMutex = SmartMutex.Mutable(locked = writeIsLocked) | ||||||
|  |  | ||||||
|  |     val readSemaphore: SmartSemaphore.Immutable = _readSemaphore.immutable() | ||||||
|  |     val writeMutex: SmartMutex.Immutable = _writeMutex.immutable() | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * Do lock in [readSemaphore] inside of [writeMutex] locking | ||||||
|  |      */ | ||||||
|  |     suspend fun acquireRead() { | ||||||
|  |         _writeMutex.waitUnlock() | ||||||
|  |         _readSemaphore.acquire() | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * Release one read permit in [readSemaphore] | ||||||
|  |      */ | ||||||
|  |     suspend fun releaseRead(): Boolean { | ||||||
|  |         return _readSemaphore.release() | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * Locking [writeMutex] and wait while all [readSemaphore] permits will be freed | ||||||
|  |      */ | ||||||
|  |     suspend fun lockWrite() { | ||||||
|  |         _writeMutex.lock() | ||||||
|  |         _readSemaphore.acquire(readPermits) | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * Unlock [writeMutex] | ||||||
|  |      */ | ||||||
|  |     suspend fun unlockWrite(): Boolean { | ||||||
|  |         return _writeMutex.unlock().also { | ||||||
|  |             if (it) { | ||||||
|  |                 _readSemaphore.release(readPermits) | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Will call [SmartSemaphore.Mutable.lock], then execute [action] and return the result after [SmartSemaphore.Mutable.unlock] | ||||||
|  |  */ | ||||||
|  | @OptIn(ExperimentalContracts::class) | ||||||
|  | suspend inline fun <T> SmartRWLocker.withReadAcquire(action: () -> T): T { | ||||||
|  |     contract { | ||||||
|  |         callsInPlace(action, InvocationKind.EXACTLY_ONCE) | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     acquireRead() | ||||||
|  |     try { | ||||||
|  |         return action() | ||||||
|  |     } finally { | ||||||
|  |         releaseRead() | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Will wait until the [SmartSemaphore.permitsStateFlow] of [this] instance will have [permits] count free permits. | ||||||
|  |  * | ||||||
|  |  * Anyway, after the end of this block there are no any guaranties that [SmartSemaphore.freePermits] >= [permits] due to | ||||||
|  |  * the fact that some other parties may lock it again | ||||||
|  |  */ | ||||||
|  | suspend fun SmartRWLocker.waitReadRelease(permits: Int = 1) = readSemaphore.waitRelease(permits) | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Will call [SmartMutex.Mutable.lock], then execute [action] and return the result after [SmartMutex.Mutable.unlock] | ||||||
|  |  */ | ||||||
|  | @OptIn(ExperimentalContracts::class) | ||||||
|  | suspend inline fun <T> SmartRWLocker.withWriteLock(action: () -> T): T { | ||||||
|  |     contract { | ||||||
|  |         callsInPlace(action, InvocationKind.EXACTLY_ONCE) | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     lockWrite() | ||||||
|  |     try { | ||||||
|  |         return action() | ||||||
|  |     } finally { | ||||||
|  |         unlockWrite() | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Will wait until the [SmartMutex.lockStateFlow] of [this] instance will be false. | ||||||
|  |  * | ||||||
|  |  * Anyway, after the end of this block there are no any guaranties that [SmartMutex.isLocked] == false due to the fact | ||||||
|  |  * that some other parties may lock it again | ||||||
|  |  */ | ||||||
|  | suspend fun SmartRWLocker.waitWriteUnlock() = writeMutex.waitUnlock() | ||||||
| @@ -0,0 +1,168 @@ | |||||||
|  | package dev.inmo.micro_utils.coroutines | ||||||
|  |  | ||||||
|  | import kotlinx.coroutines.currentCoroutineContext | ||||||
|  | import kotlinx.coroutines.flow.MutableStateFlow | ||||||
|  | import kotlinx.coroutines.flow.StateFlow | ||||||
|  | import kotlinx.coroutines.flow.asStateFlow | ||||||
|  | import kotlinx.coroutines.flow.first | ||||||
|  | import kotlinx.coroutines.isActive | ||||||
|  | import kotlinx.coroutines.sync.Mutex | ||||||
|  | import kotlinx.coroutines.sync.Semaphore | ||||||
|  | import kotlinx.coroutines.sync.withLock | ||||||
|  | import kotlin.contracts.ExperimentalContracts | ||||||
|  | import kotlin.contracts.InvocationKind | ||||||
|  | import kotlin.contracts.contract | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * It is interface which will work like classic [Semaphore], but in difference have [permitsStateFlow] for listening of the | ||||||
|  |  * [SmartSemaphore] state. | ||||||
|  |  * | ||||||
|  |  * There is [Mutable] and [Immutable] realizations. In case you are owner and manager current state of lock, you need | ||||||
|  |  * [Mutable] [SmartSemaphore]. Otherwise, [Immutable]. | ||||||
|  |  * | ||||||
|  |  * Any [Mutable] [SmartSemaphore] may produce its [Immutable] variant which will contains [permitsStateFlow] equal to its | ||||||
|  |  * [Mutable] creator | ||||||
|  |  */ | ||||||
|  | sealed interface SmartSemaphore { | ||||||
|  |     val permitsStateFlow: StateFlow<Int> | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * * True - locked | ||||||
|  |      * * False - unlocked | ||||||
|  |      */ | ||||||
|  |     val freePermits: Int | ||||||
|  |         get() = permitsStateFlow.value | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * Immutable variant of [SmartSemaphore]. In fact will depend on the owner of [permitsStateFlow] | ||||||
|  |      */ | ||||||
|  |     class Immutable(override val permitsStateFlow: StateFlow<Int>) : SmartSemaphore | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * Mutable variant of [SmartSemaphore]. With that variant you may [lock] and [unlock]. Besides, you may create | ||||||
|  |      * [Immutable] variant of [this] instance with [immutable] factory | ||||||
|  |      * | ||||||
|  |      * @param locked Preset state of [freePermits] and its internal [_freePermitsStateFlow] | ||||||
|  |      */ | ||||||
|  |     class Mutable(private val permits: Int, acquiredPermits: Int = 0) : SmartSemaphore { | ||||||
|  |         private val _freePermitsStateFlow = SpecialMutableStateFlow<Int>(permits - acquiredPermits) | ||||||
|  |         override val permitsStateFlow: StateFlow<Int> = _freePermitsStateFlow.asStateFlow() | ||||||
|  |  | ||||||
|  |         private val internalChangesMutex = Mutex(false) | ||||||
|  |  | ||||||
|  |         fun immutable() = Immutable(permitsStateFlow) | ||||||
|  |  | ||||||
|  |         private fun checkedPermits(permits: Int) = permits.coerceIn(1 .. this.permits) | ||||||
|  |  | ||||||
|  |         /** | ||||||
|  |          * Holds call until this [SmartSemaphore] will be re-locked. That means that current method will | ||||||
|  |          */ | ||||||
|  |         suspend fun acquire(permits: Int = 1) { | ||||||
|  |             var acquiredPermits = 0 | ||||||
|  |             val checkedPermits = checkedPermits(permits) | ||||||
|  |             try { | ||||||
|  |                 do { | ||||||
|  |                     val shouldContinue = internalChangesMutex.withLock { | ||||||
|  |                         val requiredPermits = checkedPermits - acquiredPermits | ||||||
|  |                         val acquiring = minOf(freePermits, requiredPermits).takeIf { it > 0 } ?: return@withLock true | ||||||
|  |                         acquiredPermits += acquiring | ||||||
|  |                         _freePermitsStateFlow.value -= acquiring | ||||||
|  |  | ||||||
|  |                         acquiredPermits != checkedPermits | ||||||
|  |                     } | ||||||
|  |                     if (shouldContinue) { | ||||||
|  |                         waitRelease() | ||||||
|  |                     } | ||||||
|  |                 } while (shouldContinue && currentCoroutineContext().isActive) | ||||||
|  |             } catch (e: Throwable) { | ||||||
|  |                 release(acquiredPermits) | ||||||
|  |                 throw e | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         /** | ||||||
|  |          * Holds call until this [SmartSemaphore] will be re-locked. That means that while [freePermits] == true, [holds] will | ||||||
|  |          * wait for [freePermits] == false and then try to lock | ||||||
|  |          */ | ||||||
|  |         suspend fun acquireByOne(permits: Int = 1) { | ||||||
|  |             val checkedPermits = checkedPermits(permits) | ||||||
|  |             do { | ||||||
|  |                 waitRelease(checkedPermits) | ||||||
|  |                 val shouldContinue = internalChangesMutex.withLock { | ||||||
|  |                     if (_freePermitsStateFlow.value < checkedPermits) { | ||||||
|  |                         true | ||||||
|  |                     } else { | ||||||
|  |                         _freePermitsStateFlow.value -= checkedPermits | ||||||
|  |                         false | ||||||
|  |                     } | ||||||
|  |                 } | ||||||
|  |             } while (shouldContinue && currentCoroutineContext().isActive) | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         /** | ||||||
|  |          * Will try to lock this [SmartSemaphore] immediataly | ||||||
|  |          * | ||||||
|  |          * @return True if lock was successful. False otherwise | ||||||
|  |          */ | ||||||
|  |         suspend fun tryAcquire(permits: Int = 1): Boolean { | ||||||
|  |             val checkedPermits = checkedPermits(permits) | ||||||
|  |             return if (_freePermitsStateFlow.value < checkedPermits) { | ||||||
|  |                 internalChangesMutex.withLock { | ||||||
|  |                     if (_freePermitsStateFlow.value < checkedPermits) { | ||||||
|  |                         _freePermitsStateFlow.value -= checkedPermits | ||||||
|  |                         true | ||||||
|  |                     } else { | ||||||
|  |                         false | ||||||
|  |                     } | ||||||
|  |                 } | ||||||
|  |             } else { | ||||||
|  |                 false | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         /** | ||||||
|  |          * If [freePermits] == true - will change it to false and return true. If current call will not unlock this | ||||||
|  |          * [SmartSemaphore] - false | ||||||
|  |          */ | ||||||
|  |         suspend fun release(permits: Int = 1): Boolean { | ||||||
|  |             val checkedPermits = checkedPermits(permits) | ||||||
|  |             return if (_freePermitsStateFlow.value < this.permits) { | ||||||
|  |                 internalChangesMutex.withLock { | ||||||
|  |                     if (_freePermitsStateFlow.value < this.permits) { | ||||||
|  |                         _freePermitsStateFlow.value = minOf(_freePermitsStateFlow.value + checkedPermits, this.permits) | ||||||
|  |                         true | ||||||
|  |                     } else { | ||||||
|  |                         false | ||||||
|  |                     } | ||||||
|  |                 } | ||||||
|  |             } else { | ||||||
|  |                 false | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Will call [SmartSemaphore.Mutable.lock], then execute [action] and return the result after [SmartSemaphore.Mutable.unlock] | ||||||
|  |  */ | ||||||
|  | @OptIn(ExperimentalContracts::class) | ||||||
|  | suspend inline fun <T> SmartSemaphore.Mutable.withAcquire(permits: Int = 1, action: () -> T): T { | ||||||
|  |     contract { | ||||||
|  |         callsInPlace(action, InvocationKind.EXACTLY_ONCE) | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     acquire(permits) | ||||||
|  |     try { | ||||||
|  |         return action() | ||||||
|  |     } finally { | ||||||
|  |         release(permits) | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Will wait until the [SmartSemaphore.permitsStateFlow] of [this] instance will have [permits] count free permits. | ||||||
|  |  * | ||||||
|  |  * Anyway, after the end of this block there are no any guaranties that [SmartSemaphore.freePermits] >= [permits] due to | ||||||
|  |  * the fact that some other parties may lock it again | ||||||
|  |  */ | ||||||
|  | suspend fun SmartSemaphore.waitRelease(permits: Int = 1) = permitsStateFlow.first { it >= permits } | ||||||
| @@ -0,0 +1,70 @@ | |||||||
|  | package dev.inmo.micro_utils.coroutines | ||||||
|  |  | ||||||
|  | import kotlinx.coroutines.CoroutineScope | ||||||
|  | import kotlinx.coroutines.Dispatchers | ||||||
|  | import kotlinx.coroutines.ExperimentalCoroutinesApi | ||||||
|  | import kotlinx.coroutines.InternalCoroutinesApi | ||||||
|  | import kotlinx.coroutines.channels.BufferOverflow | ||||||
|  | import kotlinx.coroutines.flow.FlowCollector | ||||||
|  | import kotlinx.coroutines.flow.MutableSharedFlow | ||||||
|  | import kotlinx.coroutines.flow.MutableStateFlow | ||||||
|  | import kotlinx.coroutines.flow.StateFlow | ||||||
|  | import kotlinx.coroutines.internal.SynchronizedObject | ||||||
|  | import kotlinx.coroutines.internal.synchronized | ||||||
|  | import kotlin.coroutines.CoroutineContext | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Works like [StateFlow], but guarantee that latest value update will always be delivered to | ||||||
|  |  * each active subscriber | ||||||
|  |  */ | ||||||
|  | open class SpecialMutableStateFlow<T>( | ||||||
|  |     initialValue: T | ||||||
|  | ) : MutableStateFlow<T>, FlowCollector<T>, MutableSharedFlow<T> { | ||||||
|  |     @OptIn(InternalCoroutinesApi::class) | ||||||
|  |     private val syncObject = SynchronizedObject() | ||||||
|  |     protected val sharingFlow: MutableSharedFlow<T> = MutableSharedFlow( | ||||||
|  |         replay = 1, | ||||||
|  |         extraBufferCapacity = 1, | ||||||
|  |         onBufferOverflow = BufferOverflow.DROP_OLDEST | ||||||
|  |     ) | ||||||
|  |  | ||||||
|  |     @OptIn(InternalCoroutinesApi::class) | ||||||
|  |     override var value: T = initialValue | ||||||
|  |         set(value) { | ||||||
|  |             synchronized(syncObject) { | ||||||
|  |                 if (field != value) { | ||||||
|  |                     field = value | ||||||
|  |                     sharingFlow.tryEmit(value) | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |     override val replayCache: List<T> | ||||||
|  |         get() = sharingFlow.replayCache | ||||||
|  |     override val subscriptionCount: StateFlow<Int> | ||||||
|  |         get() = sharingFlow.subscriptionCount | ||||||
|  |  | ||||||
|  |     init { | ||||||
|  |         sharingFlow.tryEmit(initialValue) | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     override fun compareAndSet(expect: T, update: T): Boolean { | ||||||
|  |         if (expect == value) { | ||||||
|  |             value = update | ||||||
|  |         } | ||||||
|  |         return expect == value | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     @ExperimentalCoroutinesApi | ||||||
|  |     override fun resetReplayCache() = sharingFlow.resetReplayCache() | ||||||
|  |  | ||||||
|  |     override fun tryEmit(value: T): Boolean { | ||||||
|  |         return compareAndSet(this.value, value) | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     override suspend fun emit(value: T) { | ||||||
|  |         compareAndSet(this.value, value) | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     override suspend fun collect(collector: FlowCollector<T>) = sharingFlow.collect(collector) | ||||||
|  | } | ||||||
| @@ -10,8 +10,12 @@ fun CoroutineScope.LinkedSupervisorJob( | |||||||
|     additionalContext: CoroutineContext? = null |     additionalContext: CoroutineContext? = null | ||||||
| ) = coroutineContext.LinkedSupervisorJob(additionalContext) | ) = coroutineContext.LinkedSupervisorJob(additionalContext) | ||||||
|  |  | ||||||
| fun CoroutineScope.LinkedSupervisorScope( |  | ||||||
|  | fun CoroutineContext.LinkedSupervisorScope( | ||||||
|     additionalContext: CoroutineContext? = null |     additionalContext: CoroutineContext? = null | ||||||
| ) = CoroutineScope( | ) = CoroutineScope( | ||||||
|     coroutineContext + LinkedSupervisorJob(additionalContext) |     this + LinkedSupervisorJob(additionalContext) | ||||||
| ) | ) | ||||||
|  | fun CoroutineScope.LinkedSupervisorScope( | ||||||
|  |     additionalContext: CoroutineContext? = null | ||||||
|  | ) = coroutineContext.LinkedSupervisorScope(additionalContext) | ||||||
|   | |||||||
| @@ -4,28 +4,71 @@ import kotlinx.coroutines.* | |||||||
| import kotlin.coroutines.CoroutineContext | import kotlin.coroutines.CoroutineContext | ||||||
| import kotlin.coroutines.EmptyCoroutineContext | import kotlin.coroutines.EmptyCoroutineContext | ||||||
|  |  | ||||||
| private fun CoroutineScope.createWeakSubScope() = CoroutineScope(coroutineContext.minusKey(Job)).also { newScope -> | /** | ||||||
|     coroutineContext.job.invokeOnCompletion { newScope.cancel() } |  * Created [CoroutineScope] which will [launch] listening of [context] job completing and drop itself. Current weak | ||||||
|  |  * scope **will not** be attached to [context] directly. So, this [CoroutineScope] will not prevent parent one from | ||||||
|  |  * cancelling if it is launched with [supervisorScope] or [coroutineScope], but still will follow closing status | ||||||
|  |  * of parent [Job] | ||||||
|  |  */ | ||||||
|  | fun WeakScope( | ||||||
|  |     context: CoroutineContext | ||||||
|  | ) = CoroutineScope(context.minusKey(Job) + Job()).also { newScope -> | ||||||
|  |     newScope.launch { | ||||||
|  |         context.job.join() | ||||||
|  |         newScope.cancel() | ||||||
|  |     } | ||||||
| } | } | ||||||
|  |  | ||||||
| fun CoroutineScope.weakLaunch( | /** | ||||||
|  |  * Created [CoroutineScope] which will [launch] listening of [scope] [CoroutineContext] job completing and drop itself. Current weak | ||||||
|  |  * scope **will not** be attached to [scope] [CoroutineContext] directly. So, this [CoroutineScope] will not prevent parent one from | ||||||
|  |  * cancelling if it is launched with [supervisorScope] or [coroutineScope], but still will follow closing status | ||||||
|  |  * of parent [Job] | ||||||
|  |  */ | ||||||
|  | fun WeakScope( | ||||||
|  |     scope: CoroutineScope | ||||||
|  | ) = WeakScope(scope.coroutineContext) | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * [this] [CoroutineScope] will be used as base for [WeakScope]. Other parameters ([context], [start], [block]) | ||||||
|  |  * will be used to [launch] [Job] | ||||||
|  |  */ | ||||||
|  | fun CoroutineScope.launchWeak( | ||||||
|     context: CoroutineContext = EmptyCoroutineContext, |     context: CoroutineContext = EmptyCoroutineContext, | ||||||
|     start: CoroutineStart = CoroutineStart.DEFAULT, |     start: CoroutineStart = CoroutineStart.DEFAULT, | ||||||
|     block: suspend CoroutineScope.() -> Unit |     block: suspend CoroutineScope.() -> Unit | ||||||
| ): Job { | ): Job { | ||||||
|     val scope = createWeakSubScope() |     val scope = WeakScope(this) | ||||||
|     val job = scope.launch(context, start, block) |     val job = scope.launch(context, start, block) | ||||||
|     job.invokeOnCompletion { scope.cancel() } |     job.invokeOnCompletion { scope.cancel() } | ||||||
|     return job |     return job | ||||||
| } | } | ||||||
|  |  | ||||||
| fun <T> CoroutineScope.weakAsync( | /** | ||||||
|  |  * [this] [CoroutineScope] will be used as base for [WeakScope]. Other parameters ([context], [start], [block]) | ||||||
|  |  * will be used to create [async] [Deferred] | ||||||
|  |  */ | ||||||
|  | fun <T> CoroutineScope.asyncWeak( | ||||||
|     context: CoroutineContext = EmptyCoroutineContext, |     context: CoroutineContext = EmptyCoroutineContext, | ||||||
|     start: CoroutineStart = CoroutineStart.DEFAULT, |     start: CoroutineStart = CoroutineStart.DEFAULT, | ||||||
|     block: suspend CoroutineScope.() -> T |     block: suspend CoroutineScope.() -> T | ||||||
| ): Deferred<T> { | ): Deferred<T> { | ||||||
|     val scope = createWeakSubScope() |     val scope = WeakScope(this) | ||||||
|     val deferred = scope.async(context, start, block) |     val deferred = scope.async(context, start, block) | ||||||
|     deferred.invokeOnCompletion { scope.cancel() } |     deferred.invokeOnCompletion { scope.cancel() } | ||||||
|     return deferred |     return deferred | ||||||
| } | } | ||||||
|  |  | ||||||
|  | @Deprecated("Renamed", ReplaceWith("launchWeak(context, start, block)", "dev.inmo.micro_utils.coroutines.launchWeak")) | ||||||
|  | fun CoroutineScope.weakLaunch( | ||||||
|  |     context: CoroutineContext = EmptyCoroutineContext, | ||||||
|  |     start: CoroutineStart = CoroutineStart.DEFAULT, | ||||||
|  |     block: suspend CoroutineScope.() -> Unit | ||||||
|  | ): Job = launchWeak(context, start, block) | ||||||
|  |  | ||||||
|  | @Deprecated("Renamed", ReplaceWith("asyncWeak(context, start, block)", "dev.inmo.micro_utils.coroutines.asyncWeak")) | ||||||
|  | fun <T> CoroutineScope.weakAsync( | ||||||
|  |     context: CoroutineContext = EmptyCoroutineContext, | ||||||
|  |     start: CoroutineStart = CoroutineStart.DEFAULT, | ||||||
|  |     block: suspend CoroutineScope.() -> T | ||||||
|  | ): Deferred<T> = asyncWeak(context, start, block) | ||||||
|   | |||||||
							
								
								
									
										151
									
								
								coroutines/src/commonTest/kotlin/SmartRWLockerTests.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										151
									
								
								coroutines/src/commonTest/kotlin/SmartRWLockerTests.kt
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,151 @@ | |||||||
|  | import dev.inmo.micro_utils.coroutines.* | ||||||
|  | import kotlinx.coroutines.* | ||||||
|  | import kotlinx.coroutines.flow.first | ||||||
|  | import kotlinx.coroutines.sync.Mutex | ||||||
|  | import kotlinx.coroutines.sync.withLock | ||||||
|  | import kotlinx.coroutines.test.runTest | ||||||
|  | import kotlin.test.Test | ||||||
|  | import kotlin.test.assertEquals | ||||||
|  | import kotlin.test.assertTrue | ||||||
|  |  | ||||||
|  | class SmartRWLockerTests { | ||||||
|  |     @Test | ||||||
|  |     fun compositeTest() { | ||||||
|  |         val locker = SmartRWLocker() | ||||||
|  |  | ||||||
|  |         val readAndWriteWorkers = 10 | ||||||
|  |         runTest { | ||||||
|  |             var started = 0 | ||||||
|  |             var done = 0 | ||||||
|  |             val doneMutex = Mutex() | ||||||
|  |             val readWorkers = (0 until readAndWriteWorkers).map { | ||||||
|  |                 launch(start = CoroutineStart.LAZY) { | ||||||
|  |                     locker.withReadAcquire { | ||||||
|  |                         doneMutex.withLock { | ||||||
|  |                             started++ | ||||||
|  |                         } | ||||||
|  |                         delay(100L) | ||||||
|  |                         doneMutex.withLock { | ||||||
|  |                             done++ | ||||||
|  |                         } | ||||||
|  |                     } | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |  | ||||||
|  |             var doneWrites = 0 | ||||||
|  |  | ||||||
|  |             val writeWorkers = (0 until readAndWriteWorkers).map { | ||||||
|  |                 launch(start = CoroutineStart.LAZY) { | ||||||
|  |                     locker.withWriteLock { | ||||||
|  |                         assertTrue(done == readAndWriteWorkers || started == 0) | ||||||
|  |                         delay(10L) | ||||||
|  |                         doneWrites++ | ||||||
|  |                     } | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |             readWorkers.forEach { it.start() } | ||||||
|  |             writeWorkers.forEach { it.start() } | ||||||
|  |  | ||||||
|  |             readWorkers.joinAll() | ||||||
|  |             writeWorkers.joinAll() | ||||||
|  |  | ||||||
|  |             assertEquals(expected = readAndWriteWorkers, actual = done) | ||||||
|  |             assertEquals(expected = readAndWriteWorkers, actual = doneWrites) | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     @Test | ||||||
|  |     fun simpleWithWriteLockTest() { | ||||||
|  |         val locker = SmartRWLocker() | ||||||
|  |  | ||||||
|  |         runTest { | ||||||
|  |             locker.withWriteLock { | ||||||
|  |                 assertEquals(0, locker.readSemaphore.freePermits) | ||||||
|  |                 assertEquals(true, locker.writeMutex.isLocked) | ||||||
|  |             } | ||||||
|  |             assertEquals(Int.MAX_VALUE, locker.readSemaphore.freePermits) | ||||||
|  |             assertEquals(false, locker.writeMutex.isLocked) | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     @Test | ||||||
|  |     fun failureWithWriteLockTest() { | ||||||
|  |         val locker = SmartRWLocker() | ||||||
|  |  | ||||||
|  |         val exception = IllegalArgumentException() | ||||||
|  |         try { | ||||||
|  |             runTest { | ||||||
|  |                 val subscope = kotlinx.coroutines.CoroutineScope(this.coroutineContext) | ||||||
|  |                 var happenException: Throwable? = null | ||||||
|  |                 try { | ||||||
|  |                     locker.withWriteLock { | ||||||
|  |                         val checkFunction = fun (): Deferred<Unit> { | ||||||
|  |                             return subscope.async { | ||||||
|  |                                 assertEquals(0, locker.readSemaphore.freePermits) | ||||||
|  |                                 assertEquals(true, locker.writeMutex.isLocked) | ||||||
|  |                                 throw exception | ||||||
|  |                             } | ||||||
|  |                         } | ||||||
|  |                         doInDefault { | ||||||
|  |                             assertEquals(0, locker.readSemaphore.freePermits) | ||||||
|  |                             assertEquals(true, locker.writeMutex.isLocked) | ||||||
|  |                             checkFunction().await() | ||||||
|  |                         } | ||||||
|  |                     } | ||||||
|  |                 } catch (e: Exception) { | ||||||
|  |                     happenException = e | ||||||
|  |                 } | ||||||
|  |                 if (exception != happenException) { | ||||||
|  |                     assertEquals(exception, happenException ?.cause) | ||||||
|  |                 } | ||||||
|  |                 assertEquals(Int.MAX_VALUE, locker.readSemaphore.freePermits) | ||||||
|  |                 assertEquals(false, locker.writeMutex.isLocked) | ||||||
|  |             } | ||||||
|  |         } catch (e: Exception) { | ||||||
|  |             assertEquals(exception, e) | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     @Test | ||||||
|  |     fun simpleWithReadAcquireTest() { | ||||||
|  |         val locker = SmartRWLocker() | ||||||
|  |  | ||||||
|  |         runTest { | ||||||
|  |             locker.withReadAcquire { | ||||||
|  |                 assertEquals(Int.MAX_VALUE - 1, locker.readSemaphore.freePermits) | ||||||
|  |                 assertEquals(false, locker.writeMutex.isLocked) | ||||||
|  |                 locker.withReadAcquire { | ||||||
|  |                     assertEquals(Int.MAX_VALUE - 2, locker.readSemaphore.freePermits) | ||||||
|  |                     assertEquals(false, locker.writeMutex.isLocked) | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |             assertEquals(Int.MAX_VALUE, locker.readSemaphore.freePermits) | ||||||
|  |             assertEquals(false, locker.writeMutex.isLocked) | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     @Test | ||||||
|  |     fun simple2WithWriteLockTest() { | ||||||
|  |         val locker = SmartRWLocker() | ||||||
|  |  | ||||||
|  |         val unlockDelay = 1000L // 1 sec | ||||||
|  |         var unlocked: Boolean = false | ||||||
|  |         runTest { | ||||||
|  |             launch { | ||||||
|  |                 locker.withReadAcquire { | ||||||
|  |                     delay(unlockDelay) | ||||||
|  |                 } | ||||||
|  |                 unlocked = true | ||||||
|  |             } | ||||||
|  |             locker.readSemaphore.permitsStateFlow.first { it == Int.MAX_VALUE - 1 } | ||||||
|  |             assertEquals(false, unlocked) | ||||||
|  |             locker.withWriteLock { | ||||||
|  |                 assertEquals(true, unlocked) | ||||||
|  |                 assertEquals(0, locker.readSemaphore.freePermits) | ||||||
|  |                 assertEquals(true, locker.writeMutex.isLocked) | ||||||
|  |             } | ||||||
|  |             assertEquals(Int.MAX_VALUE, locker.readSemaphore.freePermits) | ||||||
|  |             assertEquals(false, locker.writeMutex.isLocked) | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -0,0 +1,33 @@ | |||||||
|  | import dev.inmo.micro_utils.coroutines.SpecialMutableStateFlow | ||||||
|  | import dev.inmo.micro_utils.coroutines.asDeferred | ||||||
|  | import dev.inmo.micro_utils.coroutines.subscribe | ||||||
|  | import kotlinx.coroutines.Job | ||||||
|  | import kotlinx.coroutines.flow.first | ||||||
|  | import kotlinx.coroutines.test.runTest | ||||||
|  | import kotlin.test.Test | ||||||
|  | import kotlin.test.assertEquals | ||||||
|  | import kotlin.test.assertTrue | ||||||
|  |  | ||||||
|  | class SpecialMutableStateFlowTests { | ||||||
|  |     @Test | ||||||
|  |     fun simpleTest() = runTest { | ||||||
|  |         val specialMutableStateFlow = SpecialMutableStateFlow(0) | ||||||
|  |         specialMutableStateFlow.value = 1 | ||||||
|  |         specialMutableStateFlow.first { it == 1 } | ||||||
|  |         assertEquals(1, specialMutableStateFlow.value) | ||||||
|  |     } | ||||||
|  |     @Test | ||||||
|  |     fun specialTest() = runTest { | ||||||
|  |         val specialMutableStateFlow = SpecialMutableStateFlow(0) | ||||||
|  |         lateinit var subscriberJob: Job | ||||||
|  |         subscriberJob = specialMutableStateFlow.subscribe(this) { | ||||||
|  |             when (it) { | ||||||
|  |                 1 -> specialMutableStateFlow.value = 2 | ||||||
|  |                 2 -> subscriberJob.cancel() | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |         specialMutableStateFlow.value = 1 | ||||||
|  |         subscriberJob.join() | ||||||
|  |         assertEquals(2, specialMutableStateFlow.value) | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										64
									
								
								coroutines/src/commonTest/kotlin/WeakJobTests.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										64
									
								
								coroutines/src/commonTest/kotlin/WeakJobTests.kt
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,64 @@ | |||||||
|  | import dev.inmo.micro_utils.coroutines.asyncWeak | ||||||
|  | import dev.inmo.micro_utils.coroutines.launchWeak | ||||||
|  | import kotlinx.coroutines.* | ||||||
|  | import kotlinx.coroutines.test.runTest | ||||||
|  | import kotlin.test.Test | ||||||
|  | import kotlin.test.assertTrue | ||||||
|  |  | ||||||
|  | class WeakJobTests { | ||||||
|  |     @Test | ||||||
|  |     fun testWeakJob() = runTest { | ||||||
|  |         var commonJobDone = false | ||||||
|  |         var weakJobStarted = false | ||||||
|  |         try { | ||||||
|  |             coroutineScope { | ||||||
|  |                 launch { | ||||||
|  |                     delay(1000) | ||||||
|  |                     commonJobDone = true | ||||||
|  |                 } | ||||||
|  |                 asyncWeak { | ||||||
|  |                     weakJobStarted = true | ||||||
|  |                     delay(100500L) | ||||||
|  |                     error("This must never happen") | ||||||
|  |                 } | ||||||
|  |             }.await() | ||||||
|  |         } catch (error: Throwable) { | ||||||
|  |             assertTrue(error is CancellationException) | ||||||
|  |             assertTrue(commonJobDone) | ||||||
|  |             assertTrue(weakJobStarted) | ||||||
|  |             return@runTest | ||||||
|  |         } | ||||||
|  |         error("Cancellation exception has not been thrown") | ||||||
|  |     } | ||||||
|  |     @Test | ||||||
|  |     fun testThatWeakJobsWorksCorrectly() = runTest { | ||||||
|  |         val scope = CoroutineScope(Dispatchers.Default) | ||||||
|  |         lateinit var weakLaunchJob: Job | ||||||
|  |         lateinit var weakAsyncJob: Job | ||||||
|  |         val completeDeferred = Job() | ||||||
|  |         coroutineScope { | ||||||
|  |             weakLaunchJob = launchWeak { | ||||||
|  |                 while (isActive) { | ||||||
|  |                     delay(100L) | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |             weakAsyncJob = asyncWeak { | ||||||
|  |                 while (isActive) { | ||||||
|  |                     delay(100L) | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |  | ||||||
|  |             coroutineContext.job.invokeOnCompletion { | ||||||
|  |                 scope.launch { | ||||||
|  |                     delay(1000L) | ||||||
|  |                     completeDeferred.complete() | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |             launch { delay(1000L); cancel() } | ||||||
|  |         } | ||||||
|  |         completeDeferred.join() | ||||||
|  |  | ||||||
|  |         assertTrue(!weakLaunchJob.isActive) | ||||||
|  |         assertTrue(!weakAsyncJob.isActive) | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -0,0 +1,26 @@ | |||||||
|  | package dev.inmo.micro_utils.coroutines | ||||||
|  |  | ||||||
|  | import kotlinx.coroutines.CancellationException | ||||||
|  | import kotlinx.coroutines.Job | ||||||
|  | import org.w3c.dom.Image | ||||||
|  |  | ||||||
|  | suspend fun preloadImage(src: String): Image { | ||||||
|  |     val image = Image() | ||||||
|  |     image.src = src | ||||||
|  |  | ||||||
|  |     val job = Job() | ||||||
|  |  | ||||||
|  |     image.addEventListener("load", { | ||||||
|  |         runCatching { job.complete() } | ||||||
|  |     }) | ||||||
|  |  | ||||||
|  |     runCatchingSafely { | ||||||
|  |         job.join() | ||||||
|  |     }.onFailure { | ||||||
|  |         if (it is CancellationException) { | ||||||
|  |             image.src = "" | ||||||
|  |         } | ||||||
|  |     }.getOrThrow() | ||||||
|  |  | ||||||
|  |     return image | ||||||
|  | } | ||||||
| @@ -1,40 +0,0 @@ | |||||||
| package dev.inmo.micro_utils.coroutines |  | ||||||
|  |  | ||||||
| import kotlinx.coroutines.* |  | ||||||
| import org.junit.Test |  | ||||||
|  |  | ||||||
| class WeakJob { |  | ||||||
|     @Test |  | ||||||
|     fun `test that weak jobs works correctly`() { |  | ||||||
|         val scope = CoroutineScope(Dispatchers.Default) |  | ||||||
|         lateinit var weakLaunchJob: Job |  | ||||||
|         lateinit var weakAsyncJob: Job |  | ||||||
|         scope.launchSynchronously { |  | ||||||
|             val completeDeferred = Job() |  | ||||||
|             coroutineScope { |  | ||||||
|                 weakLaunchJob = weakLaunch { |  | ||||||
|                     while (isActive) { |  | ||||||
|                         delay(100L) |  | ||||||
|                     } |  | ||||||
|                 } |  | ||||||
|                 weakAsyncJob = weakAsync { |  | ||||||
|                     while (isActive) { |  | ||||||
|                         delay(100L) |  | ||||||
|                     } |  | ||||||
|                 } |  | ||||||
|  |  | ||||||
|                 coroutineContext.job.invokeOnCompletion { |  | ||||||
|                     scope.launch { |  | ||||||
|                         delay(1000L) |  | ||||||
|                         completeDeferred.complete() |  | ||||||
|                     } |  | ||||||
|                 } |  | ||||||
|                 launch { delay(1000L); cancel() } |  | ||||||
|             } |  | ||||||
|             completeDeferred.join() |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         assert(!weakLaunchJob.isActive) |  | ||||||
|         assert(!weakAsyncJob.isActive) |  | ||||||
|     } |  | ||||||
| } |  | ||||||
| @@ -1 +0,0 @@ | |||||||
| <manifest package="dev.inmo.micro_utils.coroutines"/> |  | ||||||
| @@ -4,13 +4,14 @@ plugins { | |||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppProjectWithSerializationPresetPath" | apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath" | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     sourceSets { |     sourceSets { | ||||||
|         commonMain { |         commonMain { | ||||||
|             dependencies { |             dependencies { | ||||||
|                 api project(":micro_utils.common") |                 api project(":micro_utils.common") | ||||||
|  |                 api libs.krypto | ||||||
|             } |             } | ||||||
|         } |         } | ||||||
|         jsMain { |         jsMain { | ||||||
|   | |||||||
							
								
								
									
										1
									
								
								crypto/src/androidMain/AndroidManifest.xml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								crypto/src/androidMain/AndroidManifest.xml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1 @@ | |||||||
|  | <manifest/> | ||||||
| @@ -1,6 +1,8 @@ | |||||||
| package dev.inmo.micro_utils.crypto | package dev.inmo.micro_utils.crypto | ||||||
|  |  | ||||||
|  | import korlibs.crypto.md5 | ||||||
|  |  | ||||||
| typealias MD5 = String | typealias MD5 = String | ||||||
|  |  | ||||||
| expect fun SourceBytes.md5(): MD5 | fun SourceBytes.md5(): MD5 = md5().hexLower | ||||||
| fun SourceString.md5(): MD5 = encodeToByteArray().md5() | fun SourceString.md5(): MD5 = encodeToByteArray().md5().hexLower | ||||||
|   | |||||||
| @@ -1,6 +0,0 @@ | |||||||
| package dev.inmo.micro_utils.crypto |  | ||||||
|  |  | ||||||
| /** |  | ||||||
|  * @suppress |  | ||||||
|  */ |  | ||||||
| actual fun SourceBytes.md5(): MD5 = CryptoJS.MD5(decodeToString()) |  | ||||||
| @@ -1,12 +0,0 @@ | |||||||
| package dev.inmo.micro_utils.crypto |  | ||||||
|  |  | ||||||
| import java.math.BigInteger |  | ||||||
| import java.security.MessageDigest |  | ||||||
|  |  | ||||||
| /** |  | ||||||
|  * @suppress |  | ||||||
|  */ |  | ||||||
| actual fun SourceBytes.md5(): MD5 = BigInteger( |  | ||||||
|     1, |  | ||||||
|     MessageDigest.getInstance("MD5").digest(this) |  | ||||||
| ).toString(16) |  | ||||||
| @@ -1 +0,0 @@ | |||||||
| <manifest package="dev.inmo.micro_utils.crypto"/> |  | ||||||
| @@ -1,30 +1,5 @@ | |||||||
| apply plugin: 'com.getkeepsafe.dexcount' | apply plugin: 'com.getkeepsafe.dexcount' | ||||||
|  |  | ||||||
| ext { |  | ||||||
|     jvmKotlinFolderFile = { |  | ||||||
|         String sep = File.separator |  | ||||||
|         return new File("${project.projectDir}${sep}src${sep}jvmMain${sep}kotlin") |  | ||||||
|     } |  | ||||||
|  |  | ||||||
|     enableIncludingJvmCodeInAndroidPart = { |  | ||||||
|         File jvmKotlinFolder = jvmKotlinFolderFile() |  | ||||||
|         if (jvmKotlinFolder.exists()) { |  | ||||||
|             android.sourceSets.main.java.srcDirs += jvmKotlinFolder.path |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
|  |  | ||||||
|     disableIncludingJvmCodeInAndroidPart = { |  | ||||||
|         File jvmKotlinFolder = jvmKotlinFolderFile() |  | ||||||
|         String[] oldDirs = android.sourceSets.main.java.srcDirs |  | ||||||
|         android.sourceSets.main.java.srcDirs = [] |  | ||||||
|         for (oldDir in oldDirs) { |  | ||||||
|             if (oldDir != jvmKotlinFolder.path) { |  | ||||||
|                 android.sourceSets.main.java.srcDirs += oldDir |  | ||||||
|             } |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
| } |  | ||||||
|  |  | ||||||
| android { | android { | ||||||
|     compileSdkVersion libs.versions.android.props.compileSdk.get().toInteger() |     compileSdkVersion libs.versions.android.props.compileSdk.get().toInteger() | ||||||
|     buildToolsVersion libs.versions.android.props.buildTools.get() |     buildToolsVersion libs.versions.android.props.buildTools.get() | ||||||
| @@ -34,6 +9,7 @@ android { | |||||||
|         targetSdkVersion libs.versions.android.props.compileSdk.get().toInteger() |         targetSdkVersion libs.versions.android.props.compileSdk.get().toInteger() | ||||||
|         versionCode "${android_code_version}".toInteger() |         versionCode "${android_code_version}".toInteger() | ||||||
|         versionName "$version" |         versionName "$version" | ||||||
|  |         namespace "${project.group}.${project.name}" | ||||||
|     } |     } | ||||||
|     buildTypes { |     buildTypes { | ||||||
|         release { |         release { | ||||||
| @@ -51,17 +27,7 @@ android { | |||||||
|     } |     } | ||||||
|  |  | ||||||
|     compileOptions { |     compileOptions { | ||||||
|         sourceCompatibility JavaVersion.VERSION_1_8 |         sourceCompatibility JavaVersion.VERSION_17 | ||||||
|         targetCompatibility JavaVersion.VERSION_1_8 |         targetCompatibility JavaVersion.VERSION_17 | ||||||
|     } |  | ||||||
|  |  | ||||||
|     kotlinOptions { |  | ||||||
|         jvmTarget = JavaVersion.VERSION_1_8.toString() |  | ||||||
|     } |  | ||||||
|  |  | ||||||
|     sourceSets { |  | ||||||
|         String sep = File.separator |  | ||||||
|         main.java.srcDirs += "src${sep}main${sep}kotlin" |  | ||||||
|         enableIncludingJvmCodeInAndroidPart() |  | ||||||
|     } |     } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -13,10 +13,10 @@ repositories { | |||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     jvm() |     jvm() | ||||||
| //    js(IR) { |     js(IR) { | ||||||
| //        browser() |         browser() | ||||||
| //        nodejs() |         nodejs() | ||||||
| //    } |     } | ||||||
|     android {} |     android {} | ||||||
|  |  | ||||||
|     sourceSets { |     sourceSets { | ||||||
| @@ -26,44 +26,44 @@ kotlin { | |||||||
|  |  | ||||||
|                 project.parent.subprojects.forEach { |                 project.parent.subprojects.forEach { | ||||||
|                     if ( |                     if ( | ||||||
|                         it != project |                             it != project | ||||||
|                         && it.hasProperty("kotlin") |                                     && it.hasProperty("kotlin") | ||||||
|                         && it.kotlin.sourceSets.any { it.name.contains("commonMain") } |                                     && it.kotlin.sourceSets.any { it.name.contains("commonMain") } | ||||||
| //                        && it.kotlin.sourceSets.any { it.name.contains("jsMain") } |                                     && it.kotlin.sourceSets.any { it.name.contains("jsMain") } | ||||||
|                         && it.kotlin.sourceSets.any { it.name.contains("jvmMain") } |                                     && it.kotlin.sourceSets.any { it.name.contains("jvmMain") } | ||||||
|                         && it.kotlin.sourceSets.any { it.name.contains("androidMain") } |                                     && it.kotlin.sourceSets.any { it.name.contains("androidMain") } | ||||||
|                     ) { |                     ) { | ||||||
|                         api it |                         api it | ||||||
|                     } |                     } | ||||||
|                 } |                 } | ||||||
|             } |             } | ||||||
|         } |         } | ||||||
| //        jsMain { |         jsMain { | ||||||
| //            dependencies { |             dependencies { | ||||||
| //                implementation kotlin('stdlib') |                 implementation kotlin('stdlib') | ||||||
|  |  | ||||||
| //                project.parent.subprojects.forEach { |                 project.parent.subprojects.forEach { | ||||||
| //                    if ( |                     if ( | ||||||
| //                        it != project |                             it != project | ||||||
| //                        && it.hasProperty("kotlin") |                                     && it.hasProperty("kotlin") | ||||||
| //                        && it.kotlin.sourceSets.any { it.name.contains("commonMain") } |                                     && it.kotlin.sourceSets.any { it.name.contains("commonMain") } | ||||||
| //                        && it.kotlin.sourceSets.any { it.name.contains("jsMain") } |                                     && it.kotlin.sourceSets.any { it.name.contains("jsMain") } | ||||||
| //                    ) { |                     ) { | ||||||
| //                        api it |                         api it | ||||||
| //                    } |                     } | ||||||
| //                } |                 } | ||||||
| //            } |             } | ||||||
| //        } |         } | ||||||
|         jvmMain { |         jvmMain { | ||||||
|             dependencies { |             dependencies { | ||||||
|                 implementation kotlin('stdlib') |                 implementation kotlin('stdlib') | ||||||
|  |  | ||||||
|                 project.parent.subprojects.forEach { |                 project.parent.subprojects.forEach { | ||||||
|                     if ( |                     if ( | ||||||
|                         it != project |                             it != project | ||||||
|                         && it.hasProperty("kotlin") |                                     && it.hasProperty("kotlin") | ||||||
|                         && it.kotlin.sourceSets.any { it.name.contains("commonMain") } |                                     && it.kotlin.sourceSets.any { it.name.contains("commonMain") } | ||||||
|                         && it.kotlin.sourceSets.any { it.name.contains("jvmMain") } |                                     && it.kotlin.sourceSets.any { it.name.contains("jvmMain") } | ||||||
|                     ) { |                     ) { | ||||||
|                         api it |                         api it | ||||||
|                     } |                     } | ||||||
| @@ -76,10 +76,10 @@ kotlin { | |||||||
|  |  | ||||||
|                 project.parent.subprojects.forEach { |                 project.parent.subprojects.forEach { | ||||||
|                     if ( |                     if ( | ||||||
|                         it != project |                             it != project | ||||||
|                         && it.hasProperty("kotlin") |                                     && it.hasProperty("kotlin") | ||||||
|                         && it.kotlin.sourceSets.any { it.name.contains("commonMain") } |                                     && it.kotlin.sourceSets.any { it.name.contains("commonMain") } | ||||||
|                         && it.kotlin.sourceSets.any { it.name.contains("androidMain") } |                                     && it.kotlin.sourceSets.any { it.name.contains("androidMain") } | ||||||
|                     ) { |                     ) { | ||||||
|                         api it |                         api it | ||||||
|                     } |                     } | ||||||
| @@ -106,7 +106,7 @@ tasks.dokkaHtml { | |||||||
|             skipDeprecated.set(true) |             skipDeprecated.set(true) | ||||||
|  |  | ||||||
|             sourceLink { |             sourceLink { | ||||||
|                 localDirectory.set(file("./")) |                 localDirectory.set(file("../")) | ||||||
|                 remoteUrl.set(new URL("https://github.com/InsanusMokrassar/MicroUtils/blob/master/")) |                 remoteUrl.set(new URL("https://github.com/InsanusMokrassar/MicroUtils/blob/master/")) | ||||||
|                 remoteLineSuffix.set("#L") |                 remoteLineSuffix.set("#L") | ||||||
|             } |             } | ||||||
| @@ -116,9 +116,9 @@ tasks.dokkaHtml { | |||||||
|             sourceRoots.setFrom(findSourcesWithName("commonMain")) |             sourceRoots.setFrom(findSourcesWithName("commonMain")) | ||||||
|         } |         } | ||||||
|  |  | ||||||
| //        named("jsMain") { |         named("jsMain") { | ||||||
| //            sourceRoots.setFrom(findSourcesWithName("jsMain", "commonMain")) |             sourceRoots.setFrom(findSourcesWithName("jsMain")) | ||||||
| //        } |         } | ||||||
|  |  | ||||||
|         named("jvmMain") { |         named("jvmMain") { | ||||||
|             sourceRoots.setFrom(findSourcesWithName("jvmMain")) |             sourceRoots.setFrom(findSourcesWithName("jvmMain")) | ||||||
|   | |||||||
							
								
								
									
										1
									
								
								dokka/src/androidMain/AndroidManifest.xml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								dokka/src/androidMain/AndroidManifest.xml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1 @@ | |||||||
|  | <manifest/> | ||||||
| @@ -1 +0,0 @@ | |||||||
| <manifest package="dev.inmo.dokka"/> |  | ||||||
| @@ -19,16 +19,24 @@ allprojects { | |||||||
|         } |         } | ||||||
|  |  | ||||||
|         releaseMode = (project.hasProperty('RELEASE_MODE') && project.property('RELEASE_MODE') == "true") || System.getenv('RELEASE_MODE') == "true" |         releaseMode = (project.hasProperty('RELEASE_MODE') && project.property('RELEASE_MODE') == "true") || System.getenv('RELEASE_MODE') == "true" | ||||||
|  | //        String compilerPluginVersionFromProperties = (String) project.properties["compose.kotlinCompilerPluginVersion"] | ||||||
|  | //        String compilerPluginVersionFromLibrariesVersions = libs.versions.compose.kotlin.get() | ||||||
|  | //        composePluginKotlinVersion = compilerPluginVersionFromProperties | ||||||
|  | //        if (compilerPluginVersionFromProperties == null) { | ||||||
|  | //            composePluginKotlinVersion = compilerPluginVersionFromLibrariesVersions | ||||||
|  | //        } | ||||||
|  |  | ||||||
|         mppProjectWithSerializationPresetPath = "${rootProject.projectDir.absolutePath}/mppProjectWithSerialization.gradle" |         mppProjectWithSerializationPresetPath = "${rootProject.projectDir.absolutePath}/mppJvmJsAndroidProject.gradle" | ||||||
|         mppProjectWithSerializationAndComposePresetPath = "${rootProject.projectDir.absolutePath}/mppProjectWithSerializationAndCompose.gradle" |         mppProjectWithSerializationAndComposePresetPath = "${rootProject.projectDir.absolutePath}/mppProjectWithSerializationAndCompose.gradle" | ||||||
|         mppJavaProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJavaProject.gradle" |         mppJavaProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJavaProject.gradle" | ||||||
|         mppJsAndJavaProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJsAndJavaProject.gradle" |         mppJvmJsLinuxMingwProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJvmJsLinuxMingwProject.gradle" | ||||||
|  |         mppJvmJsLinuxMingwLinuxArm64ProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJvmJsLinuxMingwLinuxArm64Project.gradle" | ||||||
|  |         mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJvmJsAndroidLinuxMingwLinuxArm64Project.gradle" | ||||||
|         mppAndroidProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppAndroidProject.gradle" |         mppAndroidProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppAndroidProject.gradle" | ||||||
|  |  | ||||||
|         defaultAndroidSettingsPresetPath = "${rootProject.projectDir.absolutePath}/defaultAndroidSettings.gradle" |         defaultAndroidSettingsPresetPath = "${rootProject.projectDir.absolutePath}/defaultAndroidSettings.gradle" | ||||||
|  |  | ||||||
|         publishGradlePath = "${rootProject.projectDir.absolutePath}/publish.gradle" |         publishGradlePath = "${rootProject.projectDir.absolutePath}/publish.gradle" | ||||||
|         publishMavenPath = "${rootProject.projectDir.absolutePath}/maven.publish.gradle" |         publishJvmOnlyPath = "${rootProject.projectDir.absolutePath}/jvm.publish.gradle" | ||||||
|     } |     } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ plugins { | |||||||
|     id "com.android.library" |     id "com.android.library" | ||||||
| } | } | ||||||
|  |  | ||||||
| apply from: "$mppProjectWithSerializationPresetPath" | apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath" | ||||||
|  |  | ||||||
| kotlin { | kotlin { | ||||||
|     sourceSets { |     sourceSets { | ||||||
|   | |||||||
							
								
								
									
										1
									
								
								fsm/common/src/androidMain/AndroidManifest.xml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								fsm/common/src/androidMain/AndroidManifest.xml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1 @@ | |||||||
|  | <manifest/> | ||||||
| @@ -1,7 +1,6 @@ | |||||||
| package dev.inmo.micro_utils.fsm.common | package dev.inmo.micro_utils.fsm.common | ||||||
|  |  | ||||||
| import dev.inmo.micro_utils.common.Optional | import dev.inmo.micro_utils.common.Optional | ||||||
| import dev.inmo.micro_utils.common.onPresented |  | ||||||
| import dev.inmo.micro_utils.coroutines.* | import dev.inmo.micro_utils.coroutines.* | ||||||
| import dev.inmo.micro_utils.fsm.common.utils.StateHandlingErrorHandler | import dev.inmo.micro_utils.fsm.common.utils.StateHandlingErrorHandler | ||||||
| import dev.inmo.micro_utils.fsm.common.utils.defaultStateHandlingErrorHandler | import dev.inmo.micro_utils.fsm.common.utils.defaultStateHandlingErrorHandler | ||||||
| @@ -118,23 +117,28 @@ open class DefaultStatesMachine <T: State>( | |||||||
|      * [launchStateHandling] will returns some [State] then [statesManager] [StatesManager.update] will be used, otherwise |      * [launchStateHandling] will returns some [State] then [statesManager] [StatesManager.update] will be used, otherwise | ||||||
|      * [StatesManager.endChain]. |      * [StatesManager.endChain]. | ||||||
|      */ |      */ | ||||||
|     override fun start(scope: CoroutineScope): Job = scope.launchSafelyWithoutExceptions { |     override fun start(scope: CoroutineScope): Job { | ||||||
|         (statesManager.getActiveStates().asFlow() + statesManager.onStartChain).subscribeSafelyWithoutExceptions(this) { |         val supervisorScope = scope.LinkedSupervisorScope() | ||||||
|             launch { performStateUpdate(Optional.absent(), it, scope.LinkedSupervisorScope()) } |         supervisorScope.launchSafelyWithoutExceptions { | ||||||
|         } |             (statesManager.getActiveStates().asFlow() + statesManager.onStartChain).subscribeSafelyWithoutExceptions(supervisorScope) { | ||||||
|         statesManager.onChainStateUpdated.subscribeSafelyWithoutExceptions(this) { |                 supervisorScope.launch { performStateUpdate(Optional.absent(), it, supervisorScope) } | ||||||
|             launch { performStateUpdate(Optional.presented(it.first), it.second, scope.LinkedSupervisorScope()) } |             } | ||||||
|         } |             statesManager.onChainStateUpdated.subscribeSafelyWithoutExceptions(supervisorScope) { | ||||||
|         statesManager.onEndChain.subscribeSafelyWithoutExceptions(this) { removedState -> |                 supervisorScope.launch { performStateUpdate(Optional.presented(it.first), it.second, supervisorScope) } | ||||||
|             launch { |             } | ||||||
|                 statesJobsMutex.withLock { |             statesManager.onEndChain.subscribeSafelyWithoutExceptions(supervisorScope) { removedState -> | ||||||
|                     val stateInMap = statesJobs.keys.firstOrNull { stateInMap -> stateInMap == removedState } |                 supervisorScope.launch { | ||||||
|                     if (stateInMap === removedState) { |                     statesJobsMutex.withLock { | ||||||
|                         statesJobs[stateInMap] ?.cancel() |                         val stateInMap = statesJobs.keys.firstOrNull { stateInMap -> stateInMap == removedState } | ||||||
|  |                         if (stateInMap === removedState) { | ||||||
|  |                             statesJobs[stateInMap] ?.cancel() | ||||||
|  |                         } | ||||||
|                     } |                     } | ||||||
|                 } |                 } | ||||||
|             } |             } | ||||||
|         } |         } | ||||||
|  |  | ||||||
|  |         return supervisorScope.coroutineContext.job | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|   | |||||||
| @@ -48,8 +48,8 @@ interface DefaultStatesManagerRepo<T : State> { | |||||||
|  */ |  */ | ||||||
| open class DefaultStatesManager<T : State>( | open class DefaultStatesManager<T : State>( | ||||||
|     protected val repo: DefaultStatesManagerRepo<T> = InMemoryDefaultStatesManagerRepo(), |     protected val repo: DefaultStatesManagerRepo<T> = InMemoryDefaultStatesManagerRepo(), | ||||||
|     protected val onStartContextsConflictResolver: suspend (current: T, new: T) -> Boolean = { _, _ -> true }, |     protected val onStartContextsConflictResolver: suspend (current: T, new: T) -> Boolean = { _, _ -> false }, | ||||||
|     protected val onUpdateContextsConflictResolver: suspend (old: T, new: T, currentNew: T) -> Boolean = { _, _, _ -> true } |     protected val onUpdateContextsConflictResolver: suspend (old: T, new: T, currentNew: T) -> Boolean = { _, _, _ -> false } | ||||||
| ) : StatesManager<T> { | ) : StatesManager<T> { | ||||||
|     protected val _onChainStateUpdated = MutableSharedFlow<Pair<T, T>>(0) |     protected val _onChainStateUpdated = MutableSharedFlow<Pair<T, T>>(0) | ||||||
|     override val onChainStateUpdated: Flow<Pair<T, T>> = _onChainStateUpdated.asSharedFlow() |     override val onChainStateUpdated: Flow<Pair<T, T>> = _onChainStateUpdated.asSharedFlow() | ||||||
|   | |||||||
| @@ -1 +0,0 @@ | |||||||
| <manifest package="dev.inmo.micro_utils.fsm.common"/> |  | ||||||
Some files were not shown because too many files have changed in this diff Show More
		Reference in New Issue
	
	Block a user