1
0
mirror of https://framagit.org/tom79/fedilab-tube synced 2025-06-05 21:09:11 +02:00

602 Commits

Author SHA1 Message Date
2cdabbcb70 Release 1.13.1 2021-01-23 17:23:53 +01:00
d5ad9b181b Release 1.13.1 2021-01-23 17:14:32 +01:00
540fb3e2dc Update ReadMe remove useless accounts 2021-01-23 17:07:58 +01:00
edbe65593b Some fixes 2021-01-23 17:03:26 +01:00
d5f394dfea Fix issue with Manifest merging 2021-01-17 10:29:13 +01:00
d5a5fdf52e Release 1.13.0 2021-01-16 18:25:59 +01:00
a7f9256947 Small fixes 2021-01-16 14:14:15 +01:00
d769729901 Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!64
2021-01-16 11:34:44 +01:00
b2026c8784 New Crowdin updates 2021-01-16 11:34:44 +01:00
b29de141ef Add cast library for Google release only - Checked through Exodus 2021-01-16 11:33:59 +01:00
6d4772da75 Fix issue #170 2021-01-11 17:42:54 +01:00
2344fe0942 Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!63
2021-01-09 18:47:38 +01:00
7c309b68b8 New Crowdin updates 2021-01-09 18:47:38 +01:00
c8c5e56a17 Cannot comment reply with Pleroma accounts 2021-01-09 18:47:08 +01:00
cef227ba42 Release notes 2021-01-09 17:38:25 +01:00
02296b038a Release 1.12.0 2021-01-09 17:33:53 +01:00
b76a4cfcf5 Fix issue #160 #87 #88 - Notification counter + mark them all as read 2021-01-09 17:18:32 +01:00
f168f101bc Fix issue #160 - Add a notification counter 2021-01-09 14:13:34 +01:00
2e8a86fe20 Fix issue #160 - Move account item to make it visible in top bar 2021-01-09 10:52:34 +01:00
fe0d2fe726 fix gradle issue 2021-01-09 10:48:11 +01:00
9b322cc922 Fix issue #165 2021-01-09 10:42:37 +01:00
346656e53d Fix issue #167 2021-01-09 09:21:26 +01:00
6e6187175a Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!62
2021-01-08 18:08:28 +01:00
5e832fa046 New Crowdin updates 2021-01-08 18:08:28 +01:00
34007d4507 remove signingConfigs 2021-01-08 17:57:26 +01:00
fd400f025e Merge branch 'donation_google' into develop
# Conflicts:
#	.gitignore
2021-01-08 17:45:00 +01:00
f3f474ee13 Some fixes 2021-01-08 17:44:32 +01:00
d971032d52 Some changes 2021-01-08 11:29:49 +01:00
961c77103e Some changes 2021-01-08 11:18:01 +01:00
b22b21c47a Some changes 2021-01-07 17:39:47 +01:00
6d70bd758a Some changes 2021-01-06 19:23:44 +01:00
087ac92f15 gitignore 2021-01-06 10:30:05 +01:00
99fe789f30 Fix issue #164 & #156 2021-01-05 18:37:58 +01:00
10892f92f1 Fix issue #162 2021-01-05 17:41:38 +01:00
0a919c85ab Fix issue #163 2021-01-05 17:37:27 +01:00
761abc013f Allow donation through Google 2021-01-05 17:26:21 +01:00
327f6f0e8d Release notes 2021-01-03 16:06:15 +01:00
d6f1a360d2 Release notes 2021-01-03 16:05:47 +01:00
24ec69d7f7 Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!61
2021-01-03 16:01:01 +01:00
c80692bd34 New Crowdin updates 2021-01-03 16:01:00 +01:00
b5e9f70be6 Allow to reblog/unreblog, favourite/unfavourite, bookmark/unbookmark videos from mastodon/pleroma Accounts 2021-01-03 12:10:34 +01:00
d446081331 Small fix 2021-01-03 10:02:11 +01:00
8178cff72c Small fix 2021-01-02 18:28:13 +01:00
950d99b5de Prevent to check notifications for remote accounts 2021-01-02 18:20:36 +01:00
b7855cb1a2 Working post comments from Mastodon/Pleroma 2021-01-02 18:09:09 +01:00
b298fbfa3e Some changes 2021-01-02 13:38:58 +01:00
d83929f80a Some changes 2021-01-02 11:21:30 +01:00
b932ed2c13 Some fixes 2020-12-31 15:32:38 +01:00
36073d340d Allow connection with Mastodon & Pleroma accounts 2020-12-31 14:19:26 +01:00
0e14540b69 Allow connection of Mastodon & Pleroma accounts 2020-12-31 11:19:43 +01:00
57327a8ad0 Check rights 2020-12-30 16:20:49 +01:00
bbfa278d6b Implement logic 2020-12-30 15:37:09 +01:00
439decf6a9 Merge remote-tracking branch 'origin/develop' into develop 2020-12-30 12:21:49 +01:00
2277cc5f05 Some changes 2020-12-30 12:21:40 +01:00
4204ffccee Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!60
2020-12-30 10:11:25 +01:00
31407e709d New Crowdin updates 2020-12-30 10:11:25 +01:00
44d26bb1cf Merge remote-tracking branch 'origin/develop' into develop 2020-12-29 17:11:56 +01:00
8a8a433023 Some changes 2020-12-29 17:11:36 +01:00
5c27292543 Fix #138 #155 2020-12-29 16:53:02 +01:00
e475348d39 Some fixes 2020-12-29 09:55:15 +01:00
9f8358e471 Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!59
2020-12-28 17:36:02 +01:00
4fd8d42d85 Some fixes 2020-12-28 15:43:59 +01:00
498990c48a New translations strings.xml (French) 2020-12-28 15:43:37 +01:00
1cddf26c9a Some fixes 2020-12-28 15:39:18 +01:00
325a239b86 clean 2020-12-26 17:34:30 +01:00
2c4ef9c3ce New translations strings.xml (Russian) 2020-12-25 20:06:50 +01:00
4dbd191c4f Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!58
2020-12-25 10:33:12 +01:00
01e489da10 New Crowdin updates 2020-12-25 10:33:12 +01:00
53a7062c6d clean 2020-12-24 17:10:16 +01:00
3425e1e593 Merge remote-tracking branch 'origin/develop' into develop 2020-12-24 16:40:35 +01:00
9970635ff8 Fix issue #154 2020-12-24 16:40:18 +01:00
c1f174a5b8 Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!57
2020-12-24 15:32:59 +01:00
3587e7c524 New Crowdin updates 2020-12-24 15:32:59 +01:00
3911ad15a6 fix name 2020-12-24 12:01:59 +01:00
d40b35da59 Fix issue #158 2020-12-24 11:57:27 +01:00
ccb6e184cc Fix issue #151 2020-12-24 11:42:06 +01:00
74e45b1820 Quick fix 2020-12-18 18:36:32 +01:00
0a1336f0e0 Release 1.10.2 2020-12-18 18:00:47 +01:00
d5a0dcb980 Fix issue #152 2020-12-18 16:49:18 +01:00
83e7c41ca0 Merge branch 'l10n_develop' into develop 2020-12-18 16:35:05 +01:00
1d1b0c11a9 fix CI 2020-12-18 14:41:48 +01:00
3b2c4e2ac6 New translations strings.xml (Chinese Traditional) 2020-12-18 14:41:27 +01:00
2d77fe580f New translations strings.xml (Chinese Simplified) 2020-12-18 14:41:23 +01:00
7ae20f43f8 New translations strings.xml (Swedish) 2020-12-18 14:41:19 +01:00
f03c1b206b New translations strings.xml (Russian) 2020-12-18 14:41:16 +01:00
d99a58f2cf New translations strings.xml (Portuguese) 2020-12-18 14:41:12 +01:00
5aeaf7f34b New translations strings.xml (Polish) 2020-12-18 14:41:09 +01:00
af0b484d16 New translations strings.xml (Dutch) 2020-12-18 14:41:06 +01:00
0a6791b752 New translations strings.xml (Korean) 2020-12-18 14:41:02 +01:00
e73e306d05 New translations strings.xml (Japanese) 2020-12-18 14:40:58 +01:00
52189abbff New translations strings.xml (Italian) 2020-12-18 14:40:53 +01:00
d721f12d74 New translations strings.xml (Greek) 2020-12-18 14:40:49 +01:00
69f28bb647 New translations strings.xml (German) 2020-12-18 14:40:45 +01:00
2b2295d831 New translations strings.xml (Arabic) 2020-12-18 14:40:41 +01:00
179586b8c4 New translations strings.xml (Spanish) 2020-12-18 14:40:38 +01:00
1afad9e06a New translations strings.xml (French) 2020-12-18 14:40:35 +01:00
59c73fd864 New translations strings.xml (Romanian) 2020-12-18 14:40:30 +01:00
6820344750 Fix #145 and #153 2020-12-18 14:31:36 +01:00
680504791c New translations strings.xml (Chinese Traditional) 2020-12-17 17:53:31 +01:00
41e500a8f8 New translations strings.xml (Chinese Simplified) 2020-12-17 17:53:28 +01:00
448af1ef9a New translations strings.xml (Swedish) 2020-12-17 17:53:23 +01:00
041e8c0bd6 New translations strings.xml (Russian) 2020-12-17 17:53:19 +01:00
0b7300e93a New translations strings.xml (Polish) 2020-12-17 17:53:16 +01:00
94c5f5a705 New translations strings.xml (Dutch) 2020-12-17 17:53:12 +01:00
fa2f8a7b05 New translations strings.xml (Korean) 2020-12-17 17:53:09 +01:00
aeb288142e New translations strings.xml (Japanese) 2020-12-17 17:53:06 +01:00
635c43f458 New translations strings.xml (Italian) 2020-12-17 17:53:03 +01:00
d36138431b New translations strings.xml (Greek) 2020-12-17 17:52:58 +01:00
9cdf857730 New translations strings.xml (German) 2020-12-17 17:52:55 +01:00
52a6152af6 New translations strings.xml (Arabic) 2020-12-17 17:52:52 +01:00
9d3312c081 New translations strings.xml (Spanish) 2020-12-17 17:52:48 +01:00
1146236f46 New translations strings.xml (Portuguese) 2020-12-17 17:52:44 +01:00
ec19ee1e55 New translations strings.xml (French) 2020-12-17 17:52:39 +01:00
cc37e40158 New translations strings.xml (Romanian) 2020-12-17 17:52:05 +01:00
bdd12de34d Fix issues #150 #149 #148 #147 2020-12-17 17:37:40 +01:00
e64692d0d3 Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!55
2020-12-17 14:37:10 +01:00
7da8c0f664 New Crowdin updates 2020-12-17 14:37:10 +01:00
fc41c077dc move fastlane 2020-12-17 14:16:49 +01:00
50800da4b9 move fastlane 2020-12-17 14:01:35 +01:00
a9219e8a91 move fastlane 2020-12-17 14:00:12 +01:00
5eedadef47 New instance acad + matomo (acad flavor only) 2020-12-16 17:24:23 +01:00
14cde8e625 Fixes 2020-12-16 10:14:46 +01:00
1f2ecd591d Matomo for acad flavor 2020-12-14 16:41:29 +01:00
9a2eb6cd49 Support openid 2020-12-14 14:42:28 +01:00
aa38514bcb Merge branch 'develop' of https://framagit.org/tom79/fedilab-tube into develop 2020-12-14 08:27:49 +01:00
f2fddfb16c typo 2020-12-13 15:41:26 +01:00
05300682c1 Fixes 2020-12-13 15:41:00 +01:00
a3714a4ecf Fix issue #143 2020-12-13 11:48:56 +01:00
500584b9ef Fix some issues 2020-12-13 09:32:33 +01:00
33ac822957 fix issue #142 2020-12-13 08:53:22 +01:00
1f6107e238 Truncate long descriptions for instances with a way to expand them. 2020-12-12 15:41:28 +01:00
2b7639599c Prepare release notes 2020-12-12 15:07:43 +01:00
dedf7b0163 Fix issue #125 2020-12-12 14:58:28 +01:00
88b5a83fb1 Fix issue #127 2020-12-12 14:47:59 +01:00
efd6b0088f Fix issue #119 2020-12-12 14:45:14 +01:00
ccb5cd20b1 Merge remote-tracking branch 'origin/develop' into develop 2020-12-12 14:39:29 +01:00
668e41bc9b Fix issue #122 2020-12-12 14:39:20 +01:00
46123fa7d6 Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!54
2020-12-12 14:34:48 +01:00
b079965de8 New Crowdin updates 2020-12-12 14:34:47 +01:00
842ab914a4 Reverse to Fastlane with Flavors 2020-12-12 14:17:29 +01:00
fcb93b7dc6 update details 2020-12-12 09:32:55 +01:00
f1420fe29e Create flavor 2020-12-11 18:37:35 +01:00
23f8674adc Fix #136 - crash with download button and lives 2020-12-11 17:59:24 +01:00
76a4aa5ae6 Fix #136 - crash with download button and lives 2020-12-11 17:16:29 +01:00
85ffb4064b clean 2020-12-09 18:26:52 +01:00
73c9e639b6 Some improvements with cast 2020-12-09 18:26:11 +01:00
5172695784 some fixes 2020-12-09 15:45:54 +01:00
fcc10f97b5 Fix issue #134 2020-12-06 17:15:04 +01:00
0a12020fd8 Fix issue #129 2020-12-06 11:24:36 +01:00
e9c10b17e0 Fix issue #124 - typo 2020-12-06 10:59:01 +01:00
f4698f1312 Issue #133 - history not working in URL 2020-12-06 10:46:18 +01:00
1690507a18 Issue #123 - a small fix 2020-12-05 18:48:41 +01:00
fbeb87e29e Issue #123 - improve player 2020-12-05 18:41:07 +01:00
de14e95e90 Issue #123 - Working cast 2020-12-05 17:28:25 +01:00
35c5713b0a #123 - some tests 2020-12-05 14:01:08 +01:00
413792087e #123 - some tests 2020-12-05 11:27:27 +01:00
21c53d2b4d Add cast support #123 - try 2020-12-02 18:37:54 +01:00
5757a8b1d8 Add cast support #123 2020-12-02 18:05:35 +01:00
680bdf7bd2 Split code 2020-12-01 18:35:54 +01:00
6911fbd124 Limits some actions 2020-12-01 16:09:14 +01:00
9fdffc9709 svg 2020-11-29 12:00:04 +01:00
0b722a5ecc Add flavors 2020-11-29 11:59:27 +01:00
6ae42ffefe Allow to change thumbnail for Playlists 2020-11-28 17:56:16 +01:00
3a8c82ce63 Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!52
2020-11-28 16:48:55 +01:00
04c2b277ce New Crowdin updates 2020-11-28 16:48:55 +01:00
962462ff84 Fix some bugs 2020-11-28 16:41:21 +01:00
964b0f2690 Fix some bugs when playing 2020-11-28 14:54:47 +01:00
4b25b61680 Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!51
2020-11-28 10:40:17 +01:00
61c3735e57 New Crowdin updates 2020-11-28 10:40:16 +01:00
b0e29c0ba4 Some fixes 2020-11-28 10:33:13 +01:00
e7f55aace9 Fix issue #117 2020-11-28 10:26:20 +01:00
2955206b07 Some improvements with nsfw dialog 2020-11-28 09:32:31 +01:00
b59d97279d Fix issue #115 - Filter with remote accounts does not work 2020-11-28 09:20:44 +01:00
7d9e299940 Update release notes 2020-11-27 19:00:57 +01:00
e15252a0f8 Some fixes 2020-11-27 18:56:37 +01:00
e0907f1dc8 Swipe to change timelines 2020-11-27 18:36:31 +01:00
1107391c43 Fix a crash 2020-11-27 15:00:25 +01:00
2500035c33 Fix issue #58 - Remove more option menu for other channels 2020-11-27 14:29:29 +01:00
24ad4dbc0f Fix issue #58 - Allow to search channels 2020-11-27 14:06:42 +01:00
550394a5e4 Merge branch 'improve_comments' into develop
# Conflicts:
#	app/src/main/java/app/fedilab/fedilabtube/drawer/CommentListAdapter.java
2020-11-27 11:39:07 +01:00
720c13fa2d add decoration 2020-11-27 11:38:36 +01:00
a02b8b79c1 some tests 2020-11-26 14:16:44 +01:00
c2f99e130d clean adapter for comment 2020-11-25 15:11:13 +01:00
250aa03e9a some tries 2020-11-25 15:08:38 +01:00
dd7d253a1b Fix orientation issues 2020-11-25 11:26:14 +01:00
f2b46fffe0 Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!50
2020-11-25 09:34:44 +01:00
60630cc4ea New Crowdin updates 2020-11-25 09:34:44 +01:00
85164c18e9 Fix issue #99 2020-11-25 09:31:39 +01:00
3634e5e232 Some fixes 2020-11-24 17:32:18 +01:00
f7d44cb547 Some fixes 2020-11-24 13:50:06 +01:00
85b89507db Fix issue #113 2020-11-23 18:37:26 +01:00
7415b752cc Release 1.8.0 2020-11-22 17:03:18 +01:00
0a52060223 Merge remote-tracking branch 'origin/develop' into develop 2020-11-22 16:46:11 +01:00
1024b1e6f9 color fixes + update lib 2020-11-22 16:46:05 +01:00
23fc061711 Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!49
2020-11-22 16:44:56 +01:00
bfa3ede06b New Crowdin updates 2020-11-22 16:44:55 +01:00
c7f6cdc8c6 Fix indentation 2020-11-22 11:15:49 +01:00
58f280d347 Fix issue #106 2020-11-22 11:15:31 +01:00
0715824ae1 Fix issue #108 2020-11-22 11:04:46 +01:00
5540c8cacc Fix issue #109 2020-11-22 10:59:30 +01:00
14efbdd08f Some fixes 2020-11-21 18:54:54 +01:00
7ceb04d548 Fix remote videos not playing 2020-11-21 18:51:30 +01:00
e9608f63db Prepare release 1.8.0 2020-11-21 17:26:28 +01:00
64e1c7ca81 Update release notes 2020-11-21 17:24:28 +01:00
7823b30900 Merge remote-tracking branch 'origin/develop' into develop 2020-11-21 17:17:42 +01:00
1e45e4454c Change profile picture for channels 2020-11-21 17:17:34 +01:00
1dd3a193c5 Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!48
2020-11-21 14:17:16 +01:00
30416837a9 New Crowdin updates 2020-11-21 14:17:16 +01:00
363132d331 Fix 2020-11-21 11:06:26 +01:00
ebc0d744ed Fix 2020-11-21 09:59:33 +01:00
d685031ee8 Fix upload 2020-11-21 09:37:18 +01:00
3ea012f62e Change lib 2020-11-20 18:48:29 +01:00
9a06f5660b Some fixes 2020-11-20 15:03:06 +01:00
dff76aada1 Some fixes 2020-11-20 08:58:28 +01:00
50a9f8a1b0 Some improvements 2020-11-19 18:08:28 +01:00
8ff3b81112 Some fixes 2020-11-19 12:00:39 +01:00
38f73a5d60 Some fixes 2020-11-18 19:15:19 +01:00
15f6835a0c Some fixes 2020-11-18 19:04:54 +01:00
84e3264726 Some fixes 2020-11-18 18:15:45 +01:00
dbd068d95f Some fixes 2020-11-18 17:24:18 +01:00
acba219e44 Fix issue #85 2020-11-18 15:44:47 +01:00
c8e7c23855 Fix issue #89 2020-11-18 15:07:22 +01:00
f0ff8a6feb Some fixes with video menu 2020-11-18 10:09:29 +01:00
91a1380fef Fix issue #91 2020-11-18 10:00:25 +01:00
3351ef7d91 Fix issue #76 2020-11-17 18:49:43 +01:00
564cda58a5 Merge remote-tracking branch 'origin/develop' into develop 2020-11-17 18:31:17 +01:00
3233fe673d Some fixes 2020-11-17 18:30:56 +01:00
8cc8b284ce Some fixes 2020-11-17 18:10:45 +01:00
3ecdedc17c Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!47
2020-11-17 17:55:52 +01:00
8f361c605a New Crowdin updates 2020-11-17 17:55:51 +01:00
9d599e8b57 some improvements 2020-11-17 17:47:10 +01:00
9c676d8002 some improvements 2020-11-16 18:54:59 +01:00
d3ffc32d9b Merge branch 'develop' of https://framagit.org/tom79/fedilab-tube into develop
 Conflicts:
	app/src/main/java/app/fedilab/fedilabtube/PeertubeActivity.java
	app/src/main/java/app/fedilab/fedilabtube/drawer/CommentListAdapter.java
	app/src/main/java/app/fedilab/fedilabtube/helper/CommentDecorationHelper.java
	app/src/main/res/layout/activity_peertube.xml
