Commit Graph

185 Commits

Author SHA1 Message Date
lishoujun
029814e14e add login values check.
update Chinese translate.
2019-01-12 20:40:32 +08:00
Stefan Schueller
6545d57000 Merge remote-tracking branch 'origin/develop' into develop 2019-01-09 21:13:38 +01:00
Stefan Schüller
bd2dbda775 Wip 2019-01-09 18:13:42 +01:00
Stefan Schüller
63664c5f52 Wip 2019-01-09 18:05:56 +01:00
Stefan Schüller
f3f65eb7d9 Wip 2019-01-09 17:53:26 +01:00
Stefan Schüller
e0d7830c43 Wip 2019-01-09 08:40:28 +01:00
Stefan Schüller
e3774137af - NSFW Filter labeling 2019-01-08 16:34:25 +01:00
Stefan Schueller
66a874f577 WiP 2019-01-07 22:33:10 +01:00
Stefan Schueller
19065b516c Merge branch 'develop' of ssh://github.com/sschueller/peertube-android into develop 2019-01-07 21:40:33 +01:00
subhadipThinkpad
d1d7143d77 Bengali Translation added 2019-01-07 03:35:05 +05:30
subhadipThinkpad
5dfa88b506 Video quality selection setting feature added 2019-01-07 02:43:25 +05:30
Stefan Schueller
cd2726de80 Moved torrent progressbas into video OSD 2019-01-06 14:56:40 +01:00
Stefan Schüller
ec8a38dcee
Merge pull request #94 from ferhadnecef/stringlate-ru-9064
Updated ru (Russian) translation
2019-01-06 14:23:41 +01:00
Stefan Schueller
f94eb12f27 - Cleaned up 2019-01-06 14:13:05 +01:00
Stefan Schueller
3f0c275cdc - Cleaned up full screen button and activation 2019-01-06 13:28:07 +01:00
Stefan Schüller
a397822c23 - Added duration to video list 2019-01-06 03:23:18 +01:00
Stefan Schüller
d0d3f6c634 - Moved video playback into fragment 2019-01-06 02:28:13 +01:00
Stefan Schüller
9fa7a3bbc7 - Moved video playback into fragment 2019-01-06 02:22:55 +01:00
Stefan Schüller
33a0f501ae - Moved video playback into fragment 2019-01-06 02:14:03 +01:00
Stefan Schüller
0c11d8fba5 - Like / dislike cleanup
- Video download
- Version bump
2019-01-05 23:05:01 +01:00
ferhad.necef
06e9715754
Merge branch 'develop' into stringlate-ru-9064 2019-01-05 15:38:48 +03:00
Stefan Schüller
64deb952d9 Merge branch 'develop' of ssh://github.com/sschueller/peertube-android into develop 2019-01-04 23:32:44 +01:00
Stefan Schüller
33dc848a93 - Like / dislike, basic functionality 2019-01-04 23:32:07 +01:00
Stefan Schüller
991a758605
Merge pull request #95 from lishoujun/develop
add log to debug #86 fatal
2019-01-04 23:20:49 +01:00
Stefan Schüller
f61eeb5eca - Moved video metadata into fragment 2019-01-04 23:19:10 +01:00
ferhad.necef
10f3daf60b Updated ru (Russian) translation 2019-01-04 23:59:45 +08:00
lishoujun
875cb0fd54 add log to debug #86 2019-01-04 23:54:19 +08:00
ferhad.necef
af08efdaab Updated ru (Russian) translation 2019-01-04 17:36:34 +03:00
ferhad.necef
c10c3c01a7 Updated ru (Russian) translation 2019-01-04 17:30:58 +03:00
lishoujun
a5cc3f29b2 change the super class to CommonActivity.
Put common thing like NightMode or Apptheme in CommonActivity.
So the business activity will be more clean.
2019-01-03 23:41:39 +08:00
lishoujun
811134588a translate zh.
some string should not be translate add translatable false mark.
2019-01-03 22:42:28 +08:00
lishoujun
ba0db9c3db fix crash 2019-01-03 09:51:28 +08:00
lishoujun
92396200e2 I think torrentStream should be stoped when activity onDestroy.
add some log to debug.
handle nullpointer
2019-01-03 01:12:17 +08:00
Rex_sa
c190b5f46c
update ar 2019-01-02 07:11:34 +03:00
Stefan Schüller
31d93fffd3 Merge branch 'Login' into develop 2019-01-01 23:57:00 +01:00
Stefan Schüller
654e2be933 - Basic Login 2019-01-01 23:56:26 +01:00
Rex_sa
216417ffe2
fix 2018-12-31 23:45:33 +03:00
Stefan Schüller
fbbbaf919e Merge branch 'develop' into Login
# Conflicts:
#	app/src/main/java/net/schueller/peertube/activity/VideoListActivity.java
2018-12-31 20:55:19 +01:00
Stefan Schüller
f485f4efa7 - Added all supported languages 2018-12-31 20:45:08 +01:00
Stefan Schüller
9cc108827f wip 2018-12-31 20:32:22 +01:00
lishoujun
6e2ef78751 add languages MultiSelectListPreference. but not all languages. 2019-01-01 02:15:35 +08:00
Stefan Schüller
449b09b69f
Merge pull request #76 from BoFFire/patch-1
Minor fix in arabic strings
2018-12-31 08:36:55 +01:00
lishoujun
b21b4e945d add null check to playerNotificationManager and player on Destroy 2018-12-31 14:50:52 +08:00
ButterflyOfFire
32f5a72450
Minor fix in arabic strings 2018-12-30 19:56:23 +01:00
ButterflyOfFire
112edd2608 Updated ar (Arabic) translation
Commit made via Stringlate
2018-12-30 17:40:17 +01:00
Stefan Schueller
536dd626a9 Merge branch 'develop' into Login 2018-12-30 14:58:02 +01:00
Stefan Schueller
5ce1225530 Merge branch 'develop' of ssh://github.com/sschueller/peertube-android into develop 2018-12-29 22:37:44 +01:00
Stefan Schueller
3f93ccfc92 Replaced more icon with fonts 2018-12-29 22:36:54 +01:00
Stefan Schueller
47cf90727a WIP 2018-12-29 22:10:13 +01:00
Stefan Schueller
45f0531394 Merge branch 'develop' into Login
# Conflicts:
#	app/src/main/res/values/strings.xml
2018-12-29 16:43:58 +01:00
lishoujun
b9c1df10c8 Merge branch 'develop' of https://github.com/lishoujun/peertube-android into develop 2018-12-29 23:26:07 +08:00
lishoujun
b038d06eda add chinese translate. 2018-12-29 23:02:44 +08:00
Stefan Schueller
26d951e07d Local videos 2018-12-29 15:20:06 +01:00
Stefan Schueller
d7d597f235 Fullscreen Button 2018-12-29 15:09:20 +01:00
Stefan Schueller
f468a9998f Fullscreen Button 2018-12-29 14:21:08 +01:00
Stefan Schueller
36c36a3ea7 Added Licenses 2018-12-29 14:19:54 +01:00
Stefan Schueller
0753881e1e Added Licenses 2018-12-29 14:19:17 +01:00
lishoujun
6cab93bae4 add chinese translate. 2018-12-29 01:06:35 +08:00
Stefan Schueller
8175956bc0 Merge branch 'develop' into Login
# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/net/schueller/peertube/activity/LoginActivity.java
#	app/src/main/java/net/schueller/peertube/activity/VideoListActivity.java
#	app/src/main/res/values/strings.xml
2018-12-26 20:19:21 +01:00
Stefan Schueller
8fc6099892 - Android playback control
- Audio focus added
2018-12-26 20:01:29 +01:00
Stefan Schueller
a98ae31d35 - Video speed UI improvements 2018-12-26 16:15:34 +01:00
Stefan Schueller
de52e1d9d5 - Kill notification when app is killed 2018-12-26 15:24:02 +01:00
Stefan Schüller
d266ed4383 - Moved playspeed into options menu 2018-12-25 14:44:52 +01:00
Stefan Schüller
a4be7d8869 Merge remote-tracking branch 'GitHub/develop' into develop 2018-12-25 14:24:28 +01:00
Stefan Schüller
e15311b3d3 Merge remote-tracking branch 'GitHub/develop' into develop 2018-12-25 14:22:53 +01:00
Stefan Schüller
37549177f7 - Added options menu to video playback
- Changed video background color to black
- Changed layout of video OSD
2018-12-25 14:22:16 +01:00
Stefan Schüller
7c3664be9e
Merge pull request #62 from mgdx/develop
Theme Settings:
2018-12-25 13:17:49 +01:00
mgdx
761862efd3 Theme Settings:
- Fix trouble when apps launch for the first time
- Display selected color into settings
- Display msg when color change from settings
2018-12-25 01:21:26 +01:00
subhadipThinkpad
3e97ec2529 Merge conflict resolved 2018-12-24 20:29:02 +05:30
subhadipThinkpad
b4de986ddb Master codebase marged 2018-12-24 16:12:25 +05:30
subhadipThinkpad
a86f9d3913 Playback speed feature implemented 2018-12-24 10:00:32 +05:30
mgdx
a1bafa7c1f French translation completed 2018-12-24 01:19:57 +01:00
Stefan Schueller
ae3d4bd8c8 - Settings Theme fix 2018-12-23 16:54:27 +01:00
Stefan Schueller
22450294a1 - Update to Androidx libs
- Removed bottom bar view dependency
- Switched Icon Font Library
2018-12-23 16:42:01 +01:00
Stefan Schueller
55007c6789 Merge branch 'develop' of ssh://github.com/sschueller/peertube-android into develop 2018-12-21 22:00:15 +01:00
Stefan Schueller
d84f2782b7 - Themes and Darkmode 2018-12-21 21:59:10 +01:00
Stefan Schüller
a3f8eeced7
Merge pull request #50 from PaulLesur/translation/french
French translation completed
2018-12-18 21:39:42 +01:00
Paul
8948eeac9b French translation completed 2018-12-18 21:29:41 +01:00
Stefan Schueller
6163011acd Merge branch 'develop' into Login
# Conflicts:
#	app/src/main/res/values/strings.xml
2018-12-18 21:21:58 +01:00
Stefan Schueller
5073875f70 - URL validation 2018-12-18 21:07:03 +01:00
Stefan Schueller
0fed677e6e Merge branch 'develop' of ssh://github.com/sschueller/peertube-android into develop 2018-12-18 20:44:41 +01:00
Stefan Schueller
a1ea242a80 - Adaptive icon 2018-12-18 20:44:23 +01:00
Rex_sa
d0d330700c
Update strings
Fix typo
2018-12-18 06:43:10 +00:00
Rex_sa
492837f056
Update strings 2018-12-18 06:33:41 +00:00
Stefan Schueller
519fdb7b00 - Restart video play activity with correct data on trigger from notification 2018-12-17 21:32:01 +01:00
Stefan Schueller
eeb2fcd5f0 - Fixed permission missing for Android Pie 2018-12-17 21:07:49 +01:00
Stefan Schueller
de7ca4f451 - Fixed crash when stopping playback in notification
- Audio output change detection (headphones unplugged)
- Android 5.0 Support (untested)
2018-12-17 18:54:09 +01:00
Stefan Schueller
67fcb14b0c - WiP 2018-12-17 18:11:41 +01:00
Stefan Schueller
c86ebdcf2c - Missing assets 2018-12-15 22:45:02 +01:00
Stefan Schueller
a874dc0d5a - Torrent video notice 2018-12-15 22:00:44 +01:00
Stefan Schueller
a6ce0a570d - Video player moved into service
- Video notification and background playback
2018-12-15 21:59:59 +01:00
Stefan Schueller
6a50094fda - Share ability 2018-12-15 14:24:11 +01:00
Stefan Schueller
43b10c680d - Better search 2018-12-02 17:28:18 +01:00
Stefan Schueller
d65243945f Merge branch 'develop' into Login 2018-12-02 15:12:17 +01:00
Stefan Schueller
bc8d0788be Merge branch 'master' into Login 2018-12-02 15:09:56 +01:00
Stefan Schueller
57c3079c68 - Prevent fatal when server URL is invalid 2018-12-02 14:59:14 +01:00
Stefan Schueller
7120a36091 - Remove unavailable feature 2018-12-02 14:44:34 +01:00
Stefan Schueller
0cd6972a30 - Moved permissions to only ask when required 2018-12-02 14:40:44 +01:00
Stefan Schueller
484de114a4 Merge branch 'develop' of ssh://github.com/sschueller/peertube-android into develop 2018-12-02 14:29:34 +01:00
Stefan Schueller
914c247463 - loing WIP 2018-12-02 14:27:00 +01:00