Commit Graph

106 Commits

Author SHA1 Message Date
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