Peertube
/
Thorium-android-app
mirror of https://github.com/sschueller/peertube-android
1
0
Fork 0
Code Issues Releases Wiki Activity
182 Commits 5 Branches 45 Tags 9.4 MiB
Commit Graph

80 Commits

Author SHA1 Message Date
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
lishoujun 875cb0fd54 add log to debug #86 2019-01-04 23:54:19 +08: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 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
Stefan Schüller 654e2be933 - Basic Login 2019-01-01 23:56:26 +01: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 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
lishoujun b21b4e945d add null check to playerNotificationManager and player on Destroy 2018-12-31 14:50:52 +08:00
Stefan Schueller 536dd626a9 Merge branch 'develop' into Login 2018-12-30 14:58:02 +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
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
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 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
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 d84f2782b7 - Themes and Darkmode 2018-12-21 21:59:10 +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 519fdb7b00 - Restart video play activity with correct data on trigger from notification 2018-12-17 21:32:01 +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 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