2020-11-16 08:24:35 +01:00
8c95554d8e Fix issue #70 2020-11-15 18:09:14 +01:00
3ed5248c2a Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!46
2020-11-15 11:49:35 +01:00
32990932ad New Crowdin updates 2020-11-15 11:49:34 +01:00
6d0a47903c Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!45
2020-11-15 11:40:01 +01:00
05eaa196b4 Prepare release 1.7.0 2020-11-15 11:34:18 +01:00
2cd076bfb8 Comment issue #46 - Allow to delete history 2020-11-15 11:27:38 +01:00
02cd267cae Fix issue #68 - Videos in unlisted playlists cannot be displayed 2020-11-15 09:54:55 +01:00
21394cb585 New translations strings.xml (Polish) 2020-11-15 03:16:43 +01:00
73cd48b94a Release 1.7.0 2020-11-14 19:13:59 +01:00
ea2cf58e5f Merge remote-tracking branch 'origin/develop' into develop 2020-11-14 17:52:32 +01:00
2f3e29b037 Improve comments 2020-11-14 17:52:17 +01:00
33d597c2c0 Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!44
2020-11-14 17:49:49 +01:00
66afb3f4ee New Crowdin updates 2020-11-14 17:49:48 +01:00
dad94d753d Remove lib 2020-11-14 17:19:37 +01:00
1727bebf58 update release notes 2020-11-14 15:26:36 +01:00
37576c69ce fixes 2020-11-14 15:22:48 +01:00
b8f83a7227 Merge branch 'bug_fixes_1-6-0' into develop
# Conflicts:
#	app/src/main/java/app/fedilab/fedilabtube/PeertubeActivity.java
2020-11-14 15:21:58 +01:00
3a14abaf2e fixes 2020-11-14 15:18:16 +01:00
0e03a55aef Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!43
2020-11-14 15:10:47 +01:00
931fb30330 New Crowdin updates 2020-11-14 15:10:47 +01:00
b893dc9c4f Merge remote-tracking branch 'origin/develop' into develop 2020-11-14 15:10:27 +01:00
f6ddd99449 Last fixes 2020-11-14 15:09:52 +01:00
ddcbbfe670 Last fixes 2020-11-14 15:05:44 +01:00
0f7438fa54 Some fixes 2020-11-14 12:19:37 +01:00
fbbab1db68 Some fixes 2020-11-14 09:50:48 +01:00
15725dceb0 Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!42
2020-11-13 18:46:58 +01:00
1bcbcec8b8 New Crowdin updates 2020-11-13 18:46:57 +01:00
c3e475be6f Allow to export/import 2020-11-13 18:45:55 +01:00
150a81adc6 Some fixes 2020-11-12 17:08:43 +01:00
a984607ee8 Update release notes 2020-11-11 18:28:50 +01:00
2bf929986e Change button 2020-11-11 15:47:42 +01:00
860edec2e6 Follow remote accounts 2020-11-11 15:36:15 +01:00
90cfcbb7ae Fix issue #67 - Reaching profile edition from the account activity 2020-11-11 11:36:01 +01:00
c63048730f Fix issue #62 - Errors with pull to refresh 2020-11-11 11:13:29 +01:00
55bbafdbb5 Fix issue #63 - Reach owner from channels 2020-11-11 10:42:40 +01:00
0923a07e42 Fix issue #59 - Follow button from sepia search 2020-11-11 10:37:49 +01:00
431c21e066 Last fixes 2020-11-11 10:34:28 +01:00
17c84f6c37 Switch from accounts 2020-11-10 18:44:48 +01:00
58f10d9372 Add the logic 2020-11-09 18:48:10 +01:00
a6dfd842e3 improve comments 2020-11-09 15:49:29 +01:00
dfdda7627f Release 1.6.0 2020-11-08 17:48:13 +01:00
1711826c43 Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!41
2020-11-08 17:42:24 +01:00
4627de23b4 New Crowdin updates 2020-11-08 17:42:24 +01:00
023ab2d4b2 Release 1.6.0 2020-11-08 17:42:01 +01:00
2a375318ea fix issue link 2020-11-08 16:50:20 +01:00
fee593d059 Fix issue #44 - Sync NSFW + add them in settings to apply them. 2020-11-08 16:45:38 +01:00
fe3546e282 Fix issue #57 - Allow to share channel and account links 2020-11-08 10:43:27 +01:00
b61b6868a6 Fix issue #55 - Honor downloads disabled 2020-11-08 10:27:40 +01:00
2f8ecd1f3e Prepare release 2020-11-07 17:23:53 +01:00
8a9ead3f0d Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!40
2020-11-07 15:55:16 +01:00
43e2762d4d New Crowdin updates 2020-11-07 15:55:16 +01:00
8ab237a957 Fix issue #47 - Seek to last known position 2020-11-07 15:51:38 +01:00
ffa5d0883a Update release notes 2020-11-07 10:42:19 +01:00
14f0a47f52 Fix issue #40 - Allow search to resolve peertube links 2020-11-07 10:38:30 +01:00
4c1e466866 Fix issue #42 - Allow to display channels from playing video activity 2020-11-07 10:24:56 +01:00
24c6f79b51 small fix 2020-11-07 10:17:45 +01:00
8c958a2563 Fix issue #31 - Show more content when available (with a toggle button) 2020-11-07 10:09:58 +01:00
02cc00780d Merge remote-tracking branch 'origin/develop' into develop 2020-11-07 09:43:14 +01:00
d13cce3997 Fix issue #39 - Allow to display videos in smaller lists 2020-11-07 09:42:56 +01:00
985835429b Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!39
2020-11-06 19:10:28 +01:00
00751cedab New Crowdin updates 2020-11-06 19:10:28 +01:00
c4e85a7161 Some improvements 2020-11-06 19:09:37 +01:00
253b61fb11 Fix issue #29 - Accept URL for instances 2020-11-06 18:52:29 +01:00
54ffbe2e15 Fix issue #30 2020-11-06 18:40:55 +01:00
86d9ba930c Useless translations 2020-11-06 18:22:56 +01:00
fb96efc8cf Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!38
2020-11-06 18:01:22 +01:00
aaac1652e9 New Crowdin updates 2020-11-06 18:01:21 +01:00
c8fc98ee71 Add torrent 2020-11-06 17:32:12 +01:00
4457259dfd Update README.md 2020-11-05 18:03:21 +01:00
6dbb11f6e9 Fix notification settings 2020-11-05 17:56:26 +01:00
08a4b4b49a Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!37
2020-11-05 17:53:29 +01:00
4afd2ca341 New Crowdin updates 2020-11-05 17:53:29 +01:00
0c048877e0 Some new features 2020-11-05 17:38:57 +01:00
825a74de4a Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!36
2020-11-04 18:55:41 +01:00
79ca0ceb88 New Crowdin updates 2020-11-04 18:55:41 +01:00
a5ccc9bf6f Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!35
2020-11-04 18:40:32 +01:00
685467266a New Crowdin updates 2020-11-04 18:40:31 +01:00
599e53b10c Merge remote-tracking branch 'origin/develop' into develop 2020-11-04 18:40:21 +01:00
029b8b57ae push notifications 2020-11-04 18:39:45 +01:00
631264eb57 push notifications 2020-11-04 17:43:38 +01:00
e7eef5b760 Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!34
2020-11-03 07:32:14 +01:00
59741e5979 New Crowdin updates 2020-11-03 07:32:14 +01:00
0f38ad180a Allow to edit profile + profile picture 2020-11-01 18:34:53 +01:00
fdc6e6e325 Allow to edit profile 2020-10-31 18:24:52 +01:00
ed9e79496a Auto play video when ended 2020-10-31 10:37:17 +01:00
4f909417f1 Fix issue #14 2020-10-30 16:21:56 +01:00
aecb4034ad Fix issue #20 2020-10-30 14:45:37 +01:00
f0335d96d2 Fix issue #18 2020-10-29 18:56:57 +01:00
65f3886355 upgrade lib 2020-10-29 10:05:40 +01:00
8e2f1fb8fe Merge remote-tracking branch 'origin/develop' into develop 2020-10-28 15:03:15 +01:00
852cfee310 Fix double click for pausing and exit fullscreen 2020-10-28 15:03:07 +01:00
6620a12957 Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!33
2020-10-28 08:25:38 +01:00
11e8135cbd New translations strings.xml (German) 2020-10-27 11:45:01 +01:00
824c4e0cbb Comment #16 - Redirect to another app if the URL can't be open with TubeLab 2020-10-26 19:02:55 +01:00
9af7934448 Fix issue #16 2020-10-26 14:38:51 +01:00
4ffa027e8d Merge remote-tracking branch 'origin/develop' into develop 2020-10-25 17:40:27 +01:00
7e8ab3359a Add CHANGELOG + CONTRIBUTING.md + issue_template.md + FUNDING.yml 2020-10-25 17:40:09 +01:00
8e72655731 Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!32
2020-10-25 09:40:17 +01:00
5c098857bd New Crowdin updates 2020-10-25 09:40:17 +01:00
7fece740af Merge remote-tracking branch 'origin/develop' into develop 2020-10-24 16:36:54 +02:00
857ab65f93 Some improvements 2020-10-24 16:36:49 +02:00
807655da5b Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!31
2020-10-24 15:57:05 +02:00
a77f37e564 New Crowdin updates 2020-10-24 15:57:04 +02:00
1194209c82 Fix #13 - #14 - #15 Settings for auto fullscreen/ disable auto playblack / pause videos in fullscreen with key back 2020-10-24 14:42:51 +02:00
f31b6e9ac8 Fix mini video view not supported on some devices 2020-10-23 15:33:35 +02:00
3353b7205b Fix issue #10 2020-10-22 08:57:51 +02:00
0f995cc615 Fix issue #11 2020-10-21 18:43:56 +02:00
7be0f72292 Release 1.5.1 2020-10-17 18:53:13 +02:00
ffbe8877a8 Merge branch 'develop' of https://framagit.org/tom79/fedilab-tube into develop 2020-10-17 18:50:26 +02:00
74feb7e8f0 Release 1.5.1 2020-10-17 18:50:20 +02:00
cbaef4bcfe Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!30
2020-10-17 18:08:38 +02:00
38a387a423 New Crowdin updates 2020-10-17 18:08:38 +02:00
1092eefc76 Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!29
2020-10-17 16:47:12 +02:00
3615b43b97 New Crowdin updates 2020-10-17 16:47:11 +02:00
e17c7fb01d Fix some crashes 2020-10-17 10:55:25 +02:00
f3d69e19a0 Merge branch 'develop' of https://framagit.org/tom79/fedilab-tube into develop 2020-10-17 10:53:11 +02:00
ea102eb485 Fix some crashes 2020-10-17 10:52:56 +02:00
2e4c01ed62 Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!28
2020-10-17 05:55:39 +02:00
ed22892d10 New Crowdin updates 2020-10-17 05:55:39 +02:00
017bd5a6a2 Release 1.5.0 2020-10-16 18:03:41 +02:00
967f11ddb4 Release 1.5.0 2020-10-16 17:53:30 +02:00
6b4abd019e typo 2020-10-16 17:43:18 +02:00
8b66c4030f Some fixes 2020-10-16 17:41:07 +02:00
34f058358e Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!27
2020-10-16 17:26:37 +02:00
2bab907777 New Crowdin updates 2020-10-16 17:26:37 +02:00
52e64b6d85 Fix issue #9 2020-10-16 17:25:52 +02:00
9510678a9f Manage accounts 2020-10-16 17:03:07 +02:00
b4e7c3f8e2 New fixes 2020-10-16 11:37:40 +02:00
d800d2b10c Fix comment layout 2020-10-15 19:07:58 +02:00
785b4949e6 Fix a register issue 2020-10-15 19:02:12 +02:00
b79e17cb60 Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!26
2020-10-15 18:59:22 +02:00
19fcbeb4b9 New Crowdin updates 2020-10-15 18:59:22 +02:00
ffb355d1a2 Add notifications for abuse reports 2020-10-15 18:59:08 +02:00
43fd2945cc Some improvements 2020-10-15 18:37:50 +02:00
d93c74a449 Reply to comments 2020-10-15 18:11:37 +02:00
7a197993c9 Support Emoji and replies 2020-10-15 15:16:41 +02:00
dc2a252dd5 Prepare the new layout. 2020-10-14 19:14:54 +02:00
2c33f7a7f8 Prepare the new layout. 2020-10-14 19:11:53 +02:00
24a8a0dc00 Some improvements 2020-10-14 16:39:27 +02:00
b78894b33c Merge remote-tracking branch 'origin/develop' into develop 2020-10-14 16:06:24 +02:00
2d33d7f970 Fix comment issue when posting 2020-10-14 16:06:17 +02:00
8823eb74ba Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!25
2020-10-14 15:24:32 +02:00
7f77b86272 New Crowdin updates 2020-10-14 15:24:32 +02:00
2f773b2f0f Custom instances per country 2020-10-14 10:57:28 +02:00
ca69a6e86d Code cleaning 2020-10-14 10:31:02 +02:00
3e5cefbf24 Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!24
2020-10-13 18:12:03 +02:00
245ef64ebe New Crowdin updates 2020-10-13 18:12:03 +02:00
a0ff454dd9 Some improvements 2020-10-13 18:11:53 +02:00
fa6b1560f8 Prepare release 1.4.2 2020-10-13 17:57:35 +02:00
518b5f617b Merge remote-tracking branch 'origin/develop' into develop 2020-10-13 17:50:57 +02:00
7c4ce7701c some fixes 2020-10-13 17:50:52 +02:00
0b6557f9c5 Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!23
2020-10-13 16:36:10 +02:00
a8e00d137a New Crowdin updates 2020-10-13 16:36:10 +02:00
75d3f74e48 Merge remote-tracking branch 'origin/develop' into develop 2020-10-13 16:35:56 +02:00
3866317597 some fixes 2020-10-13 16:35:51 +02:00
10e904fe4a Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!22
2020-10-13 14:32:42 +02:00
be655f6c2b New Crowdin updates 2020-10-13 14:32:42 +02:00
676e540059 Dark/Light/Automatic theme 2020-10-13 14:30:08 +02:00
87763a050c Merge remote-tracking branch 'origin/develop' into develop 2020-10-13 11:06:58 +02:00
ab45c1f80c Fix some issues + check if video is federated for Sepia search 2020-10-13 11:04:35 +02:00
ec5f2c7c45 Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!21
2020-10-12 07:35:45 +02:00
c4448f22b9 New Crowdin updates 2020-10-12 07:35:44 +02:00
62af5c54aa Release 1.4.1 2020-10-11 17:21:45 +02:00
5872f5c99f Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!20
2020-10-11 17:18:41 +02:00
2b1a63e08b New Crowdin updates 2020-10-11 17:18:41 +02:00
7b96cf32b3 App rater for Google Full version 2020-10-10 15:40:16 +02:00
6108bd143c App rater for Google Full version 2020-10-10 15:33:25 +02:00
0127b9bffa Censor videos having youtube + download in their title (Google Play release only). 2020-10-10 15:21:46 +02:00
8dddfc5497 Last fixes 2020-10-10 15:05:39 +02:00
bf119a5808 Fix strings 2020-10-10 11:52:57 +02:00
89ade69c5f Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!19
2020-10-10 11:49:50 +02:00
93eaec8544 Fix some elements 2020-10-10 11:49:18 +02:00
ce984de339 New translations strings.xml (French) 2020-10-10 10:32:08 +02:00
b089ae93e1 Refresh subscription 2020-10-10 10:28:45 +02:00
fc95708a84 Merge remote-tracking branch 'origin/develop' into develop 2020-10-10 09:43:40 +02:00
7262690999 Fix translations 2020-10-10 09:43:35 +02:00
f818c74943 Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!18
2020-10-10 09:38:05 +02:00
d7c5a04965 New Crowdin updates 2020-10-10 09:38:05 +02:00
257a00fa1e Some fixes 2020-10-10 09:37:44 +02:00
23875a2ceb Fix channel filter for subscriptions 2020-10-10 09:25:00 +02:00
3f1883fbbc Fix an issue with overlapping views 2020-10-09 19:14:20 +02:00
c5269a3129 comment #5 - Some improvements 2020-10-09 18:37:54 +02:00
056092ac71 comment #5 - Add searches 2020-10-09 18:22:05 +02:00
fd7632f001 comment #5 - searches 2020-10-09 14:54:01 +02:00
fb83a1927d comment #5 - prepare layouts 2020-10-09 10:19:46 +02:00
641a616c96 Change readme + fix titles 2020-10-08 18:46:18 +02:00
fc051d8d1d Merge branch 'develop' of https://framagit.org/tom79/fedilab-tube into develop 2020-10-08 18:44:30 +02:00
b8bec4f357 Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!17
2020-10-08 18:44:22 +02:00
fe78c8bf7e New Crowdin updates 2020-10-08 18:44:21 +02:00
42caaa9dc9 Fix titles 2020-10-08 18:35:35 +02:00
74d6cb8041 Prepare release 1.3.0 2020-10-08 18:30:47 +02:00
7678da2bb6 Change description + fix pagination 2020-10-08 18:13:04 +02:00
e771153f35 Some changes 2020-10-08 17:16:42 +02:00
e96b9f7f02 Some fixes 2020-10-08 16:21:14 +02:00
0604ac9ba8 Merge remote-tracking branch 'origin/develop' into develop 2020-10-07 17:46:25 +02:00
bd0c59a69e Improve menu for videos 2020-10-07 17:46:15 +02:00
0a84b75518 typo error 2020-10-07 09:25:58 +02:00
c4b49b58cf typo error 2020-10-07 09:25:41 +02:00
afbb27896e Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!16
2020-10-07 08:53:17 +02:00
e0ff6c0ac3 New Crowdin updates 2020-10-07 08:53:17 +02:00
4d7c7e88bb typo error 2020-10-06 19:02:25 +02:00
7eef023277 some fixes 2020-10-06 18:49:15 +02:00
6a762a8fd6 some fixes 2020-10-06 17:11:25 +02:00
752e3d50c1 some fixes 2020-10-06 16:05:34 +02:00
8377f9bb8a Merge branch 'develop' into new_feature
# Conflicts:
#	app/src/main/java/app/fedilab/fedilabtube/drawer/PeertubeAdapter.java
#	app/src/main/java/app/fedilab/fedilabtube/helper/Helper.java
2020-10-06 15:32:04 +02:00
5ff06a29d2 Merge branch 'develop' of https://framagit.org/tom79/fedilab-tube into develop
 Conflicts:
	app/build.gradle
2020-10-06 15:30:53 +02:00
50aeb075b1 test 2020-10-06 15:30:15 +02:00
79ff617d67 Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!15
2020-10-06 14:09:02 +02:00
5de8524f2a New Crowdin updates 2020-10-06 14:09:02 +02:00
6164ff9163 change versionCode 2020-10-05 14:43:18 +02:00
6e8b304b63 Fix crashes 2020-10-05 14:34:22 +02:00
3be0cd727f Fix crashes 2020-10-05 14:34:01 +02:00
451dd53230 Merge remote-tracking branch 'origin/develop' into develop 2020-10-04 17:51:15 +02:00
34c1222fbc Code clean 2020-10-04 17:51:09 +02:00
ccf2fc877b Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!14
2020-10-04 17:26:04 +02:00
10a496c299 New Crowdin updates 2020-10-04 17:26:04 +02:00
ba1bfd1f9c Change loader 2020-10-04 17:25:08 +02:00
b9622da6c6 Merge remote-tracking branch 'origin/develop' into develop 2020-10-04 14:01:11 +02:00
b3e9100c2f Fix inverted strings 2020-10-04 13:53:07 +02:00
fb0e87397d Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!13
2020-10-04 13:51:25 +02:00
bed1bb634b New Crowdin updates 2020-10-04 13:51:25 +02:00
4db288743e typo 2020-10-03 19:10:00 +02:00
ba569b2d40 change version code 2020-10-03 19:04:02 +02:00
c774dcee96 Last fixes 2020-10-03 18:37:34 +02:00
48fe22c8db Merge remote-tracking branch 'origin/develop' into develop 2020-10-03 17:02:59 +02:00
3f282c8116 Some fixes 2020-10-03 17:02:48 +02:00
4f4cdd68b5 Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!12
2020-10-03 17:01:54 +02:00
9c350c922b New Crowdin updates 2020-10-03 17:01:53 +02:00
8548777c50 some checks 2020-10-03 16:22:19 +02:00
30d344987c Fix an issue 2020-10-03 13:41:33 +02:00
80c8e1a356 Release notes 2020-10-03 11:54:18 +02:00
8ce7eb386f Release 1.2.0 2020-10-03 11:44:00 +02:00
c50a587250 Some improvements 2020-10-03 11:24:26 +02:00
a8b17ce0b2 Add cache for videos 2020-10-03 10:59:31 +02:00
731863ef6c Merge remote-tracking branch 'origin/develop' into develop 2020-10-03 09:08:41 +02:00
04b8294022 Fix triple-t 2020-10-03 09:08:36 +02:00
4937ff43e5 Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!11
2020-10-03 08:18:02 +02:00
1670867a1d New Crowdin updates 2020-10-03 08:18:02 +02:00
5e947cd221 Beta release 2020-10-02 19:33:57 +02:00
1f8c5cbc05 Fix strings 2020-10-02 19:31:00 +02:00
c2ab7a3608 Some improvements 2020-10-02 19:29:00 +02:00
d62ff6d18f some fixes 2020-10-02 18:22:19 +02:00
92a0af8b36 Fix full screen 2020-10-02 15:23:36 +02:00
34ed36f9ae Fix issue 2020-10-02 15:14:08 +02:00
7777317eb8 Merge remote-tracking branch 'origin/develop' into develop 2020-10-02 07:09:01 +02:00
4d53612adc Some fixes 2020-10-02 07:03:36 +02:00
e08d9805f1 Some improvements 2020-10-01 17:42:03 +02:00
cb5b7274fe Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!10
2020-10-01 16:47:48 +02:00
db84cac8f0 New Crowdin updates 2020-10-01 16:47:47 +02:00
b6769ca25f Fix upload 2020-09-29 17:48:12 +02:00
70903578d1 upload+actions with retrofit 2020-09-29 17:42:15 +02:00
07d8a39681 Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!9
2020-09-28 07:18:09 +02:00
7410467cd6 New Crowdin updates 2020-09-28 07:18:09 +02:00
f21732f753 Refresh token 2020-09-27 18:33:51 +02:00
9dca5fcd3b Fix authentication 2020-09-27 16:33:43 +02:00
1bc99b3c46 Fix Playing 2020-09-27 14:12:06 +02:00
a8a5028852 Fix OverviewVideo 2020-09-27 11:37:48 +02:00
f5fa9944ad Change overview management 2020-09-27 11:11:39 +02:00
3697917d2b Some fixes 2020-09-26 19:41:21 +02:00
9f25405983 Some fixes 2020-09-26 19:36:10 +02:00
9c476037ef Some fixes 2020-09-26 19:31:38 +02:00
2044a85b58 Fix issue 2020-09-26 16:52:41 +02:00
d878ac780c some changes 2020-09-26 16:46:51 +02:00
55179c6955 some changes 2020-09-26 10:22:11 +02:00
618384cccb Change classes 2020-09-25 18:58:04 +02:00
0b84823f64 Release notes 2020-09-24 07:36:25 +02:00
9361f6ca64 Fix date 2020-09-24 07:31:46 +02:00
b81257c77c Release 1.1.1 2020-09-24 07:28:36 +02:00
75e919adbc Merge remote-tracking branch 'origin/develop' into develop 2020-09-24 07:27:55 +02:00
d946451b27 Fix issue #3 2020-09-24 07:27:41 +02:00
2d960d4c55 Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!8
2020-09-23 08:35:18 +02:00
6f24030b86 New Crowdin updates 2020-09-23 08:35:17 +02:00
ce7b0d4d7d Fix typo 2020-09-21 07:33:46 +02:00
ed34917550 Fix typo 2020-09-21 07:33:26 +02:00
18bd328814 Fix typo 2020-09-21 07:30:08 +02:00
cf35a65edd Fix typo 2020-09-21 07:28:26 +02:00
fe04f32aa1 Fixes 2020-09-20 18:46:11 +02:00
36f5f73a47 Fixes 2020-09-20 18:35:43 +02:00
cd5e23364d build apk 2020-09-20 18:23:20 +02:00
8bd4a3f5d1 Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!7
2020-09-20 16:14:41 +02:00
4114e4c349 New Crowdin updates 2020-09-20 16:14:41 +02:00
3993e4a67e Release 1.1.0 2020-09-20 16:13:50 +02:00
c78af3ea1a Release 1.1.0 2020-09-20 16:12:20 +02:00
132687366c Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!6
2020-09-20 15:32:26 +02:00
667469c773 New Crowdin updates 2020-09-20 15:32:26 +02:00
e78e7a6f97 Small fix 2020-09-20 15:31:56 +02:00
a1790bf32d Filter languages 2020-09-20 15:14:48 +02:00
7a8e2f32b4 Merge remote-tracking branch 'origin/develop' into develop 2020-09-20 12:16:30 +02:00
1932913793 Add logic 2020-09-20 12:16:10 +02:00
7c40060438 Add logic 2020-09-20 12:06:38 +02:00
0c6c5c813f Prepares views 2020-09-20 11:07:28 +02:00
786b80e25e Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!5
2020-09-20 09:36:52 +02:00
4cc0729d77 New translations strings.xml (Italian) 2020-09-19 21:15:19 +02:00
9f444d6d88 Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!4
2020-09-19 18:24:26 +02:00
700fe6c9e8 New Crowdin updates 2020-09-19 18:24:26 +02:00
3c2b8cc699 release 1.1.0-a 2020-09-19 18:22:44 +02:00
eef6b3d76c release 1.1.0-a 2020-09-19 18:19:59 +02:00
0a7fab6883 Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!3
2020-09-19 17:23:07 +02:00
1f7fe1fc6f New Crowdin updates 2020-09-19 17:23:06 +02:00
5bb395f2d3 disable MissingTranslation 2020-09-19 17:22:34 +02:00
4d6cb47e6c some fixes 2020-09-19 16:50:20 +02:00
f7f85a9dbb some fixes 2020-09-19 15:06:24 +02:00
118c2175f5 Play Minimized video when app in background 2020-09-19 14:56:10 +02:00
645c9fa240 Add crowdin link 2020-09-19 13:07:39 +02:00
13baaccd81 allows username when logging in 2020-09-19 13:01:27 +02:00
aaa8281da8 Merge branch 'l10n_develop' into 'develop'
New Crowdin updates

