Compare commits
3657 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| a42bdf32e1 | |||
| c29d69b44d | |||
| 547b1d07bd | |||
| 22a1dfd354 | |||
| be81e758c6 | |||
| b3117e6410 | |||
| 47ab109c2b | |||
| bc04efbaac | |||
| fbb9d21e73 | |||
| f5308e4287 | |||
| 15b5920e3b | |||
| d09aaab398 | |||
| f7008e2362 | |||
| e939778beb | |||
| 8643b50bd1 | |||
| 74e42525d4 | |||
| 833a387574 | |||
| e574c67ad6 | |||
| ce38d5e891 | |||
| 3a44da4a9d | |||
| eba9106db5 | |||
| 4501226562 | |||
| b974193564 | |||
| 0b3e447258 | |||
| 9908cc02a2 | |||
| 4e67011d7c | |||
| 5f93c0bab3 | |||
| caec5e7c45 | |||
| 240cb4b363 | |||
| 91e8eb66b1 | |||
| 27bd69ec62 | |||
| 553fd39e21 | |||
| 733ee1c6e6 | |||
| ef61c9597d | |||
| e874af791e | |||
| a4b2bb1aa0 | |||
| bc9b20ffc8 | |||
| 6f212328a1 | |||
| a68cde7ac9 | |||
| 5cab331058 | |||
| 6d25a10abd | |||
| d2516947f2 | |||
| 4150d060ee | |||
| 1688076457 | |||
| 5c1f669b2b | |||
| cc1e080ce1 | |||
| 0dfd31a308 | |||
| bd13535d3c | |||
| 27386bb4f0 | |||
| c6c07f03bf | |||
| b0ad08f7c5 | |||
| d1957331b8 | |||
| ffedc04777 | |||
| 684762db58 | |||
| 5a44da3fb0 | |||
| 88cf46d999 | |||
| 906b9413d1 | |||
| 060c4f1529 | |||
| 7902aea849 | |||
| ee22fd8ee8 | |||
| a6e275f8aa | |||
| a61468d600 | |||
| 78c26cb669 | |||
| 0d493c410e | |||
| 80dbbbc1ed | |||
| 81e8872a11 | |||
| 6e1aba6fa0 | |||
| 4220c62ac0 | |||
| 4b73567075 | |||
| fdff0d255a | |||
| e956cf14c4 | |||
| a1646e1b76 | |||
| 5099118dd7 | |||
| 6845ce4984 | |||
| e0d1ad4b52 | |||
| 04b8d0f4a8 | |||
| fe3bf61acb | |||
| 577b9b4635 | |||
| 4b7de188fd | |||
| 3bfb212dc9 | |||
| be7eb41cf3 | |||
| c7db4f528e | |||
| 8a14bc46f6 | |||
| 01ee1a1e49 | |||
| 9d6c9676ab | |||
| 19d8563a76 | |||
| 74e09e1fa9 | |||
| 6533e3e170 | |||
| bfeca771f8 | |||
| f128111650 | |||
| 38fadda762 | |||
| d6d40b01e6 | |||
| bc051f5d81 | |||
| 39bf2190a1 | |||
| b88f81726b | |||
| 24e6cdec62 | |||
| 951671b2f3 | |||
| 21e30545a0 | |||
| 946edb7e16 | |||
| 89c44af374 | |||
| faad451e22 | |||
| 25ef0ecad1 | |||
| efa6caca66 | |||
| 5be4c107f4 | |||
| 65f42dd3e5 | |||
| 287d246777 | |||
| d56f652d0a | |||
| 1f1ef4445f | |||
| 22a669a573 | |||
| f55cce5614 | |||
| a6c3cf1c28 | |||
| cbc803d038 | |||
| a8cefcd0fd | |||
| 2b95dbab22 | |||
| 7a923a947e | |||
| 19e35a7609 | |||
| b8088169ee | |||
| a5594fbb7a | |||
| a733d87c37 | |||
| 79d8ba9ef8 | |||
| 3ee7d4504c | |||
| 579509aad8 | |||
| 24ff73ab06 | |||
| 60d5e7e515 | |||
| c610758ae1 | |||
| 17d2755844 | |||
| 0ab14e0f3d | |||
| bcbaf4985a | |||
| b2e8713db0 | |||
| af60e1fdfb | |||
| 75043325ff | |||
| 337e5b9e4d | |||
| 1ff986f1e6 | |||
| 6412bb9fcd | |||
| 8425997c29 | |||
| f4b585b830 | |||
| 47c259fa9a | |||
| 80208e3188 | |||
| 2655d3e773 | |||
| ca8814c478 | |||
| 6a397922d2 | |||
| ee062f8a38 | |||
| c8bdf8e641 | |||
| 0b2bd6899f | |||
| 32d811b46e | |||
| 80a8017a18 | |||
| 2b90bfd054 | |||
| 8cb6d63abe | |||
| 9837680540 | |||
| e2b741dd08 | |||
| 18546fd3cc | |||
| a87d2e5b09 | |||
| 3ae30e2468 | |||
| f821c8ba86 | |||
| 5c96774e79 | |||
| c26a5edc03 | |||
| f8afa9dbad | |||
| db1167ead5 | |||
| 0008673ab0 | |||
| 59d4bfa4ac | |||
| 04f146c641 | |||
| ea97ff65df | |||
| 9827b3fc92 | |||
| a35ed2e9b1 | |||
| 26d2a861d7 | |||
| 389ed9b362 | |||
| c5e5e862ad | |||
| b676fd6614 | |||
| 0194efafbc | |||
| 9ba1357dbb | |||
| 64b66a0c57 | |||
| 7787dae9f6 | |||
| d0ca06f964 | |||
| f7d1a53622 | |||
| 5f13d027af | |||
| cf45a8079c | |||
| 9e553cc900 | |||
| 1f3466e4b2 | |||
| c813934bcb | |||
| 480202853d | |||
| 4c58bd81bb | |||
| 9f9b6966a8 | |||
| 52c97b63d5 | |||
| eee18ec7a4 | |||
| 4d444046de | |||
| 4d5e31b231 | |||
| 8544f7d20a | |||
| 1feb5cbb65 | |||
| 1d2fde6e69 | |||
| 20423121ee | |||
| ebf7b0a0c3 | |||
| 1189a07794 | |||
| 63e9041922 | |||
| 699be450b0 | |||
| 66b175c56c | |||
| 81a7aca4a0 | |||
| 065f42fbef | |||
| c92371b36a | |||
| 97c46183c3 | |||
| c02b8fab53 | |||
| 6540913d59 | |||
| b70c3be5af | |||
| 461f1c246b | |||
| 6d091dfa81 | |||
| 97ad6bc2f8 | |||
| 93ee8a53ed | |||
| bf9b6d6627 | |||
| 5f637952aa | |||
| 17de8cea6f | |||
| afea79476f | |||
| 7215a2def0 | |||
| b8d2d14d68 | |||
| a2b53c75f4 | |||
| 7a5f69d3a5 | |||
| 7fd9893560 | |||
| f209031df0 | |||
| 2dbab929ac | |||
| e9eb764d12 | |||
| 41a4a5527a | |||
| 4ded3c6bc8 | |||
| 51e573e475 | |||
| 98c3169929 | |||
| ff65a4d04f | |||
| 278f49dec8 | |||
| d444e1ca3c | |||
| 13e07696b9 | |||
| 23c3a4d651 | |||
| c9869bab0e | |||
| ecdb509371 | |||
| de376a84f8 | |||
| 9abd8bcaa6 | |||
| 8ddadb8e6d | |||
| 924ef3313e | |||
| 8cb68a6e64 | |||
| 23f47f10f8 | |||
| 251fa17487 | |||
| bae3373fe9 | |||
| 0a685a66e3 | |||
| 5ca9ca857a | |||
| d9dfa6d746 | |||
| 3a5220546e | |||
| 047d5c2340 | |||
| 725c21c0a1 | |||
| 7939e39fc1 | |||
| a133bd8f9e | |||
| 1f9790cba8 | |||
| a3ba1e1490 | |||
| accb30152f | |||
| dc7daa6e8c | |||
| 1d8e788d53 | |||
| 568b908b26 | |||
| 3ab63adb34 | |||
| 91692f345e | |||
| dbdb98a682 | |||
| df66cd5753 | |||
| 6e39dd37f8 | |||
| 7212f7be94 | |||
| 77fe494e6c | |||
| 2f491e8c10 | |||
| f4fe7b1ab3 | |||
| 7e444cbf31 | |||
| ed6ab9c53c | |||
| f91ca3154c | |||
| bbfab1b201 | |||
| 1f2e3bcf70 | |||
| d1f3791f97 | |||
| 490b95a001 | |||
| 12e6f03098 | |||
| d86f42e2e9 | |||
| 360d59d3de | |||
| b617420290 | |||
| 53b267150b | |||
| 0dfd55ed52 | |||
| daabd5381d | |||
| a842129e37 | |||
| e8b9c2bbc3 | |||
| e55924dae3 | |||
| e3a8143d58 | |||
| 30310bb874 | |||
| 9f377b172d | |||
| 23175902fb | |||
| 706bd8b01f | |||
| dc4ac07e11 | |||
| 5be4129ba9 | |||
| f75a48ccab | |||
| 2815aa4b62 | |||
| 0383b0e1c7 | |||
| 1601741495 | |||
| be1fae956b | |||
| c7557d80bb | |||
| ac28124664 | |||
| 1deaf7650e | |||
| 9074fa1b6c | |||
| 5721a615a2 | |||
| fadcf1cd41 | |||
| a50b1ac78e | |||
| 9a7d4fdb36 | |||
| 9fb51a689d | |||
| 65bda35001 | |||
| 443ded86a5 | |||
| 83b5ebb02c | |||
| 240d8f6b6c | |||
| 39c5422341 | |||
| 4893a2b743 | |||
| 3408ea97f4 | |||
| ddb17f61cb | |||
| bbe182cf82 | |||
| b7b7bdf19b | |||
| 5681938a9e | |||
| 74835dcef5 | |||
| ed0dc05366 | |||
| 653eb8320a | |||
| 54b9c4370b | |||
| fa9cb3903c | |||
| 0f1d8500d1 | |||
| 20d7fd2c03 | |||
| 1d838344dc | |||
| fd826199e2 | |||
| f485d90ef2 | |||
| ec39e67a09 | |||
| 1a86db0a8b | |||
| 6a1fada22f | |||
| 2898e06246 | |||
| 0d87c65b49 | |||
| 9b97cdfcd1 | |||
| 95feae846a | |||
| b09eeaede3 | |||
| 35dec1634c | |||
| e49a425106 | |||
| adbad04867 | |||
| 850bd2f887 | |||
| d240b457e2 | |||
| 6d800caab1 | |||
| 7bf153db39 | |||
| 1b69f29751 | |||
| dfc3837739 | |||
| 30e847866e | |||
| fbc902e830 | |||
| 208f1d71ba | |||
| 38a15a96b3 | |||
| 46f8753746 | |||
| 70bc8f33b1 | |||
| 6cd27ab096 | |||
| 5581b404f7 | |||
| 2ef74eb908 | |||
| 16c654141f | |||
| dfc785f2fd | |||
| f621cdf032 | |||
| 8b04d9c4a6 | |||
| 364b4702e3 | |||
| a98c16de28 | |||
| 881bf1982a | |||
| f340622977 | |||
| 194379295d | |||
| 901cffee97 | |||
| d93c2ec5f3 | |||
| 306522863a | |||
| e54d85e04d | |||
| cb30ad27c3 | |||
| 8685c9cc88 | |||
| a6f03d0f23 | |||
| e3c812b155 | |||
| f149de9ce3 | |||
| 3447dd2569 | |||
| b2b8c7fd54 | |||
| 486bcd0aec | |||
| c8a33201f5 | |||
| 4a37c2cc7e | |||
| d23db5bafd | |||
| ac528f9a10 | |||
| 256eadd49d | |||
| 64e58934a5 | |||
| 92dfadfdba | |||
| cbce70143b | |||
| f4b9e3159e | |||
| 928781391d | |||
| 05cd672464 | |||
| d3109bbc37 | |||
| eabdb7c721 | |||
| ad990e8cd7 | |||
| db3eef0104 | |||
| c4f1ba7962 | |||
| 7451fbd413 | |||
| b6c55de55a | |||
| dd3ee6d99e | |||
| bbb6a7c22c | |||
| dc1b50a7bf | |||
| 21bfb88e0b | |||
| aaab8adce9 | |||
| df502f835c | |||
| dd6a4cd153 | |||
| 76656997ef | |||
| 32070a0bd6 | |||
| b9420d4dde | |||
| 1b810e1294 | |||
| f16d59bff6 | |||
| b5bf3aadc5 | |||
| f6a27a1522 | |||
| 83758fcd72 | |||
| 070917bc0b | |||
| 543a04dfdd | |||
| b4d5eb0eec | |||
| 9f84cc4952 | |||
| 09fe35f1ca | |||
| 27e50b2dd9 | |||
| 971460848b | |||
| 8bc2937bb4 | |||
| 0e9b68c2a1 | |||
| ba298c2afb | |||
| 79f5ed4dc3 | |||
| bbb2f874ee | |||
| 9af3759b07 | |||
| 1f6fe6bf0c | |||
| 7b291e85d7 | |||
| 0f72066bc0 | |||
| 70e0e7b216 | |||
| 7e50bb1b6d | |||
| a3eb107068 | |||
| 6133ef121a | |||
| c6d24e9534 | |||
| 441d3f721f | |||
| 3c212e4bcc | |||
| 50eb71bc1f | |||
| 0806821b5f | |||
| 36d0f17953 | |||
| 700adb7972 | |||
| a156369f8b | |||
| c0f6dc511b | |||
| 63e1461eba | |||
| 804e5f10c8 | |||
| 6cc7271a41 | |||
| f66194189b | |||
| 5d97d6d492 | |||
| f3a308e669 | |||
| a230504925 | |||
| 90e19e282c | |||
| b585bfe44c | |||
| 475e04eeb4 | |||
| f89b2b0efb | |||
| b94f3c176b | |||
| d1d729d287 | |||
| e23bbcc405 | |||
| 4129985b0f | |||
| 5cb7b623d9 | |||
| 3c52efadd6 | |||
| 73b4977051 | |||
| 422c2c02ce | |||
| d692329975 | |||
| 931574bc11 | |||
| caddbd8501 | |||
| 8ece2c8612 | |||
| 3a219321d1 | |||
| 35cb924a17 | |||
| b67e5bbd20 | |||
| 1db275230e | |||
| 5ac72092fb | |||
| bdd9ded1e8 | |||
| 759aeb6ed6 | |||
| 12023d51ae | |||
| c426785b90 | |||
| 09d960c7a1 | |||
| f37fe4a503 | |||
| 013e56bef0 | |||
| d6835ba766 | |||
| d7890cbc81 | |||
| 2b6886c534 | |||
| e77590a125 | |||
| ca330b2d80 | |||
| 20f1524701 | |||
| 96b2a15643 | |||
| ad59392e02 | |||
| 29f92b887c | |||
| 46328211c2 | |||
| 3760130d1f | |||
| 1094827fac | |||
| 36fcb44af5 | |||
| a683fbac4b | |||
| 64ad9019d1 | |||
| 1e80d5c8a8 | |||
| ac765b1ee8 | |||
| 850c4f0a9a | |||
| 4c32999752 | |||
| 76823b167a | |||
| 9994cfd260 | |||
| 1750236474 | |||
| fed6e31f9e | |||
| 9bafc7d4a1 | |||
| be58b48d20 | |||
| 303abac980 | |||
| d1a459efc2 | |||
| 96069e6f09 | |||
| 301a721329 | |||
| e8c6801a32 | |||
| 355f3ef614 | |||
| eaa6083586 | |||
| a0c5d02c51 | |||
| 76f9f5fc82 | |||
| 8e2598e93b | |||
| c0672c41df | |||
| 4c6601fbc5 | |||
| b99c87d1bd | |||
| 66ffbfe951 | |||
| 8cb01a1027 | |||
| 193e5eccbb | |||
| bf7fc28bb0 | |||
| e35cbc343a | |||
| 1c7b053c8c | |||
| 88cdcd4b47 | |||
| 1432fed8f9 | |||
| a14307b9a4 | |||
| 3bdce5aa08 | |||
| d7526f93b8 | |||
| 8932578b90 | |||
| 631ac9881d | |||
| 78334ed797 | |||
| b06da89654 | |||
| d6c2e78993 | |||
| 67d1ac551d | |||
| dcb6be717d | |||
| f2c04eec1a | |||
| a08311cf43 | |||
| 1e28f3aa86 | |||
| 426af41f2c | |||
| fd08a219f9 | |||
| 25b6aec0e9 | |||
| 3e40209d15 | |||
| 54ff94f905 | |||
| 7a4faf6b0d | |||
| 8922b00a5f | |||
| 702efa8693 | |||
| e7a8c897a3 | |||
| c59d1d87bd | |||
| a706efb8b3 | |||
| e391e83a00 | |||
| 2940bf20d8 | |||
| 081db5a58b | |||
| b34805272f | |||
| 98443dba99 | |||
| dd6e733d8c | |||
| 92d3439c3b | |||
| bd155cd600 | |||
| e14e53c0ae | |||
| 77a6a63174 | |||
| 40f2463f09 | |||
| e5d1048c8d | |||
| bf3b529fb2 | |||
| d0fde46027 | |||
| 0f348dff10 | |||
| d3f5080e73 | |||
| a453c8ec1e | |||
| 2a60aa8f59 | |||
| 41e7870509 | |||
| 57f66b77ab | |||
| 53572406e9 | |||
| a288255ab1 | |||
| 353c958ae0 | |||
| bc5ab0d7e5 | |||
| 9d915b5640 | |||
| 3aaee270eb | |||
| d53a7156e2 | |||
| 3af24ea3d0 | |||
| 5483212b06 | |||
| 419279fe5e | |||
| 501e899b27 | |||
| 3bb9edb009 | |||
| e52b1188a3 | |||
| 9e877e4762 | |||
| 5711757110 | |||
| e1c33dad43 | |||
| 4b2400774c | |||
| afd4a59622 | |||
| bdce437470 | |||
| 33479cda11 | |||
| 385cee3dc7 | |||
| d0bbd7655b | |||
| a83b8f62fe | |||
| 0cd9176703 | |||
| d8e526923d | |||
| 3a6f417662 | |||
| 7d807a7f11 | |||
| e9d5718495 | |||
| 0dd7f74a11 | |||
| 9bd4ba489c | |||
| dd55b50dad | |||
| 1719d21a5b | |||
| 75ef8d99d4 | |||
| ae06fd1680 | |||
| 2b03f7dea8 | |||
| 7591b012b4 | |||
| 0e089f49f3 | |||
| 5ad1856b13 | |||
| 965dbbe829 | |||
| 262c9886df | |||
| ac5a9ea65d | |||
| ed9b4c8f3d | |||
| 209aa6a8a5 | |||
| 81ee6ac1fa | |||
| 024dd603cb | |||
| 50654c6baf | |||
| 8c9bf60fc6 | |||
| a83eb0b983 | |||
| ab3cbfea0f | |||
| c93e5ca1a6 | |||
| c2841092da | |||
| 8b11e1d611 | |||
| 6375a851b2 | |||
| f21200a7ec | |||
| 5752cebdec | |||
| fa6329c157 | |||
| 98a9884798 | |||
| 1f7f615411 | |||
| a79345ccf9 | |||
| 732e0e76f9 | |||
| 63d29f2097 | |||
| 9dd2f7d1c1 | |||
| afd25363b3 | |||
| 2eb5a42099 | |||
| 9c753034b4 | |||
| 95b7c701a2 | |||
| 56685a9dec | |||
| 45b13ea813 | |||
| b0feed84bb | |||
| 0e2da83e1f | |||
| fa364a150d | |||
| 6ec78d77a9 | |||
| 8853bb5408 | |||
| e4d6355875 | |||
| 1e08d72cc9 | |||
| ea82d2df94 | |||
| 71c0114f8f | |||
| a3955c7c37 | |||
| e610b70590 | |||
| 7f4d47d7b5 | |||
| fd27ec11a2 | |||
| 2aa036f3aa | |||
| 2c49a4f3f1 | |||
| 10e4a52947 | |||
| 9f3936e180 | |||
| a3a76ce0c3 | |||
| 545db52f94 | |||
| bfa02a97ee | |||
| 3a2eeaa204 | |||
| 42b3a5dfc9 | |||
| b5cb47a0c7 | |||
| 443e069a13 | |||
| 9c432c3110 | |||
| 79934d51ac | |||
| 496cf9145b | |||
| 264bb3746f | |||
| 7b1ccf4507 | |||
| a326265dba | |||
| 0864bc8104 | |||
| f5656470a9 | |||
| 5bc773f1aa | |||
| 6bfd8c8db8 | |||
| df2865456e | |||
| fc6d5f1f23 | |||
| 96dab8c81b | |||
| 1d13d51f0c | |||
| 87d92d25f9 | |||
| 025dee6821 | |||
| 796d086615 | |||
| bb1ef08474 | |||
| cc770d8bb4 | |||
| 8a56c262cb | |||
| c0a9958b5b | |||
| 7351cd3377 | |||
| 7b3d5848b9 | |||
| 0f311e062e | |||
| 57930a8d86 | |||
| 7c0069394f | |||
| 379913fb3e | |||
| 542d9ccb77 | |||
| c8ae3b83b5 | |||
| 0a046fc100 | |||
| c551a38a8b | |||
| 72b1ca82ed | |||
| 1ef81c45db | |||
| 08e6ae76f2 | |||
| 6e410e049d | |||
| 22b7962940 | |||
| 5788f99b20 | |||
| 8685e43dc2 | |||
| b8bea27155 | |||
| c9226d3b79 | |||
| 9701feff04 | |||
| b8b40a88ef | |||
| adcf7b388b | |||
| 3a7562d96c | |||
| 2753cf7d0b | |||
| 5841415a0b | |||
| d79fa07834 | |||
| ff6caf706e | |||
| c953fbc67a | |||
| 55870cca85 | |||
| 0123242be6 | |||
| 81a6d7b53a | |||
| f423b07cee | |||
| 33231bdbb1 | |||
| 677b691ef1 | |||
| 5e74e80a9a | |||
| 70b5d799a2 | |||
| 16f18fe16f | |||
| 8538c79dd8 | |||
| f8e3b28e51 | |||
| 9f665e07fd | |||
| b7c010c086 | |||
| 8296c0194d | |||
| f537cc7321 | |||
| 4fa2401b27 | |||
| f30e3cd5cd | |||
| b73353120f | |||
| 7fa9df1f99 | |||
| ea3de8a987 | |||
| c159e1eba4 | |||
| 420d538a73 | |||
| 36672d6857 | |||
| 51dc6f8e8d | |||
| 9a6c9eeace | |||
| bfb7f781ec | |||
| 8ca24b877c | |||
| 01ef5cfa6f | |||
| 08825fcf04 | |||
| 4f5e87f87d | |||
| 45b1fafdd5 | |||
| e89258c173 | |||
| d47d37afd2 | |||
| d9effc80a7 | |||
| 03d2b05ffd | |||
| e2cac6ee60 | |||
| f749ddb5ae | |||
| 6bb409fed0 | |||
| 6da2d9d104 | |||
| cd267123e7 | |||
| 617ee719c8 | |||
| 4edad610ee | |||
| fda95bbec9 | |||
| 1028e09888 | |||
| 4abd07694c | |||
| a53b3288f7 | |||
| 7ba771c417 | |||
| 2a145b4791 | |||
| cf90462772 | |||
| d9a6701260 | |||
| 1dc9558541 | |||
| 972de5f92e | |||
| 28270b202e | |||
| c9ee1a4218 | |||
| 4c428d2547 | |||
| 9bf1189f77 | |||
| 484666e499 | |||
| 28cdd39842 | |||
| 9483241d43 | |||
| d8a0265ad0 | |||
| a6999fe7bd | |||
| f7db1c583b | |||
| a009be416f | |||
| 7d515a3187 | |||
| 6428074cdc | |||
| 4e2eb2a0a1 | |||
| 6903a3e048 | |||
| 233522a5e6 | |||
| cd52dc29c9 | |||
| 363cb14bff | |||
| 5cfae845b7 | |||
| 6dc03f567a | |||
| b11f671c59 | |||
| a4cabf1f0f | |||
| 0bd94e5f3f | |||
| 9c00d1afd1 | |||
| 6eecef0048 | |||
| 88c7e6ce1b | |||
| 86a42f3c7c | |||
| 58135607e8 | |||
| 601c2fe9fa | |||
| d6af46ed58 | |||
| 186efc0a23 | |||
| a1f62ec79f | |||
| 111baff976 | |||
| 02bb5bb48e | |||
| 86aac36153 | |||
| 8438f7f7b3 | |||
| 617335e8b7 | |||
| 772e1ebce8 | |||
| 89a6b56a61 | |||
| 70eea7baea | |||
| 5b22487059 | |||
| e22ff7742e | |||
| 3d99fab808 | |||
| f19948e4cd | |||
| cf0419f27b | |||
| 09df2dd20f | |||
| 3ef1ae4b09 | |||
| 1e1d4f6f4b | |||
| 15155aa394 | |||
| ef7db315d3 | |||
| b480623884 | |||
| 4f6db25dd3 | |||
| 6dcdd93195 | |||
| 39433f94cb | |||
| 01701e5f0b | |||
| 01b4bc0e76 | |||
| ff611795a0 | |||
| 33650d3fe6 | |||
| bd58187c4e | |||
| 330c6b09cf | |||
| af0c1a5ce9 | |||
| f792b9f59a | |||
| 5e6a505a37 | |||
| 9c81157856 | |||
| 0d01c0ee40 | |||
| 0b2b306022 | |||
| 175023645d | |||
| 820b5b89e1 | |||
| 1e8a843952 | |||
| 4d5c19e3ef | |||
| d92106abec | |||
| 1706e8e8f9 | |||
| 96de908487 | |||
| 21c59bc2f6 | |||
| a8ff1628c4 | |||
| 34450aa5e7 | |||
| b56f20f0c2 | |||
| 71c2bcbd0c | |||
| f0eb85660a | |||
| 44eeb9142c | |||
| 41be6916bb | |||
| 840ea69276 | |||
| 2763c27283 | |||
| 8bc84114d7 | |||
| 828a19aea1 | |||
| 705c9b2538 | |||
| ab7e8d2f43 | |||
| 24d60f570c | |||
| 8cb0559062 | |||
| 525cb5fd26 | |||
| 2cf77d09b2 | |||
| fa0b154d0d | |||
| 9684429d96 | |||
| 88cd919d92 | |||
| 6678d5b36b | |||
| 53d91be9d9 | |||
| 162e2c78a9 | |||
| 19f7636259 | |||
| 199f74ffad | |||
| cc0bef8546 | |||
| 3a685c609d | |||
| 864f7cb595 | |||
| 376c0137a7 | |||
| bc7c5736ac | |||
| 1cf2a33525 | |||
| 71d625e43e | |||
| 5b71810763 | |||
| 3e728e0d91 | |||
| ca7e741304 | |||
| 0d4d1769f0 | |||
| 539285f6cf | |||
| 7394e8b382 | |||
| 4362989d3a | |||
| 3d09ee363d | |||
| 5efe1dba62 | |||
| ae25cae1bb | |||
| 8a5cb93210 | |||
| f33db6c766 | |||
| 5a479c6dfe | |||
| 1661fc96b2 | |||
| eb78c66ea6 | |||
| 5a264c5c53 | |||
| 8255fef72d | |||
| 1c26dd109a | |||
| a62dee645b | |||
| de49a947f3 | |||
| 078533dd3f | |||
| 09798c95c2 | |||
| 57bcded2a9 | |||
| 7d9a7659d8 | |||
| 9d8dee86e8 | |||
| d170e92de5 | |||
| 3a699f95be | |||
| ce61530431 | |||
| 0e1a20edd3 | |||
| 177a28611e | |||
| 5b60a879b2 | |||
| fd42cae3b1 | |||
| 944861d225 | |||
| 8e5192de50 | |||
| aa53e87e10 | |||
| e76004162a | |||
| 35482511af | |||
| b604f0619e | |||
| 8eed97cf3e | |||
| a4c41643f0 | |||
| 592333afab | |||
| cf6b1d9489 | |||
| 83c6b1924f | |||
| e7fd12ee19 | |||
| c1cec71bf1 | |||
| 4639b2092c | |||
| 6e6ffe178b | |||
| 3ee0976ac4 | |||
| a9b1581d1d | |||
| aba8cb4090 | |||
| b90c680805 | |||
| ca87a6b751 | |||
| 70f0475171 | |||
| 17ce705dfe | |||
| 34e48b0f02 | |||
| 0fad5840f3 | |||
| 09102ab6db | |||
| abb9b6e302 | |||
| 58b36e01f0 | |||
| 9a059add14 | |||
| 0e766261d1 | |||
| 9655dcbff9 | |||
| 062d687cdb | |||
| 0e7d909646 | |||
| 98ef2a8975 | |||
| bb5758f5bd | |||
| e8c9661776 | |||
| 381022fde0 | |||
| 0691975a4d | |||
| 409621a240 | |||
| d42b6e5361 | |||
| 07428663c5 | |||
| 8fefdd580b | |||
| 18cd3d49fa | |||
| 974d7434d7 | |||
| b5d40baeba | |||
| 28801a1332 | |||
| 0ccd70a7b9 | |||
| 9f45405d89 | |||
| a4cf0518c4 | |||
| aec0721757 | |||
| 150ce66a46 | |||
| 770e00968b | |||
| ec34e4cfb3 | |||
| 8a1574be72 | |||
| 5f436abbda | |||
| 2f64785a63 | |||
| f43d2ab766 | |||
| 9f6d412c98 | |||
| 3a1e1bc7f8 | |||
| 0743835893 | |||
| 6ab9f0716b | |||
| e62e821fc3 | |||
| a5c01977bd | |||
| 73c96a49a4 | |||
| 68f84c5d39 | |||
| 33886cc2ad | |||
| 7f124aa76b | |||
| 071e33719e | |||
| 68685828ca | |||
| 5efd745562 | |||
| 29cffa96e6 | |||
| 76e44794ff | |||
| 5bc7f2f973 | |||
| e1f6a57df2 | |||
| c8629cc92a | |||
| 3b5b2461bb | |||
| a49a74fc6b | |||
| da5df06298 | |||
| 33fb7cee81 | |||
| 8b546459bf | |||
| 1dbebf0529 | |||
| e31550c524 | |||
| 18ac53b6ce | |||
| 39387fa1c6 | |||
| 08cb38554f | |||
| 4bf5b41cfa | |||
| 20bd0287dc | |||
| 7cbda8a9d5 | |||
| e826ef1754 | |||
| 61cf316fb5 | |||
| a28c39bea9 | |||
| caa1680dc6 | |||
| 61bc8f5bbe | |||
| 07edfde08d | |||
| 3d0846bec6 | |||
| 5a40b83065 | |||
| d52715c513 | |||
| 9085b777a7 | |||
| 68afba0c31 | |||
| 384efcbfdc | |||
| 0a83728b82 | |||
| 7fe603c5fe | |||
| f0cfc65540 | |||
| c2e4381a50 | |||
| 65bfa15553 | |||
| 1fbc38d38d | |||
| df8ed8e678 | |||
| 9c4ccb2da9 | |||
| 4043bd8696 | |||
| 93ddc27566 | |||
| d0a9885a50 | |||
| 48ecf26a42 | |||
| 6b8ccc8a83 | |||
| 8f9b07dcb4 | |||
| f40484f16c | |||
| 2c0515c597 | |||
| e813995b34 | |||
| 8bb8a1c266 | |||
| abcf7cddff | |||
| 2ae1d7fe29 | |||
| 8506b340e8 | |||
| ab1226fa31 | |||
| 0947ae2291 | |||
| c91bc2086c | |||
| be2d66d4ab | |||
| 47c189409e | |||
| 1e4451ce41 | |||
| bb5d4069cd | |||
| dfe7606dd5 | |||
| 9442416844 | |||
| 74713239fb | |||
| 76c06f68fb | |||
| 03145839f3 | |||
| b90d3193ab | |||
| 41f5206c63 | |||
| 0d65e5cafc | |||
| 33fb24c5e5 | |||
| 79f974ee2b | |||
| 0aa3903a52 | |||
| 63c1330f50 | |||
| 5ecb41adc2 | |||
| 2571247829 | |||
| ca290bf664 | |||
| f5d8ca8dd2 | |||
| f5f0c56043 | |||
| 0b27765c30 | |||
| 2f8eda0810 | |||
| d9c2f82656 | |||
| 857b53c4ca | |||
| 982828d0af | |||
| 6b050d6236 | |||
| 7585c80906 | |||
| 2bd5734386 | |||
| aef035923a | |||
| 8e361610bc | |||
| 4a5f2406e7 | |||
| 801b597fa0 | |||
| fb0dac20c1 | |||
| e3d7856e1c | |||
| ea626847d6 | |||
| 0dd563f16c | |||
| a701d1ecd8 | |||
| fd63a7f5f9 | |||
| 631d978ef5 | |||
| f4591fa22c | |||
| 45909e70b6 | |||
| 17428e1e94 | |||
| d96c705953 | |||
| 5867093895 | |||
| 48ad505e55 | |||
| 4b1eea2ed5 | |||
| 5902af967c | |||
| 33960e4264 | |||
| 2be9f58545 | |||
| fe50678565 | |||
| 7354b5a438 | |||
| 261327ed4a | |||
| 961d8be8b9 | |||
| 4907dc26a0 | |||
| 7cc1f878b4 | |||
| 7823ca4eec | |||
| 64c03a40a7 | |||
| 2f9b8775e8 | |||
| 97e567e505 | |||
| 008b0a435d | |||
| 0cea2faa92 | |||
| c43e9047bc | |||
| c68ec5ed9a | |||
| f1ce31cfeb | |||
| 44ea7dbfab | |||
| 80f5a6252e | |||
| dcd4b8026f | |||
| b7604a11e4 | |||
| 2e4f4cc4c2 | |||
| d64b1c74f4 | |||
| 0e8de4c91a | |||
| b0dcd7be85 | |||
| cff11657f0 | |||
| 7edf71c95f | |||
| ed4ec20ad7 | |||
| 32834f08c5 | |||
| a189f31f38 | |||
| 18d98d5432 | |||
| 0b3f5ddca7 | |||
| 6231cf8663 | |||
| 24113a4d7f | |||
| cb3785de5c | |||
| 75c58c556a | |||
| b7f8da5ec2 | |||
| 6676f6b760 | |||
| 6549ebb361 | |||
| f893d4601b | |||
| 134c54ca03 | |||
| 651034e2a8 | |||
| e228918cca | |||
| ddecd50ef6 | |||
| 8e9be4fcf0 | |||
| 800fabd5a0 | |||
| e94b7768dc | |||
| 2b633c091c | |||
| 120c965e32 | |||
| 5ee710b7c5 | |||
| 721bc83b9f | |||
| 8e907d9144 | |||
| 3827faa0e5 | |||
| 4161f8ff56 | |||
| 5f00430795 | |||
| 832397595d | |||
| 6df5e2916f | |||
| 39d26febc1 | |||
| 9c938b1260 | |||
| b182c1cb80 | |||
| 7594f6b516 | |||
| c9f1422c42 | |||
| ea943548ec | |||
| 7078bad2ed | |||
| f61e65336d | |||
| 1107543463 | |||
| 02587dc27e | |||
| 282c48f530 | |||
| 0e687d9e1b | |||
| fefbc3c4ab | |||
| d9bb4fa024 | |||
| 9ced32f2df | |||
| 429ebdbf3a | |||
| 7233137e93 | |||
| e0375050d2 | |||
| 396845a694 | |||
| e4f6be4938 | |||
| 88ce01dc46 | |||
| d11561f797 | |||
| 298d0ae75b | |||
| 791e3a3492 | |||
| aff5654bde | |||
| 71f03996f5 | |||
| ad03336916 | |||
| b8bd8d62ce | |||
| ee7376919e | |||
| c42abaac6b | |||
| 0955e9f089 | |||
| efddcc1dcf | |||
| 10a3e18e7a | |||
| 415b0afe38 | |||
| 57ca65e3b6 | |||
| 6ce0db575f | |||
| 635006efae | |||
| a2032af55a | |||
| 16ff92230a | |||
| 511dca70da | |||
| c9a7a167ea | |||
| 2468062eff | |||
| b6b54923b2 | |||
| 83b1fb67bf | |||
| 8f7bc30b10 | |||
| b9fd09d043 | |||
| b76d7fbb9c | |||
| c7ba2bc5a1 | |||
| 594f156a1f | |||
| 7a8a95853e | |||
| d16949c139 | |||
| f29cf16e13 | |||
| 5f16df912a | |||
| ec3f0ddab3 | |||
| cbd6d8158a | |||
| 4cf647b02c | |||
| 75ac35bf53 | |||
| d64b6a4d93 | |||
| 4d8c44782e | |||
| 24a343661d | |||
| 863f1373e4 | |||
| aed601fcda | |||
| 79a38b2763 | |||
| 8f35da9576 | |||
| 1d5d91c2bf | |||
| ba859b64e3 | |||
| 517b792e43 | |||
| 6102536136 | |||
| fe3fcdddaa | |||
| 0744770a50 | |||
| 3b8509ac39 | |||
| c555c201d6 | |||
| 928c62a237 | |||
| 0b7495a462 | |||
| 604c5069ac | |||
| 720f747460 | |||
| ab4ed7ed9f | |||
| d701ee81ba | |||
| bc334d9ec1 | |||
| 58ebedb7c3 | |||
| 64018fb02c | |||
| a6e9412a69 | |||
| f4ccb8dbd4 | |||
| 3f99263b5a | |||
| 8ba5980009 | |||
| deadd17c28 | |||
| b94d6ab240 | |||
| 203c56a7fe | |||
| e7e671c1ff | |||
| 4b6c9a875b | |||
| 9b0c14c9c7 | |||
| a484963572 | |||
| dad09f4a87 | |||
| e30d816765 | |||
| 7deb589a75 | |||
| 8bd5818a81 | |||
| 4debca0054 | |||
| fd3940fcd0 | |||
| 5a4860a45a | |||
| e67bb581e6 | |||
| 89b1c6debe | |||
| 1ddb53ad47 | |||
| ae456a498e | |||
| 834b0465fe | |||
| d50d9b6ef2 | |||
| 45e5813f15 | |||
| 876606df82 | |||
| 97f6afae3b | |||
| d106bc520e | |||
| 4b4fd603f1 | |||
| 0f86dcbcb1 | |||
| b850cb077f | |||
| 56c7d1cc6b | |||
| 1de84fa3da | |||
| a774693135 | |||
| 189355a238 | |||
| b4e94b9af1 | |||
| 7bee6470bd | |||
| 449042b456 | |||
| 18b436195d | |||
| db8d767ca1 | |||
| ad8349b2b4 | |||
| a318b88ac8 | |||
| c8c00f8391 | |||
| f1b3a1495d | |||
| 30c9941286 | |||
| d343fd24ff | |||
| bbce0b946e | |||
| 5efada2a6e | |||
| 7dc86aaeb2 | |||
| d7f7114328 | |||
| 1f41fefa09 | |||
| e7c1687565 | |||
| 60ce1916f6 | |||
| d8e0d4ab73 | |||
| 2d4cabf4ef | |||
| 176b2b05d3 | |||
| 27cea61edb | |||
| 636ffbf39a | |||
| ced42e3d86 | |||
| 85eba36d4c | |||
| abd8f59a07 | |||
| 8bb55ad5db | |||
| 9609010906 | |||
| db124f4ca6 | |||
| fcb2c9ea7f | |||
| 021fa9668f | |||
| d2243ccabc | |||
| 429b13664d | |||
| 97c72dfafd | |||
| 512167e536 | |||
| 2e8d9ea411 | |||
| 6e5365a8e8 | |||
| c1b39b1472 | |||
| ce756ec5eb | |||
| bcf94161b6 | |||
| 421dbe5632 | |||
| f2125150d4 | |||
| 2e84468785 | |||
| 071bca5353 | |||
| d00d6f0588 | |||
| 8c421b2255 | |||
| 5262dd0bc2 | |||
| 86a3f407ce | |||
| d558e8f507 | |||
| 32f488be61 | |||
| 1d6710e30e | |||
| 33b4b62ad0 | |||
| 001537863a | |||
| 052d651ea0 | |||
| b720cf26ee | |||
| 501dbd1746 | |||
| 0b75c95e93 | |||
| 9d6ff995f7 | |||
| 6cf06d9abe | |||
| 21be96887d | |||
| 434dd07cfa | |||
| 849d5bdf1c | |||
| 053aae4d5a | |||
| a6cae727bd | |||
| f0a8dfc26e | |||
| e9bb0d84a6 | |||
| e1d2a09207 | |||
| d1055ef5ee | |||
| 0a0854a367 | |||
| f7d2bbc34c | |||
| 0c7f61891e | |||
| 636f78f78a | |||
| 12e9559e96 | |||
| 9571afa286 | |||
| 7a09e89041 | |||
| 4efd2a3f5e | |||
| 3cc0e10031 | |||
| 738d73937b | |||
| efa6f53fdf | |||
| 5ec245fcdd | |||
| c8736b7f72 | |||
| fe3b063790 | |||
| 864129488f | |||
| 2e81f981ca | |||
| f89c6696b3 | |||
| 5a5b1431eb | |||
| 56e272c5d4 | |||
| 8cda9df762 | |||
| 44e994f420 | |||
| d5aaebc44d | |||
| 063083f1a4 | |||
| 125b21ef30 | |||
| 5a14ef080c | |||
| 53bde78293 | |||
| 0a0753c4c5 | |||
| aafe93b723 | |||
| 55861ecf0e | |||
| 4f13b62a81 | |||
| 9dbf0b0c4b | |||
| ecbd7ea769 | |||
| bc36ac5afe | |||
| 468ed40a5d | |||
| d6cfdd007a | |||
| 0d38d1b38d | |||
| 640f960bd0 | |||
| ef4063fcd8 | |||
| 8b19bd8917 | |||
| cad06c712a | |||
| aa3d170e1f | |||
| 4eb8f4fff3 | |||
| 4a9f7778bd | |||
| 0369b5b79f | |||
| 433687930f | |||
| 2e199d633c | |||
| cffd72fa07 | |||
| b37fe0ff35 | |||
| f8116ab6e0 | |||
| 1a68435eb4 | |||
| 5329ccd37f | |||
| 82b6b63fc5 | |||
| 68180b2436 | |||
| 65f8762b4e | |||
| 18eff91510 | |||
| 5ace0242b4 | |||
| 81ed568ed7 | |||
| 6b7ddc8522 | |||
| 3291eef752 | |||
| bd6f30f320 | |||
| 129149fb23 | |||
| 232e314ca3 | |||
| 61bcf078a9 | |||
| d911419cf2 | |||
| e8a832fb2c | |||
| 5d93747b13 | |||
| da00033e6f | |||
| c0900491d6 | |||
| 9ccae3e3a9 | |||
| 52f8bd8565 | |||
| feb479d9b9 | |||
| dfa60a44f6 | |||
| afa47ba26e | |||
| f7c5b7f1cc | |||
| b9e944a9e5 | |||
| 14b796b27a | |||
| 3f208a7b65 | |||
| 3303d70c1c | |||
| b0215058d2 | |||
| 244219bdde | |||
| 8c26cb2aa3 | |||
| b880b731b4 | |||
| b593fa3550 | |||
| 027ae7b2dd | |||
| 67fbb47639 | |||
| 9e194021c5 | |||
| 520ae87f14 | |||
| 6a74a18e99 | |||
| ccfe7dc335 | |||
| 3a26501aec | |||
| e890f02d97 | |||
| ce80f4e39a | |||
| 9a2b7f8987 | |||
| cc27b4329d | |||
| 97defda41c | |||
| c514f55496 | |||
| e31c5e7a68 | |||
| 9fd22081fa | |||
| d9f897bc53 | |||
| 826ff2f79f | |||
| 1d4f96d5d9 | |||
| e0ccac0289 | |||
| 7cd9990cfb | |||
| c972917b3a | |||
| 7d995f2fc9 | |||
| 2654a1484c | |||
| 9bb05e6717 | |||
| 6bd2dabd60 | |||
| 743e5a0755 | |||
| f49d6f31a5 | |||
| b74df8186d | |||
| 30d611e295 | |||
| c21bfd84c1 | |||
| c38ee02d4b | |||
| c4d7b544cb | |||
| c7db1cebec | |||
| ff2a6fd241 | |||
| d66bf7b395 | |||
| 3d6f9a1a2d | |||
| e80b8b19c4 | |||
| 9410ed0acc | |||
| b5331c5f5a | |||
| 179229821b | |||
| 5b28f4b1c9 | |||
| 86410b1f80 | |||
| 5447b357d2 | |||
| 19020f686f | |||
| 1ebe7baf7c | |||
| ed520de514 | |||
| b888a9a3b8 | |||
| d2708ca2a5 | |||
| f93149191e | |||
| 664f18c1ea | |||
| e44d2875cc | |||
| 89e01a706e | |||
| e561a25542 | |||
| 5107dbcb5e | |||
| 4cd114b0b3 | |||
| 88cb5dd4ca | |||
| c3c773eac6 | |||
| 89bf4713ce | |||
| 9d2b2db01f | |||
| 8a1b4274a0 | |||
| d94673279a | |||
| e1e1932071 | |||
| 4422dd8066 | |||
| 4f7dff1884 | |||
| 0fb8c6902f | |||
| 363f555f9c | |||
| f20fa758e7 | |||
| 7bd5a9b0c0 | |||
| 6bf211a5c6 | |||
| dbfbfb1b1f | |||
| e8e99dc3d0 | |||
| 6994b0b5df | |||
| da04450a2b | |||
| d740f5a09d | |||
| 9b57749c18 | |||
| 8929f0c211 | |||
| 036fe3ab71 | |||
| 10b327f533 | |||
| 6810a0d048 | |||
| f47ac17499 | |||
| 06718466ea | |||
| 266b2f44d1 | |||
| c564c55f75 | |||
| 82f68db819 | |||
| 925dc14b84 | |||
| 148f0da718 | |||
| 38c9b2d0d7 | |||
| 2c96afd9e1 | |||
| e44e68e226 | |||
| a3e9fbbc16 | |||
| dfa81656d3 | |||
| e0084f6652 | |||
| c88e67abe1 | |||
| f5f6cb59f5 | |||
| 16d3a35274 | |||
| d2f7279791 | |||
| d4fb45748f | |||
| 37dbff6025 | |||
| b064bccc52 | |||
| 9394031177 | |||
| 439b508619 | |||
| 95cb4db92c | |||
| 6ff0509124 | |||
| 883596b388 | |||
| ae1740cacd | |||
| 63319b78f9 | |||
| e31bfa5e63 | |||
| 583de3606d | |||
| 100b7b28ed | |||
| bf46ca115b | |||
| c4fd180f40 | |||
| 1e1d93f779 | |||
| 9d6ba74a6d | |||
| 13ed536065 | |||
| 2b9846cc61 | |||
| 15a2024614 | |||
| d1db798f16 | |||
| 3bf9e9343d | |||
| 3dd578064e | |||
| c9fa895ba4 | |||
| 10b714210b | |||
| 66fd25365b | |||
| 0b5af64ca1 | |||
| 4f8e8adc23 | |||
| c93b487483 | |||
| bc0a2e3404 | |||
| ab61869956 | |||
| 111cebf0ec | |||
| 26f1261ac2 | |||
| 891005a65e | |||
| f8ecf409ca | |||
| 760223029a | |||
| cbfe96cdc5 | |||
| 14f776721c | |||
| fdf37bc19d | |||
| 04f83e77d2 | |||
| 08bcfde5c7 | |||
| 49d055ce36 | |||
| c0ec72f66a | |||
| 69f2b18f10 | |||
| b5fa77a98d | |||
| 6559bfa8e0 | |||
| e53df3cff1 | |||
| f26a8799fa | |||
| 0fac9767fe | |||
| a1a86432d3 | |||
| ccd4398e4b | |||
| 71900213c0 | |||
| 4137b9aae9 | |||
| 4f1026c046 | |||
| 7aef17625c | |||
| 880f153ed2 | |||
| bfe2e21db4 | |||
| bc3eeb6a5c | |||
| 1d81bb526f | |||
| 6afac7a4ee | |||
| 327336ee10 | |||
| 3f173d4434 | |||
| f9bd84dba0 | |||
| 707985a081 | |||
| 51c24d5712 | |||
| 6e0cdc7434 | |||
| 4dd2bbe6af | |||
| f009e1aa39 | |||
| 642a843397 | |||
| 19131fe4a0 | |||
| 19675f74ab | |||
| bf6369e1b7 | |||
| 97cad0b36c | |||
| c817a0b1c0 | |||
| 517d5bdfb7 | |||
| ff375c1eb5 | |||
| 77e6dc1b73 | |||
| 07cd1dcdbb | |||
| 6b5f9c976b | |||
| e7739d1034 | |||
| d56cb50057 | |||
| 3100328014 | |||
| ab1d6d8582 | |||
| 7ad1c4fdf2 | |||
| 3f667948f1 | |||
| 86054be1bd | |||
| bb37e08235 | |||
| e1e11586b0 | |||
| f15964e1b9 | |||
| 8b92bd7367 | |||
| ae5bedc3bd | |||
| 54641cbcd8 | |||
| 85e700fddc | |||
| 112b32deb1 | |||
| f1b448db9c | |||
| d7d4e2c3b9 | |||
| 67819ef7f5 | |||
| 986295c343 | |||
| 2e69c47e2a | |||
| 3eb2d1afc9 | |||
| e6b67d941e | |||
| d7b4eeb05b | |||
| f371e9e0e2 | |||
| c14f2af060 | |||
| 09ff246ef7 | |||
| 2cae2557de | |||
| b091d3b5c5 | |||
| 068dadf10f | |||
| 9176879ebe | |||
| 1b9bd39f17 | |||
| 283291b51b | |||
| efaa7df201 | |||
| a320f52746 | |||
| 0b4a4dda78 | |||
| b464d78ae2 | |||
| 1580389f8c | |||
| d8f92f2c00 | |||
| fb54ac1752 | |||
| 124f4c9d2e | |||
| 3c3abea865 | |||
| 27ab203f7d | |||
| 31b5dc9ad0 | |||
| 19281e2919 | |||
| 11ca9cc450 | |||
| b7c1b61404 | |||
| d88995e8b9 | |||
| a90a2ec692 | |||
| 612dac55d8 | |||
| 483faa9574 | |||
| 25b34cfb37 | |||
| f94d27acca | |||
| 3563fac1e8 | |||
| 28eb0cd677 | |||
| 3c9224ab09 | |||
| dffae9e782 | |||
| c840027ab9 | |||
| 67da38bf35 | |||
| 794434078d | |||
| 6960bd0d63 | |||
| 1c18f0e5f0 | |||
| 9216e8b97c | |||
| 87f60daa3a | |||
| dc444ab04d | |||
| 89b0402a92 | |||
| be0a067cf0 | |||
| 1a73df6edc | |||
| 2fb1280b12 | |||
| 8095698217 | |||
| 05d12972e4 | |||
| 8a91036b1f | |||
| 42766e320f | |||
| 87fa74bb58 | |||
| 41051e1ecd | |||
| 6ded502e89 | |||
| 1c36a82fe2 | |||
| 8a9fd12c74 | |||
| a06cf731d6 | |||
| 5a9c8255bd | |||
| b0713cc0e7 | |||
| 76c7fcd89a | |||
| db3194224b | |||
| 3711a97fc3 | |||
| 087cfa8fc0 | |||
| b857d25576 | |||
| 9627233a54 | |||
| c989e22d63 | |||
| a4bf50f3e8 | |||
| 624871b5e3 | |||
| cf27dfad97 | |||
| 639263f3c8 | |||
| ff1a554cea | |||
| 51bce4d2dc | |||
| 9f6427c203 | |||
| 12e895d0e9 | |||
| 4518f07cb1 | |||
| fc78bfdd2a | |||
| 1d2173eb6f | |||
| c38a5f3ba1 | |||
| 28a1c18489 | |||
| 427096838d | |||
| 3d732625b1 | |||
| 7923b20d1d | |||
| c23a2467d9 | |||
| 6c9d64900e | |||
| 8458825932 | |||
| 4c457c093c | |||
| e452ca3598 | |||
| 3f9fd82b92 | |||
| bb23372b4d | |||
| be257aa4bf | |||
| ea4ff998a2 | |||
| 2bb76de736 | |||
| 0ebc8d255d | |||
| 85bbb950d2 | |||
| ccdd33bcca | |||
| 3da337b91b | |||
| 326684d01c | |||
| 2361e28552 | |||
| 653d2e97b0 | |||
| 61a7f4e0d8 | |||
| 9bf05222f8 | |||
| bca97bbd2e | |||
| 7decb2fab0 | |||
| 6d2a642bc2 | |||
| 903751c799 | |||
| cd7d8ea559 | |||
| 1605af1aa4 | |||
| b7898064f3 | |||
| 3c59a33759 | |||
| b4eaad984e | |||
| 214be6b802 | |||
| 4b09254789 | |||
| c70e374219 | |||
| 620b6e09b5 | |||
| bf5b060123 | |||
| a606d3a837 | |||
| 7497a8ec58 | |||
| e22c5f25fe | |||
| ed8669be66 | |||
| be238493dd | |||
| 707031d0b7 | |||
| 8fd0ab1cf1 | |||
| 41cb741883 | |||
| 9e30280e4e | |||
| 9eca3df172 | |||
| 2a676dbc9a | |||
| 7d5d462a2a | |||
| 4792ff6d3e | |||
| dfab60c2eb | |||
| 1983b63ce8 | |||
| 5db20b48ca | |||
| 7240d02c06 | |||
| 17cec8fdac | |||
| eb49ee7939 | |||
| 40c5d14eb4 | |||
| df7c832b96 | |||
| 9e855fd589 | |||
| 29d44d45b6 | |||
| 07053d270d | |||
| ce33a1c413 | |||
| 54589db47c | |||
| 7e2fa82f3c | |||
| 02d9d929b2 | |||
| e00b0ef495 | |||
| d179997169 | |||
| 0b6250686d | |||
| ab763a0ce1 | |||
| 95340fc3ad | |||
| 5ce40abbba | |||
| 1a89d9b4ce | |||
| df37b7709a | |||
| afcccdf9d8 | |||
| aa693afb88 | |||
| 2243f73ef3 | |||
| 65ee6b80ef | |||
| 207cc60911 | |||
| a9c12e47f2 | |||
| 6c985efca2 | |||
| 65c8a57aa3 | |||
| 42f1e79bed | |||
| 28599646cc | |||
| 785bb71d4f | |||
| bdba53c6ca | |||
| 451ac53551 | |||
| 3e03f24ec3 | |||
| 260410b554 | |||
| 5ff9c157d6 | |||
| 26512da615 | |||
| 5e7966b6e0 | |||
| 555218b2ab | |||
| 74cf36e607 | |||
| 6389b873cf | |||
| a177834e07 | |||
| 6f862a09d9 | |||
| 2053fe7bb9 | |||
| ef1964eeff | |||
| c9d4a07756 | |||
| 0ef7713433 | |||
| 32da1cd84d | |||
| 2ee3592320 | |||
| b6d0609bed | |||
| 9eba8e4b64 | |||
| 1e3e6af9b9 | |||
| 9cbfa40320 | |||
| e0923b6f02 | |||
| 3de6db170c | |||
| 7079c787be | |||
| 147ef4e7c9 | |||
| d1ea2c2bdb | |||
| 0537eb3518 | |||
| 868a42f106 | |||
| eef7279319 | |||
| e881af032e | |||
| 65fbb30f01 | |||
| 6f97d4ff15 | |||
| e2610df8aa | |||
| 6df00ac1c5 | |||
| c5c5620b79 | |||
| 9a10675441 | |||
| 2eb26aaba1 | |||
| 89496446c1 | |||
| 72a6f31790 | |||
| 7b025443c1 | |||
| 9505ba9a23 | |||
| e5078627c1 | |||
| 3b92eb3a23 | |||
| 9e85c0b8d5 | |||
| af4a24053b | |||
| 544eb798b0 | |||
| b7c2f85a02 | |||
| c8bcfe654b | |||
| 90e621db1f | |||
| da6f3da448 | |||
| 8a7786f9ca | |||
| af32c4f40f | |||
| 378cae7151 | |||
| 3b83d12056 | |||
| 5d34ddbd13 | |||
| 9c0e522804 | |||
| 59f2092482 | |||
| ac119d815c | |||
| 2212abe3c7 | |||
| 09453d13cd | |||
| 2f6e36a8bc | |||
| df06149c6d | |||
| 14ea38da8b | |||
| 6a9fa7c488 | |||
| 34889bc460 | |||
| f89433322b | |||
| 25778911c9 | |||
| 631bfe8302 | |||
| 9565e81dab | |||
| 296cd81167 | |||
| 41278eb137 | |||
| be6fd6d633 | |||
| 784ce8bc26 | |||
| c6861d1e49 | |||
| 2c87df6d75 | |||
| 3ef2a9c901 | |||
| 9859e4ff14 | |||
| bc37316fa5 | |||
| 0ddd11aef5 | |||
| b164398d47 | |||
| 9f63125816 | |||
| 02f0f4831e | |||
| dcf5e5668a | |||
| f008975936 | |||
| 2bfb1ff49e | |||
| b0bb09db08 | |||
| b3ad974bbb | |||
| 40dba3d183 | |||
| ccaf652c8b | |||
| 832e2499c9 | |||
| 12ce7e3b0d | |||
| 883b4bc9a8 | |||
| 6039c5e1d4 | |||
| e9ac687fe0 | |||
| 302144d003 | |||
| 532c7495e4 | |||
| 5f4e32b921 | |||
| 360b757bf3 | |||
| 1a6baf2beb | |||
| bafcd0e37f | |||
| 80f2237e2b | |||
| 96b67a8f2b | |||
| f983c93363 | |||
| dc9173e015 | |||
| 40e2aba739 | |||
| a0b3e21b14 | |||
| 61227b2d89 | |||
| 27c796cda0 | |||
| 86b782e2f0 | |||
| a4b6d9e87b | |||
| 221155979e | |||
| e94d62f6a9 | |||
| a9872f665f | |||
| 2fa1f6daf4 | |||
| acdb140a4e | |||
| 0568ccca2c | |||
| d1c2d3df3d | |||
| 371375178e | |||
| f0de32eb04 | |||
| 2dbd2ff956 | |||
| 4b7d996cb3 | |||
| 8796318335 | |||
| 99c094d9a1 | |||
| a08cbe4265 | |||
| 599b220523 | |||
| cbfcaaeb59 | |||
| d32221416d | |||
| b052c34e76 | |||
| b6fd63a512 | |||
| b986dd51a9 | |||
| 9244255b86 | |||
| 1bcbf7b5de | |||
| 2b85a0ebba | |||
| 1f093aa69f | |||
| a7d855cc27 | |||
| e50938078f | |||
| 87255a1ad3 | |||
| 4dbc9fe682 | |||
| 0e8f926769 | |||
| 38f317fb35 | |||
| cb8744999b | |||
| 737045bdde | |||
| 47ba1cbf4b | |||
| 9d7fbf4956 | |||
| d503a0cf66 | |||
| 9d7d4382fe | |||
| c03fda24b0 | |||
| b1116ff90b | |||
| 27ffabb62a | |||
| 456f62d1a5 | |||
| 83082b9ef8 | |||
| c1dd6eadad | |||
| 56663c53a4 | |||
| 083eb5c351 | |||
| 465b7a66c6 | |||
| a64a51bc16 | |||
| cee6a5bbd0 | |||
| fd82a4990a | |||
| a267708ab5 | |||
| be3422cf59 | |||
| 9c807697de | |||
| 73d1a07fc1 | |||
| e3229dc933 | |||
| 257de5a836 | |||
| ba83d84fd5 | |||
| f4ac6311b0 | |||
| 508730e125 | |||
| 9e5bd5e379 | |||
| 72c75bdf37 | |||
| 80470ef4f2 | |||
| 812ca57d42 | |||
| 9a24f12e11 | |||
| 4cf7c4b32c | |||
| 453dd01928 | |||
| 72273b7a85 | |||
| 4dddea507f | |||
| ec74968f94 | |||
| 733e5fac74 | |||
| 339764f32b | |||
| 095750d1e9 | |||
| aab2f7b1c4 | |||
| f06476a4f6 | |||
| 27bdc41ce2 | |||
| 5b14f98a95 | |||
| f23e0cc740 | |||
| 2fe3214660 | |||
| 3755e792be | |||
| ac0d0da5a3 | |||
| 902db2a10d | |||
| 220dce74b0 | |||
| f48660622c | |||
| 44b72e97f8 | |||
| 35ef17a2c2 | |||
| 682bd49e7e | |||
| 78c288ed42 | |||
| 568c24317b | |||
| 52c6aeb4ce | |||
| 18491e3aab | |||
| 7f14b26873 | |||
| faddce53be | |||
| 7bacdf35fb | |||
| 663c96e781 | |||
| 82b83b6e79 | |||
| de20a51537 | |||
| 565a9a334d | |||
| bc28f1b2e5 | |||
| b5e18ea7c4 | |||
| 1c20addf6d | |||
| b337da3719 | |||
| b7383f34c3 | |||
| 7030efb170 | |||
| ab60c6aad6 | |||
| c62e67d516 | |||
| 6bbcb3138c | |||
| d016750dbc | |||
| 58829cefb1 | |||
| 8e8d6b0438 | |||
| 83121da43b | |||
| 6ea3c5632f | |||
| e47906d479 | |||
| ba17b37e50 | |||
| c885e9d0dd | |||
| ec8e8acb27 | |||
| c8be5919fd | |||
| 2146bee57e | |||
| 772e0e56a6 | |||
| 09f08f04db | |||
| 6abd71e237 | |||
| 9ba2e2bc99 | |||
| 951c695776 | |||
| 5cdd1f034c | |||
| f746b9b4af | |||
| ed96cdd57e | |||
| 36e6641980 | |||
| 67d24783d8 | |||
| 530a27215c | |||
| 40a2b2a524 | |||
| 191fdf88ea | |||
| d7cd8dfcf5 | |||
| 78cd1914b8 | |||
| bf9afd4f83 | |||
| 033b545d53 | |||
| 70da12c635 | |||
| 3e92f94054 | |||
| 8cd1e35cc1 | |||
| b145a6169d | |||
| e0dd00cf0b | |||
| 978b6c5a09 | |||
| ba9c8beb2d | |||
| dc3657322a | |||
| 9bdd0aa6fe | |||
| 76ed9a92b1 | |||
| 5d2144f698 | |||
| f1a3c5dffa | |||
| 4789cfb2e5 | |||
| 4bc19666a2 | |||
| cf7e87997f | |||
| 3561c12b6c | |||
| d6de2914ee | |||
| 4f42a713f2 | |||
| 333f533d6c | |||
| 5cc9b7bfcb | |||
| 7d5ec3b043 | |||
| 155e5bcc7f | |||
| 984521b034 | |||
| 729c002e8e | |||
| 68dabec4a6 | |||
| b4fee2de94 | |||
| 4bdf8ab3bd | |||
| 6b5f230b17 | |||
| 359d53ecb2 | |||
| cba40a6688 | |||
| 831a12303a | |||
| 82bf454c79 | |||
| 21bd5ecc62 | |||
| 2909d8a9c3 | |||
| d9f951230f | |||
| 19c50a8e16 | |||
| 0d79893b19 | |||
| 27aa9d6471 | |||
| 56475a943f | |||
| 4bf87acb80 | |||
| 20641c694f | |||
| daa85ff675 | |||
| 60f81b14ed | |||
| 775e67815f | |||
| 7e2cd35358 | |||
| e2f9e31994 | |||
| 2ef56797a5 | |||
| effaf8cd7b | |||
| 3109abb5d2 | |||
| dd2b42d6eb | |||
| 2aa72f4230 | |||
| 54eaa620a8 | |||
| 04cc524bbb | |||
| c1c5381950 | |||
| 8a6323cf56 | |||
| e517201ed0 | |||
| 953bd8b908 | |||
| 0bd15916ac | |||
| 621a33a516 | |||
| 25c2cf66c2 | |||
| c890755411 | |||
| 79d0f6852d | |||
| cad1a105ca | |||
| d9ba8b6f58 | |||
| 8dd10776f4 | |||
| ad01b379c7 | |||
| d98617b23c | |||
| d42e92a868 | |||
| 62a716cfc7 | |||
| ba469a7be3 | |||
| ac55add2b9 | |||
| 9e5d9d23de | |||
| d4db27b092 | |||
| d4b985cf5b | |||
| a679d96f93 | |||
| b5c0a005c3 | |||
| 9dadade230 | |||
| 81805f00d8 | |||
| e6abe73404 | |||
| 199455de46 | |||
| 0460425d43 | |||
| ffbbead396 | |||
| 57da176c98 | |||
| 75ef964d66 | |||
| 0bd1d83fca | |||
| fb4f6bb91e | |||
| a1b361b2ff | |||
| 2be5a6732a | |||
| 164ba7a16b | |||
| 3269af0add | |||
| c2fd6b8794 | |||
| af35d45ba7 | |||
| 0b08e53de2 | |||
| d7836cce47 | |||
| bb81fd0542 | |||
| 83c3223668 | |||
| 17c495bc97 | |||
| 2fe97f55dd | |||
| 7fe7ace504 | |||
| cabe966d27 | |||
| 3d3af298af | |||
| afa2c9875e | |||
| 37bfefaa3d | |||
| 3937400ef6 | |||
| af11dac5e0 | |||
| f0beca8606 | |||
| 1fef0144b3 | |||
| f1573a550a | |||
| 2085e82312 | |||
| b0207e5cd7 | |||
| f2ef8c7b08 | |||
| b7b55d933f | |||
| 5f017ab96c | |||
| dc9346c067 | |||
| 373f8cc7e7 | |||
| 6bcbc55212 | |||
| e3475124a7 | |||
| 7b14315cbe | |||
| b6fdf4e6e4 | |||
| d18f334b02 | |||
| 92dce8515c | |||
| 4686194541 | |||
| 68487329d1 | |||
| 1de9fe67a3 | |||
| 7d09348abc | |||
| 26a44dfd9a | |||
| 3461a50288 | |||
| 77903ed2c9 | |||
| 3008b335a7 | |||
| fd90dcffa6 | |||
| a12f4bcbe8 | |||
| f8460fb76f | |||
| 92821be777 | |||
| 6c91db9405 | |||
| c3c0ab7947 | |||
| 234f1f4a0a | |||
| 94c11face5 | |||
| 81281e560e | |||
| f8cacb01c9 | |||
| 66ba54ffa0 | |||
| 52253afd3a | |||
| 07f6cf55b6 | |||
| 8ac7330c9d | |||
| 5ed3968771 | |||
| 39a3fb6132 | |||
| 4a338da44c | |||
| bf9280b1e3 | |||
| 85095b5e59 | |||
| 20eec8d30a | |||
| 1a23ba673c | |||
| 2ec090354b | |||
| 6848a7a475 | |||
| 420cb0f49b | |||
| 4018237691 | |||
| 2b6309f7c1 | |||
| 1e4a6c04c2 | |||
| e4481ca3e6 | |||
| 5a32550f85 | |||
| b9a9cc6cd9 | |||
| 920f8e4180 | |||
| e998ac07e1 | |||
| c4bcdc56c8 | |||
| 82a338bd13 | |||
| 33118568bc | |||
| 2ea4b09dcc | |||
| 8f801b1bdb | |||
| 1483f19f10 | |||
| 7fd3f0e8d9 | |||
| 7701d31bdc | |||
| eb3e7e0b86 | |||
| aaef92b139 | |||
| 6838897353 | |||
| 8f7c44d1e7 | |||
| e314f968b8 | |||
| 1676f19830 | |||
| 352137c440 | |||
| c8deb63de9 | |||
| 172aed44ab | |||
| 09a6a0a604 | |||
| 89b16e48e9 | |||
| 45855c794c | |||
| d402c5555c | |||
| fef4d6bc23 | |||
| dc7fb591be | |||
| f66742ec98 | |||
| da6c33617c | |||
| 4ea5b199b9 | |||
| 00eee811f4 | |||
| e3f13dd633 | |||
| 178b1be990 | |||
| 2aa4cdc442 | |||
| 53c5ebbef9 | |||
| c98b10c548 | |||
| 08e460d208 | |||
| 06322dcfdc | |||
| d045b0440f | |||
| 2fd3816edf | |||
| 28f3565bae | |||
| e82c3f15d2 | |||
| 4b36671041 | |||
| 3a6e6fc980 | |||
| a3e69df3ff | |||
| 0cd11c799d | |||
| 9063267db1 | |||
| df23d20d32 | |||
| 3b889753db | |||
| 400051d342 | |||
| 2fbdb9bfef | |||
| 87a0ce47b9 | |||
| a1993ab39e | |||
| 648015fe4c | |||
| 3d9536420c | |||
| d5389e8c3e | |||
| e5d86a708e | |||
| eae078b710 | |||
| 119c24f6e6 | |||
| 7b800914f6 | |||
| 97f4103e67 | |||
| 99706edf70 | |||
| 00974d97a7 | |||
| adfa66505e | |||
| 54bfe5d4b4 | |||
| fedcd33b0b | |||
| cd129e1f46 | |||
| 86c736dd17 | |||
| 5321878dd2 | |||
| e149683da7 | |||
| c97ae1e87f | |||
| 0ed45e40c6 | |||
| 70124b8465 | |||
| 6c7131f2a8 | |||
| f5085b208d | |||
| cbd52459bd | |||
| 28750142a9 | |||
| 9e224d13ad | |||
| 5082936ad1 | |||
| 32e8044b0b | |||
| 0314e28766 | |||
| ee92cbf92c | |||
| d84c4de0d7 | |||
| 8b4c05ead3 | |||
| a30e19e365 | |||
| 97227ca26e | |||
| 68f50ef6de | |||
| ab8d159791 | |||
| 883eccb2d0 | |||
| c5fa717d55 | |||
| 1c0ce45937 | |||
| aab0f63201 | |||
| d76eb44257 | |||
| 336abcce82 | |||
| afa2dd2c0e | |||
| c26e0ecbef | |||
| c795c8e482 | |||
| 12f17e6f49 | |||
| 79fde1c118 | |||
| 29bd7889b7 | |||
| a34c17a461 | |||
| 840576055f | |||
| 9575401127 | |||
| 2d05ff98ca | |||
| b3688b043e | |||
| 004043c3e5 | |||
| 4b8d4e92b8 | |||
| fa18ace9e6 | |||
| 6869f003e7 | |||
| 314c3a76a6 | |||
| 7a4b5569f3 | |||
| c9ccae4ac7 | |||
| 9ff1af221b | |||
| eae2b63586 | |||
| 246b13da4b | |||
| 16f3217364 | |||
| 9500169719 | |||
| 3ef085fbc7 | |||
| 0091755c70 | |||
| 6afa67acad | |||
| 30b0348655 | |||
| 5da0afc509 | |||
| d0bec34ec4 | |||
| fe6ec32d8e | |||
| c36a494952 | |||
| c1351a1994 | |||
| 2a74cf6604 | |||
| a0c766d820 | |||
| 5890ddd2d5 | |||
| 6101b9899e | |||
| 362d4aff8c | |||
| ff2fe17b2c | |||
| 7a203cb608 | |||
| f876b8cab4 | |||
| db87201724 | |||
| 5c00d9723d | |||
| ba035db684 | |||
| 6ecde2dc7e | |||
| 70f592e967 | |||
| 8138f7a5d6 | |||
| 0489582d7b | |||
| b1c6d4ba4a | |||
| 0f2d77400e | |||
| ce65213d33 | |||
| 0bd4461c32 | |||
| 3044a1daea | |||
| d8e00e5902 | |||
| bc9ff8b4b1 | |||
| d2a245194f | |||
| a8002ce13e | |||
| 8337cda5b8 | |||
| 7119bcc66f | |||
| f9e8cfeb75 | |||
| 894d6e1133 | |||
| 517026bef3 | |||
| 6e413f41b3 | |||
| 19293b063d | |||
| cd741ab93c | |||
| 3dd52ea523 | |||
| 21ba44d422 | |||
| 887c4e3dd1 | |||
| 0562165421 | |||
| 7b8203bd1d | |||
| 2f986bac65 | |||
| 0bcdab1958 | |||
| b8400cc0bf | |||
| 08a17a58ef | |||
| 1893c3557d | |||
| 7318884583 | |||
| 1c3dd62d28 | |||
| 5ae68f0826 | |||
| 236ad9813a | |||
| 963bbedea5 | |||
| e5d41576c9 | |||
| cd87395ab0 | |||
| da9858d41f | |||
| d8a81e00cf | |||
| 4b229decb6 | |||
| 6445304c1f | |||
| e1a7f3c0b5 | |||
| ddd06ea9f6 | |||
| 8ee1066b9d | |||
| 2877712876 | |||
| fcbfe9ca1c | |||
| 9dca626560 | |||
| 8e62ff239c | |||
| 3ab54c7d67 | |||
| ead6249580 | |||
| 17c62b3996 | |||
| 51a565b49f | |||
| 7a6f64b973 | |||
| eb0237cd4e | |||
| f19a7681b4 | |||
| 0fc001534f | |||
| fe7cf7052d | |||
| f3112c3acb | |||
| 504fd7fe14 | |||
| 5d1f19f1a0 | |||
| b80d8411c4 | |||
| e4a65ce36c | |||
| bd9a88b903 | |||
| 2da8525439 | |||
| 3f54c07009 | |||
| cc07db0269 | |||
| 472d49f241 | |||
| cc358b4872 | |||
| ad32e56660 | |||
| 4fd832d4a2 | |||
| efa7094cc5 | |||
| b951a16364 | |||
| 04b7a7fcb2 | |||
| c8e184d29c | |||
| 48f9380f21 | |||
| 93361881ed | |||
| d362c539cf | |||
| 7710bd7a48 | |||
| bc56b70b4c | |||
| 7145ba25b4 | |||
| bdf04d64d8 | |||
| 3b109ca98d | |||
| 2646cf63cb | |||
| d3bc6ad77c | |||
| 93248bc8fb | |||
| 09ffd991f2 | |||
| b525a26917 | |||
| 6f7f85a117 | |||
| 1a3cb984be | |||
| 89ee5b4df3 | |||
| 4f2364f402 | |||
| 4033e56345 | |||
| 330fa98215 | |||
| f1bfc2af0a | |||
| 81122b59ad | |||
| 6087c862d8 | |||
| ccb4190314 | |||
| 8fc43ff3fb | |||
| 719b7c2414 | |||
| ae5a8d04a2 | |||
| 7cfe8c3dd8 | |||
| de2dd9bef4 | |||
| 70bea25cbc | |||
| 64b452d851 | |||
| f30301ac4f | |||
| cd1a99727a | |||
| 81dfdb5bda | |||
| 7219972af5 | |||
| 8bb94bc104 | |||
| 1e63be4bae | |||
| dfabe3242e | |||
| 6979227410 | |||
| ceb0e68b2a | |||
| b10758cd96 | |||
| 13f5c0e685 | |||
| 087b3b0e69 | |||
| 9d02d4ed67 | |||
| c4d5471c9b | |||
| a5645036ae | |||
| ec57495481 | |||
| 79a86769ee | |||
| 5f97aa4b99 | |||
| 102aabcc95 | |||
| cc28fdb65b | |||
| 9065992cd7 | |||
| cdf2cc8e81 | |||
| 6f5c1aec2c | |||
| ad8a9d2099 | |||
| 00540bcfcc | |||
| fc12c1f29e | |||
| 45dc512f01 | |||
| 0691875f06 | |||
| c320d16af4 | |||
| d105c58309 | |||
| 55fd48d2dd | |||
| 8c65aeec88 | |||
| 7749c2600a | |||
| 79b3a71d15 | |||
| c4bddfd6f4 | |||
| 073c8a3c98 | |||
| b653e8d059 | |||
| 71bb550b1f | |||
| 19f1853426 | |||
| 3b5fba9b52 | |||
| 89c9ad0612 | |||
| e4a62b4db8 | |||
| 1b3eaeb755 | |||
| b4573fdc23 | |||
| 2acfef5d33 | |||
| 40d611b2f4 | |||
| ae24966c42 | |||
| 342b214fd5 | |||
| 8c74fa74c1 | |||
| 4c552b4e24 | |||
| 089cb06680 | |||
| f20911ee2e | |||
| 041544573f | |||
| 29615a3f0d | |||
| 256a6c6ee7 | |||
| 62c40575c9 | |||
| acf2a4bee2 | |||
| 6bb87e1db9 | |||
| 5f99083747 | |||
| 22e9687aff | |||
| aaceb86ba9 | |||
| da013e9d51 | |||
| 8aa06c7128 | |||
| 1b27ff0d95 | |||
| 9c54cc0e86 | |||
| ffee51cee8 | |||
| 859248acde | |||
| 11972297b0 | |||
| 8c17c6b2d9 | |||
| 2ac6d5d07b | |||
| 87c2a8fd3e | |||
| 2a5f3e6afd | |||
| 8472dbb195 | |||
| 15ff1998cb | |||
| f682f347d5 | |||
| 625d0704bc | |||
| faa4ddd98f | |||
| e5885da82c | |||
| efa2f3f1d5 | |||
| b0afea35ee | |||
| 9207600130 | |||
| 81a9483f76 | |||
| 3cf1bebe07 | |||
| df775eeb2d | |||
| bee9f46eaf | |||
| 8afc6b4c04 | |||
| 152b77b01c | |||
| 822d1c3eb9 | |||
| aa7fb772a0 | |||
| 6ccff0697f | |||
| e23c2bcfb2 | |||
| 1ef6026134 | |||
| 93d702990a | |||
| 86ccb76a2b | |||
| 23c2dad9d1 | |||
| d3216b0520 | |||
| feac34ca32 | |||
| 4a0a2a8856 | |||
| 8f72c36351 | |||
| dc019cd58d | |||
| 9feb097d11 | |||
| dad0befca4 | |||
| c013db29bc | |||
| 4b33e94707 | |||
| 362dcda90c | |||
| 43cf0659fd | |||
| 88c4e0e499 | |||
| aed9248b35 | |||
| c03f2a9adb | |||
| 9e6e4bc5af | |||
| 83af7a30d8 | |||
| 8000d51caf | |||
| 96d740db64 | |||
| ff15031113 | |||
| 4e9fa91f27 | |||
| 870c5d723c | |||
| 254a1d59ac | |||
| ce05f5b22a | |||
| b2eb50732e | |||
| 35395926ff | |||
| e77a685b50 | |||
| ee9a19d788 | |||
| 5cb0752645 | |||
| 26a41e0afc | |||
| d2ea6dfe8d | |||
| 46b027108c | |||
| 9afd415e3f | |||
| bb989dbc4c | |||
| 50095ad044 | |||
| 23ca7bd05e | |||
| f38c4ab242 | |||
| 966f661dce | |||
| 8db6f5b569 | |||
| c0aabcfa5a | |||
| 235fd16e5a | |||
| 5a3bcfa51a | |||
| c3912042e9 | |||
| cfbb1b1634 | |||
| 40d0eed281 | |||
| 5e52552a0c | |||
| 9a220fade9 | |||
| b86c9b3867 | |||
| d22deda242 | |||
| 2167111ff4 | |||
| 6028137c46 | |||
| 22dafff7b7 | |||
| 339b045697 | |||
| 28ce9a1656 | |||
| 34c273be7a | |||
| 0e645de733 | |||
| 1281bb311a | |||
| 5557144728 | |||
| 828949efa4 | |||
| b0980e2e90 | |||
| a17fc3efd2 | |||
| 6a9f3d9199 | |||
| ffd3f3f14b | |||
| 912075ddd4 | |||
| 3833a9f7fe | |||
| 6dd40a6edf | |||
| aa1a7a467f | |||
| a89475158f | |||
| bd887c6624 | |||
| e8d4537f0d | |||
| aa392d61e2 | |||
| fa2948e4ab | |||
| 4ce0809948 | |||
| 7956e761c8 | |||
| 2dc92dcc98 | |||
| c604c12297 | |||
| 3b249d6a06 | |||
| 1b0bdea135 | |||
| 604ded53b8 | |||
| d509890f8f | |||
| f973ab8ac2 | |||
| 67407d4bd6 | |||
| 36cbd4a96f | |||
| 896dab6d2b | |||
| 8103bf58d8 | |||
| 58868dcd4f | |||
| 762fc0d06e | |||
| bf03a4c54b | |||
| eac6bdcbbd | |||
| fe368bc87e | |||
| ff5999b383 | |||
| ebcfcf125c | |||
| c5e996546b | |||
| 9cd0d03298 | |||
| 456fa03f8e | |||
| a7e706268d | |||
| 794da145c6 | |||
| ca889ee04c | |||
| ee4e2c5288 | |||
| 1bd6e53f04 | |||
| bcba6dfe5d | |||
| ebe8cbc798 | |||
| f54fe60ca5 | |||
| 39b782053a | |||
| 5f83cc7656 | |||
| 97229c258d | |||
| 97e8037a6a | |||
| a9400afd74 | |||
| 2e11a2bfe2 | |||
| a59cc3a6a2 | |||
| 8c0593ad0a | |||
| 3566645643 | |||
| 127fb2d648 | |||
| bb3a14aac0 | |||
| 2cc2722a0b | |||
| 366aa4b307 | |||
| a6a43ef948 | |||
| 2419d652c2 | |||
| c47a01d11d | |||
| a6ec014e73 | |||
| b1569c4744 | |||
| 4f85e09edc | |||
| 3e9dd156e0 | |||
| 832aa0c303 | |||
| cdc17a8bb4 | |||
| caf59954da | |||
| 8b2f2b21cd | |||
| 744455adef | |||
| 7d9e1cd83a | |||
| 08d9af31f8 | |||
| a4711379e3 | |||
| 8c4773a9bf | |||
| 3e3b48e0cf | |||
| 5aea1348f6 | |||
| ce64da7849 | |||
| 74bc4a4515 | |||
| b723700d0b | |||
| f6983bba4b | |||
| 0ea4f6f13a | |||
| 1c2d64ea0a | |||
| e28a9a7cd2 | |||
| a200043667 | |||
| e8cf0a3dd2 | |||
| 10ed2233ee | |||
| ffb7cafe1b | |||
| 041550fa6b | |||
| f066c7bdce | |||
| f5eebb1b87 | |||
| 3731037e68 | |||
| ae28dc01fe | |||
| 65991ba512 | |||
| 55ac8995a9 | |||
| bdbc453fc0 | |||
| fc9dafeccd | |||
| c3cda97692 | |||
| 7cb3cdaa05 | |||
| a61d30f522 | |||
| 1bb4dac8b5 | |||
| 999285fcbc | |||
| 16dd54299a | |||
| cf7be09396 | |||
| 0365ac5043 | |||
| 89fb6f6bd8 | |||
| 52eb7bffb6 | |||
| ed3e3c9c41 | |||
| 77b54ed03b | |||
| c815579cb9 | |||
| 60f34d89ba | |||
| 2dd37ff965 | |||
| 750d109c93 | |||
| 23b5f879ae | |||
| cc4d57bc0c | |||
| c573301b2d | |||
| f19482985d | |||
| 2062ee7dfc | |||
| f24494d877 | |||
| 9f05d8d8d9 | |||
| ad139438f9 | |||
| 0118a7691f | |||
| 7915202aaa | |||
| 5492bf86d1 | |||
| 32e01c7861 | |||
| 13728c7c09 | |||
| a76945deef | |||
| 08c01f2b4e | |||
| eaa6922a95 | |||
| b99fa2b997 | |||
| cf28a3378f | |||
| 63ba6ec37c | |||
| f07856ecb7 | |||
| 44e81383f9 | |||
| d5c0b9cd5c | |||
| 4b0b519261 | |||
| fde0a4ade1 | |||
| fbd7f1b2b0 | |||
| 32bc71ae0f | |||
| 0cf39e94a2 | |||
| 6ccb32c837 | |||
| c63763982a | |||
| c26e63dec3 | |||
| 014e5257d0 | |||
| 1911187450 | |||
| 827e94b721 | |||
| fe9e6d47a2 | |||
| fe8cd0b884 | |||
| 496e0c0862 | |||
| f2c3673406 | |||
| 8dd2ebd245 | |||
| cc06c469ee | |||
| 96d8397787 | |||
| 20346091c3 | |||
| 776f9bf360 | |||
| d09218ca97 | |||
| c4e8375ef6 | |||
| 4e288e4b85 | |||
| 324d3f6ef1 | |||
| e640d4280a | |||
| 3951f08531 | |||
| 684546f080 | |||
| 507ab6723c | |||
| 0f4483e2f8 | |||
| de9c3c94de | |||
| 730048c70b | |||
| 1637d2202c | |||
| c0a6850eff | |||
| 8f642ad112 | |||
| 0b879eb5a0 | |||
| c1d4dd92cd | |||
| 4741e674c4 | |||
| d3ad49c4e1 | |||
| 3487da83ab | |||
| 3bc96bf319 | |||
| 3e22941484 | |||
| b6dcbb1377 | |||
| f6d99ba106 | |||
| 2bacc8d7b8 | |||
| dfc5d61514 | |||
| b2d989887d | |||
| 0c72f1e5d3 | |||
| 58ce6d8a2c | |||
| e7c0f3b5d0 | |||
| c799f8d716 | |||
| fb036bfe4c | |||
| acfd522b57 | |||
| f16f7b08c8 | |||
| b06201d079 | |||
| 17ba5e6a48 | |||
| b488ee5235 | |||
| a012943119 | |||
| 2afcd38bc5 | |||
| ef86905c58 | |||
| 66f41ca1ae | |||
| 44f53dabed | |||
| 2eee3c1c3e | |||
| ac652cbbd7 | |||
| de4a7be6a5 | |||
| 5a3a2231c0 | |||
| 8326d37806 | |||
| eb0ecadf31 | |||
| 661815ea1f | |||
| e4f1ca83f9 | |||
| da2b9cb132 | |||
| 547e5a26ee | |||
| 1068b64b74 | |||
| d8f6ed196e | |||
| 9ebea2b040 | |||
| 0c41c36c0d | |||
| 1b1f3e3d8b | |||
| fe33982df7 | |||
| 53804b6c80 | |||
| 5ce068b6fa | |||
| 9b97570a92 | |||
| 352b844954 | |||
| 49fff1d17e | |||
| d19f647d99 | |||
| c5deb1d3b7 | |||
| 167e1e79a8 | |||
| 91b3decf01 | |||
| 4ab93b067e | |||
| 008fa88012 | |||
| 4c49497577 | |||
| 8dd3741fa7 | |||
| 5572e07b34 | |||
| 3f5589b655 | |||
| 48abfdd621 | |||
| 06088b807b | |||
| 21e47d8ce0 | |||
| c39ab2fda2 | |||
| 4197120d92 | |||
| da7bd0f4ea | |||
| 21ac283355 | |||
| 153f638e03 | |||
| 9156735aa0 | |||
| b8ad90a4cb | |||
| 36f7ba71f9 | |||
| b1af2089a4 | |||
| 2b50a314a5 | |||
| 376d02cce2 | |||
| a4ae9e8fd5 | |||
| 9e5204934f | |||
| 1ffd77595d | |||
| dac6a362f2 | |||
| 6d29b5140b | |||
| 2c5414a8e7 | |||
| 2fa325dbf3 | |||
| 969a677d7d | |||
| 90470342e7 | |||
| a4e762fb01 | |||
| da2d732041 | |||
| 6a5acee438 | |||
| 49cd5014d2 | |||
| 522882c0cc | |||
| 7e8b4dc4b9 | |||
| 8e673f6634 | |||
| 05e6018bd1 | |||
| e1a845d49f | |||
| 2deded2d88 | |||
| af550a7104 | |||
| e68d7eb12d | |||
| a186e68ca0 | |||
| 81c60ca6f2 | |||
| bd9347afd7 | |||
| 9023cdf726 | |||
| 9caef87899 | |||
| c9d9c065a2 | |||
| c024c8d87b | |||
| 850a0d988a | |||
| 7bd3128e8f | |||
| 43a1ec60ce | |||
| d04d83b972 | |||
| 89516c41e3 | |||
| 4f9b6535fb | |||
| 6ab1f6158a | |||
| bb8e6a51f4 | |||
| 7a8ea2666b | |||
| 3029c6d10c | |||
| 9bb0ba2953 | |||
| 0e22eaf7c3 | |||
| 53ee9d31bc | |||
| 7134edf2f2 | |||
| e4da671cbc | |||
| 8cde2420e7 | |||
| 3c4c215931 | |||
| 2685309926 | |||
| 03b4a788c5 | |||
| eb6cdd0fc0 | |||
| 0b1c24e55c | |||
| 057c2d69a9 | |||
| 79c2cf90cf | |||
| 20cbdccbf6 | |||
| 5d05d71210 | |||
| 08294e8ada | |||
| 41f7262280 | |||
| 6aa361b801 | |||
| 7bcc428178 | |||
| c212217f67 | |||
| 9281e0adf3 | |||
| ace10fc511 | |||
| 0ac923e104 | |||
| 082aa0a34a | |||
| acf5c0931f | |||
| ee204f35ef | |||
| e51de2bfce | |||
| c7da9a45ee | |||
| e885224855 | |||
| d48eccc0e4 | |||
| 21012b305f | |||
| a79e322eff | |||
| b5a1cf1b10 | |||
| 40ebd7bc2c | |||
| ef37ee0f38 | |||
| 49033bf952 | |||
| d9725240a6 | |||
| cb5518a261 | |||
| ac71d8aa2a | |||
| aa733fbfb1 | |||
| d2b8f65612 | |||
| cf6ac06f73 | |||
| 496ad9c4e2 | |||
| 657ec17559 | |||
| 62c9af5cba | |||
| a4f16a1f30 | |||
| 1b595ee7fe | |||
| fa556e4e33 | |||
| 391d718909 | |||
| 2ce14e443d | |||
| cdf0a3a3e7 | |||
| f00f9a5277 | |||
| 7112642e89 | |||
| 3714c21f97 | |||
| 24c49b7f2f | |||
| b16429f3f8 | |||
| 27734495f4 | |||
| 097b338d19 | |||
| cbb8450435 | |||
| 3b7e0a91bd | |||
| d9a1e56282 | |||
| b63e74369c | |||
| 4d0ba06cba | |||
| c4369dc237 | |||
| 99dd212496 | |||
| 6e41033ed6 | |||
| 90a5cb7aae | |||
| bccfbaa03b | |||
| e32ff7116d | |||
| 00214843cb | |||
| dd4054c4fc | |||
| 0b40b92340 | |||
| 60a3c41003 | |||
| f501c60de1 | |||
| b985a935b0 | |||
| a2f1790db2 | |||
| 5784ab63cc | |||
| fd857c2586 | |||
| 29df8762e2 | |||
| 32e13c3495 | |||
| e6151b3b71 | |||
| 6823b08651 | |||
| b588bb02f4 | |||
| faf7b6efa2 | |||
| 03492da2cd | |||
| 8abfc2ada0 | |||
| a262a2ef71 | |||
| 435a38f1d1 | |||
| 91d7db7c01 | |||
| e298c88728 | |||
| d58e7a58d0 | |||
| e530412ef0 | |||
| 1d5e2dc4d5 | |||
| d0b5faf266 | |||
| 76e8a39276 | |||
| 66fe8e694f | |||
| abd8a230b4 | |||
| 565662a8aa | |||
| 0f00e71b5e | |||
| 44fea0117d | |||
| b9b39a24f7 | |||
| 358fb87683 | |||
| f0ef73d150 | |||
| 1d2297a5fc | |||
| 862736bba4 | |||
| e30dac7cc2 | |||
| f97d5fa232 | |||
| e909616aff | |||
| be219bbee6 | |||
| 17c1c81b4e | |||
| bf0a16c707 | |||
| 86a54feb41 | |||
| 2c923470f8 | |||
| 5d26250b45 | |||
| 6d90e0bf51 | |||
| 51df795a8c | |||
| 9ee053e4f9 | |||
| 4044185ab3 | |||
| f4fe825162 | |||
| cb785b89f0 | |||
| 8289128399 | |||
| e9146f5fc1 | |||
| bc7de458d3 | |||
| 4aa44331f0 | |||
| eada19f516 | |||
| 63677b1451 | |||
| 5789d96a3d | |||
| 0afdeb9bcc | |||
| 79dd8f4e49 | |||
| 93f204ba22 | |||
| 98ad96115a | |||
| ae4ce12c17 | |||
| b8767042b4 | |||
| 200e5f3373 | |||
| ebb68cccfe | |||
| cc4be23802 | |||
| 9f44b1695d | |||
| 94344deff3 | |||
| a41994cb41 | |||
| eee6a713fa | |||
| aed28fe503 | |||
| 7bc72e683b | |||
| 31e386de44 | |||
| 31737efd87 | |||
| be096b9657 | |||
| 3e773ef94b | |||
| 111adc917b | |||
| 6a1b2861f3 | |||
| ed3ff01c22 | |||
| 73e4af98cc | |||
| 84835428ba | |||
| 9f3099ef2b | |||
| 412eed51cd | |||
| bd20d1af02 | |||
| a15932cc7f | |||
| 8942c31a5c | |||
| 90fe6921e2 | |||
| e8a872d351 | |||
| a16ae846ae | |||
| 38de0e352f | |||
| eeaa50ddcb | |||
| 16b0d4eb24 | |||
| 053fb403c5 | |||
| 1d70d4bca0 | |||
| bba04ba1bd | |||
| e926180605 | |||
| 958b62f8c7 | |||
| d238a9e9dd | |||
| 1588c25fba | |||
| fb993a7060 | |||
| 6b375614ca | |||
| da928fb549 | |||
| f657c2f1d1 | |||
| 594cc0f06d | |||
| d712bb1988 | |||
| d00c92ef99 | |||
| 59a30238eb | |||
| cb75c6fbe6 | |||
| 8056b66714 | |||
| e09501d779 | |||
| 70192222ad | |||
| cc253d4b33 | |||
| 7d3918a1c6 | |||
| e759a14909 | |||
| fd5a1c5b4b | |||
| c95dc12a96 | |||
| 70ef5912c2 | |||
| 79bb9db3b9 | |||
| d3791ea99b | |||
| 5982fed0b8 | |||
| 1254df2db1 | |||
| 8a23af8581 | |||
| 9cabb27c39 | |||
| 5c17437ba6 | |||
| 520c3659d2 | |||
| 962374b765 | |||
| 8fcc809299 | |||
| 8eac101082 | |||
| b1605ac44e | |||
| 90afc1e221 | |||
| adeba81340 | |||
| 8c10b7ba04 | |||
| 8aae77ff70 | |||
| 7eeacc6268 | |||
| 06e02781d2 | |||
| 3b5625c663 | |||
| ea47f93bc1 | |||
| c33c2de18b | |||
| f125a798bf | |||
| 84d7281002 | |||
| d98a53ec43 | |||
| ee3026233e | |||
| 8fb0b69a79 | |||
| 03ce6c05a9 | |||
| 1d3a03909b | |||
| 7020b78faa | |||
| f1746b41a2 | |||
| 22b96e4b24 | |||
| ddf684f6c6 | |||
| cc9d327ea0 | |||
| 47e23e3463 | |||
| 8feb903021 | |||
| 124172e4d7 | |||
| 9d4367cfac | |||
| 6cd9dfce8c | |||
| 4a3dbe4d60 | |||
| 062ab5045a | |||
| ba472d3b7b | |||
| 82adcf37f4 | |||
| 4f23690ab4 | |||
| 17481aeb38 | |||
| 26adbb1717 | |||
| ffd2785499 | |||
| 5c6d160cbf | |||
| 28a5c5b343 | |||
| 3501fff7fc | |||
| 1988337598 | |||
| be2fdd5cfa | |||
| ef0837c514 | |||
| 252f88e362 | |||
| 8ba9b47141 | |||
| f984339b13 | |||
| a1ff1d2585 | |||
| 3bbe7d0322 | |||
| 3fd729f1a2 | |||
| 375b75c422 | |||
| 340a1e3e3a | |||
| 8d3ab8f93b | |||
| 8dc52de871 | |||
| 6ff39be4bf | |||
| e2548ac9e2 | |||
| 0ce94ada82 | |||
| 77a4c4be70 | |||
| 9616084769 | |||
| 163a246c58 | |||
| 31efcb4a86 | |||
| 1faea596f8 | |||
| cd5cb9093c | |||
| 9f1bd89a0c | |||
| 0908053881 | |||
| 910068bcf5 | |||
| d9ae0ff1bf | |||
| 4bea1a6e70 | |||
| e7873b0fa0 | |||
| c892704ee3 | |||
| 7cd44c853a | |||
| 818b42b97e | |||
| 5870ba98b4 | |||
| 19939c985a | |||
| 7d65a9ef22 | |||
| eb45f7c3bc | |||
| 90a89c9224 | |||
| e59b52dcac | |||
| 07d4edef4e | |||
| b76c2f7b8d | |||
| be414510a4 | |||
| e4b2052231 | |||
| 5066b23603 | |||
| 86de9830b4 | |||
| 758b5e4810 | |||
| 79e2c55c34 | |||
| 802cf51cf9 | |||
| 55d4a90041 | |||
| cf535a2f8f | |||
| ba38964e8a | |||
| c943e5dd43 | |||
| 65f44da4c9 | |||
| 24c51afa40 | |||
| e6739adb35 | |||
| 06fceb07cc | |||
| c87029254c | |||
| d52aca1d3d | |||
| 26af05cd01 | |||
| f7750f2a2c | |||
| 675b4f55c1 | |||
| a322439a83 | |||
| f7a1046c67 | |||
| c17593d932 | |||
| 109d2969a5 | |||
| 2d3c463bf3 | |||
| 74073b641f | |||
| 426033f835 | |||
| a9ad1e22d6 | |||
| 903aa014e4 | |||
| e058854c3f | |||
| c16ce866dc | |||
| f9eba950e0 | |||
| 3eb53d3195 | |||
| 2a5921d3d0 | |||
| 440c711335 | |||
| 7ea573123b | |||
| 7f5ce45fad | |||
| bd16542e25 | |||
| b95a696a5a | |||
| b8f40e8314 | |||
| 0bbeff0b5b | |||
| 5828e16421 | |||
| 8497d2efba | |||
| b578d2ced0 | |||
| 239b461f75 | |||
| c7db7c0926 | |||
| e107766a61 | |||
| 05a0b6c615 | |||
| 7ada8f18fb | |||
| 887a77f4a3 | |||
| 97bde67b1d | |||
| 33c3668175 | |||
| 0158fc3a7a | |||
| 72bb2ddb08 | |||
| 01c1a37fa2 | |||
| 35aa51d6a9 | |||
| ada42ee57d | |||
| fe9b27ecf2 | |||
| e03f120a00 | |||
| 59344f540d | |||
| e829f1fc1b | |||
| d9904eb5f1 | |||
| 10cd26af5e | |||
| c1f649fc83 | |||
| a4865f860d | |||
| 14fce8edfe | |||
| 6826e3567d | |||
| 250e8625a7 | |||
| 58530d6f72 | |||
| 823fb3fca7 | |||
| 29302c0891 | |||
| 03570ebd43 | |||
| 2a4a0d38e3 | |||
| 9be9127ad1 | |||
| 66dd1c01f0 | |||
| d8dce7938d | |||
| 0701f5885e | |||
| ea3f660999 | |||
| 95a21ffe8a | |||
| 89d2cf8340 | |||
| 0eb676d3cd | |||
| ac1a762fa8 | |||
| 59a05262a1 | |||
| 5f91d187c8 | |||
| 8d8bf311ed | |||
| 69545c8a56 | |||
| a1868c0205 | |||
| 12bc4f0da8 | |||
| 510b887042 | |||
| ff7171daa2 | |||
| 5b0dbd5d30 | |||
| 9c7fb25a94 | |||
| 2e24eab5ad | |||
| 8135ad4424 | |||
| 6ffa40e40d | |||
| bc120176ca | |||
| d50d4ae1c9 | |||
| d34aa61e95 | |||
| 04578a4ed1 | |||
| 3e5282a06d | |||
| f86cadb802 | |||
| c4fe4d87db | |||
| 7e5deeaab3 | |||
| 36c425d699 | |||
| a2c69c6144 | |||
| 58e3c0604d | |||
| 7408849eb5 | |||
| b42142f692 | |||
| ddafdcf392 | |||
| 95cbaf1993 | |||
| 43aa3c857d | |||
| 964e0d6f41 | |||
| 5a1c52d3b5 | |||
| 02c374b61e | |||
| f2094e049a | |||
| 8ff2b3b090 | |||
| eeaa363132 | |||
| 43e51848fc | |||
| 8b17117220 | |||
| a4e06a4ce0 | |||
| 4d55f5ebdb | |||
| 268f3c77c2 | |||
| ce73718620 | |||
| d307c58f87 | |||
| e7ec021da8 | |||
| ca94fc7a96 | |||
| 9d650c4885 | |||
| c6d9be499c | |||
| 0e78e8b3f9 | |||
| 2a99278b52 | |||
| 4a47c096f7 | |||
| bd961be055 | |||
| 525fea80b8 | |||
| 6f92ae6a59 | |||
| 8bad6c0f54 | |||
| 91cca16f40 | |||
| a0697a048d | |||
| d22c6aae79 | |||
| 83997980ba | |||
| 4d9bdd1c12 | |||
| 163a73722e | |||
| 65d17decb8 | |||
| 1aa300f97e | |||
| 8fbb30bded | |||
| 6b0f1a0c10 | |||
| 1cee590eca | |||
| 9ff370ee27 | |||
| cd0057ea5a | |||
| 2c0a294b6a | |||
| 3e09bd5c60 | |||
| 0a99d7cebb | |||
| 3138e3edc7 | |||
| 99ab34ad0b | |||
| 9b7923f8f5 | |||
| cfcbe7f107 | |||
| 5fb27ab186 | |||
| 36b1a3c020 | |||
| baccb5d12e | |||
| adc4621711 | |||
| a8d78664e9 | |||
| 9fab4eb088 | |||
| 0d0f1315ff | |||
| 555598c155 | |||
| f49fa23f69 | |||
| b732064f88 | |||
| 1f99a381eb | |||
| 81b610cc4c | |||
| b0a0bfc888 | |||
| 6221ccb53b | |||
| cbe1da2d68 | |||
| 24297e373c | |||
| 99d14a559c | |||
| 08339a1f65 | |||
| 4e3ad38087 | |||
| 63c97fadc6 | |||
| 45633ad7e8 | |||
| 8508decd5c | |||
| 315f47bf30 | |||
| 12f8d79d84 | |||
| 710690e2d2 | |||
| 03bfbe81d0 | |||
| c990fb6fe7 | |||
| 9b31cd63a4 | |||
| dee3ccdf77 | |||
| de23a32c96 | |||
| 2beb840a5c | |||
| f748d76549 | |||
| 9d9a326c2b | |||
| 9184827195 | |||
| cb533c954b | |||
| ead876036d | |||
| cfa25eccb1 | |||
| b0d6233de6 | |||
| b07b8a1aaa | |||
| a68cdaf2ba | |||
| 16641b9193 | |||
| 0469a90992 | |||
| 6dc3e5ab7a | |||
| 82012fa623 | |||
| 7ddd254bb1 | |||
| 464858cfdf | |||
| 30db23255d | |||
| 868c1ef891 | |||
| b961356b7b | |||
| 2e32d6c574 | |||
| a31e5aab79 | |||
| ae4f9565bd | |||
| f33ba10b96 | |||
| 904c519091 | |||
| a0db837910 | |||
| 51cb5db8b4 | |||
| c328728e0c | |||
| 3384ef67a6 | |||
| e89c549706 | |||
| 3c67ac73da | |||
| 656349e6c5 | |||
| df2af0185c | |||
| 913d30f2de | |||
| e96172b698 | |||
| 0c241f683d | |||
| a19097de2b | |||
| f6feeb9d1e | |||
| f205e6f9cc | |||
| 4e543e6068 | |||
| 176062f11c | |||
| 4d88191171 | |||
| 025ea1d094 | |||
| a4283d545a | |||
| 52fa2aace9 | |||
| fa711cf142 | |||
| 70bc7e53fe | |||
| 56f22aa073 | |||
| 878a87278d | |||
| c4a539d2ba | |||
| 4225e81080 | |||
| 8fd4887f10 | |||
| 0e397797b4 | |||
| e6c8458ce7 | |||
| 50ea9919af | |||
| 67f62df894 | |||
| 0da0280156 | |||
| fa713eac4a | |||
| 2c7d56ab34 | |||
| e340268dd0 | |||
| affec6720b | |||
| 5047826a74 | |||
| 33d9230442 | |||
| 607b174c5f | |||
| 6b4ea71404 | |||
| 014322c240 | |||
| b789f84151 | |||
| 19d5fe1ba6 | |||
| 93b95954c4 | |||
| fb7a2aaa32 | |||
| 3105eacd4d | |||
| 215893214f | |||
| 30e01d6700 | |||
| 94cfc5d7d6 | |||
| 471b32cce1 | |||
| 036b34e91d | |||
| 77f7f8c1ed | |||
| e6fc991d2a | |||
| 060881777d | |||
| 6e567fa725 | |||
| 7e4c01937f | |||
| 06a00e6482 | |||
| 242df42f55 | |||
| 8d78c16c8a | |||
| db2b05eb7f | |||
| 282b1090ba | |||
| 4f6c9fa866 | |||
| 9375842c71 | |||
| ea3fca0f1b | |||
| 5971d67a66 | |||
| 9f5fa880d6 | |||
| 357b68dd4f | |||
| 384f3f5698 | |||
| a4f855ccd8 | |||
| 4d80af4e06 | |||
| 7abce12499 | |||
| 7b1302c011 | |||
| 66d23b7eac | |||
| dc0255509b | |||
| 6661f91eb5 | |||
| 2eb36aedeb | |||
| 0e623ebfeb | |||
| ffb73569e9 | |||
| 713cda9455 | |||
| 223721cca8 | |||
| e7479c8a93 | |||
| 224fe0069b | |||
| cb97847392 | |||
| 6a29531467 | |||
| 262e249d2c | |||
| 77479efaef | |||
| 898863a8d9 | |||
| 05d555f98d | |||
| 868092db10 | |||
| 7a738c2eca | |||
| b304dbcba6 | |||
| 6e28a5daa4 | |||
| 8f4f9660ed | |||
| 2d01535651 | |||
| e57d4669fc | |||
| f47c599dea | |||
| 7a693a90f7 | |||
| 9cf51de3f7 | |||
| 5089c20cd6 | |||
| a0da23f86a | |||
| 44d24b57c6 | |||
| c143d774d4 | |||
| 9e92240dd0 | |||
| d2c586b096 | |||
| fbfbb9408a | |||
| fb56665dec | |||
| 5b65c216b6 | |||
| 9ad98c5970 | |||
| cae9d0f2e5 | |||
| c0d267c63e | |||
| 70704b0a5e | |||
| b135275201 | |||
| 7e1eae6681 | |||
| 30f5d6dc85 | |||
| a50dd1168b | |||
| 62fa1620aa | |||
| a0d42c8b59 | |||
| a21663da61 | |||
| 67a0382942 | |||
| f5c2467d01 | |||
| a3abcc8094 | |||
| edf439f301 | |||
| 2245563250 | |||
| bca21d5515 | |||
| 89cae2e7c9 | |||
| 26c381a4c4 | |||
| 4bc5aa050c | |||
| cd44b0d180 | |||
| 59ee91ca5d | |||
| 59165a7033 | |||
| 93d242c05f | |||
| 4bbb6591e3 | |||
| 7df8025f6a | |||
| f19c52f40e | |||
| b7840779fe | |||
| 28042a8cc9 | |||
| b2907226bf | |||
| a2f46821f5 | |||
| b7385cd4cc | |||
| 718c65818c | |||
| 91e2293606 | |||
| 3c4a921f9a | |||
| d04b333126 | |||
| 0a4bef4d9a | |||
| a0f090a83a | |||
| dc8ee5943c | |||
| 9132c36aa7 | |||
| 224c0d759f | |||
| ffcaca2db1 | |||
| 409fc4a43b | |||
| 16968f3f2b | |||
| e3fd0dce21 | |||
| 53b6b6deca | |||
| 26f47a50d0 | |||
| 3cf77374c4 | |||
| a1129c3f0f | |||
| 2fe74603a3 | |||
| 54d517363d | |||
| 948fe0c0e6 | |||
| dbd8e6c0e9 | |||
| 02b5601933 | |||
| 3ed40608a2 | |||
| 36d7c2dd91 | |||
| fa7ef68851 | |||
| f84877a4fc | |||
| 261fb62e24 | |||
| 48d8aa4cd8 | |||
| 95ff0d3db6 | |||
| 2dc1d914c0 | |||
| fc06701009 | |||
| ee4f334296 | |||
| cac2395237 | |||
| 5afc3f13cf | |||
| 9030917c14 | |||
| 9905def352 | |||
| a3793aa92b | |||
| 76c8498956 | |||
| 75bd8ea5a2 | |||
| 50a5e864ac | |||
| 352fc26f7e | |||
| 44afa1623e | |||
| 14acafabfc | |||
| 773af58d03 | |||
| 352b851e9c | |||
| 8353a01082 | |||
| b70e001206 | |||
| a741bb4d55 | |||
| 24adee3d54 | |||
| 09203ffb95 | |||
| e94338f4c6 | |||
| dd9dd8ee81 | |||
| 01d6dcac59 | |||
| ad0ee6b0d6 | |||
| 769c8c228e | |||
| 50fcd67085 | |||
| 52d03e6b7d | |||
| b949cd0039 | |||
| e527170315 | |||
| ec7d210c36 | |||
| 74a4089464 | |||
| fa9e14f574 | |||
| cdbeefcd16 | |||
| ffdd5f4091 | |||
| bb60525780 | |||
| 82634af649 | |||
| 3643ed9f13 | |||
| fac59ab705 | |||
| 1e343b0d12 | |||
| 34bb467b97 | |||
| b092525c10 | |||
| 256dac3a82 | |||
| dfe947f54d | |||
| ce09407816 | |||
| beee6af79d | |||
| c282562867 | |||
| 2aed9b3a33 | |||
| 210910f21e | |||
| 1d666318ae | |||
| 4df6095089 | |||
| d4edcce224 | |||
| d7c6761841 | |||
| 5733224f8d | |||
| 22fd5042bc | |||
| 44a6f2d448 | |||
| cd9c17f9b3 | |||
| dc07bcf0fa | |||
| 248b8fb4fd | |||
| d5ec7c3001 | |||
| 35182a1483 | |||
| 21b0a517a9 | |||
| 19a770445e | |||
| c6512f1376 | |||
| 2cb3963138 | |||
| d05c394c68 | |||
| 797de31960 | |||
| a0af1a811a | |||
| 4933b9ce54 | |||
| e81c4eb155 | |||
| b284c8bc56 | |||
| 872d2d4337 | |||
| 525f1b7781 | |||
| 2f99d8ca62 | |||
| 7781014cf7 | |||
| 2432b36f5d | |||
| 288aa015fa | |||
| 1cb8b922c3 | |||
| 41cec64bf6 | |||
| d82bda9d00 | |||
| b84da40365 | |||
| d02c947b84 | |||
| 7167a5a71e | |||
| f13c2455ea | |||
| b200b66612 | |||
| b811df8cda | |||
| 1e239b78c3 | |||
| 3a8daadd92 | |||
| f605d6fca5 | |||
| cd85e43624 | |||
| 2b94d09539 | |||
| ab82da5c75 | |||
| 8a467aa537 | |||
| 742e6b1e3e | |||
| e35e8bcdce | |||
| 5f953aa47f | |||
| e550e9aa1d | |||
| 26e2defd9e | |||
| 3b3641c69e | |||
| 56ccd518d6 | |||
| 59846280a8 | |||
| aa95e3abcd | |||
| ad6340c1a7 | |||
| 62a54aab58 | |||
| 23f1e81cf0 | |||
| d014f422d2 | |||
| 68a9f1bc46 | |||
| 798637d465 | |||
| 60ea4c5f77 | |||
| 0e119950c2 | |||
| 4be4467fc6 | |||
| 06636b2a28 | |||
| 71a36d1b25 | |||
| 9ba93ff8d2 | |||
| 4059308dd7 | |||
| 9befe8ae5f | |||
| 20e01f3b2c | |||
| 98b894ed8e | |||
| ac8b7264b3 | |||
| bf7b24ecc0 | |||
| 9f43dd2db5 | |||
| 28d868985e | |||
| cf1be26da2 | |||
| 1de9b73aa0 | |||
| 3532a6360b | |||
| beddc8e1ea | |||
| df81fba565 | |||
| 25da0d26ef | |||
| e0c34d20a8 | |||
| cc6db5b5cc | |||
| c38df03add | |||
| 63402358d1 | |||
| 3ae1de735e | |||
| a701eb0e4f | |||
| 09caf017a9 | |||
| 32b8b2093d | |||
| c84a4f1aa8 | |||
| d90c0b5431 | |||
| 94f6785f0d | |||
| f01c382807 | |||
| 6d42803dd8 | |||
| 61e908ccb5 | |||
| 236bcba2bd | |||
| 7bae8c34a7 | |||
| 3960341640 | |||
| 06e453dd05 | |||
| 0347877290 | |||
| b464526d5e | |||
| 361b1cbad4 | |||
| 56a866fca7 | |||
| 49e0d68374 | |||
| 0ccd05e605 | |||
| 916e4586c5 | |||
| c9ffd0b4bb | |||
| 1d2f6f46a4 | |||
| 4af6d856b9 | |||
| 6fd4294391 | |||
| 88b2b85f2a | |||
| 2c1dff6ac8 | |||
| 481b42f563 | |||
| 597c321009 | |||
| 76651f75d8 | |||
| 3d8bae55a1 | |||
| 4b6869e367 | |||
| 477ba7c081 | |||
| 5b6d9725b8 | |||
| 25c3cea115 | |||
| d90601276f | |||
| 4f692bc698 | |||
| d8dd02eef0 | |||
| 8ad65ae233 | |||
| eabbb4569b | |||
| 49888b771d | |||
| 2b1c1cd052 | |||
| 61884e67ec | |||
| 9a2f028843 | |||
| 2b56acf164 | |||
| 98b67dcc28 | |||
| 500dfa3107 | |||
| c4efcfd2db | |||
| 81ee6bbcf6 | |||
| e4e2e76e06 | |||
| f847862e84 | |||
| 427dbeafde | |||
| 99ac85b40e | |||
| 020388baed | |||
| 4ade79de4f | |||
| 870dda9b8b | |||
| 27dd5298f7 | |||
| 6d5d406ce9 | |||
| ffb5e7e6f7 | |||
| 0de101c89f | |||
| bd3a0766e1 | |||
| f536cc8f8a | |||
| 826c0495fc | |||
| 9eac541ce5 |
@@ -0,0 +1,4 @@
|
||||
# These are supported funding model platforms
|
||||
|
||||
liberapay: OpenTracks
|
||||
custom: https://play.google.com/store/apps/details?id=de.dennisguse.opentracks.playstore
|
||||
@@ -0,0 +1,26 @@
|
||||
---
|
||||
name: Bug report
|
||||
about: Report issues of OpenTracks features
|
||||
title: ''
|
||||
labels: potential bug
|
||||
assignees: ''
|
||||
|
||||
---
|
||||
|
||||
**Describe the bug**
|
||||
A clear and concise description of what the bug is.
|
||||
|
||||
**To Reproduce**
|
||||
1. Go to '...'
|
||||
2. Click on '....'
|
||||
3. Scroll down to '....'
|
||||
4. See error
|
||||
|
||||
If applicable:
|
||||
* add screenshots
|
||||
* add logcat output
|
||||
|
||||
**Technical information**
|
||||
- Device: [e.g. Nexus 7 (2013)]
|
||||
- OS: [e.g. LineageOS 15.1]
|
||||
- Version [e.g. v3.2.4]
|
||||
@@ -0,0 +1,20 @@
|
||||
---
|
||||
name: Feature request
|
||||
about: Suggest an idea for OpenTracks
|
||||
title: ''
|
||||
labels: enhancement
|
||||
assignees: ''
|
||||
|
||||
---
|
||||
|
||||
**Is your feature request related to a problem? Please describe.**
|
||||
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
|
||||
|
||||
**Describe the solution you'd like**
|
||||
A clear and concise description of what you want to happen.
|
||||
|
||||
**Describe alternatives you've considered**
|
||||
A clear and concise description of any alternative solutions or features you've considered.
|
||||
|
||||
**Additional context**
|
||||
Add any other context or screenshots about the feature request here.
|
||||
@@ -0,0 +1,21 @@
|
||||
# Thanks for your contribution.
|
||||
|
||||
## PLEASE REMOVE
|
||||
To support us in providing a nice (and fast) open-source experience:
|
||||
1. Verify that the tests are passing
|
||||
2. Check that the code is properly formatted (using AndroidStudio's autoformatter)
|
||||
3. Provide write access to the [branch](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork)
|
||||
4. If the PR is not ready for review, please submit it as a [draft](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-requests#draft-pull-requests)
|
||||
## PLEASE REMOVE
|
||||
|
||||
**Describe the pull request**
|
||||
A clear and concise description of what the pull request changes/adds.
|
||||
|
||||
**Link to the the issue**
|
||||
(If available): The link to the issue that this pull request solves.
|
||||
|
||||
**License agreement**
|
||||
By opening this pull request, you are providing your contribution under the _Apache License 2.0_ (see [LICENSE.md](LICENSE.md)).
|
||||
|
||||
**Note: new dependencies/libraries**
|
||||
Please refrain from introducing new libraries without consulting the team.
|
||||
@@ -0,0 +1,10 @@
|
||||
version: 2
|
||||
updates:
|
||||
- package-ecosystem: "gradle"
|
||||
directory: "/"
|
||||
schedule:
|
||||
interval: "daily"
|
||||
- package-ecosystem: "github-actions"
|
||||
directory: "/"
|
||||
schedule:
|
||||
interval: "daily"
|
||||
@@ -0,0 +1,34 @@
|
||||
name: "CodeQL"
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [main]
|
||||
pull_request:
|
||||
branches: [main]
|
||||
schedule:
|
||||
- cron: '0 6 * * 1'
|
||||
|
||||
jobs:
|
||||
analyse:
|
||||
name: Analyse
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v2
|
||||
with:
|
||||
fetch-depth: 2
|
||||
|
||||
- run: git checkout HEAD^2
|
||||
if: ${{ github.event_name == 'pull_request' }}
|
||||
|
||||
- name: Initialize CodeQL
|
||||
uses: github/codeql-action/init@v1
|
||||
with:
|
||||
languages: java
|
||||
|
||||
- run: |
|
||||
./gradlew build
|
||||
|
||||
- name: Perform CodeQL Analysis
|
||||
uses: github/codeql-action/analyze@v1
|
||||
@@ -0,0 +1,21 @@
|
||||
#https://github.com/marketplace/actions/android-emulator-runner
|
||||
name: Test
|
||||
on: [push, pull_request]
|
||||
jobs:
|
||||
test:
|
||||
runs-on: macos-latest
|
||||
strategy:
|
||||
matrix:
|
||||
api-level: [29]
|
||||
target: [default]
|
||||
steps:
|
||||
- name: checkout
|
||||
uses: actions/checkout@v2
|
||||
|
||||
- name: run tests
|
||||
uses: reactivecircus/android-emulator-runner@v2
|
||||
with:
|
||||
api-level: ${{ matrix.api-level }}
|
||||
target: ${{ matrix.target }}
|
||||
arch: x86_64
|
||||
script: ./gradlew connectedCheck
|
||||
@@ -0,0 +1,82 @@
|
||||
# Built application files
|
||||
*.apk
|
||||
*.ap_
|
||||
|
||||
# Files for the ART/Dalvik VM
|
||||
*.dex
|
||||
|
||||
# Java class files
|
||||
*.class
|
||||
|
||||
# Generated files
|
||||
bin/
|
||||
gen/
|
||||
out/
|
||||
release/
|
||||
|
||||
# Gradle files
|
||||
.gradle/
|
||||
build/
|
||||
|
||||
# Local configuration file (sdk path, etc)
|
||||
local.properties
|
||||
|
||||
# Proguard folder generated by Eclipse
|
||||
proguard/
|
||||
|
||||
# Log Files
|
||||
*.log
|
||||
|
||||
# Android Studio Navigation editor temp files
|
||||
.navigation/
|
||||
|
||||
# Android Studio captures folder
|
||||
captures/
|
||||
|
||||
# IntelliJ
|
||||
*.iml
|
||||
.idea/workspace.xml
|
||||
.idea/tasks.xml
|
||||
.idea/gradle.xml
|
||||
.idea/assetWizardSettings.xml
|
||||
.idea/dictionaries
|
||||
.idea/libraries
|
||||
.idea/caches
|
||||
|
||||
|
||||
# IntelliJ IDEA
|
||||
*.iws
|
||||
/out/
|
||||
|
||||
# User-specific configurations
|
||||
.idea/.name
|
||||
.idea/caches/
|
||||
.idea/compiler.xml
|
||||
.idea/copyright/profiles_settings.xml
|
||||
.idea/dataSources.ids
|
||||
.idea/datasources.xml
|
||||
.idea/dynamic.xml
|
||||
.idea/encodings.xml
|
||||
.idea/jsLibraryMappings.xml
|
||||
.idea/libraries/
|
||||
.idea/misc.xml
|
||||
.idea/modules.xml
|
||||
.idea/scopes/scope_settings.xml
|
||||
.idea/shelf/
|
||||
.idea/sqlDataSources.xml
|
||||
.idea/vcs.xml
|
||||
.idea/uiDesigner.xml
|
||||
.idea/jarRepositories.xml
|
||||
.idea/markdown-navigator-enh.xml
|
||||
.idea/markdown-navigator.xml
|
||||
|
||||
# Keystore files
|
||||
*.jks
|
||||
|
||||
# External native build folder generated in Android Studio 2.2 and later
|
||||
.externalNativeBuild
|
||||
|
||||
# Fastlane
|
||||
Appfile
|
||||
releasePlayStore/*
|
||||
Gemfile.lock
|
||||
@@ -1,6 +0,0 @@
|
||||
syntax:glob
|
||||
|
||||
*/bin
|
||||
*/gen/**
|
||||
.metadata
|
||||
MyTracksTest/annotations.log
|
||||
@@ -0,0 +1,116 @@
|
||||
<component name="ProjectCodeStyleConfiguration">
|
||||
<code_scheme name="Project" version="173">
|
||||
<codeStyleSettings language="XML">
|
||||
<indentOptions>
|
||||
<option name="CONTINUATION_INDENT_SIZE" value="4" />
|
||||
</indentOptions>
|
||||
<arrangement>
|
||||
<rules>
|
||||
<section>
|
||||
<rule>
|
||||
<match>
|
||||
<AND>
|
||||
<NAME>xmlns:android</NAME>
|
||||
<XML_ATTRIBUTE />
|
||||
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
</rule>
|
||||
</section>
|
||||
<section>
|
||||
<rule>
|
||||
<match>
|
||||
<AND>
|
||||
<NAME>xmlns:.*</NAME>
|
||||
<XML_ATTRIBUTE />
|
||||
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
<order>BY_NAME</order>
|
||||
</rule>
|
||||
</section>
|
||||
<section>
|
||||
<rule>
|
||||
<match>
|
||||
<AND>
|
||||
<NAME>.*:id</NAME>
|
||||
<XML_ATTRIBUTE />
|
||||
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
</rule>
|
||||
</section>
|
||||
<section>
|
||||
<rule>
|
||||
<match>
|
||||
<AND>
|
||||
<NAME>.*:name</NAME>
|
||||
<XML_ATTRIBUTE />
|
||||
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
</rule>
|
||||
</section>
|
||||
<section>
|
||||
<rule>
|
||||
<match>
|
||||
<AND>
|
||||
<NAME>name</NAME>
|
||||
<XML_ATTRIBUTE />
|
||||
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
</rule>
|
||||
</section>
|
||||
<section>
|
||||
<rule>
|
||||
<match>
|
||||
<AND>
|
||||
<NAME>style</NAME>
|
||||
<XML_ATTRIBUTE />
|
||||
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
</rule>
|
||||
</section>
|
||||
<section>
|
||||
<rule>
|
||||
<match>
|
||||
<AND>
|
||||
<NAME>.*</NAME>
|
||||
<XML_ATTRIBUTE />
|
||||
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
<order>BY_NAME</order>
|
||||
</rule>
|
||||
</section>
|
||||
<section>
|
||||
<rule>
|
||||
<match>
|
||||
<AND>
|
||||
<NAME>.*</NAME>
|
||||
<XML_ATTRIBUTE />
|
||||
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
<order>ANDROID_ATTRIBUTE_ORDER</order>
|
||||
</rule>
|
||||
</section>
|
||||
<section>
|
||||
<rule>
|
||||
<match>
|
||||
<AND>
|
||||
<NAME>.*</NAME>
|
||||
<XML_ATTRIBUTE />
|
||||
<XML_NAMESPACE>.*</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
<order>BY_NAME</order>
|
||||
</rule>
|
||||
</section>
|
||||
</rules>
|
||||
</arrangement>
|
||||
</codeStyleSettings>
|
||||
</code_scheme>
|
||||
</component>
|
||||
@@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="Encoding" addBOMForNewFiles="with NO BOM" />
|
||||
</project>
|
||||
@@ -0,0 +1,9 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
|
||||
<output url="file://$PROJECT_DIR$/build/classes" />
|
||||
</component>
|
||||
<component name="ProjectType">
|
||||
<option name="id" value="Android" />
|
||||
</component>
|
||||
</project>
|
||||
@@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="RenderSettings">
|
||||
<option name="showDecorations" value="true" />
|
||||
</component>
|
||||
</project>
|
||||
@@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="RunConfigurationProducerService">
|
||||
<option name="ignoredProducers">
|
||||
<set>
|
||||
<option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
|
||||
<option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
|
||||
<option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
|
||||
</set>
|
||||
</option>
|
||||
</component>
|
||||
</project>
|
||||
@@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="VcsDirectoryMappings">
|
||||
<mapping directory="" vcs="Git" />
|
||||
</component>
|
||||
</project>
|
||||
@@ -0,0 +1,10 @@
|
||||
[main]
|
||||
host = https://www.transifex.com
|
||||
|
||||
[opentracks.src-main-res-values-strings-xml--main]
|
||||
file_filter = src/main/res/values-<lang>/strings.xml
|
||||
minimum_perc = 0
|
||||
source_file = src/main/res/values/strings.xml
|
||||
source_lang = en
|
||||
type = ANDROID
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
# How to contribute?
|
||||
|
||||
## Testing
|
||||
|
||||
Just use OpenTracks and tell us what can be improved by opening an issue [here](https://github.com/OpenTracksApp/OpenTracks/issues/new/choose)
|
||||
|
||||
If we broke things (happens now and then), please tell us also.
|
||||
|
||||
## Coding new features
|
||||
|
||||
You have a cool idea for a feature that is missing in OpenTracks?
|
||||
And you would like to help by implementing it?
|
||||
If not, you can just take a look at the [issue tracker](https://github.com/OpenTracksApp/OpenTracks/issues).
|
||||
|
||||
Advices:
|
||||
* creating an issue beforehand might be a good idea
|
||||
Sometimes it is helpful to discuss your idea and also your implementation approach first.
|
||||
We may be able to give you some hints on how to tackle the problem.
|
||||
It also makes merging your changes easier and, usually, faster.
|
||||
* please only add new dependencies if is absolutely necessary
|
||||
If you need to:
|
||||
* tell us why those are required,
|
||||
* what alternatives are existing, and
|
||||
* why you choose this dependency.
|
||||
And also verify that the license(s) are compatible with _Apache 2.0_ as well as open-source.
|
||||
|
||||
## Coding conventions
|
||||
|
||||
None so far.
|
||||
Just keep it simple.
|
||||
And follow the _scout rule_.
|
||||
|
||||
You can take a look at existing code and get a feeling for it.
|
||||
|
||||
Please autoformat your code using AndroidStudio's code formatter.
|
||||
@@ -0,0 +1,201 @@
|
||||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
|
||||
1. Definitions.
|
||||
|
||||
"License" shall mean the terms and conditions for use, reproduction,
|
||||
and distribution as defined by Sections 1 through 9 of this document.
|
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by
|
||||
the copyright owner that is granting the License.
|
||||
|
||||
"Legal Entity" shall mean the union of the acting entity and all
|
||||
other entities that control, are controlled by, or are under common
|
||||
control with that entity. For the purposes of this definition,
|
||||
"control" means (i) the power, direct or indirect, to cause the
|
||||
direction or management of such entity, whether by contract or
|
||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity
|
||||
exercising permissions granted by this License.
|
||||
|
||||
"Source" form shall mean the preferred form for making modifications,
|
||||
including but not limited to software source code, documentation
|
||||
source, and configuration files.
|
||||
|
||||
"Object" form shall mean any form resulting from mechanical
|
||||
transformation or translation of a Source form, including but
|
||||
not limited to compiled object code, generated documentation,
|
||||
and conversions to other media types.
|
||||
|
||||
"Work" shall mean the work of authorship, whether in Source or
|
||||
Object form, made available under the License, as indicated by a
|
||||
copyright notice that is included in or attached to the work
|
||||
(an example is provided in the Appendix below).
|
||||
|
||||
"Derivative Works" shall mean any work, whether in Source or Object
|
||||
form, that is based on (or derived from) the Work and for which the
|
||||
editorial revisions, annotations, elaborations, or other modifications
|
||||
represent, as a whole, an original work of authorship. For the purposes
|
||||
of this License, Derivative Works shall not include works that remain
|
||||
separable from, or merely link (or bind by name) to the interfaces of,
|
||||
the Work and Derivative Works thereof.
|
||||
|
||||
"Contribution" shall mean any work of authorship, including
|
||||
the original version of the Work and any modifications or additions
|
||||
to that Work or Derivative Works thereof, that is intentionally
|
||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||
or by an individual or Legal Entity authorized to submit on behalf of
|
||||
the copyright owner. For the purposes of this definition, "submitted"
|
||||
means any form of electronic, verbal, or written communication sent
|
||||
to the Licensor or its representatives, including but not limited to
|
||||
communication on electronic mailing lists, source code control systems,
|
||||
and issue tracking systems that are managed by, or on behalf of, the
|
||||
Licensor for the purpose of discussing and improving the Work, but
|
||||
excluding communication that is conspicuously marked or otherwise
|
||||
designated in writing by the copyright owner as "Not a Contribution."
|
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||
on behalf of whom a Contribution has been received by Licensor and
|
||||
subsequently incorporated within the Work.
|
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
copyright license to reproduce, prepare Derivative Works of,
|
||||
publicly display, publicly perform, sublicense, and distribute the
|
||||
Work and such Derivative Works in Source or Object form.
|
||||
|
||||
3. Grant of Patent License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
(except as stated in this section) patent license to make, have made,
|
||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||
where such license applies only to those patent claims licensable
|
||||
by such Contributor that are necessarily infringed by their
|
||||
Contribution(s) alone or by combination of their Contribution(s)
|
||||
with the Work to which such Contribution(s) was submitted. If You
|
||||
institute patent litigation against any entity (including a
|
||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||
or a Contribution incorporated within the Work constitutes direct
|
||||
or contributory patent infringement, then any patent licenses
|
||||
granted to You under this License for that Work shall terminate
|
||||
as of the date such litigation is filed.
|
||||
|
||||
4. Redistribution. You may reproduce and distribute copies of the
|
||||
Work or Derivative Works thereof in any medium, with or without
|
||||
modifications, and in Source or Object form, provided that You
|
||||
meet the following conditions:
|
||||
|
||||
(a) You must give any other recipients of the Work or
|
||||
Derivative Works a copy of this License; and
|
||||
|
||||
(b) You must cause any modified files to carry prominent notices
|
||||
stating that You changed the files; and
|
||||
|
||||
(c) You must retain, in the Source form of any Derivative Works
|
||||
that You distribute, all copyright, patent, trademark, and
|
||||
attribution notices from the Source form of the Work,
|
||||
excluding those notices that do not pertain to any part of
|
||||
the Derivative Works; and
|
||||
|
||||
(d) If the Work includes a "NOTICE" text file as part of its
|
||||
distribution, then any Derivative Works that You distribute must
|
||||
include a readable copy of the attribution notices contained
|
||||
within such NOTICE file, excluding those notices that do not
|
||||
pertain to any part of the Derivative Works, in at least one
|
||||
of the following places: within a NOTICE text file distributed
|
||||
as part of the Derivative Works; within the Source form or
|
||||
documentation, if provided along with the Derivative Works; or,
|
||||
within a display generated by the Derivative Works, if and
|
||||
wherever such third-party notices normally appear. The contents
|
||||
of the NOTICE file are for informational purposes only and
|
||||
do not modify the License. You may add Your own attribution
|
||||
notices within Derivative Works that You distribute, alongside
|
||||
or as an addendum to the NOTICE text from the Work, provided
|
||||
that such additional attribution notices cannot be construed
|
||||
as modifying the License.
|
||||
|
||||
You may add Your own copyright statement to Your modifications and
|
||||
may provide additional or different license terms and conditions
|
||||
for use, reproduction, or distribution of Your modifications, or
|
||||
for any such Derivative Works as a whole, provided Your use,
|
||||
reproduction, and distribution of the Work otherwise complies with
|
||||
the conditions stated in this License.
|
||||
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||
any Contribution intentionally submitted for inclusion in the Work
|
||||
by You to the Licensor shall be under the terms and conditions of
|
||||
this License, without any additional terms or conditions.
|
||||
Notwithstanding the above, nothing herein shall supersede or modify
|
||||
the terms of any separate license agreement you may have executed
|
||||
with Licensor regarding such Contributions.
|
||||
|
||||
6. Trademarks. This License does not grant permission to use the trade
|
||||
names, trademarks, service marks, or product names of the Licensor,
|
||||
except as required for reasonable and customary use in describing the
|
||||
origin of the Work and reproducing the content of the NOTICE file.
|
||||
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||
agreed to in writing, Licensor provides the Work (and each
|
||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
implied, including, without limitation, any warranties or conditions
|
||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||
appropriateness of using or redistributing the Work and assume any
|
||||
risks associated with Your exercise of permissions under this License.
|
||||
|
||||
8. Limitation of Liability. In no event and under no legal theory,
|
||||
whether in tort (including negligence), contract, or otherwise,
|
||||
unless required by applicable law (such as deliberate and grossly
|
||||
negligent acts) or agreed to in writing, shall any Contributor be
|
||||
liable to You for damages, including any direct, indirect, special,
|
||||
incidental, or consequential damages of any character arising as a
|
||||
result of this License or out of the use or inability to use the
|
||||
Work (including but not limited to damages for loss of goodwill,
|
||||
work stoppage, computer failure or malfunction, or any and all
|
||||
other commercial damages or losses), even if such Contributor
|
||||
has been advised of the possibility of such damages.
|
||||
|
||||
9. Accepting Warranty or Additional Liability. While redistributing
|
||||
the Work or Derivative Works thereof, You may choose to offer,
|
||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||
or other liability obligations and/or rights consistent with this
|
||||
License. However, in accepting such obligations, You may act only
|
||||
on Your own behalf and on Your sole responsibility, not on behalf
|
||||
of any other Contributor, and only if You agree to indemnify,
|
||||
defend, and hold each Contributor harmless for any liability
|
||||
incurred by, or claims asserted against, such Contributor by reason
|
||||
of your accepting any such warranty or additional liability.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
APPENDIX: How to apply the Apache License to your work.
|
||||
|
||||
To apply the Apache License to your work, attach the following
|
||||
boilerplate notice, with the fields enclosed by brackets "[]"
|
||||
replaced with your own identifying information. (Don't include
|
||||
the brackets!) The text should be enclosed in the appropriate
|
||||
comment syntax for the file format. We also recommend that a
|
||||
file or class name and description of purpose be included on the
|
||||
same "printed page" as the copyright notice for easier
|
||||
identification within third-party archives.
|
||||
|
||||
Copyright [yyyy] [name of copyright owner]
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
@@ -1,10 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
|
||||
<classpathentry kind="lib" path="libs/googleloginclient-helper.jar"/>
|
||||
<classpathentry kind="lib" path="libs/google-common.jar"/>
|
||||
<classpathentry kind="lib" path="libs/accounts.jar"/>
|
||||
<classpathentry kind="src" path="src"/>
|
||||
<classpathentry kind="src" path="gen"/>
|
||||
<classpathentry kind="output" path="bin"/>
|
||||
</classpath>
|
||||
@@ -1,33 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<projectDescription>
|
||||
<name>MyTracks</name>
|
||||
<comment></comment>
|
||||
<projects>
|
||||
</projects>
|
||||
<buildSpec>
|
||||
<buildCommand>
|
||||
<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
<buildCommand>
|
||||
<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
<buildCommand>
|
||||
<name>org.eclipse.jdt.core.javabuilder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
<buildCommand>
|
||||
<name>com.android.ide.eclipse.adt.ApkBuilder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
</buildSpec>
|
||||
<natures>
|
||||
<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
|
||||
<nature>org.eclipse.jdt.core.javanature</nature>
|
||||
</natures>
|
||||
</projectDescription>
|
||||
@@ -1,12 +0,0 @@
|
||||
#Wed Sep 29 18:44:16 BRT 2010
|
||||
eclipse.preferences.version=1
|
||||
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
|
||||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
|
||||
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
|
||||
org.eclipse.jdt.core.compiler.compliance=1.6
|
||||
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
|
||||
org.eclipse.jdt.core.compiler.debug.localVariable=generate
|
||||
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
|
||||
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
|
||||
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
|
||||
org.eclipse.jdt.core.compiler.source=1.6
|
||||
@@ -1,125 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="com.google.android.maps.mytracks"
|
||||
android:installLocation="auto"
|
||||
android:versionCode="22"
|
||||
android:versionName="1.0.21">
|
||||
<application android:icon="@drawable/arrow_icon"
|
||||
android:label="@string/app_name"
|
||||
android:backupAgent="com.google.android.apps.mytracks.io.backup.MyTracksBackupAgent">
|
||||
<uses-library android:name="com.google.android.maps" />
|
||||
|
||||
<meta-data android:name="com.google.android.backup.api_key"
|
||||
android:value="AEdPqrEAAAAIi-_QiwoRSc9_bAC9cmuNXTQyU8ajJmGtKdhskQ" />
|
||||
|
||||
<provider android:name="com.google.android.apps.mytracks.content.MyTracksProvider"
|
||||
android:authorities="com.google.android.maps.mytracks" />
|
||||
|
||||
<activity android:name="com.google.android.apps.mytracks.MyTracks"
|
||||
android:label="My Tracks"
|
||||
android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|fontScale">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.MAIN" />
|
||||
<category android:name="android.intent.category.LAUNCHER" />
|
||||
</intent-filter>
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.VIEW" />
|
||||
<category android:name="android.intent.category.DEFAULT" />
|
||||
<category android:name="android.intent.category.BROWSABLE" />
|
||||
<data android:scheme="file" />
|
||||
<data android:mimeType="application/gpx+xml" />
|
||||
<data android:mimeType="application/gpx" />
|
||||
<data android:mimeType="application/vnd.google-earth.gpx" />
|
||||
<data android:mimeType="application/vnd.google-earth.gpx+xml" />
|
||||
</intent-filter>
|
||||
</activity>
|
||||
|
||||
<activity android:name="com.google.android.apps.mytracks.MyTracksMap"
|
||||
android:label="MyTracks" />
|
||||
|
||||
<activity android:name="com.google.android.apps.mymaps.MyMapsList"
|
||||
android:label="@string/map_list_title"
|
||||
android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|fontScale" />
|
||||
|
||||
<activity android:name="com.google.android.apps.mytracks.MyTracksList"
|
||||
android:label="Recorded Tracks" />
|
||||
|
||||
<activity android:name="com.google.android.apps.mytracks.MyTracksWaypointsList"
|
||||
android:label="Recorded Waypoints" />
|
||||
|
||||
<activity android:name="com.google.android.apps.mytracks.MyTracksDetails"
|
||||
android:label="@string/trackdetails_title" />
|
||||
|
||||
<activity android:name="com.google.android.apps.mytracks.MyTracksWaypointDetails"
|
||||
android:label="@string/waypointdetails_title" />
|
||||
|
||||
<activity android:name="com.google.android.apps.mytracks.MyTracksSettings"
|
||||
android:label="@string/mytracks_settings" />
|
||||
|
||||
<activity android:name="com.google.android.apps.mytracks.AggregatedStatsActivity"
|
||||
android:label="@string/aggregated_stats" />
|
||||
|
||||
<activity android:name="com.google.android.apps.mytracks.StatsActivity"
|
||||
android:label="@string/statistics" />
|
||||
|
||||
<activity android:name="com.google.android.apps.mytracks.ChartActivity"
|
||||
android:label="@string/elevation_label"/>
|
||||
|
||||
<activity android:name="com.google.android.apps.mytracks.WelcomeActivity"
|
||||
android:label="@string/welcome"/>
|
||||
|
||||
<service android:name="com.google.android.apps.mytracks.services.TrackRecordingService"
|
||||
android:label="Track Recording Service"
|
||||
android:icon="@drawable/arrow_320"
|
||||
android:enabled="true"
|
||||
android:exported="true" />
|
||||
|
||||
<receiver android:name="com.google.android.apps.mytracks.MyTracksReceiver">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.BOOT_COMPLETED" />
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
</application>
|
||||
|
||||
<!-- Permissions to initialize service -->
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
|
||||
|
||||
<!-- Permissions for recording tracks and showing maps -->
|
||||
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
|
||||
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
|
||||
<uses-permission android:name="android.permission.INTERNET" />
|
||||
<uses-permission android:name="android.permission.WAKE_LOCK" />
|
||||
|
||||
<!-- Permissions for uploading tracks -->
|
||||
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
|
||||
<uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
|
||||
<uses-permission android:name="android.permission.USE_CREDENTIALS" />
|
||||
<uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH" />
|
||||
<uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.local" />
|
||||
<uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.wise" />
|
||||
<uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.writely" />
|
||||
<uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES" />
|
||||
|
||||
<!-- Permissions for misc services -->
|
||||
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
|
||||
|
||||
<!-- Features required -->
|
||||
<uses-feature android:name="android.hardware.location" android:required="true"/>
|
||||
<uses-feature android:name="android.hardware.location.gps" android:required="true"/>
|
||||
<uses-feature android:name="android.hardware.touchscreen" android:required="true"/>
|
||||
|
||||
<!-- Features optional -->
|
||||
<uses-feature android:name="android.hardware.bluetooth" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.location.network" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.sensor.compass" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.telephony" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.telephony.gsm" android:required="false"/>
|
||||
<uses-feature android:name="android.hardware.touchscreen.multitouch" android:required="false"/>
|
||||
|
||||
<uses-sdk android:minSdkVersion="3"/>
|
||||
<supports-screens
|
||||
android:largeScreens="true"
|
||||
android:normalScreens="true"
|
||||
android:smallScreens="true"
|
||||
android:anyDensity="true" />
|
||||
</manifest>
|
||||
@@ -1,24 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<launchConfiguration type="com.android.ide.eclipse.adt.debug.LaunchConfigType">
|
||||
<intAttribute key="com.android.ide.eclipse.adt.action" value="0"/>
|
||||
<stringAttribute key="com.android.ide.eclipse.adt.commandline" value=""/>
|
||||
<intAttribute key="com.android.ide.eclipse.adt.delay" value="0"/>
|
||||
<booleanAttribute key="com.android.ide.eclipse.adt.nobootanim" value="false"/>
|
||||
<intAttribute key="com.android.ide.eclipse.adt.speed" value="0"/>
|
||||
<booleanAttribute key="com.android.ide.eclipse.adt.target" value="false"/>
|
||||
<booleanAttribute key="com.android.ide.eclipse.adt.wipedata" value="false"/>
|
||||
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
|
||||
<listEntry value="/MyTracks"/>
|
||||
<listEntry value="/MyTracks/AndroidManifest.xml"/>
|
||||
</listAttribute>
|
||||
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
|
||||
<listEntry value="4"/>
|
||||
<listEntry value="1"/>
|
||||
</listAttribute>
|
||||
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
|
||||
<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
|
||||
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
|
||||
</listAttribute>
|
||||
<booleanAttribute key="org.eclipse.jdt.launching.ALLOW_TERMINATE" value="true"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="MyTracks"/>
|
||||
</launchConfiguration>
|
||||
@@ -1,62 +0,0 @@
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html lang="en-US" xml:lang="en-US" xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
<title>My Tracks Welcome</title>
|
||||
</head>
|
||||
<body>
|
||||
<div>
|
||||
<img src="file:///android_asset/welcome.png" />
|
||||
|
||||
<p>
|
||||
<b>What is My Tracks?</b><br>
|
||||
<i>My Tracks</i> is an application for your Android powered phone. With <i>My Tracks</i> you can record GPS tracks and visualize your hiking, running, biking or any other activity while watching live performance statistics. <i>My Tracks</i> makes it easy to archive your training history with <i>Google Docs</i> and <i>Google My Maps</i>, and share your activities with friends and the world.<br><br>
|
||||
|
||||
<b>How do I see the map, statistics and elevation profile?</b><br>
|
||||
Touch the map. Left and right arrows will appear. Tap on these arrows to cycle between the map view, the track statistics view, and the elevation profile.<br> <br>
|
||||
|
||||
<b>Why does the application sometimes display <i>Waiting for a better GPS fix. Make sure the sky is visible</i>?</b><br>
|
||||
For <i>My Tracks</i> to work, your phone needs to be in line-of-sight contact with the GPS satellites orbiting the earth. If line-of-sight is obstructed by trees, buildings or canyon walls, you may not get an accurate fix. If you see the message Waiting for a better GPS fix, wait a minute or two. If your device does not achieve a fix, move to an area clear of obstructions and try again.
|
||||
<br> <br>
|
||||
|
||||
<b>How do I send my tracks to <i>Google My Maps</i> and <i>Google Docs</i>?</b><br>
|
||||
Tap the <i>Options</i> button located at the bottom right corner of the map and select <i>Send to Google...</i> Then choose to send the track to <i>Google My Maps</i> and/or <i>Google Docs</i>. The first time you do this, you may be prompted to log into your Google account. By default your track will be uploaded to a new <i>My Map</i> that will be created in your account. You can opt to add your track to an existing <i>My Map</i> if you prefer. In that case you will be asked to choose a <i>My Map</i> from your account. You can view and edit all of your <i>My Maps</i> by going to maps.google.com, signing in, and clicking on the <i>My Maps</i> tab.<br> <br>
|
||||
|
||||
<b>How do I share tracks with friends and the rest of the world? </b><br>
|
||||
After recording a track, press the <i>Options</i> button on the bottom right of the map and then select <i>Share with friends...</i> Select how you want to share the track: a) as a link to a <i>Google My Map</i> (you will be prompted to upload the track to <i>Google My Maps</i> if you have not already done so), b) as a GPX file in an e-mail attachment, or c) as a KML file in an e-mail attachment. You can also send an e-mail with a link to your <i>My Map</i> by going to maps.google.com on your computer. Select the map and then click <i>Link</i> on the right side of the Google Maps web site.<br> <br>
|
||||
|
||||
<b>Can I view other people's tracks on my Android phone?</b><br>
|
||||
Yes. Use the <i>Google My Maps Editor</i> application, available from the <i>Android Market</i>, to view tracks that have been uploaded to <a href="http://www.google.com/url?sa=D&q=http%3A%2F%2Fmaps.google.com">maps.google.com</a> by you or your friends. If you have received an e-mail invitation to view a map, you can click on the link contained in the e-mail to view the map on your Android phone, assuming that <i>Google My Maps Editor</i> is installed on the phone.<br> <br>
|
||||
|
||||
<b>What are way point markers?</b><br>
|
||||
Way point markers are used to annotate a place. For example if you are recording a track and you are close to an interesting place, let's say a mountain top, press <i>MENU | Markers | Insert Way point</i> to insert a way point marker at that location. Type a name and description for the place. Once you send your track to Google a place marker will show up on your map. People who view your maps can read your description and learn about this place.<br> <br>
|
||||
|
||||
<b>What are statistics markers?</b><br>
|
||||
Let's say you are recording a bike ride up a hill. You will be able to see the total time and distance for the trip, but wouldn't it be good to know how long the climbing part took and how much altitude has been gained? That's what statistics marker are for. Insert a statistics marker once at the bottom of the hill, and once at the top. Now you will be able to view track statistics for each segment of your ride. Each marker has the statistic for the segment up to the marker. Note: To insert a statistics marker simply press the track ball (while the <i>My Tracks</i> application is in the foreground), or use <i>MENU | Markers | Insert Statistics</i>.<br> <br>
|
||||
|
||||
<b>Do I need a cell signal and data connection to use <i>My Tracks</i>?</b><br>
|
||||
A cell signal or data connection is not required to record GPS tracks. However, if there is no data connection, you will not be able to see satellite imagery or a map. Instead, you will see a grey screen or partial map. Tracks, represented as simple lines, can still be recorded even if there is no data connection.<br> <br>
|
||||
|
||||
<b>How long does the battery last when recording tracks?</b><br>
|
||||
The GPS receiver draws a relatively high amount of power, so a fully charged battery typically survives less than 5 hours. Battery life depends on many factors, including signal strength, battery freshness, and tasks running in parallel. Switching off some or all of the phone's radios will lengthen battery life. Putting the phone into Airplane mode will yield the best results.<br> <br>
|
||||
|
||||
<b>What can I do with tracks after saving them as GPX or KML files to the SD card or sharing such files with friends?</b><br> GPX and KML are standard file formats for storing data from GPS receivers. You can use Google Earth or similar applications to visualize and edit GPS tracks. Go to http://earth.google.com to download the latest version of Google Earth for free.<br> <br>
|
||||
|
||||
<b>How precise are the recorded tracks?</b><br>
|
||||
Under optimal conditions the location error can be +/- 20 feet (6 meters). However, precision depends on the quality of the GPS signal. Your phone needs to be in line-of-sight contact with the GPS satellites orbiting the earth. The signal will be best in open areas free of trees, buildings, canyon walls and other obstructions. The blue circle around the orange location arrow indicates estimated precision. (You may need to zoom in or out to see the circle.) If the precision is too low, a message at the top of the screen will alert you and tracks will not be recorded. You can change the minimum required precision in the <i>My Tracks</i> Settings (See: <i>MENU | Settings | Pause recording if accuracy drops below</i>).<br> <br>
|
||||
|
||||
<b> How precise is the elevation measurement?</b><br>
|
||||
GPS receivers measure elevations much less precisely than latitude and longitude. Elevations can sometimes be off by a few hundred feet, though relative changes are tracked more precisely. To get a good elevation measurement make sure that you have a strong GPS signal (good sky visibility) and wait a few minutes for the elevation to settle to a stable value.<br> <br>
|
||||
|
||||
<b>Can I edit the tracks and correct them for inaccuracies?</b><br>
|
||||
Once you upload tracks to <i>Google My Maps</i>, you can move, delete or insert individual track points as desired.<br> <br>
|
||||
|
||||
<b>Why do very long tracks split into multiple segments upon sending them to <i>Google My Maps</i>? </b><br>
|
||||
Tracks on maps.google.com are limited to 500 points or less. As a result, long tracks are split into multiple pieces upon upload to <i>Google My Maps</i>.<br><br>
|
||||
|
||||
<b>How do I delete all tracks from my phone?</b><br> Press the MENU button and select List tracks. Tap the Delete all tracks button. This permanently deletes the recorded GPS tracks from memory. If you have saved tracks to the SD card, you must delete them separately. Tracks uploaded to <i>Google My Maps</i> and <i>Google Docs</i> must also be deleted separately.<br> <br>
|
||||
|
||||
<b>Who can see maps I send to maps.google.com?</b><br> By default new maps that you send to maps.google.com will be publicly visible. To prevent newly created maps from being public, go to the <i>My Tracks</i> settings screen and deselect the check box labeled <i>Make maps public on maps.google.com</i>. You can change the visibility of existing maps through the maps.google.com web site or using the <i>Google My Maps Editor</i> application from your Android phone.<br> <br> <br><br>
|
||||
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
Before Width: | Height: | Size: 23 KiB |
@@ -1,13 +0,0 @@
|
||||
# This file is automatically generated by Android Tools.
|
||||
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
|
||||
#
|
||||
# This file must be checked in Version Control Systems.
|
||||
#
|
||||
# To customize properties used by the Ant build system use,
|
||||
# "build.properties", and override values to adapt the script to your
|
||||
# project structure.
|
||||
|
||||
# Indicates whether an apk should be generated for each density.
|
||||
split.density=false
|
||||
# Project target.
|
||||
target=Google Inc.:Google APIs:8
|
||||
|
Before Width: | Height: | Size: 671 B |
|
Before Width: | Height: | Size: 680 B |
|
Before Width: | Height: | Size: 738 B |
|
Before Width: | Height: | Size: 783 B |
|
Before Width: | Height: | Size: 746 B |
|
Before Width: | Height: | Size: 720 B |
|
Before Width: | Height: | Size: 703 B |
|
Before Width: | Height: | Size: 671 B |
|
Before Width: | Height: | Size: 810 B |
|
Before Width: | Height: | Size: 698 B |
|
Before Width: | Height: | Size: 694 B |
|
Before Width: | Height: | Size: 725 B |
|
Before Width: | Height: | Size: 805 B |
|
Before Width: | Height: | Size: 812 B |
|
Before Width: | Height: | Size: 689 B |
|
Before Width: | Height: | Size: 760 B |
|
Before Width: | Height: | Size: 707 B |
|
Before Width: | Height: | Size: 743 B |
|
Before Width: | Height: | Size: 974 B |
|
Before Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 358 B |
|
Before Width: | Height: | Size: 8.4 KiB |
|
Before Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 3.3 KiB |
|
Before Width: | Height: | Size: 2.9 KiB |
|
Before Width: | Height: | Size: 4.2 KiB |
|
Before Width: | Height: | Size: 3.8 KiB |
|
Before Width: | Height: | Size: 3.4 KiB |
|
Before Width: | Height: | Size: 3.0 KiB |
|
Before Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 913 B |
|
Before Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 722 B |
|
Before Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 220 B |
|
Before Width: | Height: | Size: 7.2 KiB |
|
Before Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 3.1 KiB |
|
Before Width: | Height: | Size: 2.9 KiB |
|
Before Width: | Height: | Size: 4.2 KiB |
|
Before Width: | Height: | Size: 3.8 KiB |
@@ -1,27 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright 2010 Google Inc.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<item android:state_window_focused="false"
|
||||
android:drawable="@drawable/right_arrow_stats" />
|
||||
|
||||
<item android:state_pressed="true"
|
||||
android:drawable="@drawable/right_arrow_stats_press" />
|
||||
|
||||
<item android:drawable="@drawable/right_arrow_stats" />
|
||||
|
||||
</selector>
|
||||
|
Before Width: | Height: | Size: 3.5 KiB |
|
Before Width: | Height: | Size: 3.0 KiB |
@@ -1,27 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright 2010 Google Inc.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<item android:state_window_focused="false"
|
||||
android:drawable="@drawable/right_arrow_track" />
|
||||
|
||||
<item android:state_pressed="true"
|
||||
android:drawable="@drawable/right_arrow_track_press" />
|
||||
|
||||
<item android:drawable="@drawable/right_arrow_track" />
|
||||
|
||||
</selector>
|
||||
|
Before Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 279 B |
|
Before Width: | Height: | Size: 274 B |
|
Before Width: | Height: | Size: 1.2 KiB |
@@ -1,127 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright 2008 Google Inc.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
<TableLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:stretchColumns="2">
|
||||
<TableRow>
|
||||
<ImageView
|
||||
android:layout_column="1"
|
||||
android:src="@drawable/arrow_icon" />
|
||||
<LinearLayout
|
||||
android:layout_column="2"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:orientation="vertical">
|
||||
<TextView
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:text="@string/app_name"
|
||||
android:textSize="30sp" />
|
||||
<TextView
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:text="@string/about_copyright_message"
|
||||
android:textSize="15sp" />
|
||||
</LinearLayout>
|
||||
</TableRow>
|
||||
|
||||
<View
|
||||
android:layout_height="2dip" />
|
||||
|
||||
<TableRow>
|
||||
<TextView
|
||||
android:paddingLeft="10dip"
|
||||
android:paddingRight="10dip"
|
||||
android:layout_column="1"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:text="@string/about_team"
|
||||
android:textSize="20sp" />
|
||||
<LinearLayout
|
||||
android:layout_column="2"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:orientation="vertical">
|
||||
<TextView
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:text="@string/about_dylan"
|
||||
android:textSize="20sp" />
|
||||
<TextView
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:text="@string/about_leif"
|
||||
android:textSize="20sp" />
|
||||
<TextView
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:text="@string/about_rdamazio"
|
||||
android:textSize="20sp" />
|
||||
<TextView
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:text="@string/about_sandor"
|
||||
android:textSize="20sp" />
|
||||
</LinearLayout>
|
||||
</TableRow>
|
||||
|
||||
<View
|
||||
android:layout_height="2dip" />
|
||||
|
||||
<TableRow>
|
||||
<TextView
|
||||
android:paddingLeft="10dip"
|
||||
android:paddingRight="10dip"
|
||||
android:layout_column="1"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:text="@string/about_version"
|
||||
android:textSize="20sp" />
|
||||
<TextView
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/about_version_register"
|
||||
android:layout_width="wrap_content"
|
||||
android:text="@string/unknown"
|
||||
android:textSize="20sp" />
|
||||
</TableRow>
|
||||
|
||||
<View
|
||||
android:layout_height="2dip" />
|
||||
|
||||
<TableRow>
|
||||
<TextView
|
||||
android:paddingLeft="10dip"
|
||||
android:paddingRight="10dip"
|
||||
android:layout_column="1"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:text="@string/about_support"
|
||||
android:textSize="20sp" />
|
||||
<TextView
|
||||
android:autoLink="web"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:text="@string/about_weburl"
|
||||
android:textSize="18sp" />
|
||||
</TableRow>
|
||||
|
||||
<View
|
||||
android:layout_height="4dip" />
|
||||
|
||||
</TableLayout>
|
||||
@@ -1,133 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright 2009 Google Inc.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:id="@+id/screen"
|
||||
android:layout_width="200dip"
|
||||
android:layout_height="fill_parent"
|
||||
android:orientation="vertical">
|
||||
<LinearLayout
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/list_bar">
|
||||
<TextView
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/chart_settings"
|
||||
android:textSize="20dip"
|
||||
android:textColor="#fff"
|
||||
android:layout_marginLeft="10dip"/>
|
||||
</LinearLayout>
|
||||
<ScrollView
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1">
|
||||
<TableLayout
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:stretchColumns="1"
|
||||
android:layout_marginTop="5dip"
|
||||
android:layout_marginLeft="5dip">
|
||||
<TableRow>
|
||||
<LinearLayout
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:layout_marginLeft="10dip">
|
||||
<LinearLayout
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal">
|
||||
<ImageView android:src="@drawable/x_axis"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"/>
|
||||
<TextView
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/x_axis"
|
||||
android:textSize="20dip" />
|
||||
</LinearLayout>
|
||||
<RadioGroup android:id="@+id/chart_settings_x"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content">
|
||||
<RadioButton android:id="@+id/chart_settings_by_distance"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/by_distance"/>
|
||||
<RadioButton android:id="@+id/chart_settings_by_time"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/by_time"/>
|
||||
</RadioGroup>
|
||||
</LinearLayout>
|
||||
</TableRow>
|
||||
<TableRow>
|
||||
<LinearLayout
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:layout_marginLeft="10dip">
|
||||
<LinearLayout
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal">
|
||||
<ImageView android:src="@drawable/y_axis"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"/>
|
||||
<TextView
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/y_axis"
|
||||
android:textSize="20dip" />
|
||||
</LinearLayout>
|
||||
<CheckBox android:id="@+id/chart_settings_elevation"
|
||||
android:checked="true"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/elevation"/>
|
||||
<CheckBox android:id="@+id/chart_settings_speed"
|
||||
android:checked="true"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/speed"/>
|
||||
</LinearLayout>
|
||||
</TableRow>
|
||||
</TableLayout>
|
||||
</ScrollView>
|
||||
<LinearLayout
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/list_bar"
|
||||
android:padding="3dip">
|
||||
<Button android:id="@+id/chart_settings_cancel"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="48dip"
|
||||
android:layout_gravity="right"
|
||||
android:text="@string/cancel"
|
||||
android:textSize="14dip"/>
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"/>
|
||||
<Button android:id="@+id/chart_settings_ok"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="48dip"
|
||||
android:layout_gravity="right"
|
||||
android:text="@string/ok"
|
||||
android:textSize="14dip"/>
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
@@ -1,103 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright 2010 Google Inc.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apl/res/com.google.android.maps"
|
||||
android:orientation="vertical"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent">
|
||||
<LinearLayout
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/list_bar"
|
||||
android:layout_weight="0"
|
||||
android:padding="3dip">
|
||||
<TextView android:id="@+id/message"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textSize="16dip"
|
||||
android:textColor="#fff"
|
||||
android:text="@string/select_map_message"
|
||||
android:layout_weight="0"/>
|
||||
</LinearLayout>
|
||||
<ListView android:id="@+id/maplist"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"/>
|
||||
<TextView android:id="@+id/mapslist_empty"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:layout_gravity="center"
|
||||
android:gravity="center"
|
||||
android:padding="3dip"
|
||||
android:textSize="16dip"
|
||||
android:textColor="#c00"
|
||||
android:textStyle="bold"
|
||||
android:text="@string/mapslist_no_maps_available"
|
||||
android:visibility="gone"/>
|
||||
<TextView android:id="@+id/failed"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:gravity="center"
|
||||
android:padding="3dip"
|
||||
android:textSize="16dip"
|
||||
android:textColor="#c00"
|
||||
android:textStyle="bold"
|
||||
android:text="@string/maps_list_failed"
|
||||
android:visibility="gone"/>
|
||||
<LinearLayout
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/list_bar"
|
||||
android:layout_weight="0"
|
||||
android:padding="3dip">
|
||||
<LinearLayout android:id="@+id/loading"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
android:padding="3dip"
|
||||
android:layout_gravity="center">
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"/>
|
||||
<ProgressBar
|
||||
android:layout_height="20dip"
|
||||
android:layout_width="20dip"
|
||||
android:layout_gravity="center"/>
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:paddingLeft="3dip"
|
||||
android:textSize="16dip"
|
||||
android:textColor="#fff"
|
||||
android:textStyle="bold"
|
||||
android:text="@string/maps_list_loading"/>
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"/>
|
||||
</LinearLayout>
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"/>
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
@@ -1,40 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright 2010 Google Inc.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
<LinearLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:padding="2dip"
|
||||
android:orientation="vertical">
|
||||
<TextView android:id="@+id/maplistitem"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textSize="9pt"
|
||||
android:textStyle="bold"
|
||||
android:textColor="#fff"
|
||||
android:singleLine="true"/>
|
||||
<TextView android:id="@+id/maplistdesc"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textSize="8pt"
|
||||
android:singleLine="true"/>
|
||||
<TextView android:id="@+id/maplistpublic"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textSize="7pt"
|
||||
android:singleLine="true"/>
|
||||
</LinearLayout>
|
||||
@@ -1,88 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright 2010 Google Inc.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:orientation="vertical"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:paddingTop="10dip"
|
||||
android:background="#c000">
|
||||
<TextView android:text="@string/trackdetails_name"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"/>
|
||||
<LinearLayout
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal">
|
||||
<ImageView android:id="@+id/trackdetails_icon"
|
||||
android:src="@drawable/track"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:paddingLeft="4dip"
|
||||
android:paddingRight="4dip"/>
|
||||
<EditText android:id="@+id/trackdetails_name"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:singleLine="true"
|
||||
android:autoText="true"
|
||||
android:capitalize="words"
|
||||
android:selectAllOnFocus="true"/>
|
||||
</LinearLayout>
|
||||
<TextView android:text="@string/trackdetails_category"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"/>
|
||||
<AutoCompleteTextView android:id="@+id/trackdetails_category"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:singleLine="true"/>
|
||||
<TextView android:text="@string/trackdetails_description"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"/>
|
||||
<EditText android:id="@+id/trackdetails_description"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="0dip"
|
||||
android:singleLine="false"
|
||||
android:autoText="true"
|
||||
android:capitalize="sentences"
|
||||
android:selectAllOnFocus="true"
|
||||
android:maxLines="50"
|
||||
android:gravity="top"
|
||||
android:layout_weight="1"/>
|
||||
<LinearLayout
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/list_bar"
|
||||
android:padding="3dip">
|
||||
<Button android:id="@+id/trackdetails_cancel"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="48dip"
|
||||
android:layout_gravity="right"
|
||||
android:text="@string/cancel"
|
||||
android:textSize="14dip"/>
|
||||
<TextView
|
||||
android:layout_width="0dip"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"/>
|
||||
<Button android:id="@+id/trackdetails_save"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="48dip"
|
||||
android:layout_gravity="right"
|
||||
android:text="@string/save"
|
||||
android:textSize="14dip"/>
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
@@ -1,58 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright 2010 Google Inc.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
<RelativeLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:id="@+id/elevation_root"
|
||||
android:orientation="vertical"
|
||||
android:layout_height="fill_parent"
|
||||
android:layout_width="fill_parent">
|
||||
<LinearLayout android:id="@+id/elevation_chart"
|
||||
android:orientation="vertical"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:layout_weight="1">
|
||||
</LinearLayout>
|
||||
<RelativeLayout android:id="@+id/elevation_zoom_layout"
|
||||
android:orientation="vertical"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:layout_weight="0">
|
||||
<ZoomControls android:id="@+id/elevation_zoom"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:layout_centerHorizontal="true"/>
|
||||
</RelativeLayout>
|
||||
<LinearLayout android:id="@+id/elevation_busypane"
|
||||
android:orientation="vertical"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:layout_weight="0"
|
||||
android:padding="3dip"
|
||||
android:visibility="gone">
|
||||
<ProgressBar
|
||||
android:layout_weight="1"
|
||||
android:layout_height="0dip"
|
||||
android:layout_width="wrap_content"
|
||||
android:maxWidth="80dip"
|
||||
android:maxHeight="80dip"
|
||||
android:minWidth="80dip"
|
||||
android:minHeight="80dip"
|
||||
android:layout_gravity="center"/>
|
||||
</LinearLayout>
|
||||
</RelativeLayout>
|
||||
@@ -1,83 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright 2010 Google Inc.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
<RelativeLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:id="@+id/screen"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent">
|
||||
<com.google.android.maps.MapView android:id="@+id/map"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:clickable="true"
|
||||
android:enabled="true"
|
||||
android:focusable="true"
|
||||
android:focusableInTouchMode="true"
|
||||
android:apiKey="0TXoRmxTinrZKQ9JSazj-9A34XX6_lXsRvTpXWA"/>
|
||||
<!-- corresponding certificate md5: 81:DF:A2:63:53:C7:6B:1E:6C:24:62:D4:91:1C:36:3A -->
|
||||
<LinearLayout android:id="@+id/messagepane"
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/list_bar"
|
||||
android:layout_weight="0"
|
||||
android:padding="3dip"
|
||||
android:visibility="gone">
|
||||
<TextView android:id="@+id/messagetext"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textSize="16dip"
|
||||
android:textColor="#fff"
|
||||
android:text="@string/wait_for_fix"
|
||||
android:layout_weight="0"/>
|
||||
</LinearLayout>
|
||||
<LinearLayout android:id="@+id/busypane"
|
||||
android:orientation="vertical"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:layout_weight="0"
|
||||
android:padding="3dip"
|
||||
android:visibility="gone">
|
||||
<ProgressBar
|
||||
android:layout_weight="1"
|
||||
android:layout_height="0dip"
|
||||
android:layout_width="wrap_content"
|
||||
android:maxWidth="80dip"
|
||||
android:maxHeight="80dip"
|
||||
android:minWidth="80dip"
|
||||
android:minHeight="80dip"
|
||||
android:layout_gravity="center"/>
|
||||
</LinearLayout>
|
||||
<LinearLayout
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:layout_gravity="center"
|
||||
android:paddingTop="10dip">
|
||||
<LinearLayout
|
||||
android:layout_width = "wrap_content"
|
||||
android:layout_height= "wrap_content"
|
||||
android:layout_weight="1"/>
|
||||
<ImageButton
|
||||
android:id="@+id/showOptions"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="0"
|
||||
android:visibility="visible"
|
||||
android:src="@android:drawable/ic_menu_more"/>
|
||||
</LinearLayout>
|
||||
</RelativeLayout>
|
||||
@@ -1,66 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright 2010 Google Inc.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apl/res/com.google.android.apps.mytracks"
|
||||
android:id="@+id/tracklist_root"
|
||||
android:orientation="vertical"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent">
|
||||
<LinearLayout
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/list_bar"
|
||||
android:layout_weight="0"
|
||||
android:padding="3dip">
|
||||
<TextView android:id="@+id/message"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textSize="16dip"
|
||||
android:textColor="#fff"
|
||||
android:text="@string/tracklist_pick_one"
|
||||
android:layout_weight="0"/>
|
||||
</LinearLayout>
|
||||
<ListView android:id="@android:id/list"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"/>
|
||||
<LinearLayout
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/list_bar"
|
||||
android:layout_weight="0"
|
||||
android:padding="3dip">
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"/>
|
||||
<Button android:id="@+id/tracklist_btn_export_all"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="48dip"
|
||||
android:layout_gravity="left|top"
|
||||
android:text="@string/tracklist_btn_export_all"
|
||||
android:textSize="14dip"/>
|
||||
<Button android:id="@+id/tracklist_btn_delete_all"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="48dip"
|
||||
android:layout_gravity="left|top"
|
||||
android:text="@string/tracklist_btn_delete_all"
|
||||
android:textSize="14dip"/>
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
@@ -1,83 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright 2010 Google Inc.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:paddingTop="2dip"
|
||||
android:paddingBottom="2dip"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:minHeight="?android:attr/listPreferredItemHeight"
|
||||
android:orientation="vertical">
|
||||
|
||||
<LinearLayout
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content">
|
||||
<ImageView android:id="@+id/trackdetails_item_icon"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingLeft="4dip"
|
||||
android:paddingRight="2dip"
|
||||
android:paddingTop="5dip"
|
||||
android:src="@drawable/track"/>
|
||||
<LinearLayout
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content">
|
||||
<TextView android:id="@+id/trackdetails_item_name"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="6dip"
|
||||
android:layout_marginTop="6dip"
|
||||
android:singleLine="true"
|
||||
android:text="Track name"
|
||||
android:textAppearance="?android:attr/textAppearanceLarge"/>
|
||||
<TextView android:id="@+id/trackdetails_item_category"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="6dip"
|
||||
android:layout_marginTop="6dip"
|
||||
android:singleLine = "true"
|
||||
android:text="Activity type"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"/>
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
|
||||
<TextView android:id="@+id/trackdetails_item_time"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="6dip"
|
||||
android:singleLine="true"
|
||||
android:textColor="#fff"
|
||||
android:text="Start time"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"/>
|
||||
<TextView android:id="@+id/trackdetails_item_stats"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="6dip"
|
||||
android:singleLine="true"
|
||||
android:textColor="#0f0"
|
||||
android:text="Distance and total time"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"/>
|
||||
<TextView android:id="@+id/trackdetails_item_description"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft = "6dip"
|
||||
android:singleLine = "false"
|
||||
android:text="Description"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"/>
|
||||
|
||||
</LinearLayout>
|
||||
@@ -1,70 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright 2010 Google Inc.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:paddingTop="2dip"
|
||||
android:paddingBottom="2dip"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:minHeight="?android:attr/listPreferredItemHeight"
|
||||
android:orientation="vertical">
|
||||
|
||||
<LinearLayout
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<ImageView android:id="@+id/waypointslist_item_icon"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="6dip"
|
||||
android:layout_marginTop="6dip"
|
||||
android:src="@drawable/ylw_pushpin"/>
|
||||
|
||||
<LinearLayout
|
||||
android:orientation="vertical"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<TextView android:id="@+id/waypointslist_item_name"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="6dip"
|
||||
android:layout_marginTop="6dip"
|
||||
android:singleLine = "true"
|
||||
android:text="Name"
|
||||
android:textAppearance="?android:attr/textAppearanceLarge"/>
|
||||
|
||||
<TextView android:id="@+id/waypointslist_item_time"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft = "6dip"
|
||||
android:singleLine = "true"
|
||||
android:textColor = "#fff"
|
||||
android:text="date and time"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"/>
|
||||
|
||||
<TextView android:id="@+id/waypointslist_item_category"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft = "6dip"
|
||||
android:singleLine = "true"
|
||||
android:textColor="#0f0"
|
||||
android:text="category"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
@@ -1,129 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright 2010 Google Inc.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:id="@+id/screen"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:orientation="vertical">
|
||||
<LinearLayout
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/list_bar">
|
||||
<TextView
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/sendtogoogle_title"
|
||||
android:textSize="20dip"
|
||||
android:textColor="#fff"
|
||||
android:layout_marginLeft="10dip"/>
|
||||
</LinearLayout>
|
||||
<ScrollView android:id="@+id/sendtogoogle_scrollview"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="0dip"
|
||||
android:layout_weight="1">
|
||||
<TableLayout
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:stretchColumns="1"
|
||||
android:layout_marginTop="5dip"
|
||||
android:layout_marginLeft="5dip">
|
||||
<TableRow>
|
||||
<ImageView android:src="@drawable/mymaps_icon"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"/>
|
||||
<LinearLayout
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:layout_marginLeft="10dip">
|
||||
<CheckBox android:id="@+id/sendtogoogle_google_mymaps"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/sendtogoogle_google_mymaps"
|
||||
android:textSize="20dip"
|
||||
android:checked="true"/>
|
||||
<RadioGroup android:id="@+id/sendtogoogle_group_mymaps"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content">
|
||||
<RadioButton android:id="@+id/sendtogoogle_create_new_map"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/sendtogoogle_create_new_map"/>
|
||||
<RadioButton android:id="@+id/sendtogoogle_pick_existing_map"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/sendtogoogle_pick_existing_map"/>
|
||||
</RadioGroup>
|
||||
</LinearLayout>
|
||||
</TableRow>
|
||||
<TableRow>
|
||||
<ImageView android:src="@drawable/googledocs_icon"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"/>
|
||||
<LinearLayout
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:layout_marginLeft="10dip">
|
||||
<CheckBox android:id="@+id/sendtogoogle_google_docs"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/sendtogoogle_google_docs"
|
||||
android:textSize="20dip"
|
||||
android:checked="true"/>
|
||||
<RadioGroup android:id="@+id/sendtogoogle_group_docs"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:visibility="gone">
|
||||
<RadioButton android:id="@+id/sendtogoogle_send_stats"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/sendtogoogle_send_stats"/>
|
||||
<RadioButton android:id="@+id/sendtogoogle_send_stats_and_points"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/sendtogoogle_send_stats_and_points"
|
||||
android:enabled="false"/>
|
||||
</RadioGroup>
|
||||
</LinearLayout>
|
||||
</TableRow>
|
||||
</TableLayout>
|
||||
</ScrollView>
|
||||
<LinearLayout
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/list_bar"
|
||||
android:padding="3dip">
|
||||
<Button android:id="@+id/sendtogoogle_cancel"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="48dip"
|
||||
android:layout_gravity="right"
|
||||
android:text="@string/cancel"
|
||||
android:textSize="14dip"/>
|
||||
<TextView
|
||||
android:layout_width="0dip"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"/>
|
||||
<Button android:id="@+id/sendtogoogle_send_now"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="48dip"
|
||||
android:layout_gravity="right"
|
||||
android:text="@string/sendtogoogle_send_now"
|
||||
android:textSize="14dip"/>
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
@@ -1,509 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright 2010 Google Inc.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:orientation="vertical"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:background="#c000">
|
||||
<ScrollView
|
||||
android:id="@+id/scrolly"
|
||||
android:layout_height="0dip"
|
||||
android:layout_weight="1"
|
||||
android:layout_width="fill_parent"
|
||||
android:scrollbarStyle="insideInset">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:orientation="vertical">
|
||||
<TextView android:text="@string/waypointdetails_name"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"/>
|
||||
<LinearLayout
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal">
|
||||
<ImageView android:id="@+id/waypointdetails_icon"
|
||||
android:src="@drawable/ylw_pushpin"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:paddingLeft="4dip"
|
||||
android:paddingRight="2dip"/>
|
||||
<EditText android:id="@+id/waypointdetails_name"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:singleLine="true"
|
||||
android:autoText="true"
|
||||
android:capitalize="words"
|
||||
android:selectAllOnFocus="true"/>
|
||||
</LinearLayout>
|
||||
<LinearLayout android:id="@+id/waypointdetails_description_layout"
|
||||
android:orientation="vertical"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="0dip"
|
||||
android:visibility="visible"
|
||||
android:layout_weight="1">
|
||||
<TextView android:id="@+id/waypointdetails_category_label"
|
||||
android:text="@string/waypointdetails_category"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"/>
|
||||
<AutoCompleteTextView android:id="@+id/waypointdetails_category"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:singleLine="true"/>
|
||||
<TextView android:text="@string/waypointdetails_description"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"/>
|
||||
<EditText android:id="@+id/waypointdetails_description"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="0dip"
|
||||
android:singleLine="false"
|
||||
android:autoText="true"
|
||||
android:capitalize="sentences"
|
||||
android:selectAllOnFocus="true"
|
||||
android:minLines="5"
|
||||
android:maxLines="50"
|
||||
android:gravity="top"
|
||||
android:layout_weight="1"/>
|
||||
</LinearLayout>
|
||||
|
||||
<TableLayout android:id="@+id/waypoint_stats"
|
||||
android:visibility="gone"
|
||||
android:padding="2dip"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="fill_parent"
|
||||
android:stretchColumns="1,4">
|
||||
<!-- Total distance and max speed -->
|
||||
<TableRow
|
||||
android:padding="1dip">
|
||||
<TextView
|
||||
android:id="@+id/total_distance_label"
|
||||
android:layout_column="1"
|
||||
android:layout_span="3"
|
||||
android:text="@string/total_distance_label" />
|
||||
<TextView
|
||||
android:id="@+id/max_speed_label"
|
||||
android:layout_column="4"
|
||||
android:layout_span="2"
|
||||
android:text="@string/max_speed_label" />
|
||||
</TableRow>
|
||||
<TableRow
|
||||
android:background="@color/stat_label_background">
|
||||
<TextView
|
||||
android:gravity="right"
|
||||
android:id="@+id/total_distance_register"
|
||||
android:layout_column="1"
|
||||
android:layout_marginBottom="-9dip"
|
||||
android:layout_marginTop="-9dip"
|
||||
android:text="@string/unknown"
|
||||
android:textColor="@color/stat_label_text"
|
||||
android:textSize="40sp" />
|
||||
<TextView
|
||||
android:gravity="left"
|
||||
android:id="@+id/total_distance_unit_label"
|
||||
android:layout_column="2"
|
||||
android:layout_marginBottom="-9dip"
|
||||
android:layout_marginTop="-9dip"
|
||||
android:text="@string/mile"
|
||||
android:textColor="@color/stat_label_text" />
|
||||
<!-- TODO 4/08/2009
|
||||
The following is a bad hack to get a spacer the same size as the
|
||||
text. Ideally this should just be a View, however I don't know how to
|
||||
set the view height properly. fill_parent on this element causes as
|
||||
NullPointerException. This same filler is repeated on each line.-->
|
||||
<TextView
|
||||
android:background="@color/black"
|
||||
android:layout_column="3"
|
||||
android:layout_marginBottom="-9dip"
|
||||
android:layout_marginTop="-9dip"
|
||||
android:layout_width="5dip"
|
||||
android:textSize="40sp" />
|
||||
<TextView
|
||||
android:gravity="right"
|
||||
android:id="@+id/max_speed_register"
|
||||
android:layout_column="4"
|
||||
android:layout_marginBottom="-9dip"
|
||||
android:layout_marginTop="-9dip"
|
||||
android:text="@string/unknown"
|
||||
android:textColor="@color/stat_label_text"
|
||||
android:textSize="40sp" />
|
||||
<LinearLayout
|
||||
android:gravity="bottom"
|
||||
android:layout_column="5"
|
||||
android:layout_width="wrap_content"
|
||||
android:lines="1"
|
||||
android:orientation="vertical">
|
||||
<TextView
|
||||
android:id="@+id/max_speed_unit_label_top"
|
||||
android:gravity="bottom"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="-1dip"
|
||||
android:layout_marginTop="-1dip"
|
||||
android:layout_width="wrap_content"
|
||||
android:textColor="@color/stat_label_text" />
|
||||
<TextView
|
||||
android:background="@color/black"
|
||||
android:layout_height="3dip"
|
||||
android:layout_width="fill_parent" />
|
||||
<TextView
|
||||
android:id="@+id/max_speed_unit_label_bottom"
|
||||
android:gravity="bottom"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="-1dip"
|
||||
android:layout_marginTop="-1dip"
|
||||
android:layout_width="wrap_content"
|
||||
android:textColor="@color/stat_label_text" />
|
||||
</LinearLayout>
|
||||
</TableRow>
|
||||
|
||||
<!-- Total time and average speed -->
|
||||
<TableRow>
|
||||
<TextView
|
||||
android:id="@+id/track_time_label"
|
||||
android:layout_column="1"
|
||||
android:layout_span="3"
|
||||
android:text="@string/total_time_label" />
|
||||
<TextView
|
||||
android:id="@+id/average_speed_label"
|
||||
android:layout_column="4"
|
||||
android:layout_span="2"
|
||||
android:text="@string/average_speed_label" />
|
||||
</TableRow>
|
||||
<TableRow
|
||||
android:background="@color/stat_label_background">
|
||||
<TextView
|
||||
android:gravity="right"
|
||||
android:id="@+id/total_time_register"
|
||||
android:layout_column="1"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="-9dip"
|
||||
android:layout_marginTop="-9dip"
|
||||
android:layout_span="2"
|
||||
android:layout_width="fill_parent"
|
||||
android:text="@string/unknown"
|
||||
android:textColor="@color/stat_label_text"
|
||||
android:textSize="40sp" />
|
||||
<TextView
|
||||
android:background="@color/black"
|
||||
android:layout_column="3"
|
||||
android:layout_marginBottom="-9dip"
|
||||
android:layout_marginTop="-9dip"
|
||||
android:layout_width="5dip"
|
||||
android:textSize="40sp" />
|
||||
<TextView
|
||||
android:gravity="right"
|
||||
android:id="@+id/average_speed_register"
|
||||
android:layout_column="4"
|
||||
android:layout_marginBottom="-9dip"
|
||||
android:layout_marginTop="-9dip"
|
||||
android:text="@string/unknown"
|
||||
android:textColor="@color/stat_label_text"
|
||||
android:textSize="40sp" />
|
||||
<LinearLayout
|
||||
android:gravity="bottom"
|
||||
android:layout_column="5"
|
||||
android:layout_width="wrap_content"
|
||||
android:lines="1"
|
||||
android:orientation="vertical">
|
||||
<TextView
|
||||
android:id="@+id/average_speed_unit_label_top"
|
||||
android:gravity="bottom"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="-1dip"
|
||||
android:layout_marginTop="-1dip"
|
||||
android:layout_width="wrap_content"
|
||||
android:textColor="@color/stat_label_text" />
|
||||
<TextView
|
||||
android:background="@color/black"
|
||||
android:layout_height="3dip"
|
||||
android:layout_width="fill_parent" />
|
||||
<TextView
|
||||
android:id="@+id/average_speed_unit_label_bottom"
|
||||
android:gravity="bottom"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="-1dip"
|
||||
android:layout_marginTop="-1dip"
|
||||
android:layout_width="wrap_content"
|
||||
android:textColor="@color/stat_label_text" />
|
||||
</LinearLayout>
|
||||
</TableRow>
|
||||
|
||||
<!-- Moving time and average moving speed -->
|
||||
<TableRow>
|
||||
<TextView
|
||||
android:id="@+id/moving_time_label"
|
||||
android:layout_column="1"
|
||||
android:layout_span="3"
|
||||
android:text="@string/moving_time_label" />
|
||||
<TextView
|
||||
android:id="@+id/average_moving_speed_label"
|
||||
android:layout_column="4"
|
||||
android:layout_span="2"
|
||||
android:text="@string/average_moving_speed_label" />
|
||||
</TableRow>
|
||||
<TableRow
|
||||
android:background="@color/stat_label_background">
|
||||
<TextView
|
||||
android:gravity="right"
|
||||
android:id="@+id/moving_time_register"
|
||||
android:layout_column="1"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="-9dip"
|
||||
android:layout_marginTop="-9dip"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_span="2"
|
||||
android:text="@string/unknown"
|
||||
android:textColor="@color/stat_label_text"
|
||||
android:textSize="40sp" />
|
||||
<TextView
|
||||
android:background="@color/black"
|
||||
android:layout_column="3"
|
||||
android:layout_marginBottom="-9dip"
|
||||
android:layout_marginTop="-9dip"
|
||||
android:layout_width="5dip"
|
||||
android:textSize="40sp" />
|
||||
<TextView
|
||||
android:gravity="right"
|
||||
android:id="@+id/average_moving_speed_register"
|
||||
android:layout_column="4"
|
||||
android:layout_marginBottom="-9dip"
|
||||
android:layout_marginTop="-9dip"
|
||||
android:text="@string/unknown"
|
||||
android:textColor="@color/stat_label_text"
|
||||
android:textSize="40sp" />
|
||||
<LinearLayout
|
||||
android:gravity="bottom"
|
||||
android:layout_column="5"
|
||||
android:layout_width="wrap_content"
|
||||
android:lines="1"
|
||||
android:orientation="vertical">
|
||||
<TextView
|
||||
android:id="@+id/average_moving_speed_unit_label_top"
|
||||
android:gravity="bottom"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="-1dip"
|
||||
android:layout_marginTop="-1dip"
|
||||
android:layout_width="wrap_content"
|
||||
android:textColor="@color/stat_label_text" />
|
||||
<TextView
|
||||
android:background="@color/black"
|
||||
android:layout_height="3dip"
|
||||
android:layout_width="fill_parent" />
|
||||
<TextView
|
||||
android:id="@+id/average_moving_speed_unit_label_bottom"
|
||||
android:gravity="bottom"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="-1dip"
|
||||
android:layout_marginTop="-1dip"
|
||||
android:layout_width="wrap_content"
|
||||
android:textColor="@color/stat_label_text" />
|
||||
</LinearLayout>
|
||||
</TableRow>
|
||||
|
||||
<!-- Elevation and elevation gain -->
|
||||
<TableRow>
|
||||
<TextView
|
||||
android:id="@+id/elevation_label"
|
||||
android:layout_column="1"
|
||||
android:layout_span="3"
|
||||
android:text="@string/elevation_label" />
|
||||
<TextView
|
||||
android:id="@+id/elevation_gain_label"
|
||||
android:layout_column="4"
|
||||
android:layout_span="2"
|
||||
android:text="@string/elevation_gain_label" />
|
||||
</TableRow>
|
||||
<TableRow
|
||||
android:background="@color/stat_label_background">
|
||||
<TextView
|
||||
android:gravity="right"
|
||||
android:id="@+id/elevation_register"
|
||||
android:layout_column="1"
|
||||
android:layout_marginBottom="-9dip"
|
||||
android:layout_marginTop="-9dip"
|
||||
android:text="@string/unknown"
|
||||
android:textColor="@color/stat_label_text"
|
||||
android:textSize="40sp" />
|
||||
<TextView
|
||||
android:gravity="left"
|
||||
android:id="@+id/elevation_unit_label"
|
||||
android:layout_column="2"
|
||||
android:layout_marginBottom="-9dip"
|
||||
android:layout_marginTop="-9dip"
|
||||
android:text="@string/feet"
|
||||
android:textColor="@color/stat_label_text"/>
|
||||
<TextView
|
||||
android:background="@color/black"
|
||||
android:layout_column="3"
|
||||
android:layout_marginBottom="-9dip"
|
||||
android:layout_marginTop="-9dip"
|
||||
android:layout_width="5dip"
|
||||
android:textSize="40sp" />
|
||||
<TextView
|
||||
android:gravity="right"
|
||||
android:id="@+id/elevation_gain_register"
|
||||
android:layout_column="4"
|
||||
android:layout_marginBottom="-9dip"
|
||||
android:layout_marginTop="-9dip"
|
||||
android:text="@string/unknown"
|
||||
android:textColor="@color/stat_label_text"
|
||||
android:textSize="40sp" />
|
||||
<TextView
|
||||
android:gravity="left"
|
||||
android:id="@+id/elevation_gain_unit_label"
|
||||
android:layout_column="5"
|
||||
android:layout_marginBottom="-9dip"
|
||||
android:layout_marginTop="-9dip"
|
||||
android:text="@string/feet"
|
||||
android:textColor="@color/stat_label_text" />
|
||||
</TableRow>
|
||||
|
||||
<!-- Min and max elevation -->
|
||||
<TableRow>
|
||||
<TextView
|
||||
android:id="@+id/min_elevation_label"
|
||||
android:layout_column="1"
|
||||
android:layout_span="3"
|
||||
android:text="@string/min_elevation_label" />
|
||||
<TextView
|
||||
android:id="@+id/max_elevation_label"
|
||||
android:layout_column="4"
|
||||
android:layout_span="3"
|
||||
android:text="@string/max_elevation_label" />
|
||||
</TableRow>
|
||||
<TableRow
|
||||
android:background="@color/stat_label_background">
|
||||
<TextView
|
||||
android:gravity="right"
|
||||
android:id="@+id/min_elevation_register"
|
||||
android:layout_column="1"
|
||||
android:layout_marginBottom="-9dip"
|
||||
android:layout_marginTop="-9dip"
|
||||
android:text="@string/unknown"
|
||||
android:textColor="@color/stat_label_text"
|
||||
android:textSize="40sp" />
|
||||
<TextView
|
||||
android:gravity="left"
|
||||
android:id="@+id/min_elevation_unit_label"
|
||||
android:layout_column="2"
|
||||
android:layout_marginBottom="-9dip"
|
||||
android:layout_marginTop="-9dip"
|
||||
android:text="@string/feet"
|
||||
android:textColor="@color/stat_label_text" />
|
||||
<TextView
|
||||
android:background="@color/black"
|
||||
android:layout_column="3"
|
||||
android:layout_marginBottom="-9dip"
|
||||
android:layout_marginTop="-9dip"
|
||||
android:layout_width="5dip"
|
||||
android:textSize="40sp" />
|
||||
<TextView
|
||||
android:gravity="right"
|
||||
android:id="@+id/max_elevation_register"
|
||||
android:layout_column="4"
|
||||
android:layout_marginBottom="-9dip"
|
||||
android:layout_marginTop="-9dip"
|
||||
android:text="@string/unknown"
|
||||
android:textColor="@color/stat_label_text"
|
||||
android:textSize="40sp" />
|
||||
<TextView
|
||||
android:id="@+id/max_elevation_unit_label"
|
||||
android:gravity="left"
|
||||
android:layout_column="5"
|
||||
android:layout_marginBottom="-9dip"
|
||||
android:layout_marginTop="-9dip"
|
||||
android:text="@string/feet"
|
||||
android:textColor="@color/stat_label_text" />
|
||||
</TableRow>
|
||||
|
||||
<!-- Min and max grade -->
|
||||
<TableRow>
|
||||
<TextView
|
||||
android:id="@+id/min_grade_label"
|
||||
android:layout_column="1"
|
||||
android:layout_span="3"
|
||||
android:text="@string/min_grade_label" />
|
||||
<TextView
|
||||
android:id="@+id/max_grade_label"
|
||||
android:layout_column="4"
|
||||
android:layout_span="2"
|
||||
android:text="@string/max_grade_label" />
|
||||
</TableRow>
|
||||
<TableRow
|
||||
android:background="@color/stat_label_background">
|
||||
<TextView
|
||||
android:gravity="right"
|
||||
android:id="@+id/min_grade_register"
|
||||
android:layout_column="1"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="-9dip"
|
||||
android:layout_marginTop="-9dip"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_span="2"
|
||||
android:text="@string/unknown"
|
||||
android:textColor="@color/stat_label_text"
|
||||
android:textSize="40sp" />
|
||||
<TextView
|
||||
android:background="@color/black"
|
||||
android:layout_column="3"
|
||||
android:layout_marginBottom="-9dip"
|
||||
android:layout_marginTop="-9dip"
|
||||
android:layout_width="5dip"
|
||||
android:textSize="40sp" />
|
||||
<TextView
|
||||
android:gravity="right"
|
||||
android:id="@+id/max_grade_register"
|
||||
android:layout_column="4"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="-9dip"
|
||||
android:layout_marginTop="-9dip"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_span="2"
|
||||
android:text="@string/unknown"
|
||||
android:textColor="@color/stat_label_text"
|
||||
android:textSize="40sp" />
|
||||
</TableRow>
|
||||
</TableLayout>
|
||||
</LinearLayout>
|
||||
</ScrollView>
|
||||
|
||||
<LinearLayout
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/list_bar"
|
||||
android:padding="3dip">
|
||||
<Button android:id="@+id/waypointdetails_cancel"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="48dip"
|
||||
android:layout_gravity="right"
|
||||
android:text="@string/cancel"
|
||||
android:textSize="14dip"/>
|
||||
<TextView
|
||||
android:layout_width="0dip"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"/>
|
||||
<Button android:id="@+id/waypointdetails_save"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="48dip"
|
||||
android:layout_gravity="right"
|
||||
android:text="@string/save"
|
||||
android:textSize="14dip"/>
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
@@ -1,67 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright 2010 Google Inc.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apl/res/com.google.android.apps.mytracks"
|
||||
android:id="@+id/waypointslist_root"
|
||||
android:orientation="vertical"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent">
|
||||
<LinearLayout
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/list_bar"
|
||||
android:layout_weight="0"
|
||||
android:padding="3dip">
|
||||
<TextView android:id="@+id/message"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textSize="16dip"
|
||||
android:textColor="#fff"
|
||||
android:text="@string/waypointslist_pick_one"
|
||||
android:layout_weight="0"/>
|
||||
</LinearLayout>
|
||||
|
||||
<ListView android:id="@android:id/list"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"/>
|
||||
<LinearLayout
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/list_bar"
|
||||
android:layout_weight="0"
|
||||
android:padding="3dip">
|
||||
<TextView
|
||||
android:layout_width="0dip"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"/>
|
||||
<Button android:id="@+id/waypointslist_btn_insert_statistics"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="48dip"
|
||||
android:layout_gravity="left|top"
|
||||
android:text="@string/waypointslist_btn_insert_statistics"
|
||||
android:textSize="14dip"/>
|
||||
<Button android:id="@+id/waypointslist_btn_insert_waypoint"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="48dip"
|
||||
android:layout_gravity="left|top"
|
||||
android:text="@string/waypointslist_btn_insert_waypoint"
|
||||
android:textSize="14dip"/>
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
@@ -1,542 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright 2010 Google Inc.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
<RelativeLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:id="@+id/stats_root"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="fill_parent">
|
||||
|
||||
<ScrollView
|
||||
android:id="@+id/scrolly"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="fill_parent">
|
||||
|
||||
<TableLayout
|
||||
android:id="@+id/stats_table"
|
||||
android:layout_height="wrap_content"
|
||||
android:stretchColumns="1,4"
|
||||
android:layout_width="fill_parent">
|
||||
|
||||
<!-- Layout the speed large on it's own line. -->
|
||||
<TableRow>
|
||||
<TextView
|
||||
android:id="@+id/speed_label"
|
||||
android:layout_span="5"
|
||||
android:text="@string/speed" />
|
||||
</TableRow>
|
||||
<TableRow
|
||||
android:background="@color/stat_label_background">
|
||||
<TextView
|
||||
android:gravity="right"
|
||||
android:id="@+id/speed_register"
|
||||
android:layout_column="1"
|
||||
android:layout_marginBottom="-13dip"
|
||||
android:layout_marginTop="-13dip"
|
||||
android:layout_span="4"
|
||||
android:text="@string/unknown"
|
||||
android:textColor="@color/stat_label_text"
|
||||
android:textSize="50sp" />
|
||||
<LinearLayout
|
||||
android:gravity="bottom"
|
||||
android:layout_column="5"
|
||||
android:layout_width="wrap_content"
|
||||
android:lines="1"
|
||||
android:orientation="vertical">
|
||||
<TextView
|
||||
android:layout_height="fill_parent"
|
||||
android:layout_width="fill_parent" />
|
||||
<TextView
|
||||
android:id="@+id/speed_unit_label_top"
|
||||
android:gravity="bottom"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="2dip"
|
||||
android:layout_marginTop="2dip"
|
||||
android:layout_width="wrap_content"
|
||||
android:textColor="@color/stat_label_text" />
|
||||
<TextView
|
||||
android:background="@color/black"
|
||||
android:layout_height="3dip"
|
||||
android:layout_width="fill_parent" />
|
||||
<TextView
|
||||
android:id="@+id/speed_unit_label_bottom"
|
||||
android:gravity="bottom"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="2dip"
|
||||
android:layout_marginTop="2dip"
|
||||
android:layout_width="wrap_content"
|
||||
android:textColor="@color/stat_label_text" />
|
||||
</LinearLayout>
|
||||
</TableRow>
|
||||
|
||||
<!-- Total distance and max speed -->
|
||||
<TableRow
|
||||
android:padding="1dip">
|
||||
<TextView
|
||||
android:id="@+id/total_distance_label"
|
||||
android:layout_column="1"
|
||||
android:layout_span="3"
|
||||
android:text="@string/total_distance_label" />
|
||||
<TextView
|
||||
android:id="@+id/max_speed_label"
|
||||
android:layout_column="4"
|
||||
android:layout_span="2"
|
||||
android:text="@string/max_speed_label" />
|
||||
</TableRow>
|
||||
<TableRow
|
||||
android:background="@color/stat_label_background">
|
||||
<TextView
|
||||
android:gravity="right"
|
||||
android:id="@+id/total_distance_register"
|
||||
android:layout_column="1"
|
||||
android:layout_marginBottom="-9dip"
|
||||
android:layout_marginTop="-9dip"
|
||||
android:text="@string/unknown"
|
||||
android:textColor="@color/stat_label_text"
|
||||
android:textSize="40sp" />
|
||||
<TextView
|
||||
android:gravity="left"
|
||||
android:id="@+id/total_distance_unit_label"
|
||||
android:layout_column="2"
|
||||
android:layout_marginBottom="-9dip"
|
||||
android:layout_marginTop="-9dip"
|
||||
android:text="@string/mile"
|
||||
android:textColor="@color/stat_label_text" />
|
||||
<!-- TODO 4/08/2009
|
||||
The following is a bad hack to get a spacer the same size as the
|
||||
text. Ideally this should just be a View, however I don't know how to
|
||||
set the view height properly. fill_parent on this element causes as
|
||||
NullPointerException. This same filler is repeated on each line.-->
|
||||
<TextView
|
||||
android:background="@color/black"
|
||||
android:layout_column="3"
|
||||
android:layout_marginBottom="-9dip"
|
||||
android:layout_marginTop="-9dip"
|
||||
android:layout_width="5dip"
|
||||
android:textSize="40sp" />
|
||||
<TextView
|
||||
android:gravity="right"
|
||||
android:id="@+id/max_speed_register"
|
||||
android:layout_column="4"
|
||||
android:layout_marginBottom="-9dip"
|
||||
android:layout_marginTop="-9dip"
|
||||
android:text="@string/unknown"
|
||||
android:textColor="@color/stat_label_text"
|
||||
android:textSize="40sp" />
|
||||
<LinearLayout
|
||||
android:gravity="bottom"
|
||||
android:layout_column="5"
|
||||
android:layout_width="wrap_content"
|
||||
android:lines="1"
|
||||
android:orientation="vertical">
|
||||
<TextView
|
||||
android:id="@+id/max_speed_unit_label_top"
|
||||
android:gravity="bottom"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="-1dip"
|
||||
android:layout_marginTop="-1dip"
|
||||
android:layout_width="wrap_content"
|
||||
android:textColor="@color/stat_label_text" />
|
||||
<TextView
|
||||
android:background="@color/black"
|
||||
android:layout_height="3dip"
|
||||
android:layout_width="fill_parent" />
|
||||
<TextView
|
||||
android:id="@+id/max_speed_unit_label_bottom"
|
||||
android:gravity="bottom"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="-1dip"
|
||||
android:layout_marginTop="-1dip"
|
||||
android:layout_width="wrap_content"
|
||||
android:textColor="@color/stat_label_text" />
|
||||
</LinearLayout>
|
||||
</TableRow>
|
||||
|
||||
<!-- Total time and average speed -->
|
||||
<TableRow>
|
||||
<TextView
|
||||
android:id="@+id/track_time_label"
|
||||
android:layout_column="1"
|
||||
android:layout_span="3"
|
||||
android:text="@string/total_time_label" />
|
||||
<TextView
|
||||
android:id="@+id/average_speed_label"
|
||||
android:layout_column="4"
|
||||
android:layout_span="2"
|
||||
android:text="@string/average_speed_label" />
|
||||
</TableRow>
|
||||
<TableRow
|
||||
android:background="@color/stat_label_background">
|
||||
<TextView
|
||||
android:gravity="right"
|
||||
android:id="@+id/total_time_register"
|
||||
android:layout_column="1"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="-9dip"
|
||||
android:layout_marginTop="-9dip"
|
||||
android:layout_span="2"
|
||||
android:layout_width="fill_parent"
|
||||
android:text="@string/unknown"
|
||||
android:textColor="@color/stat_label_text"
|
||||
android:textSize="40sp" />
|
||||
<TextView
|
||||
android:background="@color/black"
|
||||
android:layout_column="3"
|
||||
android:layout_marginBottom="-9dip"
|
||||
android:layout_marginTop="-9dip"
|
||||
android:layout_width="5dip"
|
||||
android:textSize="40sp" />
|
||||
<TextView
|
||||
android:gravity="right"
|
||||
android:id="@+id/average_speed_register"
|
||||
android:layout_column="4"
|
||||
android:layout_marginBottom="-9dip"
|
||||
android:layout_marginTop="-9dip"
|
||||
android:text="@string/unknown"
|
||||
android:textColor="@color/stat_label_text"
|
||||
android:textSize="40sp" />
|
||||
<LinearLayout
|
||||
android:gravity="bottom"
|
||||
android:layout_column="5"
|
||||
android:layout_width="wrap_content"
|
||||
android:lines="1"
|
||||
android:orientation="vertical">
|
||||
<TextView
|
||||
android:id="@+id/average_speed_unit_label_top"
|
||||
android:gravity="bottom"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="-1dip"
|
||||
android:layout_marginTop="-1dip"
|
||||
android:layout_width="wrap_content"
|
||||
android:textColor="@color/stat_label_text" />
|
||||
<TextView
|
||||
android:background="@color/black"
|
||||
android:layout_height="3dip"
|
||||
android:layout_width="fill_parent" />
|
||||
<TextView
|
||||
android:id="@+id/average_speed_unit_label_bottom"
|
||||
android:gravity="bottom"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="-1dip"
|
||||
android:layout_marginTop="-1dip"
|
||||
android:layout_width="wrap_content"
|
||||
android:textColor="@color/stat_label_text" />
|
||||
</LinearLayout>
|
||||
</TableRow>
|
||||
|
||||
<!-- Moving time and average moving speed -->
|
||||
<TableRow>
|
||||
<TextView
|
||||
android:id="@+id/moving_time_label"
|
||||
android:layout_column="1"
|
||||
android:layout_span="3"
|
||||
android:text="@string/moving_time_label" />
|
||||
<TextView
|
||||
android:id="@+id/average_moving_speed_label"
|
||||
android:layout_column="4"
|
||||
android:layout_span="2"
|
||||
android:text="@string/average_moving_speed_label" />
|
||||
</TableRow>
|
||||
<TableRow
|
||||
android:background="@color/stat_label_background">
|
||||
<TextView
|
||||
android:gravity="right"
|
||||
android:id="@+id/moving_time_register"
|
||||
android:layout_column="1"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="-9dip"
|
||||
android:layout_marginTop="-9dip"
|
||||
android:layout_span="2"
|
||||
android:layout_width="fill_parent"
|
||||
android:text="@string/unknown"
|
||||
android:textColor="@color/stat_label_text"
|
||||
android:textSize="40sp" />
|
||||
<TextView
|
||||
android:background="@color/black"
|
||||
android:layout_column="3"
|
||||
android:layout_marginBottom="-9dip"
|
||||
android:layout_marginTop="-9dip"
|
||||
android:layout_width="5dip"
|
||||
android:textSize="40sp" />
|
||||
<TextView
|
||||
android:gravity="right"
|
||||
android:id="@+id/average_moving_speed_register"
|
||||
android:layout_column="4"
|
||||
android:layout_marginBottom="-9dip"
|
||||
android:layout_marginTop="-9dip"
|
||||
android:text="@string/unknown"
|
||||
android:textColor="@color/stat_label_text"
|
||||
android:textSize="40sp" />
|
||||
<LinearLayout
|
||||
android:gravity="bottom"
|
||||
android:layout_column="5"
|
||||
android:layout_width="wrap_content"
|
||||
android:lines="1"
|
||||
android:orientation="vertical">
|
||||
<TextView
|
||||
android:id="@+id/average_moving_speed_unit_label_top"
|
||||
android:gravity="bottom"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="-1dip"
|
||||
android:layout_marginTop="-1dip"
|
||||
android:layout_width="wrap_content"
|
||||
android:textColor="@color/stat_label_text" />
|
||||
<TextView
|
||||
android:background="@color/black"
|
||||
android:layout_height="3dip"
|
||||
android:layout_width="fill_parent" />
|
||||
<TextView
|
||||
android:id="@+id/average_moving_speed_unit_label_bottom"
|
||||
android:gravity="bottom"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="-1dip"
|
||||
android:layout_marginTop="-1dip"
|
||||
android:layout_width="wrap_content"
|
||||
android:textColor="@color/stat_label_text" />
|
||||
</LinearLayout>
|
||||
</TableRow>
|
||||
|
||||
<!-- Elevation and elevation gain -->
|
||||
<TableRow>
|
||||
<TextView
|
||||
android:id="@+id/elevation_label"
|
||||
android:layout_column="1"
|
||||
android:layout_span="3"
|
||||
android:text="@string/elevation_label" />
|
||||
<TextView
|
||||
android:id="@+id/elevation_gain_label"
|
||||
android:layout_column="4"
|
||||
android:layout_span="2"
|
||||
android:text="@string/elevation_gain_label" />
|
||||
</TableRow>
|
||||
<TableRow
|
||||
android:background="@color/stat_label_background">
|
||||
<TextView
|
||||
android:gravity="right"
|
||||
android:id="@+id/elevation_register"
|
||||
android:layout_column="1"
|
||||
android:layout_marginBottom="-9dip"
|
||||
android:layout_marginTop="-9dip"
|
||||
android:text="@string/unknown"
|
||||
android:textColor="@color/stat_label_text"
|
||||
android:textSize="40sp" />
|
||||
<TextView
|
||||
android:gravity="left"
|
||||
android:id="@+id/elevation_unit_label"
|
||||
android:layout_column="2"
|
||||
android:layout_marginBottom="-9dip"
|
||||
android:layout_marginTop="-9dip"
|
||||
android:text="@string/feet"
|
||||
android:textColor="@color/stat_label_text"/>
|
||||
<TextView
|
||||
android:background="@color/black"
|
||||
android:layout_column="3"
|
||||
android:layout_marginBottom="-9dip"
|
||||
android:layout_marginTop="-9dip"
|
||||
android:layout_width="5dip"
|
||||
android:textSize="40sp" />
|
||||
<TextView
|
||||
android:gravity="right"
|
||||
android:id="@+id/elevation_gain_register"
|
||||
android:layout_column="4"
|
||||
android:layout_marginBottom="-9dip"
|
||||
android:layout_marginTop="-9dip"
|
||||
android:text="@string/unknown"
|
||||
android:textColor="@color/stat_label_text"
|
||||
android:textSize="40sp" />
|
||||
<TextView
|
||||
android:gravity="right"
|
||||
android:id="@+id/elevation_gain_unit_label"
|
||||
android:layout_column="5"
|
||||
android:layout_marginBottom="-9dip"
|
||||
android:layout_marginTop="-9dip"
|
||||
android:text="@string/feet"
|
||||
android:textColor="@color/stat_label_text" />
|
||||
</TableRow>
|
||||
|
||||
<!-- Min and max elevation -->
|
||||
<TableRow>
|
||||
<TextView
|
||||
android:id="@+id/min_elevation_label"
|
||||
android:layout_column="1"
|
||||
android:layout_span="3"
|
||||
android:text="@string/min_elevation_label" />
|
||||
<TextView
|
||||
android:id="@+id/max_elevation_label"
|
||||
android:layout_column="4"
|
||||
android:layout_span="3"
|
||||
android:text="@string/max_elevation_label" />
|
||||
</TableRow>
|
||||
<TableRow
|
||||
android:background="@color/stat_label_background">
|
||||
<TextView
|
||||
android:gravity="right"
|
||||
android:id="@+id/min_elevation_register"
|
||||
android:layout_column="1"
|
||||
android:layout_marginBottom="-9dip"
|
||||
android:layout_marginTop="-9dip"
|
||||
android:text="@string/unknown"
|
||||
android:textColor="@color/stat_label_text"
|
||||
android:textSize="40sp" />
|
||||
<TextView
|
||||
android:gravity="left"
|
||||
android:id="@+id/min_elevation_unit_label"
|
||||
android:layout_column="2"
|
||||
android:layout_marginBottom="-9dip"
|
||||
android:layout_marginTop="-9dip"
|
||||
android:text="@string/feet"
|
||||
android:textColor="@color/stat_label_text" />
|
||||
<TextView
|
||||
android:background="@color/black"
|
||||
android:layout_column="3"
|
||||
android:layout_marginBottom="-9dip"
|
||||
android:layout_marginTop="-9dip"
|
||||
android:layout_width="5dip"
|
||||
android:textSize="40sp" />
|
||||
<TextView
|
||||
android:gravity="right"
|
||||
android:id="@+id/max_elevation_register"
|
||||
android:layout_column="4"
|
||||
android:layout_marginBottom="-9dip"
|
||||
android:layout_marginTop="-9dip"
|
||||
android:text="@string/unknown"
|
||||
android:textColor="@color/stat_label_text"
|
||||
android:textSize="40sp" />
|
||||
<TextView
|
||||
android:gravity="right"
|
||||
android:id="@+id/max_elevation_unit_label"
|
||||
android:layout_column="5"
|
||||
android:layout_marginBottom="-9dip"
|
||||
android:layout_marginTop="-9dip"
|
||||
android:text="@string/feet"
|
||||
android:textColor="@color/stat_label_text" />
|
||||
</TableRow>
|
||||
|
||||
<!-- Min and max grade -->
|
||||
<TableRow>
|
||||
<TextView
|
||||
android:id="@+id/min_grade_label"
|
||||
android:layout_column="1"
|
||||
android:layout_span="3"
|
||||
android:text="@string/min_grade_label" />
|
||||
<TextView
|
||||
android:id="@+id/max_grade_label"
|
||||
android:layout_column="4"
|
||||
android:layout_span="2"
|
||||
android:text="@string/max_grade_label" />
|
||||
</TableRow>
|
||||
<TableRow
|
||||
android:background="@color/stat_label_background">
|
||||
<TextView
|
||||
android:gravity="right"
|
||||
android:id="@+id/min_grade_register"
|
||||
android:layout_column="1"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="-9dip"
|
||||
android:layout_marginTop="-9dip"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_span="2"
|
||||
android:text="@string/unknown"
|
||||
android:textColor="@color/stat_label_text"
|
||||
android:textSize="40sp" />
|
||||
<TextView
|
||||
android:background="@color/black"
|
||||
android:layout_column="3"
|
||||
android:layout_marginBottom="-9dip"
|
||||
android:layout_marginTop="-9dip"
|
||||
android:layout_width="5dip"
|
||||
android:textSize="40sp" />
|
||||
<TextView
|
||||
android:gravity="right"
|
||||
android:id="@+id/max_grade_register"
|
||||
android:layout_column="4"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="-9dip"
|
||||
android:layout_marginTop="-9dip"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_span="2"
|
||||
android:text="@string/unknown"
|
||||
android:textColor="@color/stat_label_text"
|
||||
android:textSize="40sp" />
|
||||
</TableRow>
|
||||
|
||||
<!-- Latitude and Longitude -->
|
||||
<TableRow>
|
||||
<TextView
|
||||
android:layout_column="1"
|
||||
android:layout_span="3"
|
||||
android:text="@string/latitude_label" />
|
||||
<TextView
|
||||
android:layout_column="4"
|
||||
android:layout_span="2"
|
||||
android:text="@string/longitude_label" />
|
||||
</TableRow>
|
||||
<TableRow
|
||||
android:background="@color/stat_label_background">
|
||||
<TextView
|
||||
android:gravity="right"
|
||||
android:id="@+id/latitude_register"
|
||||
android:layout_column="1"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="-5dip"
|
||||
android:layout_marginTop="-5dip"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_span="2"
|
||||
android:text="@string/unknown"
|
||||
android:textColor="@color/stat_label_text"
|
||||
android:textSize="25sp" />
|
||||
<TextView
|
||||
android:background="@color/black"
|
||||
android:layout_column="3"
|
||||
android:layout_marginBottom="-9dip"
|
||||
android:layout_marginTop="-9dip"
|
||||
android:layout_width="5dip"
|
||||
android:textSize="25sp" />
|
||||
<TextView
|
||||
android:gravity="right"
|
||||
android:id="@+id/longitude_register"
|
||||
android:layout_column="4"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="-5dip"
|
||||
android:layout_marginTop="-5dip"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_span="2"
|
||||
android:text="@string/unknown"
|
||||
android:textColor="@color/stat_label_text"
|
||||
android:textSize="25sp" />
|
||||
</TableRow>
|
||||
|
||||
</TableLayout>
|
||||
</ScrollView>
|
||||
<LinearLayout android:id="@+id/stats_busypane"
|
||||
android:orientation="vertical"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:layout_weight="0"
|
||||
android:padding="3dip"
|
||||
android:visibility="gone">
|
||||
<ProgressBar
|
||||
android:layout_weight="1"
|
||||
android:layout_height="0dip"
|
||||
android:layout_width="wrap_content"
|
||||
android:maxWidth="80dip"
|
||||
android:maxHeight="80dip"
|
||||
android:minWidth="80dip"
|
||||
android:minHeight="80dip"
|
||||
android:layout_gravity="center"/>
|
||||
</LinearLayout>
|
||||
</RelativeLayout>
|
||||
@@ -1,53 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright 2010 Google Inc.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
<LinearLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:orientation="vertical">
|
||||
<WebView
|
||||
android:id="@+id/welcome_web"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:layout_weight="1" />
|
||||
<LinearLayout
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="0"
|
||||
android:background="@drawable/list_bar"
|
||||
android:padding="3dip">
|
||||
<Button
|
||||
android:id="@+id/welcome_about"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="48dip"
|
||||
android:layout_gravity="left"
|
||||
android:text="@string/welcome_about"
|
||||
android:textSize="14dip" />
|
||||
<TextView
|
||||
android:layout_width="0dip"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1" />
|
||||
<Button
|
||||
android:id="@+id/welcome_read_later"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="48dip"
|
||||
android:layout_gravity="right"
|
||||
android:text="@string/welcome_read_later"
|
||||
android:textSize="14dip" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
@@ -1,34 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:id="@+id/menu_start_recording"
|
||||
android:icon="@drawable/menu_record"
|
||||
android:title="@string/start_recording"/>
|
||||
|
||||
<item android:id="@+id/menu_stop_recording"
|
||||
android:icon="@drawable/menu_stop"
|
||||
android:title="@string/stop_recording"/>
|
||||
|
||||
<item android:id="@+id/menu_list_tracks"
|
||||
android:icon="@drawable/menu_list_tracks"
|
||||
android:title="@string/list_tracks"/>
|
||||
|
||||
<item android:id="@+id/menu_list_markers"
|
||||
android:icon="@drawable/menu_marker"
|
||||
android:title="@string/list_markers"/>
|
||||
|
||||
<item android:id="@+id/menu_settings"
|
||||
android:icon="@android:drawable/ic_menu_preferences"
|
||||
android:orderInCategory="1001"
|
||||
android:title="@string/settings"/>
|
||||
|
||||
<item android:id="@+id/menu_aggregated_stats"
|
||||
android:icon="@android:drawable/ic_menu_info_details"
|
||||
android:orderInCategory="1002"
|
||||
android:title="@string/aggregated_stats"/>
|
||||
|
||||
<item android:id="@+id/menu_help"
|
||||
android:icon="@android:drawable/ic_menu_info_details"
|
||||
android:orderInCategory="1003"
|
||||
android:title="@string/help"/>
|
||||
|
||||
</menu>
|
||||
@@ -1,43 +0,0 @@
|
||||
End User License Agreement
|
||||
|
||||
By downloading, installing or using this application or any portion thereof ("Application"), you agree to the following terms and conditions (the "Terms and Conditions").
|
||||
|
||||
1. USE OF APPLICATION
|
||||
a. Google grants you the non-exclusive, non-transferable, limited right and license to install and use this Application solely and exclusively for your personal use.
|
||||
b. You may not use the Application in any manner that could damage, disable, overburden, or impair the Application (or servers or networks connected to the Application), nor may you use the Application in any manner that could interfere with any other party's use and enjoyment of the Application (or servers or networks connected to the Application).
|
||||
c. You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) your use of the Application, any breach of your obligations under the Terms and Conditions, and for the consequences (including any loss or damage which Google may suffer) of any such breach.
|
||||
|
||||
2. PROPRIETARY RIGHTS
|
||||
You acknowledge that (a) the Application contains proprietary and confidential information that is protected by applicable intellectual property and other laws, and (b) Google and/or third parties own all right, title and interest in and to the Application and content, excluding content provided by you, that may be presented or accessed through the Application, including without limitation all Intellectual Property Rights therein and thereto. "Intellectual Property Rights" means any and all rights existing from time to time under patent law, copyright law, trade secret law, trademark law, unfair competition law, and any and all other proprietary rights, and any and all applications, renewals, extensions and restorations thereof, now or hereafter in force and effect worldwide. You agree that you will not, and will not allow any third party to, (i) copy, sell, license, distribute, transfer, modify, adapt, translate, prepare derivative works from, decompile, reverse engineer, disassemble or otherwise attempt to derive source code from the Application or content that may be presented or accessed through the Application for any purpose, unless otherwise permitted, (ii) take any action to circumvent or defeat the security or content usage rules provided, deployed or enforced by any functionality (including without limitation digital rights management functionality) contained in the Application, (iii) use the Application to access, copy, transfer, transcode or retransmit content in violation of any law or third party rights, or (iv) remove, obscure, or alter Google's or any third party's copyright notices, trademarks, or other proprietary rights notices affixed to or contained within or accessed in conjunction with or through the Application.
|
||||
|
||||
3. GOOGLE TERMS OF SERVICE AND PRIVACY POLICY
|
||||
a. Google’s Privacy Policy (located at http://www.google.com/privacypolicy.html) explains how Google treats your information and protects your privacy when you use the Application. You agree to the use of your data in accordance with Google’s privacy policies.
|
||||
b. The Application may contain features that are used in conjunction with Google’s search and other services. Accordingly, your use of such features of the Application is also governed by Google’s Terms of Service located at http://www.google.com/terms_of_service.html, Google’s Privacy Policy located at http://www.google.com/privacypolicy.html, as well as any applicable Google Service-specific Terms of Service and Privacy Policy, which may be updated from time to time and without notice.
|
||||
|
||||
4. U.S. GOVERNMENT RESTRICTED RIGHTS
|
||||
This Application, related materials and documentation have been developed entirely with private funds. If the user of the Application is an agency, department, employee, or other entity of the United States Government, the use, duplication, reproduction, release, modification, disclosure, or transfer of the Application, including technical data or manuals, is restricted by the terms, conditions and covenants contained in these Terms and Conditions. In accordance with Federal Acquisition Regulation 12.212 for civilian agencies and Defense Federal Acquisition Regulation Supplement 227.7202 for military agencies, use of the Application is further restricted by these Terms and Conditions.
|
||||
|
||||
5. EXPORT RESTRICTIONS
|
||||
The Application may be subject to export controls or restrictions by the United States or other countries or territories. You agree to comply with all applicable U.S. and international export laws and regulations. These laws include restrictions on destinations, end users, and end use.
|
||||
|
||||
6. TERMINATION
|
||||
These Terms and Conditions will continue to apply until terminated by either you or Google as set forth below. You may terminate these Terms and Conditions at any time by permanently deleting the Application from your mobile device in its entirety. Your rights automatically and immediately terminate without notice from Google or any Third Party if you fail to comply with any provision of these Terms and Conditions. In such event, you must immediately delete the Application.
|
||||
|
||||
7. INDEMNITY
|
||||
To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys fees) arising out of or accruing from your use of the Application, including your downloading, installation, or use of the Application, or your violation of these Terms and Conditions.
|
||||
|
||||
8. DISCLAIMER OF WARRANTIES
|
||||
A. You expressly understand and agree that your use of the application is at your sole discretion and risk and that the application is provided “as is” and “as available” without warranty of any kind.
|
||||
B. You are solely responsible for any damage to your mobile device, or other device, or loss of data that results from such use.
|
||||
C. Google further expressly disclaims all warranties and conditions of any kind, whether express or implied, including, but not limited to the implied warranties and conditions of merchantability, fitness for a particular purpose and non-infringement, with respect to the application.
|
||||
D. The application is not intended for use in the operation of nuclear facilities, life support systems, emergency communications, aircraft navigation or communication systems, air traffic control systems, or any other activities in which the failure of the application could lead to death, personal injury, or severe physical or environmental damage.
|
||||
|
||||
9. LIMITATION OF LIABILITY
|
||||
You expressly understand and agree that google, its subsidiaries and affiliates, and its licensors are not liable to you under any theory of liability for any direct, indirect, incidental, special consequential or exemplary damages that may be incurred by you through your use of the application, including any loss of data or damage to your mobile device, whether or not google or its representatives have been advised of or should have been aware of the possibility of any such losses arising.
|
||||
|
||||
10. MISCELLANEOUS
|
||||
a. These Terms and Conditions constitute the entire Agreement between you and Google relating to the Application and govern your use of the Application, and completely replace any prior or contemporaneous agreements between you and Google regarding the Application.
|
||||
b. The failure of Google to exercise or enforce any right or provision of these Terms and Conditions does not constitute a waiver of such right or provision, which will still be available to Google.
|
||||
c. If any court of law, having the jurisdiction to decide on this matter, rules that any provision of these Terms and Conditions is invalid, then that provision will be removed from the Terms and Conditions without affecting the rest of the Terms and Conditions. The remaining provisions of these Terms and Conditions will continue to be valid and enforceable.
|
||||
d. The rights granted in these Terms and Conditions may not be assigned or transferred by either you or Google without the prior written approval of the other party. Neither you nor Google are permitted to delegate their responsibilities or obligations under these Terms and Conditions without the prior written approval of the other party.
|
||||
e. These Terms and Conditions and your relationship with Google under these Terms and Conditions will be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from these Terms and Conditions. Notwithstanding this, you agree that Google will still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.
|
||||