17 Commits

Author SHA1 Message Date
caneleex
744135d7cb 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
caneleex
a691995740 fix string key 2021-07-23 17:13:17 +02:00
caneleex
dd1ed65cb3 add setting 2021-07-23 17:10:56 +02:00
caneleex
754c2bab0e make loading stats async 2021-07-23 14:45:10 +02:00
caneleex
6e1c3f3152 optimize imports 2021-07-19 21:55:15 +02:00
caneleex
904e338bc0 add local skips tracking 2021-07-19 21:51:26 +02:00
caneleex
4b13b8bc10 we show stats now 2021-07-19 18:54:26 +02:00
caneleex
505ac42fb0 cleanup more stuff 2021-07-19 17:32:06 +02:00
caneleex
7494baf7bc add preview category (#17) 2021-06-18 14:46:55 +02:00
Oizaro
b381e3373e 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
caneleex
0ca395353d add support for voting 2021-04-22 18:43:14 +02:00
Oizaro
13207ab1e0 Make "About" string translatable 2020-10-15 14:32:34 +02:00
jakweg
29bea3b1c6 Added guidelines alert and preference entry 2020-09-02 19:31:17 +02:00
jakweg
333e7f0ee7 Removed skipped_segment string and replaced its usage with skipped_sponsor 2020-08-28 14:36:33 +02:00
jakweg
9c6e58d5dd Removed useless caching functionality 2020-08-25 13:46:20 +02:00
jakweg
437ca3ae51 Fixed string loading, replaced hardcoded strings into string resources 2020-08-25 13:19:27 +02:00
jakweg
ac2e3937ce Initial commit 2020-08-24 17:47:57 +02:00