See merge request tom79/fedilab-tube!2
2020-09-19 11:10:48 +02:00
8bcc7e8f58 New Crowdin updates 2020-09-19 11:10:48 +02:00
8085ed6a95 crowdin.yml 2020-09-19 10:57:52 +02:00
12d24f4a56 crowdin.yml 2020-09-19 10:57:44 +02:00
fcf2fbdd86 crowdin.yml 2020-09-19 10:48:49 +02:00
81a711ee4c Prepare release 1.1.0 2020-09-18 18:16:47 +02:00
b68cb689ca Multi account 2020-09-18 18:10:04 +02:00
b2f1bf2817 Some offline fixes 2020-09-18 16:08:52 +02:00
7aab6fbba9 Update info via a service 2020-09-18 14:37:34 +02:00
015a2f3289 Some fixes 2020-09-18 12:03:35 +02:00
647c827ee4 Pickup instance when registering 2020-09-17 19:01:31 +02:00
e503a5ec95 Small fixes 2020-09-17 18:37:44 +02:00
11209a5334 Some fixes 2020-09-17 17:00:12 +02:00
b23686ab64 picker layout 2020-09-17 07:28:52 +02:00
7f4c6faa1d add checkbox for selecting categories 2020-09-16 19:02:04 +02:00
33c7f12180 Open dialog 2020-09-16 17:27:07 +02:00
106bacb4b1 Add logic 2020-09-16 16:21:03 +02:00
d6c662434d About page 2020-09-16 15:48:27 +02:00
3705657aec About page 2020-09-16 15:47:49 +02:00
ea810fd61b About page 2020-09-16 14:07:44 +02:00
2d32aa9a9b Change icons 2020-09-16 10:12:34 +02:00
e672b207b6 update README.md 2020-09-16 09:19:40 +02:00
68dfb1b980 changes 2020-09-15 18:58:12 +02:00
6feedf5c24 changes 2020-09-15 18:47:26 +02:00
c196d3aebe changes 2020-09-15 18:39:37 +02:00
a87ec4ffa5 Some fixes 2020-09-15 16:07:05 +02:00
3e694b8ac2 Triple-T 2020-09-14 16:45:07 +02:00
26af939014 improve flavor 2020-09-14 15:53:31 +02:00
f0eaceb8a4 apply flavors 2020-09-13 19:20:04 +02:00
7827c97bf9 Merge branch 'master' into full_version 2020-09-13 15:25:59 +02:00
31e87a18bb Release 1.0.5 2020-09-12 18:31:37 +02:00
07546abb7e Fix instances picker selected item 2020-09-12 18:26:34 +02:00
124e0d8505 Add close button to instances picker 2020-09-12 18:10:52 +02:00
94b969c428 Fix issue case sensitive issue 2020-09-12 18:05:55 +02:00
cb9f8605d5 Improve time for videos 2020-09-12 17:54:37 +02:00
5660fb15e5 Fix channel update 2020-09-12 17:35:21 +02:00
d02fdba671 Improve channel creation 2020-09-12 16:53:04 +02:00
d8de74ce7a Merge branch 'develop' into 'master'
Add .gitlab-ci.yml

See merge request tom79/fedilab-tube!1
2020-09-12 14:25:44 +02:00
2129727cc5 Add .gitlab-ci.yml 2020-09-12 14:25:44 +02:00
119ad4884b orientation fix 2020-09-12 14:11:02 +02:00
3617fb3229 change titles for create/edit playlist/channel 2020-09-12 12:33:23 +02:00
b272a5b5f9 Fix delete playlist 2020-09-12 12:27:54 +02:00
58404694e0 Don't use token when not necessary 2020-09-12 10:42:17 +02:00
c4c745dbc0 Fix some crashes 2020-09-12 10:37:11 +02:00
2f909d5ffa Fix some crashes 2020-09-12 10:19:49 +02:00
c714e6a625 Allow to edit channel and playlists 2020-09-11 19:10:54 +02:00
bb2c129762 Some fixes 2020-09-11 15:56:18 +02:00
42b0574143 VM-v9 2020-09-11 11:50:26 +02:00
df0b18f535 VM-v8 2020-09-10 15:56:33 +02:00
e8427b883d Some fixes 2020-09-09 18:55:52 +02:00
4027a8b725 Some fixes 2020-09-09 15:00:15 +02:00
a1b816030a VM-v7 2020-09-08 15:54:07 +02:00
8c7d1c692b VM-v6 2020-09-08 12:08:49 +02:00
7588a48cb5 VM-v5 2020-09-08 10:11:11 +02:00
014302c3a8 VM-v4 2020-09-07 16:57:00 +02:00
f632aa4712 VM-v3 2020-09-07 15:03:22 +02:00
81de1c1aa0 VM-v2 2020-09-07 14:14:36 +02:00
d89c998a35 VM-v1 2020-09-07 11:16:17 +02:00
4c83a14786 VM1 2020-09-07 11:15:43 +02:00
43e6d0baeb Fix sensitive email with double queries if necessary 2020-09-06 20:42:18 +02:00
88514c0669 change build.gradle 2020-09-06 20:41:36 +02:00
f7eb17fd94 add git ignore 2020-09-05 18:50:41 +02:00
27990d56e9 Release 1.0.4 2020-09-05 18:50:17 +02:00
6d56c7f803 Fix an issue when logging in. 2020-09-05 17:15:07 +02:00
564 changed files with 46332 additions and 12802 deletions

10
.github/FUNDING.yml vendored Normal file
View File

@ -0,0 +1,10 @@
# These are supported funding model platforms
github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
patreon: tom79
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
liberapay: tom79
issuehunt: # Replace with a single IssueHunt username
otechie: # Replace with a single Otechie username
custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

17
.github/stale.yml vendored Normal file
View File

@ -0,0 +1,17 @@
# Number of days of inactivity before an issue becomes stale
daysUntilStale: 60
# Number of days of inactivity before a stale issue is closed
daysUntilClose: 7
# Issues with these labels will never be considered stale
exemptLabels:
- pinned
- security
# Label to use when marking an issue as stale
staleLabel: inactive
# Comment to post when marking an issue as stale. Set to `false` to disable
markComment: >
This issue has been automatically marked as stale because it has not had
recent activity. It will be closed if no further activity occurs. Thank you
for your contributions.
# Comment to post when closing a stale issue. Set to `false` to disable
closeComment: false

4
.gitignore vendored
View File

@ -7,3 +7,7 @@
/captures
.externalNativeBuild
.cxx
/app/release/
/app/fdroid_full/release/
/app/google_full/
/app/google_acad/

133
.gitlab-ci.yml Normal file
View File

@ -0,0 +1,133 @@
# This file is a template, and might need editing before it works on your project.
# Read more about this script on this blog post https://about.gitlab.com/2018/10/24/setting-up-gitlab-ci-for-android-projects/, by Jason Lenny
# If you are interested in using Android with FastLane for publishing take a look at the Android-Fastlane template.
image: openjdk:8-jdk
variables:
# ANDROID_COMPILE_SDK is the version of Android you're compiling with.
# It should match compileSdkVersion.
ANDROID_COMPILE_SDK: "30"
# ANDROID_BUILD_TOOLS is the version of the Android build tools you are using.
# It should match buildToolsVersion.
ANDROID_BUILD_TOOLS: "30.0.2"
# It's what version of the command line tools we're going to download from the official site.
# Official Site-> https://developer.android.com/studio/index.html
# There, look down below at the cli tools only, sdk tools package is of format:
# commandlinetools-os_type-ANDROID_SDK_TOOLS_latest.zip
# when the script was last modified for latest compileSdkVersion, it was which is written down below
ANDROID_SDK_TOOLS: "6609375"
# Packages installation before running script
before_script:
- apt-get --quiet update --yes
- apt-get --quiet install --yes wget tar unzip lib32stdc++6 lib32z1
# Setup path as android_home for moving/exporting the downloaded sdk into it
- export ANDROID_HOME="${PWD}/android-home"
# Create a new directory at specified location
- install -d $ANDROID_HOME
# Here we are installing androidSDK tools from official source,
# (the key thing here is the url from where you are downloading these sdk tool for command line, so please do note this url pattern there and here as well)
# after that unzipping those tools and
# then running a series of SDK manager commands to install necessary android SDK packages that'll allow the app to build
- wget --output-document=$ANDROID_HOME/cmdline-tools.zip https://dl.google.com/android/repository/commandlinetools-linux-${ANDROID_SDK_TOOLS}_latest.zip
# move to the archive at ANDROID_HOME
- pushd $ANDROID_HOME
- unzip -d cmdline-tools cmdline-tools.zip
- popd
- export PATH=$PATH:${ANDROID_HOME}/cmdline-tools/tools/bin/
# Nothing fancy here, just checking sdkManager version
- sdkmanager --version
# use yes to accept all licenses
- yes | sdkmanager --sdk_root=${ANDROID_HOME} --licenses || true
- sdkmanager --sdk_root=${ANDROID_HOME} "platforms;android-${ANDROID_COMPILE_SDK}"
- sdkmanager --sdk_root=${ANDROID_HOME} "platform-tools"
- sdkmanager --sdk_root=${ANDROID_HOME} "build-tools;${ANDROID_BUILD_TOOLS}"
# Not necessary, but just for surity
- chmod +x ./gradle
stages:
- build
- build-and-test
- tag
.no-upload: &no-upload
stage: build-and-test
retry: 2
# Make Project
assembleDebug:
<<: *no-upload
cache:
key: "${CI_COMMIT_TAG}"
paths:
- app/build/outputs/apk/fdroid_acad/debug/app-fdroid_acad-debug.apk
- app/build/outputs/apk/fdroid_full/debug/app-fdroid_full-debug.apk
policy: push
script:
- ./gradlew assembleDebug
# Basic android and gradle stuff
# Check linting
lintfdroid_acadDebug:
interruptible: true
stage: build
script:
- ./gradlew -Pci --console=plain :app:lintfdroid_acadDebug -PbuildDir=lint
except:
- tags
lintFdroid_fullDebug:
interruptible: true
stage: build
script:
- ./gradlew -Pci --console=plain :app:lintFdroid_fullDebug -PbuildDir=lint
except:
- tags
## PROTECTED VARIABLES TO SET IN GITLAB:
# - GITLAB_API_TOKEN: token you create on Gitlab
# - NC_REMOTE_DIR: like https://YOUR_NEXTCLOUD/remote.php/dav/files/YOUR_USER/mastalab (no trailing slash)
# - NC_SHARE_URL: share the folder in Nextcloud with public link and put your public link here (no trailing slash)
# - NC_USER: nextcloud user
# - NC_PASSWORD: nextcloud password
## Protect all tags in Gitlab repo settings (do a wildcard, ie '*')
# For now, it uses the assembleDebug builds, you'll need to create a job in build-and-test to create the apks, with only: - tags and add except: - tags to assembleDebug (like in debugTests)
# In it, put something like this to get your signature key file:
# - curl -s --output signature.jsk -u "${NC_USER}:${NC_PASSWORD}" "https://YOUR_NEXTCLOUD/remote.php/dav/files/YOUR_USER/signature.jsk"
putApkOnTags:
image: hatsoftwares/curl-jq:latest
stage: tag
retry: 2
cache:
key: "${CI_COMMIT_TAG}"
paths:
- app/build/outputs/apk/fdroid_acad/debug/app-fdroid_acad-debug.apk
- app/build/outputs/apk/fdroid_full/debug/app-fdroid_full-debug.apk
policy: pull
script:
- export PROJECT_API_URL="https://framagit.org/api/v4/projects/${CI_PROJECT_ID}"
- export DESCRIPTION_URL="${PROJECT_API_URL}/repository/tags/${CI_COMMIT_TAG}"
- export RELEASE_URL="${DESCRIPTION_URL}/release"
- export NC_UPLOAD_URL="${NC_REMOTE_DIR}/${CI_COMMIT_TAG}"
- export NC_DOWNLOAD_URL="${NC_SHARE_URL}/download?path=%2F${CI_COMMIT_TAG}%2F&files="
- 'export HEADER="Private-Token: ${GITLAB_API_TOKEN}"'
- export acadUrl="${NC_DOWNLOAD_URL}app-fdroid_acad-debug.apk"
- export fullUrl="${NC_DOWNLOAD_URL}app-fdroid_full-debug.apk"
- 'curl -s -u "${NC_USER}:${NC_PASSWORD}" -X MKCOL "${NC_UPLOAD_URL}"'
- 'curl -s -u "${NC_USER}:${NC_PASSWORD}" -T app/build/outputs/apk/fdroid_full/debug/app-fdroid_full-debug.apk "${NC_UPLOAD_URL}/app-fdroid_full-debug.apk"'
- 'curl -s -u "${NC_USER}:${NC_PASSWORD}" -T app/build/outputs/apk/fdroid_acad/debug/app-fdroid_acad-debug.apk "${NC_UPLOAD_URL}/app-fdroid_acad-debug.apk"'
- export description=$(curl -s --header "${HEADER}" "${DESCRIPTION_URL}" | jq .release.description | sed -e 's@"@@g')
- if [[ $description == 'null' ]]; then export METHOD="POST"; echo -e "[Get the acad version](${acadUrl})\n\n[Get the full version](${fullUrl})" > /tmp/text; fi
- if [[ $description != 'null' ]]; then export METHOD="PUT"; echo -e "${description}\n\n[Get the acad version](${acadUrl})\n\n[Get the full version](${fullUrl})" > /tmp/text; fi
- curl -s --request $METHOD --data-urlencode "description@/tmp/text" --header "${HEADER}" "${RELEASE_URL}"
only:
- tags

28
CHANGELOG Normal file
View File

@ -0,0 +1,28 @@
# 1.5.2
### Added:
- Enable/disable auto playback
- Enter in full-screen automatically (default disabled)
- Back press pauses the video in full-screen
### Fixed:
- Public timelines don't honor muted accounts
- Comments are not removed when switching to a video without comments
- Some other fixes
--------
# 1.5.1
- Fix some issues
- New translations
--------
# 1.5.0
- Custom default instance depending of the country
- Full managements of comments and their replies (read/post/delete)
- Profile for accounts (displays their channels & videos)
- Fix some issues when posting a comment
- Fix videos not paused after screen lock

17
CONTRIBUTING.md Normal file
View File

