Commit Graph

603 Commits

Author SHA1 Message Date
53e585237b bump the gradle plugin 2021-07-30 19:13:23 +02:00
b607e72ea7 Merge pull request #21 from caneleex/feature/configurable-colors
add support for changing segments' color
2021-07-28 16:47:54 +02:00
70d477adbf Merge branch 'master' into feature/configurable-colors 2021-07-28 13:31:37 +02:00
eceea24b70 remove unnecessary class ref 2021-07-28 13:31:27 +02:00
c96d5c8afc Merge remote-tracking branch 'upstream/master' into feature/configurable-colors 2021-07-28 13:29:49 +02:00
bfcd548d80 another shot at fixing corrupted length string 2021-07-28 13:29:26 +02:00
64b656f997 final touches 2021-07-27 19:58:14 +02:00
a5c7212db6 finished the implementation 2021-07-27 17:26:59 +02:00
f5574d0445 Merge remote-tracking branch 'upstream/master' into feature/configurable-colors
# Conflicts:
#	app/src/main/java/pl/jakubweg/SponsorBlockPreferenceFragment.java
2021-07-26 20:11:18 +02:00
3a4c6e0955 add handling of unknown error codes to submitting 2021-07-26 00:15:02 +02:00
8980480236 hopefully fix corrupted string 2021-07-26 00:13:33 +02:00
c6306b66d0 add 500 millis to the time without segments
nobody knows why
2021-07-24 20:29:21 +02:00
d3e2f2c5e4 remove static import for String.format and unused constant 2021-07-24 20:22:31 +02:00
00350bf081 mmLul
mmLul
2021-07-24 20:14:47 +02:00
89636a407c Merge remote-tracking branch 'upstream/master' into segment-length-improvements 2021-07-24 19:29:11 +02:00
45f67d4f29 ah yes 2021-07-24 18:55:45 +02:00
518572967b add proper response handling to setUsername 2021-07-24 18:53:59 +02:00
a030e6e280 fix requests not sending sometimes 2021-07-24 16:57:42 +02:00
79fb5c8c43 replace overcomplicated calc with one method 2021-07-24 16:35:09 +02:00
cd3edfe07f Skipped video length fixed 2021-07-24 02:48:33 +03:00
e188b88ad9 Merge pull request #42 from caneleex/feature/show-stats
show user stats
2021-07-24 00:34:32 +02:00
96561f6c90 finish merging 2021-07-23 23:50:57 +02:00
d29fbe4c2b Merge branch 'master' into feature/show-stats
# Conflicts:
#	app/src/main/java/pl/jakubweg/SponsorBlockSettings.java
#	app/src/main/java/pl/jakubweg/SponsorBlockUtils.java
2021-07-23 23:43:59 +02:00
e4b6f7a359 Merge pull request #44 from YTVanced/length-without-segments-pr
Length without segments pr
2021-07-24 00:27:29 +03:00
04efa79b53 Test ready I guess 2021-07-24 00:24:51 +03:00
fc3fb979ba reset segments when closing videos 2021-07-23 17:44:42 +02:00
13a12c9523 Merge remote-tracking branch 'upstream/length-without-segments-pr' into feature/length-without-segments 2021-07-23 17:34:33 +02:00
e372566998 Experiments for fixing the appending 2021-07-23 18:28:54 +03:00
5334bc4cae fix string key 2021-07-23 17:13:17 +02:00
8d189aba57 add setting 2021-07-23 17:10:56 +02:00
8b4ff63f31 moved appending the settings 2021-07-23 14:56:54 +02:00
6f63df0ce6 make loading stats async 2021-07-23 14:45:10 +02:00
c589b41990 remove wrong calc 2021-07-19 22:01:51 +02:00
6748bce0e8 replace hardcoded value with dynamic getter 2021-07-19 21:59:44 +02:00
1cd5732fe9 remove comma weirdness 2021-07-19 21:58:28 +02:00
76591f180e optimize imports 2021-07-19 21:55:15 +02:00
1cbf1603de make sure nothing weird happens here 2021-07-19 21:53:28 +02:00
eb8b6117b9 add local skips tracking 2021-07-19 21:51:26 +02:00
52aeeded20 we show stats now 2021-07-19 18:54:26 +02:00
8cbd0b7104 cleanup more stuff 2021-07-19 17:32:06 +02:00
dfe62274fd fix requesting segments 2021-07-19 17:14:16 +02:00
6038d8d318 cleanup imports 2021-07-19 16:44:33 +02:00
e88cf5143d initial cleanup 2021-07-19 16:19:47 +02:00
9b17e70e0e change preview color 2021-06-20 21:08:20 +02:00
7b6f1d6774 remove useless debug import 2021-06-18 14:53:50 +02:00
dce63e76e2 add length of the video without segments to the time bar 2021-06-18 14:51:14 +02:00
b9e454e329 add preview category (#17) 2021-06-18 14:46:55 +02:00
e08567892d fix buttons after watching Shorts
Fixes #36
2021-06-14 19:12:51 +02:00
3460237c0f Fixes (#34)
* General improvements

- Fixed preferences not obtained properly.
- Cleaned up libraries and code.
- Update deps.

* Update README.md
2021-06-08 17:25:01 +01:00
0797155a25 Merge pull request #31 from caneleex/patch/buttons-behavior
fix a lot of unintended button behaviors
2021-04-29 22:24:48 +01:00