@ -0,0 +1,17 @@
CONTRIBUTING
============
### Localizations:
TubeLab works only with [Crowdin](https://crowdin.com/project/tubelab), which offers nice tools for helping in translations.
New translations will be automatically merged in a branch.
If your language is not listed, please ask me to add it. If you prefer to work on an XML file, you should be able [to upload it with Crowdin](https://support.crowdin.com/xml-configuration/).
Crowdin will not pick up changes in develop branch, that's why all translations should be done with this tool.
### Issues:
Issues are handled on Framagit at: https://framagit.org/imattau/fedilab-tube/-/issues, before opening an issue, please check it has not yet been submitted by someone else
### Contribution to code:
Your contributions are welcomed, but please, use this repo https://framagit.org/tom79/fedilab-tube. You can create PR to the dev branch.

View File

@ -1,6 +1,46 @@
## TubeLab [![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
## TubeLab/TubeAcad [![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
This project groups two different apps. **[TubeAcad](#TubeAcad)**, a Peertube Android app for French academic authorities. All is in French. Its use is limited to some instances.
The other app is **[TubeLab](#TubeLab)** a Peertube Android app working for all instances.
## <a name="TubeLab">TubeLab</a>
Tubelab is an Android app for Peertube (GNU GPLv3). <img src='https://img.shields.io/f-droid/v/app.fedilab.tubelab?include_prereleases' />
[<img alt='Get it on Google Play' src='./images/get-it-on-play.png' height="80"/>](https://play.google.com/store/apps/details?id=app.fedilab.tubelab)
&nbsp;&nbsp;[<img alt='Get it on F-Droid' src='./images/get-it-on-fdroid.png' height="80"/>](https://f-droid.org/packages/app.fedilab.tubelab/)
### Not authenticated mode
It's a limited mode where you can do some actions:
- Switch instance
- Share videos
- Download videos
### Authenticated mode
Many features are available with this mode:
- Write/delete comments
- Upload/remove/edit videos
- Manage (create/edit/remove) channels and playlists
- Follow/unfollow channels
- Thumbs-up/down
- Check notifications
- Mute/unmute channels
- Report videos/accounts
- Check your history
## <a name="TubeAcad">TubeAcad</a>
TubeAcad est une application Android open source (GNU GPLv3) pour les instances Peertube académiques. Lauthentification se fait par adresse mail, linstance est automatiquement détectée. Il est également possible sur certaines instances de créer son compte depuis lapplication.
[<img alt='Get it on Google Play' src='./images/get-it-on-play.png' height="80"/>](https://play.google.com/store/apps/details?id=app.fedilab.fedilabtube)
&nbsp;&nbsp;[<img alt='Get it on F-Droid' src='./images/get-it-on-fdroid.png' height="80"/>](https://f-droid.org/packages/app.fedilab.fedilabtube/)
TubeLab est une application Android open source (GNU GPLv3) pour les instances Peertube académiques. Lauthentification se fait par adresse mail, linstance est automatiquement détectée. Il est également possible sur certaines instances de créer son compte depuis lapplication.
### Mode non authentifié
@ -28,9 +68,3 @@ Si vous connectez votre compte, vous pourrez interagir avec les vidéos :
- Signaler des vidéos ou des comptes
- Voir l'historique
### Télécharger
[Fdroid](https://f-droid.org/packages/app.fedilab.fedilabtube/)
[GooglePlay](https://play.google.com/store/apps/details?id=app.fedilab.fedilabtube)

View File

@ -1,23 +1,25 @@
apply plugin: 'com.android.application'
apply plugin: "androidx.navigation.safeargs"
android {
compileSdkVersion 30
buildToolsVersion "30.0.2"
defaultConfig {
applicationId "app.fedilab.fedilabtube"
minSdkVersion 21
targetSdkVersion 30
versionCode 5
versionName "1.0.3"
versionCode 39
versionName "1.13.1"
multiDexEnabled true
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
dexOptions {
javaMaxHeapSize "4g"
}
flavorDimensions "default"
buildTypes {
release {
minifyEnabled false
@ -28,6 +30,137 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
buildFeatures {
viewBinding = true
}
lintOptions {
disable 'MissingTranslation'
checkReleaseBuilds false
abortOnError false
}
//boolean full_instances if set to false means TubeAcad
productFlavors {
fdroid_acad {
applicationId "app.fedilab.fedilabtube"
resValue "string", "app_name", "TubeAcad"
resValue "string", "app_id", "app.fedilab.fedilabtube"
buildConfigField "String", "version", "\"fdroid_acad\""
buildConfigField "boolean", "full_instances", "false"
buildConfigField "boolean", "google_restriction", "false"
buildConfigField "boolean", "surfing_mode", "false"
buildConfigField "boolean", "sepia_search", "false"
buildConfigField "boolean", "instance_switcher", "true"
buildConfigField "boolean", "allow_remote_connections", "false"
buildConfigField "boolean", "google_cast_lib", "false"
buildConfigField "int", "cast_enabled", "0"
buildConfigField "int", "default_theme", "2"
}
google_acad {
applicationId "app.fedilab.fedilabtube"
resValue "string", "app_name", "TubeAcad"
resValue "string", "app_id", "app.fedilab.fedilabtube"
buildConfigField "String", "version", "\"google_acad\""
buildConfigField "boolean", "full_instances", "false"
buildConfigField "boolean", "google_restriction", "true"
buildConfigField "boolean", "surfing_mode", "false"
buildConfigField "boolean", "sepia_search", "false"
buildConfigField "boolean", "instance_switcher", "true"
buildConfigField "boolean", "allow_remote_connections", "false"
buildConfigField "boolean", "google_cast_lib", "true"
buildConfigField "int", "cast_enabled", "1"
buildConfigField "int", "default_theme", "2"
}
fdroid_full {
applicationId "app.fedilab.tubelab"
resValue "string", "app_name", "TubeLab"
resValue "string", "app_id", "app.fedilab.tubelab"
buildConfigField "String", "version", "\"fdroid_full\""
buildConfigField "boolean", "full_instances", "true"
buildConfigField "boolean", "google_restriction", "false"
buildConfigField "boolean", "surfing_mode", "true"
buildConfigField "boolean", "sepia_search", "true"
buildConfigField "boolean", "instance_switcher", "true"
buildConfigField "boolean", "allow_remote_connections", "true"
buildConfigField "boolean", "google_cast_lib", "false"
buildConfigField "int", "cast_enabled", "0"
buildConfigField "int", "default_theme", "2"
}
google_full {
applicationId "app.fedilab.tubelab"
resValue "string", "app_name", "TubeLab"
resValue "string", "app_id", "app.fedilab.tubelab"
buildConfigField "String", "version", "\"google_full\""
buildConfigField "boolean", "full_instances", "true"
buildConfigField "boolean", "google_restriction", "true"
buildConfigField "boolean", "surfing_mode", "true"
buildConfigField "boolean", "sepia_search", "true"
buildConfigField "boolean", "instance_switcher", "true"
buildConfigField "boolean", "allow_remote_connections", "true"
buildConfigField "boolean", "google_cast_lib", "true"
buildConfigField "int", "cast_enabled", "1"
buildConfigField "int", "default_theme", "2"
}
queermotion {
applicationId "org.queermotion.peertube"
resValue "string", "app_name", "QueerMotion"
resValue "string", "app_id", "org.queermotion.peertube"
buildConfigField "String", "version", "\"queermotion\""
buildConfigField "boolean", "full_instances", "true"
buildConfigField "boolean", "google_restriction", "false"
buildConfigField "boolean", "surfing_mode", "false"
buildConfigField "boolean", "sepia_search", "false"
buildConfigField "boolean", "instance_switcher", "false"
buildConfigField "boolean", "allow_remote_connections", "false"
buildConfigField "boolean", "google_cast_lib", "false"
buildConfigField "int", "cast_enabled", "0"
buildConfigField "int", "default_theme", "2"
}
bittube {
applicationId "app.fedilab.bittube"
resValue "string", "app_name", "Bittube"
resValue "string", "app_id", "app.fedilab.bittube"
buildConfigField "String", "version", "\"bittube\""
buildConfigField "boolean", "full_instances", "true"
buildConfigField "boolean", "google_restriction", "true"
buildConfigField "boolean", "surfing_mode", "false"
buildConfigField "boolean", "sepia_search", "false"
buildConfigField "boolean", "instance_switcher", "true"
buildConfigField "boolean", "allow_remote_connections", "false"
buildConfigField "boolean", "google_cast_lib", "true"
buildConfigField "int", "cast_enabled", "1"
buildConfigField "int", "default_theme", "1"
}
}
sourceSets {
fdroid_acad {
res.srcDirs = ['src/main/res', 'src/acad/res', 'src/no_google_cast_lib/res']
java.srcDirs = ['src/main/java', 'src/acad/java', 'src/no_google_donation/java', 'src/no_google_cast_lib/java']
}
google_acad {
res.srcDirs = ['src/main/res', 'src/acad/res', 'src/google_cast_lib/res']
java.srcDirs = ['src/main/java', 'src/acad/java', 'src/no_google_donation/java', 'src/google_cast_lib/java']
}
fdroid_full {
res.srcDirs = ['src/main/res', 'src/full/res', 'src/no_google_cast_lib/res']
java.srcDirs = ['src/main/java', 'src/full/java', 'src/no_google_donation/java', 'src/no_google_cast_lib/java']
}
google_full {
res.srcDirs = ['src/main/res', 'src/full/res', 'src/google_donation/res', 'src/google_cast_lib/res']
java.srcDirs = ['src/main/java', 'src/full/java', 'src/google_donation/java', 'src/google_cast_lib/java']
}
queermotion {
res.srcDirs = ['src/main/res', 'src/queermotion/res', 'src/no_google_cast_lib/res']
java.srcDirs = ['src/main/java', 'src/full/java', 'src/no_google_donation/java', 'src/no_google_cast_lib/java']
}
bittube {
res.srcDirs = ['src/main/res', 'src/bittube/res', 'src/google_cast_lib/res']
java.srcDirs = ['src/main/java', 'src/full/java', 'src/no_google_donation/java', 'src/google_cast_lib/java']
}
}
}
allprojects {
@ -37,33 +170,80 @@ allprojects {
}
}
dependencies {
implementation "androidx.multidex:multidex:2.0.1"
implementation fileTree(dir: "libs", include: ["*.jar"])
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'androidx.preference:preference:1.1.1'
implementation 'com.google.android.material:material:1.2.0'
implementation 'androidx.constraintlayout:constraintlayout:2.0.0'
implementation 'com.google.android.material:material:1.2.1'
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
implementation 'androidx.navigation:navigation-fragment:2.3.0'
implementation 'androidx.navigation:navigation-fragment:2.3.2'
implementation "androidx.fragment:fragment:1.2.5"
implementation 'androidx.navigation:navigation-ui:2.3.0'
implementation ("androidx.navigation:navigation-dynamic-features-fragment:2.3.0")
implementation 'androidx.navigation:navigation-ui:2.3.2'
implementation ("androidx.navigation:navigation-dynamic-features-fragment:2.3.2")
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
implementation 'androidx.browser:browser:1.2.0'
testImplementation 'junit:junit:4.13'
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
implementation 'androidx.browser:browser:1.3.0'
implementation 'androidx.documentfile:documentfile:1.0.1'
implementation project(path: ':torrentStream')
testImplementation 'junit:junit:4.13.1'
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
implementation 'com.github.GrenderG:Toasty:1.4.2'
implementation 'com.google.android.exoplayer:exoplayer:2.10.6'
implementation 'com.google.android.exoplayer:exoplayer:2.12.2'
implementation 'com.google.android.exoplayer:extension-mediasession:2.12.2'
implementation "com.github.mabbas007:TagsEditText:1.0.5"
implementation "com.github.bumptech.glide:glide:4.11.0"
annotationProcessor "com.github.bumptech.glide:compiler:4.11.0"
implementation 'jp.wasabeef:glide-transformations:4.0.0'
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
implementation 'org.apache.poi:poi:3.16'
implementation "net.gotev:uploadservice:3.5.2"
implementation "net.gotev:uploadservice-okhttp:3.5.2"
implementation "net.gotev:uploadservice:4.5.1"
implementation "net.gotev:uploadservice-okhttp:4.5.1"
implementation "com.google.code.gson:gson:2.8.6"
implementation 'androidx.media:media:1.2.1'
implementation 'com.github.ybq:Android-SpinKit:1.4.0'
implementation 'com.squareup.retrofit2:retrofit:2.9.0'
implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
implementation 'com.github.mancj:MaterialSearchBar:0.8.5'
implementation "io.github.kobakei:ratethisapp:1.2.0"
implementation 'com.github.vkay94:DoubleTapPlayerView:1.0.0'
implementation "androidx.work:work-runtime:2.4.0"
implementation "androidx.work:work-runtime-ktx:2.4.0"
//************ DONATION GOOGLE ONLY **************//
google_fullImplementation "com.android.billingclient:billing:3.0.2"
//************ MATOMO --> acad instances only **************//
fdroid_acadImplementation 'org.matomo.sdk:tracker:4.1.2'
google_acadImplementation 'org.matomo.sdk:tracker:4.1.2'
//************ CAST **************///
//---> Google libs (google_full + bittube)
google_acadImplementation "androidx.mediarouter:mediarouter:1.2.1"
google_acadImplementation 'com.google.android.gms:play-services-cast-framework:19.0.0'
google_fullImplementation "androidx.mediarouter:mediarouter:1.2.1"
google_fullImplementation 'com.google.android.gms:play-services-cast-framework:19.0.0'
bittubeImplementation "androidx.mediarouter:mediarouter:1.2.1"
bittubeImplementation 'com.google.android.gms:play-services-cast-framework:19.0.0'
//----> Other flavors
fdroid_acadImplementation 'su.litvak.chromecast:api-v2:0.11.3'
fdroid_acadImplementation 'com.fasterxml.jackson.core:jackson-core:2.12.0'
fdroid_acadImplementation 'org.slf4j:slf4j-simple:1.7.30'
fdroid_fullImplementation 'su.litvak.chromecast:api-v2:0.11.3'
fdroid_fullImplementation 'com.fasterxml.jackson.core:jackson-core:2.12.0'
fdroid_fullImplementation 'org.slf4j:slf4j-simple:1.7.30'
queermotionImplementation 'su.litvak.chromecast:api-v2:0.11.3'
queermotionImplementation 'com.fasterxml.jackson.core:jackson-core:2.12.0'
queermotionImplementation 'org.slf4j:slf4j-simple:1.7.30'
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

View File

@ -14,22 +14,22 @@ package app.fedilab.fedilabtube;
* You should have received a copy of the GNU General Public License along with TubeLab; if not,
* see <http://www.gnu.org/licenses>. */
import android.content.Context;
import androidx.multidex.MultiDex;
import androidx.multidex.MultiDexApplication;
import net.gotev.uploadservice.UploadService;
public class FedilabTube extends MultiDexApplication {
@Override
protected void attachBaseContext(Context base) {
super.attachBaseContext(base);
import org.matomo.sdk.Matomo;
import org.matomo.sdk.Tracker;
import org.matomo.sdk.TrackerBuilder;
MultiDex.install(FedilabTube.this);
UploadService.NAMESPACE = BuildConfig.APPLICATION_ID;
public class FedilabTube extends BaseFedilabTube {
private Tracker mMatomoTracker;
public synchronized Tracker getTracker() {
if (mMatomoTracker != null) return mMatomoTracker;
mMatomoTracker = TrackerBuilder.createDefault("https://wa.phm.education.gouv.fr/snp/matomo.php", 11).build(Matomo.getInstance(this));
return mMatomoTracker;
}
}

View File

@ -0,0 +1,47 @@
package app.fedilab.fedilabtube;
/* Copyright 2020 Thomas Schneider
*
* This file is a part of TubeLab
*
* This program is free software; you can redistribute it and/or modify it under the terms of the
* GNU General Public License as published by the Free Software Foundation; either version 3 of the
* License, or (at your option) any later version.
*
* TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
* Public License for more details.
*
* You should have received a copy of the GNU General Public License along with TubeLab; if not,
* see <http://www.gnu.org/licenses>. */
import android.app.Activity;
import android.content.Context;
import org.matomo.sdk.Tracker;
import org.matomo.sdk.extra.TrackHelper;
public class Matomo {
public static void sendScreen(Context _mcontext, String path, String title) {
Tracker tracker = ((FedilabTube) ((Activity) _mcontext).getApplication()).getTracker();
TrackHelper.track().screen(path).title(title).with(tracker);
}
public static void sendEvent(Context _mcontext, String category, String action, String label, float value) {
Tracker tracker = ((FedilabTube) ((Activity) _mcontext).getApplication()).getTracker();
TrackHelper.track().event(category, action).name(label).value(value).with(tracker);
}
public static void sendValue(Context _mcontext, String path, int index, String dimensionValue) {
Tracker tracker = ((FedilabTube) ((Activity) _mcontext).getApplication()).getTracker();
TrackHelper.track().screen(path).dimension(index, dimensionValue).with(tracker);
}
public static void trackInstall(Context _mcontext) {
Tracker tracker = ((FedilabTube) ((Activity) _mcontext).getApplication()).getTracker();
TrackHelper.track().download().with(tracker);
}
}

View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:color="@color/colorAccent"
android:state_checked="true" />
<item android:color="@android:color/tab_indicator_text" />
</selector>

View File

@ -1,14 +1,14 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:tint="#9C27B0"
android:viewportWidth="108"
android:viewportHeight="108">
android:width="24dp"
android:height="24dp"
android:tint="#FFFFFF"
android:viewportWidth="24"
android:viewportHeight="24">
<group
android:scaleX="2.61"
android:scaleY="2.61"
android:translateX="22.68"
android:translateY="22.68">
android:scaleX="1.104"
android:scaleY="1.104"
android:translateX="-1.248"
android:translateY="-1.248">
<path
android:fillColor="@android:color/white"
android:pathData="M10,16.5l6,-4.5 -6,-4.5v9zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z" />

Binary file not shown.

After

Width:  |  Height:  |  Size: 720 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 491 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 937 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

View File

@ -0,0 +1,21 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<group
android:scaleX="2.0409248"
android:scaleY="2.0409248"
android:translateX="19.44"
android:translateY="19.44">
<path
android:fillColor="#502ca7"
android:pathData="m0,0h33.867v33.867h-33.867z" />
<path
android:fillColor="#9a26ae"
android:pathData="m15.544,29.459c-0.5613,-0.052 -1.8193,-0.2922 -2.5659,-0.49 -1.4544,-0.3854 -2.6614,-0.9423 -3.8833,-1.7918 -2.3102,-1.606 -3.8461,-3.928 -4.3943,-6.6437 -0.4789,-2.3721 -0.2362,-5.3562 0.6533,-8.0312 0.376,-1.131 0.7053,-1.8387 1.2806,-2.7519 0.9004,-1.4293 1.5877,-2.1804 2.8991,-3.1683 1.3049,-0.983 2.9258,-1.6476 4.88,-2.0009 0.8669,-0.1568 1.1303,-0.1748 2.5858,-0.1775 1.5249,-0.0027 1.6704,0.0078 2.465,0.1789 1.9969,0.43 3.3805,1.0324 4.9616,2.1602 1.8104,1.2913 3.1669,2.8519 4.0578,4.6681 0.896,1.8267 1.3075,3.6274 1.3075,5.7214 0,1.5759 -0.2607,3.1575 -0.7605,4.613 -0.8579,2.4986 -2.193,4.235 -4.4452,5.7811 -1.2142,0.8336 -2.9496,1.4792 -4.8751,1.8136 -0.6105,0.106 -3.4333,0.1862 -4.1663,0.1183zM19.42,26.9851c1.5946,-0.1757 3.0062,-0.5799 4.293,-1.2293 1.048,-0.5289 1.5517,-0.8781 2.271,-1.5743 0.9003,-0.8714 1.3979,-1.6179 1.8328,-2.7494 0.3399,-0.8845 0.4151,-1.1551 0.5267,-1.8953 0.3809,-2.5269 -0.4498,-6.1791 -1.8859,-8.291 -0.9544,-1.4038 -2.0586,-2.3755 -3.7036,-3.2592 -2.538,-1.3635 -6.6246,-1.6184 -9.6573,-0.6023 -1.2489,0.4185 -2.8043,1.4067 -3.6027,2.289 -0.7826,0.8649 -1.5925,2.2749 -1.9531,3.4007 -0.3872,1.2088 -0.4937,2.0043 -0.4947,3.695 -0.0008,1.3192 0.0189,1.6195 0.1484,2.2599 0.2029,1.0037 0.4086,1.6055 0.8491,2.4837 0.9265,1.8474 2.0961,3.1054 3.8624,4.1541 1.3723,0.8148 2.6611,1.2289 4.3987,1.4136 0.4192,0.0446 2.3964,-0.0157 3.1154,-0.0949z" />
<path
android:fillColor="#9a26ae"
android:pathData="m14.648,11.972 l7.4433,4.9609 -7.4433,4.9609z" />
</group>
</vector>

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

View File

@ -4,8 +4,13 @@
<color name="colorPrimaryDark">#4527A0</color>
<color name="colorAccent">#9C27B0</color>
<color name="tag_color">#bbF2690D</color>
<color name="tag_color_text">#FAFAFA</color>
<color name="positive_thumbs">#2b90d9</color>
<color name="favorite">#ca8f04</color>
<color name="bookmark">#795548</color>
<color name="negative_thumbs">#F44336</color>
<color name="backgroundDark">#DD000000</color>
<color name="red_1">#F44336</color>
<color name="gray_light">#80808080</color>
</resources>

View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<paths>
<external-path
name="my_images"
path="/TubeAcad/" />
</paths>

View File

@ -0,0 +1,45 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="app.fedilab.fedilabtube">
<uses-permission android:name="com.android.vending.BILLING" />
<application
android:name=".FedilabTube"
android:allowBackup="false"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme"
tools:replace="android:allowBackup">
<activity
android:name=".PeertubeActivity"
tools:node="mergeOnlyAttributes">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<!-- The app is a good candidate for URL in https://domain.name/videos/watch/xxxxx-->
<data
android:host="*"
android:pathPrefix="/videos/watch/"
android:scheme="https" />
</intent-filter>
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".PeertubeActivity" />
</activity>
<activity
android:name=".expandedcontrols.ExpandedControlsActivity"
android:theme="@style/AppThemeNoActionBar"
/>
<meta-data
android:name="com.google.android.gms.cast.framework.OPTIONS_PROVIDER_CLASS_NAME"
android:value="app.fedilab.fedilabtube.provider.CastOptionsProvider" />
</application>
</manifest>

Binary file not shown.

After

Width:  |  Height:  |  Size: 169 KiB

View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/colorAccent" android:state_checked="true" />
<item android:color="@android:color/tab_indicator_text" />
</selector>

View File

@ -0,0 +1,864 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<group
android:scaleX="0.66"
android:scaleY="0.66"
android:translateX="21"
android:translateY="21">
<path android:pathData="M85.355,14.645C75.91,5.201 63.354,0 50,0C36.644,0 24.088,5.201 14.645,14.645S0,36.644 0,50c0,13.357 5.201,25.913 14.645,35.355C24.087,94.799 36.643,100 50,100c13.357,0 25.913,-5.201 35.355,-14.645C94.799,75.912 100,63.356 100,50C100,36.646 94.799,24.09 85.355,14.645z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="15.7699"
android:endY="86.8818"
android:startX="83.2562"
android:startY="14.1677"
android:type="linear">
<item
android:color="#FF28D1BC"
android:offset="0" />
<item
android:color="#FF00ABFF"
android:offset="0.6" />
<item
android:color="#FF2A5ED6"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path
android:fillAlpha="0.71"
android:pathData="M3.151,32.464L13.3,46.493L30.239,4.045c-5.75,2.474 -11.035,6.041 -15.595,10.6C9.504,19.786 5.623,25.851 3.151,32.464z"
android:strokeAlpha="0.71">
<aapt:attr name="android:fillColor">
<gradient
android:endX="24.2938"
android:endY="39.2239"
android:startX="-4.1098"
android:startY="-39.1612"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0.5762" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path
android:fillAlpha="0.71"
android:pathData="M2.3,34.893c-1.5,4.8 -2.3,9.8 -2.3,15c0,2.8 0.2,5.5 0.7,8.2l7.8,10l36.878,-26.896L2.3,34.893z"
android:strokeAlpha="0.71">
<aapt:attr name="android:fillColor">
<gradient
android:endX="26.5038"
android:endY="54.332794"
android:startX="-2.655"
android:startY="33.41799"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0.006" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path
android:fillAlpha="0.71"
android:pathData="M40.8,5.893l27.6,28.3l8.9,-26.2c-5.8,-3.8 -12.3,-6.3 -19.2,-7.4L40.8,5.893z"
android:strokeAlpha="0.71">
<aapt:attr name="android:fillColor">
<gradient
android:endX="62.8149"
android:endY="14.768093"
android:startX="84.794"
android:startY="0.65519285"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0.0013" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path
android:fillAlpha="0.71"
android:pathData="M42.79,46.347l25.8,0.6l-27.6,-28.3z"
android:strokeAlpha="0.71">
<aapt:attr name="android:fillColor">
<gradient
android:endX="45.013"
android:endY="42.08"
android:startX="59.9387"
android:startY="27.9081"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path
android:fillAlpha="0.71"
android:pathData="M96.88,67.451C98.928,61.941 100,56.054 100,50c0,-0.202 -0.005,-0.402 -0.007,-0.604L68.806,34.399L96.88,67.451z"
android:strokeAlpha="0.71">
<aapt:attr name="android:fillColor">
<gradient
android:endX="79.7008"
android:endY="33.716"
android:startX="107.2237"
android:startY="81.6425"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0.0029" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path
android:fillAlpha="0.71"
android:pathData="M27.8,15.893l17.4,11.8l3.7,-21.1z"
android:strokeAlpha="0.71">
<aapt:attr name="android:fillColor">
<gradient
android:endX="48.8608"
android:endY="17.1429"
android:startX="27.8"
android:startY="17.1429"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="8.440641E-4" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path
android:fillAlpha="0.71"
android:pathData="M97.976,35.848l-5.312,-1.255l3.7,24l3.329,-3.044C99.895,53.719 100,51.868 100,50C100,45.14 99.308,40.386 97.976,35.848z"
android:strokeAlpha="0.71">
<aapt:attr name="android:fillColor">
<gradient
android:endX="93.5393"
android:endY="46.7512"
android:startX="101.8224"
android:startY="45.4073"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0.0017" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path
android:fillAlpha="0.71"
android:pathData="M72.998,85.447l2.742,7.442c2.87,-1.729 5.579,-3.761 8.092,-6.075L72.998,85.447z"
android:strokeAlpha="0.71">
<aapt:attr name="android:fillColor">
<gradient
android:endX="77.1128"
android:endY="79.7658"
android:startX="81.8324"
android:startY="102.8394"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0.0013" />
<item
android:color="#00FFFFFF"
android:offset="0.9982" />
</gradient>
</aapt:attr>
</path>
<path
android:fillAlpha="0.71"
android:pathData="M87.435,83.143c2.349,-2.646 4.393,-5.5 6.108,-8.522l-28.357,2.776L87.435,83.143z"
android:strokeAlpha="0.71">
<aapt:attr name="android:fillColor">
<gradient
android:endX="65.4945"
android:endY="79.3595"
android:startX="123.109"
android:startY="78.2586"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0.0022" />
<item
android:color="#00FFFFFF"
android:offset="0.9966" />
</gradient>
</aapt:attr>
</path>
<path
android:fillAlpha="0.71"
android:pathData="M72.9,85.193l-56.3,-11.1l7.2,18.4c1.6,1 3.3,1.9 5.1,2.7L72.9,85.193z"
android:strokeAlpha="0.71">
<aapt:attr name="android:fillColor">
<gradient
android:endX="38.2047"
android:endY="89.4249"
android:startX="58.4365"
android:startY="59.1884"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0.0015" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path
android:fillAlpha="0.71"
android:pathData="M79.09,58.897l-21,1.5l10.3,18.9z"
android:strokeAlpha="0.71">
<aapt:attr name="android:fillColor">
<gradient
android:endX="61.745285"
android:endY="71.03565"
android:startX="78.23818"
android:startY="57.920563"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0" />
<item
android:color="#00FFFFFF"
android:offset="0.9993" />
</gradient>
</aapt:attr>
</path>
<group>
<clip-path android:pathData="M50,50m-50,0a50,50 0,1 1,100 0a50,50 0,1 1,-100 0" />
<path android:pathData="M31.304,22.589v0.7c0,0.1 0,0.1 -0.1,0.2l-1.9,0.8c0,0 0,0 -0.1,0s0,0 -0.1,0l-0.4,-0.2l19.7,27l2.4,-1.7L31.304,22.589z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="50.7969"
android:endY="36.839092"
android:startX="28.7808"
android:startY="36.839092"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0.006" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path android:pathData="M65.409,20.005l-0.005,-1.116l-17,30.7l2.5,1.4l16.722,-30.026L65.409,20.005z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="48.3499"
android:endY="34.939095"
android:startX="67.5984"
android:startY="34.939095"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0.0013" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path android:pathData="M79.625,18.344l-0.021,-1.254l-31.3,32.1l2.1,2l31.2,-32L79.625,18.344z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="48.3039"
android:endY="34.138992"
android:startX="81.6039"
android:startY="34.138992"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="7.851759E-5" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path android:pathData="M90.104,35.389c-0.1,0 -0.1,-0.1 -0.1,-0.2v-2l-41.1,15.7l1,2.7l41.3,-15.8L90.104,35.389z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="48.8205"
android:endY="42.388992"
android:startX="91.2039"
android:startY="42.388992"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0.0038" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path android:pathData="M11.804,27.989v1.8c0,0.1 -0.1,0.2 -0.1,0.2l-1.2,0.5l38.5,20.9l1.4,-2.6L11.804,27.989z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="50.3298"
android:endY="39.689095"
android:startX="10.4298"
android:startY="39.689095"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0.0025" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path android:pathData="M17.265,50.089c0.1,0 0.1,0.2 0.1,0.2v2.5c0,0.1 -0.1,0.2 -0.1,0.2l32.439,-1.3l-0.1,-2.9L17.265,50.089z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="49.6603"
android:endY="50.888992"
android:startX="17.2212"
android:startY="50.888992"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="3.140703E-4" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path android:pathData="M7.668,60.675c0.036,0.014 0.234,0.056 0.236,0.214l0,0l0,0v1.9l42.1,-11.2l-0.9,-2.8l-42.8,11.4C6.304,60.189 7.632,60.661 7.668,60.675z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="50.0039"
android:endY="55.789093"
android:startX="6.304"
android:startY="55.789093"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0.0047" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path android:pathData="M33.904,62.147v1.942l16.7,-11.95l-1.8,-2.3L32.611,61.406L33.904,62.147z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="50.5851"
android:endY="56.964092"
android:startX="32.571"
android:startY="56.964092"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0.003" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path android:pathData="M35.804,35.789v1.2c0,0.1 -0.1,0.2 -0.1,0.2l-1.8,0.8l14.5,13.4l2,-2.1L35.804,35.789z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="50.3668"
android:endY="43.589092"
android:startX="33.8669"
android:startY="43.589092"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0.0048" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path android:pathData="M55.804,33.089C55.804,33.089 55.704,33.089 55.804,33.089c-0.1,0 -0.1,0 -0.2,0l-1.9,-0.8l0,0l-5.4,17.5l2.8,0.9l5.5,-17.9L55.804,33.089z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="48.2319"
android:endY="41.489094"
android:startX="56.5588"
android:startY="41.489094"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path android:pathData="M64.804,45.489l-13.8,3.2l0.7,2.8l13.8,-3.2L64.804,45.489z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="50.9512"
android:endY="48.489094"
android:startX="65.4322"
android:startY="48.489094"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0.0032" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path android:pathData="M74.107,63.536L74.107,63.536L74.107,63.536c0,-0.098 0,-0.098 0.098,-0.195l0,0l0,0l0,0l1.172,-0.391L50.571,49.278l-1.367,2.441l24.903,13.77C74.107,65.489 74.107,63.536 74.107,63.536z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="49.2177"
android:endY="57.3833"
android:startX="75.4526"
android:startY="57.3833"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="5.496231E-4" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path android:pathData="M81.904,79.089L81.904,79.089L81.904,79.089L81.904,79.089l2,-0.6c0,0 0,0 0.1,0l-33.7,-29.4l-1.9,2.2l33.3,29v-1C81.704,79.289 81.694,79.141 81.904,79.089z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="48.4039"
android:endY="64.689095"
android:startX="84.0039"
android:startY="64.689095"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0.0012" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path android:pathData="M54.404,79.689l2,-0.6h0.1l0.7,0.2l-6.2,-29.7l-2.8,0.6L54.404,79.689L54.404,79.689z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="48.1377"
android:endY="64.63899"
android:startX="57.3221"
android:startY="64.63899"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0.0025" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path android:pathData="M64.804,46.689l-15.6,2.1l0.4,2.9l30.2,-4.1l-0.4,-0.1c-0.1,0 -0.1,-0.1 -0.1,-0.2v-2.5l0,0l0,0l0,0L64.804,46.689">
<aapt:attr name="android:fillColor">
<gradient
android:endX="49.1732"
android:endY="48.239094"
android:startX="79.7731"
android:startY="48.239094"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0.003" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
</group>
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M51.639,0.029l-10.172,9.922l38.598,0.091"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M65.366,2.397L67.311,16.642"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M77.224,8.046L71.304,14.042"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M79.609,16.642L69.609,17.642"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M83.78,13.139L82.883,14.965"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M85.325,14.615c0.096,0.097 -3.374,29.468 -3.374,29.468"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M89.811,35.231L68.98,45.442"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M81.157,19.065L67.957,44.865"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M89.66,32.342l-48.193,-22.391l23.922,7.289"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M69.592,19.841L93.523,25.345"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M91.096,21.502L91.699,31.585"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M95.08,28.318L93.554,32.271"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M92.657,35.991L91.055,78.558"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M78.616,65.137L96.149,69.308"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M99.904,46.935L78.571,63.748"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M99.296,41.575c-0.585,0.17 -15.743,4.529 -15.743,4.529l16.414,5.629"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M99.766,54.87l-15.164,16.679l5.749,7.991"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M77.456,66.713L83.427,78.637"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M84.31,82.536L83.75,86.889"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M85.28,82.142L86.327,84.354"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M81.12,48.139l-4.73,14.382l-8.132,-14.106"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M79.18,45.887L68.951,46.291"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M79.305,47.596L17.837,88.283"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M54.335,79.846L33.835,64.846"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M65.137,48.23L16.967,87.533"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M75.145,66.556c-0.008,0.074 -16.683,13.266 -16.683,13.266"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M74.354,66.171L62.454,98.371"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M67.749,96.77L22.551,91.808"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M54.293,81.937L19.29,89.467"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M54.846,82.756l-18.767,15.187l48.523,-26.394"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M25.193,93.341L55.115,99.637"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M31.046,65.521L15.515,86.205"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M54.466,32.642L33.573,61.932"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M34.116,62.841L64.78,47.542"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M64.799,46.436L17.528,51.124"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M17.481,52.92L29.665,61.822"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M7.972,61.193L64.229,47.287"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M29.602,63.342L8.042,62.247"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M32.453,37.508L14.288,84.989"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M28.519,23.938L11.678,82.116"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M6.456,64.297L5.153,72.159"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M3.605,62.036L1.439,61.984"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M0.08,52.807L13.108,51.842"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M9.157,30.693L6.857,59.693"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M14.243,53.353L6.765,60.325"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M27.926,23.641L16.156,49.667"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M16.351,27.987L15.502,49.442"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M31.704,37.136L17.432,50.364"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M1.452,37.962L13.741,49.851"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M8.149,30.316L0.472,43.105"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M0.306,44.454L13.082,50.537"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M14.188,15.113L10.004,26.542"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M11.786,27.339L14.886,26.239"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M16.953,12.477L16.651,24.087"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M19.154,24.807L27.254,21.972"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M20.361,9.72L28.536,20.331"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M54.069,29.329L27.064,5.547"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M31.287,22.039L53.587,29.739"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M53.593,30.937L35.793,34.637"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M64.821,45.539L35.934,36.076"
android:strokeAlpha="0.6" />
<path
android:fillColor="#FFFFFF"
android:pathData="M81.802,15.419l-1.317,0.456l1.327,0.511l1.327,-0.511L81.802,15.419zM80.162,18.059l1.476,0.588v-1.92l-1.476,-0.588V18.059zM82.004,16.705v1.942l1.441,-0.584v-1.924L82.004,16.705z" />
<path
android:fillColor="#FFFFFF"
android:pathData="M67.443,17.033l-1.317,0.456L67.453,18l1.327,-0.511L67.443,17.033zM65.804,19.673l1.476,0.588v-1.92l-1.476,-0.588V19.673zM67.646,18.319v1.942l1.441,-0.584v-1.924L67.646,18.319z" />
<path
android:fillColor="#FFFFFF"
android:pathData="M55.737,29.211l-1.317,0.456l1.327,0.511l1.327,-0.511L55.737,29.211zM54.098,31.851l1.476,0.588v-1.92l-1.476,-0.588V31.851zM55.94,30.497v1.942l1.441,-0.584v-1.924L55.94,30.497z" />
<path
android:fillColor="#FFFFFF"
android:pathData="M29.251,20.523l-1.317,0.456l1.327,0.511l1.327,-0.511L29.251,20.523zM27.611,23.164l1.476,0.588v-1.92l-1.476,-0.588V23.164zM29.453,21.81v1.942l1.441,-0.584v-1.924L29.453,21.81z" />
<path
android:fillColor="#FFFFFF"
android:pathData="M15.227,49.775l-1.317,0.456l1.327,0.511l1.327,-0.511L15.227,49.775zM13.587,52.415l1.476,0.588v-1.92l-1.476,-0.588V52.415zM15.429,51.062v1.942l1.441,-0.584v-1.924L15.429,51.062z" />
<path
android:fillColor="#FFFFFF"
android:pathData="M9.601,26.95l-1.317,0.456l1.327,0.511l1.327,-0.511L9.601,26.95zM7.962,29.59l1.476,0.588v-1.92L7.962,27.67V29.59zM9.804,28.236v1.942l1.441,-0.584V27.67L9.804,28.236z" />
<path
android:fillColor="#FFFFFF"
android:pathData="M56.429,79.561l-1.317,0.456l1.327,0.511l1.327,-0.511L56.429,79.561zM54.79,82.201l1.476,0.588v-1.92l-1.476,-0.588V82.201zM56.632,80.847v1.942l1.441,-0.584v-1.924L56.632,80.847z" />
<path
android:fillColor="#FFFFFF"
android:pathData="M33.602,34.175l-1.317,0.456l1.327,0.511l1.327,-0.511L33.602,34.175zM31.963,36.815l1.476,0.588v-1.92l-1.476,-0.588V36.815zM33.804,35.462v1.942l1.441,-0.584v-1.924L33.804,35.462z" />
<path
android:fillColor="#FFFFFF"
android:pathData="M31.796,61.722l-1.317,0.456l1.327,0.511l1.327,-0.511L31.796,61.722zM30.156,64.362l1.476,0.588v-1.92l-1.476,-0.588V64.362zM31.998,63.009v1.942l1.441,-0.584v-1.924L31.998,63.009z" />
<path
android:fillColor="#FFFFFF"
android:pathData="M83.96,79.141l-1.317,0.456l1.327,0.511l1.327,-0.511L83.96,79.141zM82.321,81.781l1.476,0.588v-1.92l-1.476,-0.588V81.781zM84.162,80.428v1.942l1.441,-0.584v-1.924L84.162,80.428z" />
<path
android:fillColor="#FFFFFF"
android:pathData="M76.393,63.075l-1.317,0.456l1.327,0.511l1.327,-0.511L76.393,63.075zM74.754,65.715l1.476,0.588v-1.92l-1.476,-0.588V65.715zM76.596,64.362v1.942l1.441,-0.584v-1.924L76.596,64.362z" />
<path
android:fillColor="#FFFFFF"
android:pathData="M81.202,44.475l-1.317,0.456l1.327,0.511l1.327,-0.511L81.202,44.475zM79.563,47.115l1.476,0.588v-1.92l-1.476,-0.588V47.115zM81.404,45.762v1.942l1.441,-0.584v-1.924L81.404,45.762z" />
<path
android:fillColor="#FFFFFF"
android:pathData="M92.296,32.228l-1.317,0.456l1.327,0.511l1.327,-0.511L92.296,32.228zM90.656,34.868l1.476,0.588v-1.92l-1.476,-0.588V34.868zM92.498,33.515v1.942l1.441,-0.584v-1.924L92.498,33.515z" />
<path
android:fillColor="#FFFFFF"
android:pathData="M5.806,60.518l-1.317,0.456l1.327,0.511l1.327,-0.511L5.806,60.518zM4.167,63.158l1.476,0.588v-1.92l-1.476,-0.588V63.158zM6.009,61.804v1.942l1.441,-0.584v-1.924L6.009,61.804z" />
<path
android:fillColor="#FFFFFF"
android:pathData="M24.691,30.255c-0.615,0.788 -0.538,1.99 0.329,2.667c0.867,0.677 1.99,0.538 2.667,-0.329c6.397,-8.2 16.796,-12.263 27.125,-10.546c0.658,0.133 1.342,-0.095 1.773,-0.646c0.185,-0.237 0.29,-0.535 0.396,-0.833c0.088,-0.438 0.019,-1 -0.314,-1.386s-0.727,-0.694 -1.165,-0.782C43.638,16.373 31.949,20.952 24.691,30.255z" />
<path
android:fillColor="#FFFFFF"
android:pathData="M71.1,47.4L41.3,29.2c-1,-0.5 -2.2,-0.5 -3.2,0.1s-1.6,1.6 -1.6,2.8v36.2c0,1.1 0.6,2.2 1.6,2.8c0.5,0.3 1.1,0.5 1.6,0.5s1.1,-0.1 1.6,-0.4L71.1,53c1,-0.6 1.6,-1.6 1.6,-2.8C72.7,49.1 72.1,48 71.1,47.4zM68.5,50.2L40.3,67.4V33L68.5,50.2z" />
<path
android:fillColor="#FFFFFF"
android:pathData="M79.6,20.4C71.7,12.6 61.2,8.2 50,8.2s-21.7,4.3 -29.6,12.2C12.6,28.3 8.2,38.8 8.2,50s4.3,21.7 12.2,29.6S38.8,91.8 50,91.8s21.7,-4.3 29.6,-12.2S91.8,61.2 91.8,50S87.4,28.3 79.6,20.4zM88.1,50c0,10.2 -4,19.7 -11.2,26.9C69.7,84.1 60.2,88.1 50,88.1s-19.7,-4 -26.9,-11.2C15.9,69.7 11.9,60.2 11.9,50s4,-19.7 11.2,-26.9S39.9,11.9 50,11.9c10.2,0 19.7,4 26.9,11.2C84.1,30.3 88.1,39.8 88.1,50z" />
</group>
</vector>

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

@ -0,0 +1,862 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<group
android:scaleX="0.66"
android:scaleY="0.66"
android:translateX="21"
android:translateY="21">
<path android:pathData="M85.355,14.645C75.91,5.201 63.354,0 50,0C36.644,0 24.088,5.201 14.645,14.645S0,36.644 0,50c0,13.357 5.201,25.913 14.645,35.355C24.087,94.799 36.643,100 50,100c13.357,0 25.913,-5.201 35.355,-14.645C94.799,75.912 100,63.356 100,50C100,36.646 94.799,24.09 85.355,14.645z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="15.7699"
android:endY="86.8818"
android:startX="83.2562"
android:startY="14.1677"
android:type="linear">
<item
android:color="#FF28D1BC"
android:offset="0" />
<item
android:color="#FF00ABFF"
android:offset="0.6" />
<item
android:color="#FF2A5ED6"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path
android:fillAlpha="0.71"
android:pathData="M3.151,32.464L13.3,46.493L30.239,4.045c-5.75,2.474 -11.035,6.041 -15.595,10.6C9.504,19.786 5.623,25.851 3.151,32.464z"
android:strokeAlpha="0.71">
<aapt:attr name="android:fillColor">
<gradient
android:endX="24.2938"
android:endY="39.2239"
android:startX="-4.1098"
android:startY="-39.1612"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0.5762" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path
android:fillAlpha="0.71"
android:pathData="M2.3,34.893c-1.5,4.8 -2.3,9.8 -2.3,15c0,2.8 0.2,5.5 0.7,8.2l7.8,10l36.878,-26.896L2.3,34.893z"
android:strokeAlpha="0.71">
<aapt:attr name="android:fillColor">
<gradient
android:endX="26.5038"
android:endY="54.332794"
android:startX="-2.655"
android:startY="33.41799"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0.006" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path
android:fillAlpha="0.71"
android:pathData="M40.8,5.893l27.6,28.3l8.9,-26.2c-5.8,-3.8 -12.3,-6.3 -19.2,-7.4L40.8,5.893z"
android:strokeAlpha="0.71">
<aapt:attr name="android:fillColor">
<gradient
android:endX="62.8149"
android:endY="14.768093"
android:startX="84.794"
android:startY="0.65519285"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0.0013" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path
android:fillAlpha="0.71"
android:pathData="M42.79,46.347l25.8,0.6l-27.6,-28.3z"
android:strokeAlpha="0.71">
<aapt:attr name="android:fillColor">
<gradient
android:endX="45.013"
android:endY="42.08"
android:startX="59.9387"
android:startY="27.9081"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path
android:fillAlpha="0.71"
android:pathData="M96.88,67.451C98.928,61.941 100,56.054 100,50c0,-0.202 -0.005,-0.402 -0.007,-0.604L68.806,34.399L96.88,67.451z"
android:strokeAlpha="0.71">
<aapt:attr name="android:fillColor">
<gradient
android:endX="79.7008"
android:endY="33.716"
android:startX="107.2237"
android:startY="81.6425"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0.0029" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path
android:fillAlpha="0.71"
android:pathData="M27.8,15.893l17.4,11.8l3.7,-21.1z"
android:strokeAlpha="0.71">
<aapt:attr name="android:fillColor">
<gradient
android:endX="48.8608"
android:endY="17.1429"
android:startX="27.8"
android:startY="17.1429"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="8.440641E-4" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path
android:fillAlpha="0.71"
android:pathData="M97.976,35.848l-5.312,-1.255l3.7,24l3.329,-3.044C99.895,53.719 100,51.868 100,50C100,45.14 99.308,40.386 97.976,35.848z"
android:strokeAlpha="0.71">
<aapt:attr name="android:fillColor">
<gradient
android:endX="93.5393"
android:endY="46.7512"
android:startX="101.8224"
android:startY="45.4073"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0.0017" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path
android:fillAlpha="0.71"
android:pathData="M72.998,85.447l2.742,7.442c2.87,-1.729 5.579,-3.761 8.092,-6.075L72.998,85.447z"
android:strokeAlpha="0.71">
<aapt:attr name="android:fillColor">
<gradient
android:endX="77.1128"
android:endY="79.7658"
android:startX="81.8324"
android:startY="102.8394"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0.0013" />
<item
android:color="#00FFFFFF"
android:offset="0.9982" />
</gradient>
</aapt:attr>
</path>
<path
android:fillAlpha="0.71"
android:pathData="M87.435,83.143c2.349,-2.646 4.393,-5.5 6.108,-8.522l-28.357,2.776L87.435,83.143z"
android:strokeAlpha="0.71">
<aapt:attr name="android:fillColor">
<gradient
android:endX="65.4945"
android:endY="79.3595"
android:startX="123.109"
android:startY="78.2586"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0.0022" />
<item
android:color="#00FFFFFF"
android:offset="0.9966" />
</gradient>
</aapt:attr>
</path>
<path
android:fillAlpha="0.71"
android:pathData="M72.9,85.193l-56.3,-11.1l7.2,18.4c1.6,1 3.3,1.9 5.1,2.7L72.9,85.193z"
android:strokeAlpha="0.71">
<aapt:attr name="android:fillColor">
<gradient
android:endX="38.2047"
android:endY="89.4249"
android:startX="58.4365"
android:startY="59.1884"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0.0015" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path
android:fillAlpha="0.71"
android:pathData="M79.09,58.897l-21,1.5l10.3,18.9z"
android:strokeAlpha="0.71">
<aapt:attr name="android:fillColor">
<gradient
android:endX="61.745285"
android:endY="71.03565"
android:startX="78.23818"
android:startY="57.920563"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0" />
<item
android:color="#00FFFFFF"
android:offset="0.9993" />
</gradient>
</aapt:attr>
</path>
<group>
<clip-path android:pathData="M50,50m-50,0a50,50 0,1 1,100 0a50,50 0,1 1,-100 0" />
<path android:pathData="M31.304,22.589v0.7c0,0.1 0,0.1 -0.1,0.2l-1.9,0.8c0,0 0,0 -0.1,0s0,0 -0.1,0l-0.4,-0.2l19.7,27l2.4,-1.7L31.304,22.589z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="50.7969"
android:endY="36.839092"
android:startX="28.7808"
android:startY="36.839092"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0.006" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path android:pathData="M65.409,20.005l-0.005,-1.116l-17,30.7l2.5,1.4l16.722,-30.026L65.409,20.005z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="48.3499"
android:endY="34.939095"
android:startX="67.5984"
android:startY="34.939095"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0.0013" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path android:pathData="M79.625,18.344l-0.021,-1.254l-31.3,32.1l2.1,2l31.2,-32L79.625,18.344z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="48.3039"
android:endY="34.138992"
android:startX="81.6039"
android:startY="34.138992"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="7.851759E-5" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path android:pathData="M90.104,35.389c-0.1,0 -0.1,-0.1 -0.1,-0.2v-2l-41.1,15.7l1,2.7l41.3,-15.8L90.104,35.389z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="48.8205"
android:endY="42.388992"
android:startX="91.2039"
android:startY="42.388992"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0.0038" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path android:pathData="M11.804,27.989v1.8c0,0.1 -0.1,0.2 -0.1,0.2l-1.2,0.5l38.5,20.9l1.4,-2.6L11.804,27.989z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="50.3298"
android:endY="39.689095"
android:startX="10.4298"
android:startY="39.689095"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0.0025" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path android:pathData="M17.265,50.089c0.1,0 0.1,0.2 0.1,0.2v2.5c0,0.1 -0.1,0.2 -0.1,0.2l32.439,-1.3l-0.1,-2.9L17.265,50.089z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="49.6603"
android:endY="50.888992"
android:startX="17.2212"
android:startY="50.888992"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="3.140703E-4" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path android:pathData="M7.668,60.675c0.036,0.014 0.234,0.056 0.236,0.214l0,0l0,0v1.9l42.1,-11.2l-0.9,-2.8l-42.8,11.4C6.304,60.189 7.632,60.661 7.668,60.675z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="50.0039"
android:endY="55.789093"
android:startX="6.304"
android:startY="55.789093"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0.0047" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path android:pathData="M33.904,62.147v1.942l16.7,-11.95l-1.8,-2.3L32.611,61.406L33.904,62.147z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="50.5851"
android:endY="56.964092"
android:startX="32.571"
android:startY="56.964092"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0.003" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path android:pathData="M35.804,35.789v1.2c0,0.1 -0.1,0.2 -0.1,0.2l-1.8,0.8l14.5,13.4l2,-2.1L35.804,35.789z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="50.3668"
android:endY="43.589092"
android:startX="33.8669"
android:startY="43.589092"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0.0048" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path android:pathData="M55.804,33.089C55.804,33.089 55.704,33.089 55.804,33.089c-0.1,0 -0.1,0 -0.2,0l-1.9,-0.8l0,0l-5.4,17.5l2.8,0.9l5.5,-17.9L55.804,33.089z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="48.2319"
android:endY="41.489094"
android:startX="56.5588"
android:startY="41.489094"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path android:pathData="M64.804,45.489l-13.8,3.2l0.7,2.8l13.8,-3.2L64.804,45.489z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="50.9512"
android:endY="48.489094"
android:startX="65.4322"
android:startY="48.489094"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0.0032" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path android:pathData="M74.107,63.536L74.107,63.536L74.107,63.536c0,-0.098 0,-0.098 0.098,-0.195l0,0l0,0l0,0l1.172,-0.391L50.571,49.278l-1.367,2.441l24.903,13.77C74.107,65.489 74.107,63.536 74.107,63.536z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="49.2177"
android:endY="57.3833"
android:startX="75.4526"
android:startY="57.3833"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="5.496231E-4" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path android:pathData="M81.904,79.089L81.904,79.089L81.904,79.089L81.904,79.089l2,-0.6c0,0 0,0 0.1,0l-33.7,-29.4l-1.9,2.2l33.3,29v-1C81.704,79.289 81.694,79.141 81.904,79.089z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="48.4039"
android:endY="64.689095"
android:startX="84.0039"
android:startY="64.689095"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0.0012" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path android:pathData="M54.404,79.689l2,-0.6h0.1l0.7,0.2l-6.2,-29.7l-2.8,0.6L54.404,79.689L54.404,79.689z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="48.1377"
android:endY="64.63899"
android:startX="57.3221"
android:startY="64.63899"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0.0025" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path android:pathData="M64.804,46.689l-15.6,2.1l0.4,2.9l30.2,-4.1l-0.4,-0.1c-0.1,0 -0.1,-0.1 -0.1,-0.2v-2.5l0,0l0,0l0,0L64.804,46.689">
<aapt:attr name="android:fillColor">
<gradient
android:endX="49.1732"
android:endY="48.239094"
android:startX="79.7731"
android:startY="48.239094"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0.003" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
</group>
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M51.639,0.029l-10.172,9.922l38.598,0.091"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M65.366,2.397L67.311,16.642"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M77.224,8.046L71.304,14.042"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M79.609,16.642L69.609,17.642"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M83.78,13.139L82.883,14.965"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M85.325,14.615c0.096,0.097 -3.374,29.468 -3.374,29.468"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M89.811,35.231L68.98,45.442"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M81.157,19.065L67.957,44.865"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M89.66,32.342l-48.193,-22.391l23.922,7.289"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M69.592,19.841L93.523,25.345"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M91.096,21.502L91.699,31.585"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M95.08,28.318L93.554,32.271"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M92.657,35.991L91.055,78.558"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M78.616,65.137L96.149,69.308"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M99.904,46.935L78.571,63.748"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M99.296,41.575c-0.585,0.17 -15.743,4.529 -15.743,4.529l16.414,5.629"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M99.766,54.87l-15.164,16.679l5.749,7.991"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M77.456,66.713L83.427,78.637"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M84.31,82.536L83.75,86.889"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M85.28,82.142L86.327,84.354"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M81.12,48.139l-4.73,14.382l-8.132,-14.106"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M79.18,45.887L68.951,46.291"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M79.305,47.596L17.837,88.283"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M54.335,79.846L33.835,64.846"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M65.137,48.23L16.967,87.533"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M75.145,66.556c-0.008,0.074 -16.683,13.266 -16.683,13.266"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M74.354,66.171L62.454,98.371"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M67.749,96.77L22.551,91.808"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M54.293,81.937L19.29,89.467"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M54.846,82.756l-18.767,15.187l48.523,-26.394"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M25.193,93.341L55.115,99.637"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M31.046,65.521L15.515,86.205"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M54.466,32.642L33.573,61.932"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M34.116,62.841L64.78,47.542"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M64.799,46.436L17.528,51.124"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M17.481,52.92L29.665,61.822"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M7.972,61.193L64.229,47.287"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M29.602,63.342L8.042,62.247"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M32.453,37.508L14.288,84.989"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M28.519,23.938L11.678,82.116"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M6.456,64.297L5.153,72.159"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M3.605,62.036L1.439,61.984"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M0.08,52.807L13.108,51.842"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M9.157,30.693L6.857,59.693"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M14.243,53.353L6.765,60.325"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M27.926,23.641L16.156,49.667"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M16.351,27.987L15.502,49.442"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M31.704,37.136L17.432,50.364"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M1.452,37.962L13.741,49.851"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M8.149,30.316L0.472,43.105"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M0.306,44.454L13.082,50.537"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M14.188,15.113L10.004,26.542"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M11.786,27.339L14.886,26.239"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M16.953,12.477L16.651,24.087"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M19.154,24.807L27.254,21.972"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M20.361,9.72L28.536,20.331"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M54.069,29.329L27.064,5.547"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M31.287,22.039L53.587,29.739"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M53.593,30.937L35.793,34.637"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M64.821,45.539L35.934,36.076"
android:strokeAlpha="0.6" />
<path
android:fillColor="#FFFFFF"
android:pathData="M81.802,15.419l-1.317,0.456l1.327,0.511l1.327,-0.511L81.802,15.419zM80.162,18.059l1.476,0.588v-1.92l-1.476,-0.588V18.059zM82.004,16.705v1.942l1.441,-0.584v-1.924L82.004,16.705z" />
<path
android:fillColor="#FFFFFF"
android:pathData="M67.443,17.033l-1.317,0.456L67.453,18l1.327,-0.511L67.443,17.033zM65.804,19.673l1.476,0.588v-1.92l-1.476,-0.588V19.673zM67.646,18.319v1.942l1.441,-0.584v-1.924L67.646,18.319z" />
<path
android:fillColor="#FFFFFF"
android:pathData="M55.737,29.211l-1.317,0.456l1.327,0.511l1.327,-0.511L55.737,29.211zM54.098,31.851l1.476,0.588v-1.92l-1.476,-0.588V31.851zM55.94,30.497v1.942l1.441,-0.584v-1.924L55.94,30.497z" />
<path
android:fillColor="#FFFFFF"
android:pathData="M29.251,20.523l-1.317,0.456l1.327,0.511l1.327,-0.511L29.251,20.523zM27.611,23.164l1.476,0.588v-1.92l-1.476,-0.588V23.164zM29.453,21.81v1.942l1.441,-0.584v-1.924L29.453,21.81z" />
<path
android:fillColor="#FFFFFF"
android:pathData="M15.227,49.775l-1.317,0.456l1.327,0.511l1.327,-0.511L15.227,49.775zM13.587,52.415l1.476,0.588v-1.92l-1.476,-0.588V52.415zM15.429,51.062v1.942l1.441,-0.584v-1.924L15.429,51.062z" />
<path
android:fillColor="#FFFFFF"
android:pathData="M9.601,26.95l-1.317,0.456l1.327,0.511l1.327,-0.511L9.601,26.95zM7.962,29.59l1.476,0.588v-1.92L7.962,27.67V29.59zM9.804,28.236v1.942l1.441,-0.584V27.67L9.804,28.236z" />
<path
android:fillColor="#FFFFFF"
android:pathData="M56.429,79.561l-1.317,0.456l1.327,0.511l1.327,-0.511L56.429,79.561zM54.79,82.201l1.476,0.588v-1.92l-1.476,-0.588V82.201zM56.632,80.847v1.942l1.441,-0.584v-1.924L56.632,80.847z" />
<path
android:fillColor="#FFFFFF"
android:pathData="M33.602,34.175l-1.317,0.456l1.327,0.511l1.327,-0.511L33.602,34.175zM31.963,36.815l1.476,0.588v-1.92l-1.476,-0.588V36.815zM33.804,35.462v1.942l1.441,-0.584v-1.924L33.804,35.462z" />
<path
android:fillColor="#FFFFFF"
android:pathData="M31.796,61.722l-1.317,0.456l1.327,0.511l1.327,-0.511L31.796,61.722zM30.156,64.362l1.476,0.588v-1.92l-1.476,-0.588V64.362zM31.998,63.009v1.942l1.441,-0.584v-1.924L31.998,63.009z" />
<path
android:fillColor="#FFFFFF"
android:pathData="M83.96,79.141l-1.317,0.456l1.327,0.511l1.327,-0.511L83.96,79.141zM82.321,81.781l1.476,0.588v-1.92l-1.476,-0.588V81.781zM84.162,80.428v1.942l1.441,-0.584v-1.924L84.162,80.428z" />
<path
android:fillColor="#FFFFFF"
android:pathData="M76.393,63.075l-1.317,0.456l1.327,0.511l1.327,-0.511L76.393,63.075zM74.754,65.715l1.476,0.588v-1.92l-1.476,-0.588V65.715zM76.596,64.362v1.942l1.441,-0.584v-1.924L76.596,64.362z" />
<path
android:fillColor="#FFFFFF"
android:pathData="M81.202,44.475l-1.317,0.456l1.327,0.511l1.327,-0.511L81.202,44.475zM79.563,47.115l1.476,0.588v-1.92l-1.476,-0.588V47.115zM81.404,45.762v1.942l1.441,-0.584v-1.924L81.404,45.762z" />
<path
android:fillColor="#FFFFFF"
android:pathData="M92.296,32.228l-1.317,0.456l1.327,0.511l1.327,-0.511L92.296,32.228zM90.656,34.868l1.476,0.588v-1.92l-1.476,-0.588V34.868zM92.498,33.515v1.942l1.441,-0.584v-1.924L92.498,33.515z" />
<path
android:fillColor="#FFFFFF"
android:pathData="M5.806,60.518l-1.317,0.456l1.327,0.511l1.327,-0.511L5.806,60.518zM4.167,63.158l1.476,0.588v-1.92l-1.476,-0.588V63.158zM6.009,61.804v1.942l1.441,-0.584v-1.924L6.009,61.804z" />
<path
android:fillColor="#FFFFFF"
android:pathData="M24.691,30.255c-0.615,0.788 -0.538,1.99 0.329,2.667c0.867,0.677 1.99,0.538 2.667,-0.329c6.397,-8.2 16.796,-12.263 27.125,-10.546c0.658,0.133 1.342,-0.095 1.773,-0.646c0.185,-0.237 0.29,-0.535 0.396,-0.833c0.088,-0.438 0.019,-1 -0.314,-1.386s-0.727,-0.694 -1.165,-0.782C43.638,16.373 31.949,20.952 24.691,30.255z" />
<path
android:fillColor="#FFFFFF"
android:pathData="M71.1,47.4L41.3,29.2c-1,-0.5 -2.2,-0.5 -3.2,0.1s-1.6,1.6 -1.6,2.8v36.2c0,1.1 0.6,2.2 1.6,2.8c0.5,0.3 1.1,0.5 1.6,0.5s1.1,-0.1 1.6,-0.4L71.1,53c1,-0.6 1.6,-1.6 1.6,-2.8C72.7,49.1 72.1,48 71.1,47.4zM68.5,50.2L40.3,67.4V33L68.5,50.2z" />
<path
android:fillColor="#FFFFFF"
android:pathData="M79.6,20.4C71.7,12.6 61.2,8.2 50,8.2s-21.7,4.3 -29.6,12.2C12.6,28.3 8.2,38.8 8.2,50s4.3,21.7 12.2,29.6S38.8,91.8 50,91.8s21.7,-4.3 29.6,-12.2S91.8,61.2 91.8,50S87.4,28.3 79.6,20.4zM88.1,50c0,10.2 -4,19.7 -11.2,26.9C69.7,84.1 60.2,88.1 50,88.1s-19.7,-4 -26.9,-11.2C15.9,69.7 11.9,60.2 11.9,50s4,-19.7 11.2,-26.9S39.9,11.9 50,11.9c10.2,0 19.7,4 26.9,11.2C84.1,30.3 88.1,39.8 88.1,50z" />
</group>
</vector>

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.2 KiB

View File

@ -0,0 +1,856 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="100dp"
android:height="100dp"
android:viewportWidth="100"
android:viewportHeight="100">
<path android:pathData="M85.355,14.645C75.91,5.201 63.354,0 50,0C36.644,0 24.088,5.201 14.645,14.645S0,36.644 0,50c0,13.357 5.201,25.913 14.645,35.355C24.087,94.799 36.643,100 50,100c13.357,0 25.913,-5.201 35.355,-14.645C94.799,75.912 100,63.356 100,50C100,36.646 94.799,24.09 85.355,14.645z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="15.7699"
android:endY="86.8818"
android:startX="83.2562"
android:startY="14.1677"
android:type="linear">
<item
android:color="#FF28D1BC"
android:offset="0" />
<item
android:color="#FF00ABFF"
android:offset="0.6" />
<item
android:color="#FF2A5ED6"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path
android:fillAlpha="0.71"
android:pathData="M3.151,32.464L13.3,46.493L30.239,4.045c-5.75,2.474 -11.035,6.041 -15.595,10.6C9.504,19.786 5.623,25.851 3.151,32.464z"
android:strokeAlpha="0.71">
<aapt:attr name="android:fillColor">
<gradient
android:endX="24.2938"
android:endY="39.2239"
android:startX="-4.1098"
android:startY="-39.1612"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0.5762" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path
android:fillAlpha="0.71"
android:pathData="M2.3,34.893c-1.5,4.8 -2.3,9.8 -2.3,15c0,2.8 0.2,5.5 0.7,8.2l7.8,10l36.878,-26.896L2.3,34.893z"
android:strokeAlpha="0.71">
<aapt:attr name="android:fillColor">
<gradient
android:endX="26.5038"
android:endY="54.332794"
android:startX="-2.655"
android:startY="33.41799"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0.006" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path
android:fillAlpha="0.71"
android:pathData="M40.8,5.893l27.6,28.3l8.9,-26.2c-5.8,-3.8 -12.3,-6.3 -19.2,-7.4L40.8,5.893z"
android:strokeAlpha="0.71">
<aapt:attr name="android:fillColor">
<gradient
android:endX="62.8149"
android:endY="14.768093"
android:startX="84.794"
android:startY="0.65519285"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0.0013" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path
android:fillAlpha="0.71"
android:pathData="M42.79,46.347l25.8,0.6l-27.6,-28.3z"
android:strokeAlpha="0.71">
<aapt:attr name="android:fillColor">
<gradient
android:endX="45.013"
android:endY="42.08"
android:startX="59.9387"
android:startY="27.9081"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path
android:fillAlpha="0.71"
android:pathData="M96.88,67.451C98.928,61.941 100,56.054 100,50c0,-0.202 -0.005,-0.402 -0.007,-0.604L68.806,34.399L96.88,67.451z"
android:strokeAlpha="0.71">
<aapt:attr name="android:fillColor">
<gradient
android:endX="79.7008"
android:endY="33.716"
android:startX="107.2237"
android:startY="81.6425"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0.0029" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path
android:fillAlpha="0.71"
android:pathData="M27.8,15.893l17.4,11.8l3.7,-21.1z"
android:strokeAlpha="0.71">
<aapt:attr name="android:fillColor">
<gradient
android:endX="48.8608"
android:endY="17.1429"
android:startX="27.8"
android:startY="17.1429"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="8.440641E-4" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path
android:fillAlpha="0.71"
android:pathData="M97.976,35.848l-5.312,-1.255l3.7,24l3.329,-3.044C99.895,53.719 100,51.868 100,50C100,45.14 99.308,40.386 97.976,35.848z"
android:strokeAlpha="0.71">
<aapt:attr name="android:fillColor">
<gradient
android:endX="93.5393"
android:endY="46.7512"
android:startX="101.8224"
android:startY="45.4073"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0.0017" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path
android:fillAlpha="0.71"
android:pathData="M72.998,85.447l2.742,7.442c2.87,-1.729 5.579,-3.761 8.092,-6.075L72.998,85.447z"
android:strokeAlpha="0.71">
<aapt:attr name="android:fillColor">
<gradient
android:endX="77.1128"
android:endY="79.7658"
android:startX="81.8324"
android:startY="102.8394"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0.0013" />
<item
android:color="#00FFFFFF"
android:offset="0.9982" />
</gradient>
</aapt:attr>
</path>
<path
android:fillAlpha="0.71"
android:pathData="M87.435,83.143c2.349,-2.646 4.393,-5.5 6.108,-8.522l-28.357,2.776L87.435,83.143z"
android:strokeAlpha="0.71">
<aapt:attr name="android:fillColor">
<gradient
android:endX="65.4945"
android:endY="79.3595"
android:startX="123.109"
android:startY="78.2586"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0.0022" />
<item
android:color="#00FFFFFF"
android:offset="0.9966" />
</gradient>
</aapt:attr>
</path>
<path
android:fillAlpha="0.71"
android:pathData="M72.9,85.193l-56.3,-11.1l7.2,18.4c1.6,1 3.3,1.9 5.1,2.7L72.9,85.193z"
android:strokeAlpha="0.71">
<aapt:attr name="android:fillColor">
<gradient
android:endX="38.2047"
android:endY="89.4249"
android:startX="58.4365"
android:startY="59.1884"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0.0015" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path
android:fillAlpha="0.71"
android:pathData="M79.09,58.897l-21,1.5l10.3,18.9z"
android:strokeAlpha="0.71">
<aapt:attr name="android:fillColor">
<gradient
android:endX="61.745285"
android:endY="71.03565"
android:startX="78.23818"
android:startY="57.920563"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0" />
<item
android:color="#00FFFFFF"
android:offset="0.9993" />
</gradient>
</aapt:attr>
</path>
<group>
<clip-path android:pathData="M50,50m-50,0a50,50 0,1 1,100 0a50,50 0,1 1,-100 0" />
<path android:pathData="M31.304,22.589v0.7c0,0.1 0,0.1 -0.1,0.2l-1.9,0.8c0,0 0,0 -0.1,0s0,0 -0.1,0l-0.4,-0.2l19.7,27l2.4,-1.7L31.304,22.589z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="50.7969"
android:endY="36.839092"
android:startX="28.7808"
android:startY="36.839092"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0.006" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path android:pathData="M65.409,20.005l-0.005,-1.116l-17,30.7l2.5,1.4l16.722,-30.026L65.409,20.005z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="48.3499"
android:endY="34.939095"
android:startX="67.5984"
android:startY="34.939095"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0.0013" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path android:pathData="M79.625,18.344l-0.021,-1.254l-31.3,32.1l2.1,2l31.2,-32L79.625,18.344z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="48.3039"
android:endY="34.138992"
android:startX="81.6039"
android:startY="34.138992"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="7.851759E-5" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path android:pathData="M90.104,35.389c-0.1,0 -0.1,-0.1 -0.1,-0.2v-2l-41.1,15.7l1,2.7l41.3,-15.8L90.104,35.389z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="48.8205"
android:endY="42.388992"
android:startX="91.2039"
android:startY="42.388992"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0.0038" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path android:pathData="M11.804,27.989v1.8c0,0.1 -0.1,0.2 -0.1,0.2l-1.2,0.5l38.5,20.9l1.4,-2.6L11.804,27.989z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="50.3298"
android:endY="39.689095"
android:startX="10.4298"
android:startY="39.689095"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0.0025" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path android:pathData="M17.265,50.089c0.1,0 0.1,0.2 0.1,0.2v2.5c0,0.1 -0.1,0.2 -0.1,0.2l32.439,-1.3l-0.1,-2.9L17.265,50.089z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="49.6603"
android:endY="50.888992"
android:startX="17.2212"
android:startY="50.888992"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="3.140703E-4" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path android:pathData="M7.668,60.675c0.036,0.014 0.234,0.056 0.236,0.214l0,0l0,0v1.9l42.1,-11.2l-0.9,-2.8l-42.8,11.4C6.304,60.189 7.632,60.661 7.668,60.675z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="50.0039"
android:endY="55.789093"
android:startX="6.304"
android:startY="55.789093"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0.0047" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path android:pathData="M33.904,62.147v1.942l16.7,-11.95l-1.8,-2.3L32.611,61.406L33.904,62.147z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="50.5851"
android:endY="56.964092"
android:startX="32.571"
android:startY="56.964092"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0.003" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path android:pathData="M35.804,35.789v1.2c0,0.1 -0.1,0.2 -0.1,0.2l-1.8,0.8l14.5,13.4l2,-2.1L35.804,35.789z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="50.3668"
android:endY="43.589092"
android:startX="33.8669"
android:startY="43.589092"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0.0048" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path android:pathData="M55.804,33.089C55.804,33.089 55.704,33.089 55.804,33.089c-0.1,0 -0.1,0 -0.2,0l-1.9,-0.8l0,0l-5.4,17.5l2.8,0.9l5.5,-17.9L55.804,33.089z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="48.2319"
android:endY="41.489094"
android:startX="56.5588"
android:startY="41.489094"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path android:pathData="M64.804,45.489l-13.8,3.2l0.7,2.8l13.8,-3.2L64.804,45.489z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="50.9512"
android:endY="48.489094"
android:startX="65.4322"
android:startY="48.489094"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0.0032" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path android:pathData="M74.107,63.536L74.107,63.536L74.107,63.536c0,-0.098 0,-0.098 0.098,-0.195l0,0l0,0l0,0l1.172,-0.391L50.571,49.278l-1.367,2.441l24.903,13.77C74.107,65.489 74.107,63.536 74.107,63.536z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="49.2177"
android:endY="57.3833"
android:startX="75.4526"
android:startY="57.3833"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="5.496231E-4" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path android:pathData="M81.904,79.089L81.904,79.089L81.904,79.089L81.904,79.089l2,-0.6c0,0 0,0 0.1,0l-33.7,-29.4l-1.9,2.2l33.3,29v-1C81.704,79.289 81.694,79.141 81.904,79.089z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="48.4039"
android:endY="64.689095"
android:startX="84.0039"
android:startY="64.689095"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0.0012" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path android:pathData="M54.404,79.689l2,-0.6h0.1l0.7,0.2l-6.2,-29.7l-2.8,0.6L54.404,79.689L54.404,79.689z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="48.1377"
android:endY="64.63899"
android:startX="57.3221"
android:startY="64.63899"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0.0025" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path android:pathData="M64.804,46.689l-15.6,2.1l0.4,2.9l30.2,-4.1l-0.4,-0.1c-0.1,0 -0.1,-0.1 -0.1,-0.2v-2.5l0,0l0,0l0,0L64.804,46.689">
<aapt:attr name="android:fillColor">
<gradient
android:endX="49.1732"
android:endY="48.239094"
android:startX="79.7731"
android:startY="48.239094"
android:type="linear">
<item
android:color="#FFFFFFFF"
android:offset="0.003" />
<item
android:color="#00FFFFFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
</group>
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M51.639,0.029l-10.172,9.922l38.598,0.091"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M65.366,2.397L67.311,16.642"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M77.224,8.046L71.304,14.042"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M79.609,16.642L69.609,17.642"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M83.78,13.139L82.883,14.965"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M85.325,14.615c0.096,0.097 -3.374,29.468 -3.374,29.468"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M89.811,35.231L68.98,45.442"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M81.157,19.065L67.957,44.865"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M89.66,32.342l-48.193,-22.391l23.922,7.289"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M69.592,19.841L93.523,25.345"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M91.096,21.502L91.699,31.585"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M95.08,28.318L93.554,32.271"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M92.657,35.991L91.055,78.558"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M78.616,65.137L96.149,69.308"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M99.904,46.935L78.571,63.748"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M99.296,41.575c-0.585,0.17 -15.743,4.529 -15.743,4.529l16.414,5.629"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M99.766,54.87l-15.164,16.679l5.749,7.991"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M77.456,66.713L83.427,78.637"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M84.31,82.536L83.75,86.889"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M85.28,82.142L86.327,84.354"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M81.12,48.139l-4.73,14.382l-8.132,-14.106"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M79.18,45.887L68.951,46.291"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M79.305,47.596L17.837,88.283"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M54.335,79.846L33.835,64.846"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M65.137,48.23L16.967,87.533"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M75.145,66.556c-0.008,0.074 -16.683,13.266 -16.683,13.266"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M74.354,66.171L62.454,98.371"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M67.749,96.77L22.551,91.808"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M54.293,81.937L19.29,89.467"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M54.846,82.756l-18.767,15.187l48.523,-26.394"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M25.193,93.341L55.115,99.637"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M31.046,65.521L15.515,86.205"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M54.466,32.642L33.573,61.932"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M34.116,62.841L64.78,47.542"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M64.799,46.436L17.528,51.124"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M17.481,52.92L29.665,61.822"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M7.972,61.193L64.229,47.287"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M29.602,63.342L8.042,62.247"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M32.453,37.508L14.288,84.989"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M28.519,23.938L11.678,82.116"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M6.456,64.297L5.153,72.159"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M3.605,62.036L1.439,61.984"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M0.08,52.807L13.108,51.842"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M9.157,30.693L6.857,59.693"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M14.243,53.353L6.765,60.325"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M27.926,23.641L16.156,49.667"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M16.351,27.987L15.502,49.442"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M31.704,37.136L17.432,50.364"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M1.452,37.962L13.741,49.851"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M8.149,30.316L0.472,43.105"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M0.306,44.454L13.082,50.537"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M14.188,15.113L10.004,26.542"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M11.786,27.339L14.886,26.239"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M16.953,12.477L16.651,24.087"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M19.154,24.807L27.254,21.972"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M20.361,9.72L28.536,20.331"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M54.069,29.329L27.064,5.547"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M31.287,22.039L53.587,29.739"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M53.593,30.937L35.793,34.637"
android:strokeAlpha="0.6" />
<path
android:fillAlpha="0.6"
android:fillColor="#FF000000"
android:pathData="M64.821,45.539L35.934,36.076"
android:strokeAlpha="0.6" />
<path
android:fillColor="#FFFFFF"
android:pathData="M81.802,15.419l-1.317,0.456l1.327,0.511l1.327,-0.511L81.802,15.419zM80.162,18.059l1.476,0.588v-1.92l-1.476,-0.588V18.059zM82.004,16.705v1.942l1.441,-0.584v-1.924L82.004,16.705z" />
<path
android:fillColor="#FFFFFF"
android:pathData="M67.443,17.033l-1.317,0.456L67.453,18l1.327,-0.511L67.443,17.033zM65.804,19.673l1.476,0.588v-1.92l-1.476,-0.588V19.673zM67.646,18.319v1.942l1.441,-0.584v-1.924L67.646,18.319z" />
<path
android:fillColor="#FFFFFF"
android:pathData="M55.737,29.211l-1.317,0.456l1.327,0.511l1.327,-0.511L55.737,29.211zM54.098,31.851l1.476,0.588v-1.92l-1.476,-0.588V31.851zM55.94,30.497v1.942l1.441,-0.584v-1.924L55.94,30.497z" />
<path
android:fillColor="#FFFFFF"
android:pathData="M29.251,20.523l-1.317,0.456l1.327,0.511l1.327,-0.511L29.251,20.523zM27.611,23.164l1.476,0.588v-1.92l-1.476,-0.588V23.164zM29.453,21.81v1.942l1.441,-0.584v-1.924L29.453,21.81z" />
<path
android:fillColor="#FFFFFF"
android:pathData="M15.227,49.775l-1.317,0.456l1.327,0.511l1.327,-0.511L15.227,49.775zM13.587,52.415l1.476,0.588v-1.92l-1.476,-0.588V52.415zM15.429,51.062v1.942l1.441,-0.584v-1.924L15.429,51.062z" />
<path
android:fillColor="#FFFFFF"
android:pathData="M9.601,26.95l-1.317,0.456l1.327,0.511l1.327,-0.511L9.601,26.95zM7.962,29.59l1.476,0.588v-1.92L7.962,27.67V29.59zM9.804,28.236v1.942l1.441,-0.584V27.67L9.804,28.236z" />
<path
android:fillColor="#FFFFFF"
android:pathData="M56.429,79.561l-1.317,0.456l1.327,0.511l1.327,-0.511L56.429,79.561zM54.79,82.201l1.476,0.588v-1.92l-1.476,-0.588V82.201zM56.632,80.847v1.942l1.441,-0.584v-1.924L56.632,80.847z" />
<path
android:fillColor="#FFFFFF"
android:pathData="M33.602,34.175l-1.317,0.456l1.327,0.511l1.327,-0.511L33.602,34.175zM31.963,36.815l1.476,0.588v-1.92l-1.476,-0.588V36.815zM33.804,35.462v1.942l1.441,-0.584v-1.924L33.804,35.462z" />
<path
android:fillColor="#FFFFFF"
android:pathData="M31.796,61.722l-1.317,0.456l1.327,0.511l1.327,-0.511L31.796,61.722zM30.156,64.362l1.476,0.588v-1.92l-1.476,-0.588V64.362zM31.998,63.009v1.942l1.441,-0.584v-1.924L31.998,63.009z" />
<path
android:fillColor="#FFFFFF"
android:pathData="M83.96,79.141l-1.317,0.456l1.327,0.511l1.327,-0.511L83.96,79.141zM82.321,81.781l1.476,0.588v-1.92l-1.476,-0.588V81.781zM84.162,80.428v1.942l1.441,-0.584v-1.924L84.162,80.428z" />
<path
android:fillColor="#FFFFFF"
android:pathData="M76.393,63.075l-1.317,0.456l1.327,0.511l1.327,-0.511L76.393,63.075zM74.754,65.715l1.476,0.588v-1.92l-1.476,-0.588V65.715zM76.596,64.362v1.942l1.441,-0.584v-1.924L76.596,64.362z" />
<path
android:fillColor="#FFFFFF"
android:pathData="M81.202,44.475l-1.317,0.456l1.327,0.511l1.327,-0.511L81.202,44.475zM79.563,47.115l1.476,0.588v-1.92l-1.476,-0.588V47.115zM81.404,45.762v1.942l1.441,-0.584v-1.924L81.404,45.762z" />
<path
android:fillColor="#FFFFFF"
android:pathData="M92.296,32.228l-1.317,0.456l1.327,0.511l1.327,-0.511L92.296,32.228zM90.656,34.868l1.476,0.588v-1.92l-1.476,-0.588V34.868zM92.498,33.515v1.942l1.441,-0.584v-1.924L92.498,33.515z" />
<path
android:fillColor="#FFFFFF"
android:pathData="M5.806,60.518l-1.317,0.456l1.327,0.511l1.327,-0.511L5.806,60.518zM4.167,63.158l1.476,0.588v-1.92l-1.476,-0.588V63.158zM6.009,61.804v1.942l1.441,-0.584v-1.924L6.009,61.804z" />
<path
android:fillColor="#FFFFFF"
android:pathData="M24.691,30.255c-0.615,0.788 -0.538,1.99 0.329,2.667c0.867,0.677 1.99,0.538 2.667,-0.329c6.397,-8.2 16.796,-12.263 27.125,-10.546c0.658,0.133 1.342,-0.095 1.773,-0.646c0.185,-0.237 0.29,-0.535 0.396,-0.833c0.088,-0.438 0.019,-1 -0.314,-1.386s-0.727,-0.694 -1.165,-0.782C43.638,16.373 31.949,20.952 24.691,30.255z" />
<path
android:fillColor="#FFFFFF"
android:pathData="M71.1,47.4L41.3,29.2c-1,-0.5 -2.2,-0.5 -3.2,0.1s-1.6,1.6 -1.6,2.8v36.2c0,1.1 0.6,2.2 1.6,2.8c0.5,0.3 1.1,0.5 1.6,0.5s1.1,-0.1 1.6,-0.4L71.1,53c1,-0.6 1.6,-1.6 1.6,-2.8C72.7,49.1 72.1,48 71.1,47.4zM68.5,50.2L40.3,67.4V33L68.5,50.2z" />
<path
android:fillColor="#FFFFFF"
android:pathData="M79.6,20.4C71.7,12.6 61.2,8.2 50,8.2s-21.7,4.3 -29.6,12.2C12.6,28.3 8.2,38.8 8.2,50s4.3,21.7 12.2,29.6S38.8,91.8 50,91.8s21.7,-4.3 29.6,-12.2S91.8,61.2 91.8,50S87.4,28.3 79.6,20.4zM88.1,50c0,10.2 -4,19.7 -11.2,26.9C69.7,84.1 60.2,88.1 50,88.1s-19.7,-4 -26.9,-11.2C15.9,69.7 11.9,60.2 11.9,50s4,-19.7 11.2,-26.9S39.9,11.9 50,11.9c10.2,0 19.7,4 26.9,11.2C84.1,30.3 88.1,39.8 88.1,50z" />
</vector>

View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background" />
<foreground android:drawable="@drawable/ic_launcher_foreground" />
</adaptive-icon>

View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background" />
<foreground android:drawable="@drawable/ic_launcher_foreground" />
</adaptive-icon>

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 45 KiB

View File

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="colorPrimary">#343434</color>
<color name="colorPrimaryDark">#343434</color>
<color name="colorAccent">#00abff</color>
<color name="tag_color">#bbF2690D</color>
<color name="tag_color_text">#FAFAFA</color>
<color name="positive_thumbs">#2b90d9</color>
<color name="favorite">#ca8f04</color>
<color name="bookmark">#795548</color>
<color name="negative_thumbs">#F44336</color>
<color name="backgroundDark">#DD000000</color>
<color name="red_1">#F44336</color>
<color name="gray_light">#80808080</color>
</resources>

View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="ic_launcher_background">#FFFFFF</color>
</resources>

View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<paths xmlns:android="http://schemas.android.com/apk/res/android">
<external-path
name="my_images"
path="/Bittube/" />
</paths>

View File

@ -0,0 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="app.fedilab.fedilabtube">
<application
android:name=".FedilabTube"
android:allowBackup="false"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme"
tools:replace="android:allowBackup">
<activity
android:name=".MainActivity"
tools:node="merge">
<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="content" />
<data android:scheme="file" />
<data android:mimeType="*/*" />
<data android:pathPattern=".*\\.tubelab" />
<data android:pathPattern=".*\\..*\\.tubelab" />
<data android:pathPattern=".*\\..*\\..*\\.tubelab" />
<data android:pathPattern=".*\\..*\\..*\\..*\\.tubelab" />
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.tubelab" />
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.tubelab" />
</intent-filter>
</activity>
</application>
</manifest>

View File

@ -0,0 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="app.fedilab.fedilabtube">
<application
android:name=".FedilabTube"
android:allowBackup="false"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme"
tools:replace="android:allowBackup">
<activity
android:name=".PeertubeActivity"
tools:node="mergeOnlyAttributes">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<!-- The app is a good candidate for URL in https://domain.name/videos/watch/xxxxx-->
<data
android:host="*"
android:pathPrefix="/videos/watch/"
android:scheme="https" />
</intent-filter>
</activity>
</application>
</manifest>

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

View File

@ -1,4 +1,4 @@
package app.fedilab.fedilabtube.interfaces;
package app.fedilab.fedilabtube;
/* Copyright 2020 Thomas Schneider
*
* This file is a part of TubeLab
@ -14,8 +14,7 @@ package app.fedilab.fedilabtube.interfaces;
* You should have received a copy of the GNU General Public License along with TubeLab; if not,
* see <http://www.gnu.org/licenses>. */
import app.fedilab.fedilabtube.client.APIResponse;
public interface OnRetrieveFeedsInterface {
void onRetrieveFeeds(APIResponse apiResponse);
}
public class FedilabTube extends BaseFedilabTube {
}

View File

@ -1,4 +1,4 @@
package app.fedilab.fedilabtube.interfaces;
package app.fedilab.fedilabtube;
/* Copyright 2020 Thomas Schneider
*
* This file is a part of TubeLab
@ -14,10 +14,28 @@ package app.fedilab.fedilabtube.interfaces;
* You should have received a copy of the GNU General Public License along with TubeLab; if not,
* see <http://www.gnu.org/licenses>. */
import java.util.List;
import app.fedilab.fedilabtube.client.entities.Status;
import android.content.Context;
public interface OnRetrieveFeedsAccountInterface {
void onRetrieveFeedsAccount(List<Status> statuses);
@SuppressWarnings({"unused", "RedundantSuppression"})
public class Matomo {
public static void sendScreen(Context _mcontext, String path, String title) {
//Do nothing
}
public static void sendEvent(Context _mcontext, String category, String action, String label, float value) {
//Do nothing
}
public static void sendValue(Context _mcontext, String path, int index, String dimensionValue) {
//Do nothing
}
public static void trackInstall(Context _mcontext) {
//Do nothing
}
}

View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/colorAccent" android:state_checked="true" />
<item android:color="@android:color/tab_indicator_text" />
</selector>

View File

@ -0,0 +1,16 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="#FFFFFF"
android:viewportWidth="24"
android:viewportHeight="24">
<group
android:scaleX="1.104"
android:scaleY="1.104"
android:translateX="-1.248"
android:translateY="-1.248">
<path
android:fillColor="@android:color/white"
android:pathData="M10,16.5l6,-4.5 -6,-4.5v9zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z" />
</group>
</vector>

Binary file not shown.

After

Width:  |  Height:  |  Size: 720 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 491 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 937 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

View File

@ -0,0 +1,21 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<group
android:scaleX="2.0409248"
android:scaleY="2.0409248"
android:translateX="19.44"
android:translateY="19.44">
<path
android:fillColor="#000000"
android:pathData="m0,0h33.867v33.867h-33.867z" />
<path
android:fillColor="#f2690d"
android:pathData="m15.544,29.459c-0.5613,-0.052 -1.8193,-0.2922 -2.5659,-0.49 -1.4544,-0.3854 -2.6614,-0.9423 -3.8833,-1.7918 -2.3102,-1.606 -3.8461,-3.928 -4.3943,-6.6437 -0.4789,-2.3721 -0.2362,-5.3562 0.6533,-8.0312 0.376,-1.131 0.7053,-1.8387 1.2806,-2.7519 0.9004,-1.4293 1.5877,-2.1804 2.8991,-3.1683 1.3049,-0.983 2.9258,-1.6476 4.88,-2.0009 0.8669,-0.1568 1.1303,-0.1748 2.5858,-0.1775 1.5249,-0.0027 1.6704,0.0078 2.465,0.1789 1.9969,0.43 3.3805,1.0324 4.9616,2.1602 1.8104,1.2913 3.1669,2.8519 4.0578,4.6681 0.896,1.8267 1.3075,3.6274 1.3075,5.7214 0,1.5759 -0.2607,3.1575 -0.7605,4.613 -0.8579,2.4986 -2.193,4.235 -4.4452,5.7811 -1.2142,0.8336 -2.9496,1.4792 -4.8751,1.8136 -0.6105,0.106 -3.4333,0.1862 -4.1663,0.1183zM19.42,26.9851c1.5946,-0.1757 3.0062,-0.5799 4.293,-1.2293 1.048,-0.5289 1.5517,-0.8781 2.271,-1.5743 0.9003,-0.8714 1.3979,-1.6179 1.8328,-2.7494 0.3399,-0.8845 0.4151,-1.1551 0.5267,-1.8953 0.3809,-2.5269 -0.4498,-6.1791 -1.8859,-8.291 -0.9544,-1.4038 -2.0586,-2.3755 -3.7036,-3.2592 -2.538,-1.3635 -6.6246,-1.6184 -9.6573,-0.6023 -1.2489,0.4185 -2.8043,1.4067 -3.6027,2.289 -0.7826,0.8649 -1.5925,2.2749 -1.9531,3.4007 -0.3872,1.2088 -0.4937,2.0043 -0.4947,3.695 -0.0008,1.3192 0.0189,1.6195 0.1484,2.2599 0.2029,1.0037 0.4086,1.6055 0.8491,2.4837 0.9265,1.8474 2.0961,3.1054 3.8624,4.1541 1.3723,0.8148 2.6611,1.2289 4.3987,1.4136 0.4192,0.0446 2.3964,-0.0157 3.1154,-0.0949z" />
<path
android:fillColor="#f2690d"
android:pathData="m14.648,11.972 l7.4433,4.9609 -7.4433,4.9609z" />
</group>
</vector>

View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background" />
<foreground android:drawable="@drawable/ic_launcher_foreground" />
</adaptive-icon>

View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background" />
<foreground android:drawable="@drawable/ic_launcher_foreground" />
</adaptive-icon>

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.6 KiB

View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="colorPrimary">#212529</color>
<color name="colorPrimaryDark">#000000</color>
<color name="colorAccent">#F2690D</color>
<color name="tag_color">#bbF2690D</color>
<color name="tag_color_text">#FAFAFA</color>
<color name="positive_thumbs">#2b90d9</color>
<color name="negative_thumbs">#F44336</color>
<color name="favorite">#ca8f04</color>
<color name="bookmark">#795548</color>
<color name="backgroundDark">#DD000000</color>
<color name="red_1">#F44336</color>
<color name="gray_light">#80808080</color>
</resources>

View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="ic_launcher_background">#000000</color>
</resources>

View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<paths xmlns:android="http://schemas.android.com/apk/res/android">
<external-path
name="my_images"
path="/TubeLab/" />
</paths>

View File

@ -0,0 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="app.fedilab.fedilabtube">
<application
android:name=".FedilabTube"
android:allowBackup="false"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme"
tools:replace="android:allowBackup">
<activity
android:name=".MainActivity"
tools:node="merge">
<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="content" />
<data android:scheme="file" />
<data android:mimeType="*/*" />
<data android:pathPattern=".*\\.tubelab" />
<data android:pathPattern=".*\\..*\\.tubelab" />
<data android:pathPattern=".*\\..*\\..*\\.tubelab" />
<data android:pathPattern=".*\\..*\\..*\\..*\\.tubelab" />
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.tubelab" />
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.tubelab" />
</intent-filter>
</activity>
</application>
</manifest>

View File

@ -0,0 +1,41 @@
package app.fedilab.fedilabtube;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of TubeLab
*
* This program is free software; you can redistribute it and/or modify it under the terms of the
* GNU General Public License as published by the Free Software Foundation; either version 3 of the
* License, or (at your option) any later version.
*
* TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
* Public License for more details.
*
* You should have received a copy of the GNU General Public License along with TubeLab; if not,
* see <http://www.gnu.org/licenses>. */
import android.os.Bundle;
import android.view.View;
import androidx.appcompat.app.AppCompatActivity;
import app.fedilab.fedilabtube.databinding.ActivityMainBinding;
public class BaseMainActivity extends AppCompatActivity {
protected ActivityMainBinding binding;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
binding = ActivityMainBinding.inflate(getLayoutInflater());
View view = binding.getRoot();
setContentView(view);
}
//Method for discovering cast devices
public void discoverCast() {
}
}

View File

@ -0,0 +1,182 @@
package app.fedilab.fedilabtube;
import android.content.Context;
import android.content.SharedPreferences;
import android.net.Uri;
import android.os.Bundle;
import android.view.Menu;
import android.view.View;
import androidx.appcompat.app.AppCompatActivity;
import com.google.android.exoplayer2.SimpleExoPlayer;
import com.google.android.gms.cast.MediaInfo;
import com.google.android.gms.cast.MediaMetadata;
import com.google.android.gms.cast.framework.CastButtonFactory;
import com.google.android.gms.cast.framework.CastContext;
import com.google.android.gms.cast.framework.CastSession;
import com.google.android.gms.cast.framework.SessionManagerListener;
import com.google.android.gms.cast.framework.media.RemoteMediaClient;
import com.google.android.gms.common.images.WebImage;
import app.fedilab.fedilabtube.client.data.VideoData;
import app.fedilab.fedilabtube.databinding.ActivityPeertubeBinding;
import app.fedilab.fedilabtube.helper.Helper;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of TubeLab
*
* This program is free software; you can redistribute it and/or modify it under the terms of the
* GNU General Public License as published by the Free Software Foundation; either version 3 of the
* License, or (at your option) any later version.
*
* TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
* Public License for more details.
*
* You should have received a copy of the GNU General Public License along with TubeLab; if not,
* see <http://www.gnu.org/licenses>. */
public class BasePeertubeActivity extends AppCompatActivity {
protected ActivityPeertubeBinding binding;
protected VideoData.Video peertube;
protected SimpleExoPlayer player;
protected String videoURL;
protected String subtitlesStr;
private CastContext mCastContext;
private CastSession mCastSession;
private SessionManagerListener<CastSession> mSessionManagerListener;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
binding = ActivityPeertubeBinding.inflate(getLayoutInflater());
View view = binding.getRoot();
setContentView(view);
final SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
int search_cast = sharedpreferences.getInt(getString(R.string.set_cast_choice), BuildConfig.cast_enabled);
if (search_cast == 1) {
setupCastListener();
mCastContext = CastContext.getSharedInstance(this);
mCastSession = mCastContext.getSessionManager().getCurrentCastSession();
}
}
protected void loadCast() {
MediaMetadata movieMetadata = new MediaMetadata(MediaMetadata.MEDIA_TYPE_MOVIE);
movieMetadata.putString(MediaMetadata.KEY_TITLE, peertube.getTitle());
movieMetadata.putString(MediaMetadata.KEY_ARTIST, peertube.getAccount().getDisplayName());
if (subtitlesStr != null) {
movieMetadata.putString(MediaMetadata.KEY_SUBTITLE, subtitlesStr);
}
movieMetadata.addImage(new WebImage(Uri.parse("https://" + peertube.getChannel().getHost() + peertube.getPreviewPath())));
MediaInfo mediaInfo = new MediaInfo.Builder(videoURL)
.setStreamType(MediaInfo.STREAM_TYPE_BUFFERED)
.setMetadata(movieMetadata)
.setStreamDuration(peertube.getDuration() * 1000)
.build();
if (mCastSession != null) {
RemoteMediaClient remoteMediaClient = mCastSession.getRemoteMediaClient();
remoteMediaClient.load(mediaInfo);
}
}
private void setupCastListener() {
mSessionManagerListener = new SessionManagerListener<CastSession>() {
@Override
public void onSessionStarting(CastSession castSession) {
}
@Override
public void onSessionStarted(CastSession castSession, String s) {
onApplicationConnected(castSession, true);
}
@Override
public void onSessionStartFailed(CastSession castSession, int i) {
onApplicationDisconnected();
}
@Override
public void onSessionEnding(CastSession castSession) {
onApplicationDisconnected();
}
@Override
public void onSessionEnded(CastSession castSession, int i) {
onApplicationDisconnected();
}
@Override
public void onSessionResuming(CastSession castSession, String s) {
}
@Override
public void onSessionResumed(CastSession castSession, boolean b) {
onApplicationConnected(castSession, false);
}
@Override
public void onSessionResumeFailed(CastSession castSession, int i) {
onApplicationDisconnected();
}
@Override
public void onSessionSuspended(CastSession castSession, int i) {
onApplicationDisconnected();
}
private void onApplicationConnected(CastSession castSession, boolean hide) {
mCastSession = castSession;
supportInvalidateOptionsMenu();
player.setPlayWhenReady(false);
if (hide) {
binding.doubleTapPlayerView.setVisibility(View.INVISIBLE);
}
binding.minController.castMiniController.setVisibility(View.VISIBLE);
loadCast();
}
private void onApplicationDisconnected() {
binding.doubleTapPlayerView.setVisibility(View.VISIBLE);
binding.minController.castMiniController.setVisibility(View.GONE);
supportInvalidateOptionsMenu();
}
};
}
@Override
protected void onResume() {
mCastContext.getSessionManager().addSessionManagerListener(
mSessionManagerListener, CastSession.class);
super.onResume();
}
@Override
protected void onPause() {
mCastContext.getSessionManager().removeSessionManagerListener(
mSessionManagerListener, CastSession.class);
super.onPause();
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
super.onCreateOptionsMenu(menu);
getMenuInflater().inflate(R.menu.video_menu, menu);
CastButtonFactory.setUpMediaRouteButton(getApplicationContext(),
menu,
R.id.media_route_button);
return true;
}
}

View File

@ -0,0 +1,36 @@
/*
* Copyright (C) 2016 Google LLC. All Rights Reserved.
*
* 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.
*/
package app.fedilab.fedilabtube.expandedcontrols;
import android.view.Menu;
import com.google.android.gms.cast.framework.CastButtonFactory;
import com.google.android.gms.cast.framework.media.widget.ExpandedControllerActivity;
import app.fedilab.fedilabtube.R;
public class ExpandedControlsActivity extends ExpandedControllerActivity {
@Override
public boolean onCreateOptionsMenu(Menu menu) {
super.onCreateOptionsMenu(menu);
getMenuInflater().inflate(R.menu.video_menu, menu);
CastButtonFactory.setUpMediaRouteButton(this, menu, R.id.media_route_button);
return true;
}
}

View File

@ -0,0 +1,54 @@
package app.fedilab.fedilabtube.provider;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of TubeLab
*
* This program is free software; you can redistribute it and/or modify it under the terms of the
* GNU General Public License as published by the Free Software Foundation; either version 3 of the
* License, or (at your option) any later version.
*
* TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
* Public License for more details.
*
* You should have received a copy of the GNU General Public License along with TubeLab; if not,
* see <http://www.gnu.org/licenses>. */
import android.content.Context;
import com.google.android.gms.cast.framework.CastOptions;
import com.google.android.gms.cast.framework.OptionsProvider;
import com.google.android.gms.cast.framework.SessionProvider;
import com.google.android.gms.cast.framework.media.CastMediaOptions;
import com.google.android.gms.cast.framework.media.NotificationOptions;
import java.util.List;
import app.fedilab.fedilabtube.BuildConfig;
import app.fedilab.fedilabtube.expandedcontrols.ExpandedControlsActivity;
import app.fedilab.fedilabtube.helper.Helper;
public class CastOptionsProvider implements OptionsProvider {
@Override
public CastOptions getCastOptions(Context context) {
NotificationOptions notificationOptions = new NotificationOptions.Builder()
.setTargetActivityClassName(ExpandedControlsActivity.class.getName())
.build();
CastMediaOptions mediaOptions = new CastMediaOptions.Builder()
.setNotificationOptions(notificationOptions)
.setExpandedControllerActivityClassName(ExpandedControlsActivity.class.getName())
.build();
return new CastOptions.Builder()
.setReceiverApplicationId(BuildConfig.FLAVOR.compareTo("bittube") == 0 ? Helper.CAST_ID_BITTUBE : Helper.CAST_ID)
.setCastMediaOptions(mediaOptions)
.build();
}
@Override
public List<SessionProvider> getAdditionalSessionProviders(Context context) {
return null;
}
}

View File

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/castMiniController"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/black"
android:visibility="gone">
<fragment
class="com.google.android.gms.cast.framework.media.widget.MiniControllerFragment"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/media_route_button"
android:title="@string/cast"
app:actionProviderClass="androidx.mediarouter.app.MediaRouteActionProvider"
app:showAsAction="always" />
</menu>

View File

@ -0,0 +1,278 @@
package app.fedilab.fedilabtube;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of TubeLab
*
* This program is free software; you can redistribute it and/or modify it under the terms of the
* GNU General Public License as published by the Free Software Foundation; either version 3 of the
* License, or (at your option) any later version.
*
* TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
* Public License for more details.
*
* You should have received a copy of the GNU General Public License along with TubeLab; if not,
* see <http://www.gnu.org/licenses>. */
import android.os.Bundle;
import android.view.MenuItem;
import android.view.View;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentStatePagerAdapter;
import androidx.viewpager.widget.PagerAdapter;
import androidx.viewpager.widget.ViewPager;
import com.android.billingclient.api.AcknowledgePurchaseParams;
import com.android.billingclient.api.BillingClient;
import com.android.billingclient.api.BillingClientStateListener;
import com.android.billingclient.api.BillingResult;
import com.android.billingclient.api.ConsumeParams;
import com.android.billingclient.api.ConsumeResponseListener;
import com.android.billingclient.api.Purchase;
import com.android.billingclient.api.PurchasesUpdatedListener;
import com.android.billingclient.api.SkuDetailsParams;
import com.google.android.material.snackbar.Snackbar;
import com.google.android.material.tabs.TabLayout;
import org.jetbrains.annotations.NotNull;
import org.json.JSONException;
import org.json.JSONObject;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import app.fedilab.fedilabtube.databinding.ActivityDonationBinding;
import app.fedilab.fedilabtube.fragment.MySubscriptionDonationsFragment;
import app.fedilab.fedilabtube.fragment.DonationsFragment;
public class DonationActivity extends AppCompatActivity implements PurchasesUpdatedListener {
DonationsFragment donationsFragment;
DonationsFragment subscriptionDonationsFragment;
MySubscriptionDonationsFragment mySubscriptionDonationsFragment;
private ActivityDonationBinding binding;
private BillingClient billingClient;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
binding = ActivityDonationBinding.inflate(getLayoutInflater());
View view = binding.getRoot();
setContentView(view);
billingClient = BillingClient.newBuilder(this)
.setListener(this)
.enablePendingPurchases()
.build();
billingClient.startConnection(new BillingClientStateListener() {
@Override
public void onBillingSetupFinished(@NotNull BillingResult billingResult) {
if (billingResult.getResponseCode() == BillingClient.BillingResponseCode.OK) {
// The BillingClient is ready. You can query purchases here.
donationsFragment.initialized(billingClient);
subscriptionDonationsFragment.initialized(billingClient);
List<Purchase> purchases = queryPurchases();
if (purchases != null) {
for (Purchase purchase : purchases) {
if (!purchase.isAutoRenewing()) {
ConsumeParams consumeParams =
ConsumeParams.newBuilder()
.setPurchaseToken(purchase.getPurchaseToken())
.build();
ConsumeResponseListener listener = (billingResult1, purchaseToken) -> {
//noinspection StatementWithEmptyBody
if (billingResult1.getResponseCode() == BillingClient.BillingResponseCode.OK) {
// Handle the success of the consume operation.
}
};
billingClient.consumeAsync(consumeParams, listener);
}
}
}
}
}
@Override
public void onBillingServiceDisconnected() {
// Try to restart the connection on the next request to
// Google Play by calling the startConnection() method.
}
});
if (getSupportActionBar() != null)
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
donationsFragment = new DonationsFragment();
Bundle bundle1 = new Bundle();
bundle1.putSerializable("isSubscriptions", false);
donationsFragment.setArguments(bundle1);
subscriptionDonationsFragment = new DonationsFragment();
Bundle bundle2 = new Bundle();
bundle2.putSerializable("isSubscriptions", true);
subscriptionDonationsFragment.setArguments(bundle2);
mySubscriptionDonationsFragment = new MySubscriptionDonationsFragment();
binding.tablayout.addTab(binding.tablayout.newTab().setText(getString(R.string.one_time)));
binding.tablayout.addTab(binding.tablayout.newTab().setText(getString(R.string.subscriptions)));
binding.tablayout.addTab(binding.tablayout.newTab().setText(getString(R.string.my_subscriptions)));
binding.viewpager.setOffscreenPageLimit(3);
PagerAdapter mPagerAdapter = new ScreenSlidePagerAdapter(getSupportFragmentManager());
binding.viewpager.setAdapter(mPagerAdapter);
binding.viewpager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
@Override
public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
}
@Override
public void onPageSelected(int position) {
TabLayout.Tab tab = binding.tablayout.getTabAt(position);
if (tab != null)
tab.select();
}
@Override
public void onPageScrollStateChanged(int state) {
}
});
binding.tablayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
@Override
public void onTabSelected(TabLayout.Tab tab) {
binding.viewpager.setCurrentItem(tab.getPosition());
}
@Override
public void onTabUnselected(TabLayout.Tab tab) {
}
@Override
public void onTabReselected(TabLayout.Tab tab) {
}
});
}
private List<Purchase> queryPurchases() {
Purchase.PurchasesResult purchasesResult = billingClient.queryPurchases(BillingClient.SkuType.SUBS);
List<Purchase> purchases = purchasesResult.getPurchasesList();
List<String> isSubscriptions = new ArrayList<>();
HashMap<String, Purchase> map = new HashMap<>();
if (purchases != null) {
for (Purchase purchase : purchases) {
try {
if (purchase.getPurchaseState() == Purchase.PurchaseState.PURCHASED) {
JSONObject purchaseJson = new JSONObject(purchase.getOriginalJson());
String productId = purchaseJson.getString("productId");
isSubscriptions.add(productId);
map.put(productId, purchase);
}
} catch (JSONException e) {
e.printStackTrace();
}
}
SkuDetailsParams.Builder paramsSub = SkuDetailsParams.newBuilder();
paramsSub.setSkusList(isSubscriptions).setType(BillingClient.SkuType.SUBS);
billingClient.querySkuDetailsAsync(paramsSub.build(),
(billingResult2, skuDetailsList) -> mySubscriptionDonationsFragment.initialized(skuDetailsList, map, billingClient));
} else {
mySubscriptionDonationsFragment.initialized(new ArrayList<>(), map, billingClient);
}
return purchases;
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
if (item.getItemId() == android.R.id.home) {
finish();
return true;
}
return super.onOptionsItemSelected(item);
}
@Override
public void onPurchasesUpdated(@NonNull BillingResult billingResult, @Nullable List<Purchase> purchases) {
String message;
if (billingResult.getResponseCode() == BillingClient.BillingResponseCode.OK
&& purchases != null) {
for (Purchase purchase : purchases) {
if (!purchase.isAutoRenewing()) {
ConsumeParams consumeParams =
ConsumeParams.newBuilder()
.setPurchaseToken(purchase.getPurchaseToken())
.build();
ConsumeResponseListener listener = (billingResult1, purchaseToken) -> {
};
billingClient.consumeAsync(consumeParams, listener);
} else {
if (purchase.getPurchaseState() == Purchase.PurchaseState.PURCHASED) {
if (!purchase.isAcknowledged()) {
AcknowledgePurchaseParams acknowledgePurchaseParams =
AcknowledgePurchaseParams.newBuilder()
.setPurchaseToken(purchase.getPurchaseToken())
.build();
billingClient.acknowledgePurchase(acknowledgePurchaseParams, b -> {
});
}
}
queryPurchases();
}
}
message = getString(R.string.donation_succeeded_null);
} else if (billingResult.getResponseCode() == BillingClient.BillingResponseCode.USER_CANCELED) {
message = getString(R.string.donation_cancelled);
} else {
message = getString(R.string.toast_error);
}
View parentLayout = findViewById(android.R.id.content);
Snackbar snackbar = Snackbar.make(parentLayout, message, Snackbar.LENGTH_INDEFINITE);
snackbar.setAction(R.string.close, view -> snackbar.dismiss());
snackbar.show();
}
/**
* Pager adapter for the 2 fragments
*/
private class ScreenSlidePagerAdapter extends FragmentStatePagerAdapter {
ScreenSlidePagerAdapter(FragmentManager fm) {
super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
}
@NotNull
@Override
public Fragment getItem(int position) {
if (position == 0) {
return donationsFragment;
} else if (position == 1) {
return subscriptionDonationsFragment;
} else {
return mySubscriptionDonationsFragment;
}
}
@Override
public int getCount() {
return 3;
}
}
}

View File

@ -0,0 +1,91 @@
package app.fedilab.fedilabtube.drawable;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of TubeLab
*
* This program is free software; you can redistribute it and/or modify it under the terms of the
* GNU General Public License as published by the Free Software Foundation; either version 3 of the
* License, or (at your option) any later version.
*
* TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
* Public License for more details.
*
* You should have received a copy of the GNU General Public License along with TubeLab; if not,
* see <http://www.gnu.org/licenses>. */
import android.content.Context;
import android.view.LayoutInflater;
import android.view.ViewGroup;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import com.android.billingclient.api.BillingClient;
import com.android.billingclient.api.BillingFlowParams;
import com.android.billingclient.api.SkuDetails;
import java.util.List;
import java.util.Locale;
import app.fedilab.fedilabtube.DonationActivity;
import app.fedilab.fedilabtube.R;
import app.fedilab.fedilabtube.databinding.DrawerDonationBinding;
public class DonationButtonAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
private final List<SkuDetails> skuDetails;
private final BillingClient billingClient;
private Context context;
private final boolean isSubscription;
public DonationButtonAdapter(List<SkuDetails> skuDetails, BillingClient billingClient, boolean subscription) {
this.isSubscription = subscription;
this.skuDetails = skuDetails;
this.billingClient = billingClient;
}
@NonNull
@Override
public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
context = parent.getContext();
DrawerDonationBinding itemBinding = DrawerDonationBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false);
return new ViewHolder(itemBinding);
}
@Override
public void onBindViewHolder(@NonNull RecyclerView.ViewHolder viewHolder, int position) {
final ViewHolder holder = (ViewHolder) viewHolder;
SkuDetails skuDetail = skuDetails.get(position);
String currency = skuDetail.getPriceCurrencyCode();
String price = skuDetail.getPrice();
if (isSubscription) {
holder.binding.buttonDonation.setText(String.format(Locale.getDefault(), "%s %s / %s", price, currency, context.getString(R.string.month)));
} else {
holder.binding.buttonDonation.setText(String.format(Locale.getDefault(), "%s %s", price, currency));
}
holder.binding.buttonDonation.setOnClickListener(v -> {
BillingFlowParams billingFlowParams = BillingFlowParams.newBuilder()
.setSkuDetails(skuDetail)
.build();
billingClient.launchBillingFlow((DonationActivity) context, billingFlowParams);
});
}
@Override
public int getItemCount() {
return skuDetails.size();
}
static class ViewHolder extends RecyclerView.ViewHolder {
DrawerDonationBinding binding;
ViewHolder(DrawerDonationBinding itemView) {
super(itemView.getRoot());
binding = itemView;
}
}
}

View File

@ -0,0 +1,128 @@
package app.fedilab.fedilabtube.drawable;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of TubeLab
*
* This program is free software; you can redistribute it and/or modify it under the terms of the
* GNU General Public License as published by the Free Software Foundation; either version 3 of the
* License, or (at your option) any later version.
*
* TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
* Public License for more details.
*
* You should have received a copy of the GNU General Public License along with TubeLab; if not,
* see <http://www.gnu.org/licenses>. */
import android.content.Context;
import android.view.LayoutInflater;
import android.view.ViewGroup;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog;
import androidx.recyclerview.widget.RecyclerView;
import com.android.billingclient.api.BillingClient;
import com.android.billingclient.api.ConsumeParams;
import com.android.billingclient.api.ConsumeResponseListener;
import com.android.billingclient.api.Purchase;
import com.android.billingclient.api.SkuDetails;
import org.json.JSONException;
import org.json.JSONObject;
import java.util.HashMap;
import java.util.List;
import app.fedilab.fedilabtube.R;
import app.fedilab.fedilabtube.databinding.DrawerMyDonationBinding;
import es.dmoral.toasty.Toasty;
public class DonationHistoryAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
private final List<SkuDetails> skuDetailsList;
private final BillingClient billingClient;
private Context context;
private final HashMap<String, Purchase> map;
public DonationHistoryAdapter(List<SkuDetails> SkuDetailsList, HashMap<String, Purchase> map, BillingClient billingClient) {
this.skuDetailsList = SkuDetailsList;
this.billingClient = billingClient;
this.map = map;
}
@NonNull
@Override
public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
context = parent.getContext();
DrawerMyDonationBinding itemBinding = DrawerMyDonationBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false);
return new ViewHolder(itemBinding);
}
@Override
public void onBindViewHolder(@NonNull RecyclerView.ViewHolder viewHolder, int position) {
final ViewHolder holder = (ViewHolder) viewHolder;
SkuDetails skuDetails = skuDetailsList.get(position);
holder.binding.productTitle.setText(skuDetails.getTitle());
holder.binding.productName.setText(skuDetails.getDescription());
holder.binding.productInfo.setText(skuDetails.getOriginalPrice());
holder.binding.cancelDonation.setOnClickListener(v -> {
AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(context);
dialogBuilder.setMessage(R.string.cancel_subscription_confirm);
dialogBuilder.setPositiveButton(R.string.cancel_subscription, (dialog, id) -> {
JSONObject skudetailsJson;
try {
skudetailsJson = new JSONObject(skuDetails.getOriginalJson());
String productId = skudetailsJson.getString("productId");
if (map.containsKey(productId)) {
Purchase purchase = map.get(productId);
if (purchase != null) {
ConsumeParams consumeParams =
ConsumeParams.newBuilder()
.setPurchaseToken(purchase.getPurchaseToken())
.build();
if (purchase.getPurchaseState() == Purchase.PurchaseState.PURCHASED) {
ConsumeResponseListener listener = (billingResult1, purchaseToken) -> {
if (billingResult1.getResponseCode() == BillingClient.BillingResponseCode.OK) {
Toasty.success(context, context.getString(R.string.subscription_cancelled), Toasty.LENGTH_LONG).show();
}
skuDetailsList.remove(skuDetails);
notifyDataSetChanged();
};
billingClient.consumeAsync(consumeParams, listener);
}
}
}
} catch (JSONException e) {
e.printStackTrace();
}
dialog.dismiss();
});
dialogBuilder.setNegativeButton(R.string.cancel, (dialog, id) -> dialog.dismiss());
AlertDialog alertDialogLogoutAccount = dialogBuilder.create();
alertDialogLogoutAccount.show();
});
}
@Override
public int getItemCount() {
return skuDetailsList.size();
}
static class ViewHolder extends RecyclerView.ViewHolder {
DrawerMyDonationBinding binding;
ViewHolder(DrawerMyDonationBinding itemView) {
super(itemView.getRoot());
binding = itemView;
}
}
}

View File

@ -0,0 +1,112 @@
package app.fedilab.fedilabtube.fragment;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of TubeLab
*
* This program is free software; you can redistribute it and/or modify it under the terms of the
* GNU General Public License as published by the Free Software Foundation; either version 3 of the
* License, or (at your option) any later version.
*
* TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
* Public License for more details.
*
* You should have received a copy of the GNU General Public License along with TubeLab; if not,
* see <http://www.gnu.org/licenses>. */
import android.content.Context;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
import androidx.recyclerview.widget.LinearLayoutManager;
import com.android.billingclient.api.BillingClient;
import com.android.billingclient.api.SkuDetailsParams;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import app.fedilab.fedilabtube.R;
import app.fedilab.fedilabtube.databinding.FragmentDonationsBinding;
import app.fedilab.fedilabtube.drawable.DonationButtonAdapter;
public class DonationsFragment extends Fragment {
public static final String[] donations = {"1", "2", "5", "10"};
private FragmentDonationsBinding binding;
private View rootView;
private Context context;
private boolean isSubscriptions;
@Override
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
binding = FragmentDonationsBinding.inflate(LayoutInflater.from(context));
rootView = binding.getRoot();
context = getContext();
Bundle bundle = this.getArguments();
if (bundle != null) {
isSubscriptions = bundle.getBoolean("isSubscriptions", false);
}
int donationText;
if (isSubscriptions) {
donationText = R.string.recurrent_donation_text;
} else {
donationText = R.string.one_time_donation_text;
}
binding.donationText.setText(donationText);
binding.loader.setVisibility(View.VISIBLE);
binding.lvProducts.setVisibility(View.GONE);
return rootView;
}
public void initialized(BillingClient bc) {
List<String> donationsList = new ArrayList<>();
for (String val : donations) {
donationsList.add("tubelab_donation_" + val + (isSubscriptions ? "_s" : ""));
}
SkuDetailsParams.Builder params = SkuDetailsParams.newBuilder();
if (isSubscriptions) {
params.setSkusList(donationsList).setType(BillingClient.SkuType.SUBS);
} else {
params.setSkusList(donationsList).setType(BillingClient.SkuType.INAPP);
}
bc.querySkuDetailsAsync(params.build(),
(billingResult, skuDetailsList) -> {
binding.loader.setVisibility(View.GONE);
binding.lvProducts.setVisibility(View.VISIBLE);
if (skuDetailsList != null) {
Collections.sort(skuDetailsList, (obj1, obj2) -> obj1.getPrice().compareTo(obj2.getPrice()));
}
DonationButtonAdapter donationButtonAdapter = new DonationButtonAdapter(skuDetailsList, bc, isSubscriptions);
binding.lvProducts.setAdapter(donationButtonAdapter);
binding.lvProducts.setLayoutManager(new LinearLayoutManager(context));
});
}
@Override
public void onDestroyView() {
super.onDestroyView();
rootView = null;
}
@Override
public void onCreate(Bundle saveInstance) {
super.onCreate(saveInstance);
}
@Override
public void onAttach(@NonNull Context context) {
super.onAttach(context);
this.context = context;
}
}

View File

@ -0,0 +1,80 @@
package app.fedilab.fedilabtube.fragment;
/* Copyright 2021 Thomas Schneider
*
* This file is a part of TubeLab
*
* This program is free software; you can redistribute it and/or modify it under the terms of the
* GNU General Public License as published by the Free Software Foundation; either version 3 of the
* License, or (at your option) any later version.
*
* TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
* Public License for more details.
*
* You should have received a copy of the GNU General Public License along with TubeLab; if not,
* see <http://www.gnu.org/licenses>. */
import android.content.Context;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
import androidx.recyclerview.widget.LinearLayoutManager;
import com.android.billingclient.api.BillingClient;
import com.android.billingclient.api.Purchase;
import com.android.billingclient.api.SkuDetails;
import java.util.HashMap;
import java.util.List;
import app.fedilab.fedilabtube.databinding.FragmentMyDonationsBinding;
import app.fedilab.fedilabtube.drawable.DonationHistoryAdapter;
public class MySubscriptionDonationsFragment extends Fragment {
private FragmentMyDonationsBinding binding;
private View rootView;
private Context context;
@Override
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
binding = FragmentMyDonationsBinding.inflate(LayoutInflater.from(context));
rootView = binding.getRoot();
context = getContext();
binding.loader.setVisibility(View.VISIBLE);
binding.lvPurchases.setVisibility(View.GONE);
return rootView;
}
public void initialized(List<SkuDetails> skuDetailsList, HashMap<String, Purchase> map, BillingClient bc) {
binding.loader.setVisibility(View.GONE);
binding.lvPurchases.setVisibility(View.VISIBLE);
DonationHistoryAdapter donationHistoryAdapter = new DonationHistoryAdapter(skuDetailsList, map, bc);
binding.lvPurchases.setAdapter(donationHistoryAdapter);
binding.lvPurchases.setLayoutManager(new LinearLayoutManager(context));
}
@Override
public void onDestroyView() {
super.onDestroyView();
rootView = null;
}
@Override
public void onCreate(Bundle saveInstance) {
super.onCreate(saveInstance);
}
@Override
public void onAttach(@NonNull Context context) {
super.onAttach(context);
this.context = context;
}
}

Some files were not shown because too many files have changed in this diff Show More