From a558ac08978deac42ca6fc8fbc4a7af0acc82242 Mon Sep 17 00:00:00 2001 From: Paul Brussee Date: Fri, 22 Apr 2016 21:40:13 +0200 Subject: [PATCH 001/644] .gitignore --- android/.gitignore | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 android/.gitignore diff --git a/android/.gitignore b/android/.gitignore new file mode 100644 index 00000000000..b60947232fb --- /dev/null +++ b/android/.gitignore @@ -0,0 +1,9 @@ +# Python +*.pyo +*.pyc + +.*project +*.*~ +*.apk +screen.png +typescript From 1cf5569ce6df01caec0d47126ac44a1e3c0705cc Mon Sep 17 00:00:00 2001 From: Paul Brussee Date: Fri, 22 Apr 2016 21:40:24 +0200 Subject: [PATCH 002/644] build & deploy scripts --- android/build.sh | 16 ++++++++++++++++ android/build_deploy.sh | 4 ++++ android/deploy.sh | 21 +++++++++++++++++++++ android/screenshot.sh | 6 ++++++ 4 files changed, 47 insertions(+) create mode 100755 android/build.sh create mode 100755 android/build_deploy.sh create mode 100755 android/deploy.sh create mode 100755 android/screenshot.sh diff --git a/android/build.sh b/android/build.sh new file mode 100755 index 00000000000..d8bbfa0a18c --- /dev/null +++ b/android/build.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +export ANDROIDSDK=/opt/android-sdk-linux +export ANDROIDNDK=/opt/android-ndk-r10e + +export PATH="~/.local/bin/:$PATH" + +#echo Get the latest P4A +#pip install --user --upgrade git+https://github.com/kivy/python-for-android.git + +#copy recipes +cp -R recipes ~/.local/lib/python2.7/site-packages/pythonforandroid/ + +echo Start build APK +script -c "p4a --require-perfect-match --copy-libs --debug apk" # uses .p4a config file + diff --git a/android/build_deploy.sh b/android/build_deploy.sh new file mode 100755 index 00000000000..71f74924896 --- /dev/null +++ b/android/build_deploy.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +./build.sh +./deploy.sh diff --git a/android/deploy.sh b/android/deploy.sh new file mode 100755 index 00000000000..f59440b52ac --- /dev/null +++ b/android/deploy.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +export APK=Tribler-0.1-debug.apk + +export ADB=/opt/android-sdk-linux/platform-tools/adb + +if [ -z "$APK" ] || [ ! -f $APK ]; then + echo ".apk not found" + exit 1 +fi + +echo Uninstall app +$ADB uninstall org.tribler.android + +echo Deploy $APK +$ADB install $APK + +echo Launch app +$ADB shell monkey -p org.tribler.android -c android.intent.category.LAUNCHER 1 +#$ADB shell am start -n org.tribler.android/org.kivy.android.PythonActivity + diff --git a/android/screenshot.sh b/android/screenshot.sh new file mode 100755 index 00000000000..591356d0394 --- /dev/null +++ b/android/screenshot.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +export ADB=/opt/android-sdk-linux/platform-tools/adb + +echo Make screenshot, saving to screen.png... +$ADB shell screencap -p | sed 's/\r$//' > screen.png From d840b98a3a5d56e4997d8839bc014846f235e306 Mon Sep 17 00:00:00 2001 From: Paul Brussee Date: Fri, 22 Apr 2016 21:40:36 +0200 Subject: [PATCH 003/644] .p4a config & whitelist --- android/.p4a | 55 ++++++++++++++++++++++++++++++++++++++++++ android/.p4a-whitelist | 4 +++ 2 files changed, 59 insertions(+) create mode 100644 android/.p4a create mode 100644 android/.p4a-whitelist diff --git a/android/.p4a b/android/.p4a new file mode 100644 index 00000000000..c0a2878c642 --- /dev/null +++ b/android/.p4a @@ -0,0 +1,55 @@ +--version 0.1 +--android_api 16 +--arch armeabi +--package org.tribler.android +--name "Tribler" +--service Triblerd:service/Triblerd.py +--private ./app +--add-source ./java-src +--dist_name TriblerApp +--bootstrap sdl2 +--requirements android,kivy,libtribler +--whitelist .p4a-whitelist + +--permission CAMERA +--permission RECORD_AUDIO +--permission MODIFY_AUDIO_SETTINGS + +--permission READ_EXTERNAL_STORAGE +--permission WRITE_EXTERNAL_STORAGE + +--permission ACCESS_FINE_LOCATION +--permission ACCESS_COARSE_LOCATION +--permission ACCESS_LOCATION_EXTRA_COMMANDS + +--permission NFC +--permission BLUETOOTH +--permission BLUETOOTH_ADMIN +--permission ACCESS_NETWORK_STATE +--permission CHANGE_NETWORK_STATE +--permission ACCESS_WIFI_STATE +--permission CHANGE_WIFI_STATE +--permission CHANGE_WIFI_MULTICAST_STATE +--permission INTERNET +--permission TRANSMIT_IR + +--permission USE_FINGERPRINT +--permission INSTALL_SHORTCUT +--permission UNINSTALL_SHORTCUT +--permission GET_PACKAGE_SIZE +--permission REQUEST_INSTALL_PACKAGES +--permission KILL_BACKGROUND_PROCESSES +--permission RECEIVE_BOOT_COMPLETED +--permission DISABLE_KEYGUARD +--permission EXPAND_STATUS_BAR +--permission ACCESS_NOTIFICATION_POLICY + +--permission READ_SYNC_STATS +--permission READ_SYNC_SETTINGS +--permission WRITE_SYNC_SETTINGS + +--permission VIBRATE +--permission BROADCAST_STICKY +--permission REORDER_TASKS +--permission REQUEST_IGNORE_BATTERY_OPTIMIZATIONS +--permission WAKE_LOCK diff --git a/android/.p4a-whitelist b/android/.p4a-whitelist new file mode 100644 index 00000000000..98070743fcb --- /dev/null +++ b/android/.p4a-whitelist @@ -0,0 +1,4 @@ + _csv.so + _lsprof.so + _sqlite3.so + sqlite3/* From 159864785596a4c1991c22f9afd709739d886e81 Mon Sep 17 00:00:00 2001 From: Paul Brussee Date: Fri, 22 Apr 2016 21:41:35 +0200 Subject: [PATCH 004/644] Triblerd service & app --- android/app/TriblerApp.py | 84 +++++++++++++++++++++++++++++++++ android/app/gui/TriblerApp.kv | 4 ++ android/app/main.py | 5 ++ android/app/service/Triblerd.py | 30 ++++++++++++ 4 files changed, 123 insertions(+) create mode 100644 android/app/TriblerApp.py create mode 100644 android/app/gui/TriblerApp.kv create mode 100644 android/app/main.py create mode 100644 android/app/service/Triblerd.py diff --git a/android/app/TriblerApp.py b/android/app/TriblerApp.py new file mode 100644 index 00000000000..0c5eafe7feb --- /dev/null +++ b/android/app/TriblerApp.py @@ -0,0 +1,84 @@ +from kivy.app import App +from kivy.core.window import Window + +from jnius import autoclass + + +class TriblerApp(App): + + def run(self): + self.kv_file = 'gui/TriblerApp.kv' + return App.run(self) + + def build(self): + Window.bind(on_key_down=self.on_key_down) + return App.build(self) + + def on_key_down(self, window, keycode, scancode, text, modifiers): + print self + print window + print keycode + print scancode + print text + print modifiers + + if keycode == 1073742094: # Back + print 'Back' + return True + + elif keycode == 1073741942: # Menu + print 'Menu' + return True + + return False + + + def start_service_triblerd(self): + service = autoclass('org.tribler.android.ServiceTriblerd') + mActivity = autoclass('org.kivy.android.PythonActivity').mActivity + argument = '' + service.start(mActivity, argument) + + + def on_start(self): + '''Event handler for the `on_start` event which is fired after + initialization (after build() has been called) but before the + application has started running. + ''' + self.start_service_triblerd() + + def on_stop(self): + '''Event handler for the `on_stop` event which is fired when the + application has finished running (i.e. the window is about to be + closed). + ''' + pass + + def on_pause(self): + '''Event handler called when Pause mode is requested. You should + return True if your app can go into Pause mode, otherwise + return False and your application will be stopped (the default). + + You cannot control when the application is going to go into this mode. + It's determined by the Operating System and mostly used for mobile + devices (android/ios) and for resizing. + + The default return value is False. + + .. versionadded:: 1.1.0 + ''' + return True + + def on_resume(self): + '''Event handler called when your application is resuming from + the Pause mode. + + .. versionadded:: 1.1.0 + + .. warning:: + + When resuming, the OpenGL Context might have been damaged / freed. + This is where you can reconstruct some of your OpenGL state + e.g. FBO content. + ''' + pass diff --git a/android/app/gui/TriblerApp.kv b/android/app/gui/TriblerApp.kv new file mode 100644 index 00000000000..047c46d1608 --- /dev/null +++ b/android/app/gui/TriblerApp.kv @@ -0,0 +1,4 @@ +#:kivy 1.0 + +Button: + text: 'Hello world!' \ No newline at end of file diff --git a/android/app/main.py b/android/app/main.py new file mode 100644 index 00000000000..052e0bd1c6c --- /dev/null +++ b/android/app/main.py @@ -0,0 +1,5 @@ +from TriblerApp import TriblerApp + + +if __name__ == '__main__': + TriblerApp().run() \ No newline at end of file diff --git a/android/app/service/Triblerd.py b/android/app/service/Triblerd.py new file mode 100644 index 00000000000..ecab03306e0 --- /dev/null +++ b/android/app/service/Triblerd.py @@ -0,0 +1,30 @@ +from os import getenv + +from time import sleep + +from Tribler.Core.Session import Session +from Tribler.Core.SessionConfig import SessionStartupConfig + + +class Triblerd(object): + + def run(self): + + def start_tribler(arg): + self.session = Session(SessionStartupConfig()) + upgrader = self.session.prestart() + while not upgrader.is_done: + sleep(0.1) + self.session.start() + + while not self.session.lm.initComplete: + sleep(0.2) + + while True: + sleep(1) + + start_tribler(getenv('PYTHON_SERVICE_ARGUMENT')) + + +if __name__ == '__main__': + Triblerd().run() \ No newline at end of file From afc3207df02e42ecada24433c495cd836fccf578 Mon Sep 17 00:00:00 2001 From: Paul Brussee Date: Mon, 25 Apr 2016 16:00:37 +0200 Subject: [PATCH 005/644] Tribler now requires libandroid to get the runtime api version --- android/.p4a | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/.p4a b/android/.p4a index c0a2878c642..f72cfd48626 100644 --- a/android/.p4a +++ b/android/.p4a @@ -8,7 +8,7 @@ --add-source ./java-src --dist_name TriblerApp --bootstrap sdl2 ---requirements android,kivy,libtribler +--requirements kivy,libtribler --whitelist .p4a-whitelist --permission CAMERA From 312abc11dae37e2394e6343fe09db3694471d27c Mon Sep 17 00:00:00 2001 From: Paul Brussee Date: Mon, 25 Apr 2016 16:00:52 +0200 Subject: [PATCH 006/644] local recipes folder with readme --- android/recipes/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 android/recipes/README.md diff --git a/android/recipes/README.md b/android/recipes/README.md new file mode 100644 index 00000000000..a06ca593c70 --- /dev/null +++ b/android/recipes/README.md @@ -0,0 +1 @@ +The build.sh script will ***overwrite*** the existing p4a recipes with the custom local recipes stored in this folder. From 43602b9d92548b55fdc956e9738b62c1f5616728 Mon Sep 17 00:00:00 2001 From: Paul Brussee Date: Mon, 25 Apr 2016 16:33:39 +0200 Subject: [PATCH 007/644] sdl2 back key mapped to esc (27) --- android/app/TriblerApp.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/android/app/TriblerApp.py b/android/app/TriblerApp.py index 0c5eafe7feb..8052cc59617 100644 --- a/android/app/TriblerApp.py +++ b/android/app/TriblerApp.py @@ -22,10 +22,9 @@ def on_key_down(self, window, keycode, scancode, text, modifiers): print text print modifiers - if keycode == 1073742094: # Back + if keycode == 27: # Back print 'Back' return True - elif keycode == 1073741942: # Menu print 'Menu' return True From 227a4f32a4472c3786799819e07dc0ca204c5418 Mon Sep 17 00:00:00 2001 From: Paul Brussee Date: Tue, 26 Apr 2016 16:37:54 +0200 Subject: [PATCH 008/644] set python egg cache --- android/app/service/Triblerd.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/android/app/service/Triblerd.py b/android/app/service/Triblerd.py index ecab03306e0..7a6ac447a5c 100644 --- a/android/app/service/Triblerd.py +++ b/android/app/service/Triblerd.py @@ -1,5 +1,3 @@ -from os import getenv - from time import sleep from Tribler.Core.Session import Session @@ -8,6 +6,14 @@ class Triblerd(object): + def __init__(self): + """ + Setup environment + """ + private_root_dir = os.path.realpath(os.path.split(os.environ['ANDROID_PRIVATE'])[0]) + os.environ['PYTHON_EGG_CACHE'] = os.path.join(private_root_dir, 'cache', '.egg') + + def run(self): def start_tribler(arg): @@ -23,7 +29,7 @@ def start_tribler(arg): while True: sleep(1) - start_tribler(getenv('PYTHON_SERVICE_ARGUMENT')) + start_tribler(os.getenv('PYTHON_SERVICE_ARGUMENT')) if __name__ == '__main__': From 1acf02c3a033e285fac3df477c38523aab22df86 Mon Sep 17 00:00:00 2001 From: Paul Brussee Date: Wed, 27 Apr 2016 22:18:28 +0200 Subject: [PATCH 009/644] use local tribler source --- android/.p4a | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/.p4a b/android/.p4a index f72cfd48626..d881e41d9a0 100644 --- a/android/.p4a +++ b/android/.p4a @@ -8,7 +8,7 @@ --add-source ./java-src --dist_name TriblerApp --bootstrap sdl2 ---requirements kivy,libtribler +--requirements kivy,localtribler --whitelist .p4a-whitelist --permission CAMERA From 28075238e7543162b6699cb46f627638f2a68205 Mon Sep 17 00:00:00 2001 From: Paul Brussee Date: Wed, 27 Apr 2016 23:32:34 +0200 Subject: [PATCH 010/644] default arch arm v7a --- android/.p4a | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/.p4a b/android/.p4a index d881e41d9a0..ca167f3ea21 100644 --- a/android/.p4a +++ b/android/.p4a @@ -1,6 +1,6 @@ --version 0.1 --android_api 16 ---arch armeabi +--arch armeabi-v7a --package org.tribler.android --name "Tribler" --service Triblerd:service/Triblerd.py From a386b95f387e5a0d190863a9b4c14dbd5e60e911 Mon Sep 17 00:00:00 2001 From: Paul Brussee Date: Thu, 28 Apr 2016 00:08:12 +0200 Subject: [PATCH 011/644] .gitignore ffmpeg binary --- android/app/.gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 android/app/.gitignore diff --git a/android/app/.gitignore b/android/app/.gitignore new file mode 100644 index 00000000000..4c0e9b7e877 --- /dev/null +++ b/android/app/.gitignore @@ -0,0 +1 @@ +/ffmpeg From fc6221a5eeb97777e8555c88c30413a4db541b94 Mon Sep 17 00:00:00 2001 From: Paul Brussee Date: Mon, 2 May 2016 17:16:04 +0200 Subject: [PATCH 012/644] wip HomeScreen --- android/app/HomeScreen.kv | 73 +++++++++++++++++++++++++++++++++++ android/app/TriblerApp.py | 32 ++------------- android/app/gui/TriblerApp.kv | 4 -- 3 files changed, 77 insertions(+), 32 deletions(-) create mode 100644 android/app/HomeScreen.kv delete mode 100644 android/app/gui/TriblerApp.kv diff --git a/android/app/HomeScreen.kv b/android/app/HomeScreen.kv new file mode 100644 index 00000000000..6b2e6252e42 --- /dev/null +++ b/android/app/HomeScreen.kv @@ -0,0 +1,73 @@ +#:kivy 1.9.2 + + + orientation: 'vertical' + + top_pane: top_pane + content_pane: content_pane + + canvas.before: + + Color: + rgba: 1, 1, 1, 1 + + Rectangle: + pos: self.pos + size: self.size + + BoxLayout: + id: top_pane + orientation: 'vertical' + + BoxLayout: + id: title_panel + orientation: 'horizontal' + + Button: + text: '<-' + size_hint: (None, None) + size: (dp(50), dp(50)), + on_press: root.go_back() + + Label: + text: root.title + + Button: + text: 'O\' + size_hint: (None, None) + size: (dp(50), dp(50)), + on_press: root.go_search() + + BoxLayout: + id: search_panel + orientation: 'horizontal' + + TextInput: + id: search_bar + + Button: + text: 'go' + on_press: root.go_search() + + BoxLayout: + id: tabs_panel + orientation: 'horizontal' + + Button: + text: '*' + on_press: root.go_favs() + + Button: + text: 'Recent' + on_press: root.go_recent() + + Button: + text: 'My' + on_press: root.go_mine() + + Button: + text: '+' + on_press: root.add_video() + + RecycleView: + id: content_pane \ No newline at end of file diff --git a/android/app/TriblerApp.py b/android/app/TriblerApp.py index 8052cc59617..fd3c409e9bd 100644 --- a/android/app/TriblerApp.py +++ b/android/app/TriblerApp.py @@ -1,38 +1,14 @@ from kivy.app import App -from kivy.core.window import Window - -from jnius import autoclass class TriblerApp(App): - def run(self): - self.kv_file = 'gui/TriblerApp.kv' - return App.run(self) - def build(self): - Window.bind(on_key_down=self.on_key_down) - return App.build(self) - - def on_key_down(self, window, keycode, scancode, text, modifiers): - print self - print window - print keycode - print scancode - print text - print modifiers - - if keycode == 27: # Back - print 'Back' - return True - elif keycode == 1073741942: # Menu - print 'Menu' - return True - - return False - + from HomeScreen import HomeScreen + return HomeScreen() def start_service_triblerd(self): + from jnius import autoclass service = autoclass('org.tribler.android.ServiceTriblerd') mActivity = autoclass('org.kivy.android.PythonActivity').mActivity argument = '' @@ -80,4 +56,4 @@ def on_resume(self): This is where you can reconstruct some of your OpenGL state e.g. FBO content. ''' - pass + pass \ No newline at end of file diff --git a/android/app/gui/TriblerApp.kv b/android/app/gui/TriblerApp.kv deleted file mode 100644 index 047c46d1608..00000000000 --- a/android/app/gui/TriblerApp.kv +++ /dev/null @@ -1,4 +0,0 @@ -#:kivy 1.0 - -Button: - text: 'Hello world!' \ No newline at end of file From d379d659a297f632db4c9a8e9b4b33e3932352f6 Mon Sep 17 00:00:00 2001 From: Paul Brussee Date: Mon, 2 May 2016 17:16:15 +0200 Subject: [PATCH 013/644] wip HomeScreen --- android/app/HomeScreen.py | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 android/app/HomeScreen.py diff --git a/android/app/HomeScreen.py b/android/app/HomeScreen.py new file mode 100644 index 00000000000..0f0d8e87095 --- /dev/null +++ b/android/app/HomeScreen.py @@ -0,0 +1,28 @@ +from kivy.uix.boxlayout import BoxLayout +from kivy.properties import ObjectProperty, StringProperty + + +class HomeScreen(BoxLayout): + + title = StringProperty('Tribler') + + top_pane = ObjectProperty() + content_pane = ObjectProperty() + + def go_favs(self): + print self + + def go_recent(self): + print self + + def go_mine(self): + print self + + def go_search(self): + print self + + def go_back(self): + print self + + def add_video(self): + print self \ No newline at end of file From 58f40ba980acd7d5433cde77ee0ca754b05c0f8e Mon Sep 17 00:00:00 2001 From: Paul Brussee Date: Mon, 2 May 2016 19:21:14 +0200 Subject: [PATCH 014/644] build faster without --require-perfect-match --- android/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.sh b/android/build.sh index d8bbfa0a18c..861b7d110d8 100755 --- a/android/build.sh +++ b/android/build.sh @@ -12,5 +12,5 @@ export PATH="~/.local/bin/:$PATH" cp -R recipes ~/.local/lib/python2.7/site-packages/pythonforandroid/ echo Start build APK -script -c "p4a --require-perfect-match --copy-libs --debug apk" # uses .p4a config file +script -c "p4a --copy-libs --debug apk" # uses .p4a config file From 71c151144a6dab8b9d3dc0e9b943ff24fe4ee7ea Mon Sep 17 00:00:00 2001 From: Paul Brussee Date: Mon, 2 May 2016 19:29:47 +0200 Subject: [PATCH 015/644] wip HomeScreen --- android/app/HomeScreen.kv | 11 ++++++++++- android/app/HomeScreen.py | 4 ++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/android/app/HomeScreen.kv b/android/app/HomeScreen.kv index 6b2e6252e42..8e6026c4bf7 100644 --- a/android/app/HomeScreen.kv +++ b/android/app/HomeScreen.kv @@ -19,6 +19,15 @@ id: top_pane orientation: 'vertical' + canvas.before: + + Color: + rgba: 1, 0, 0, 1 + + Rectangle: + pos: self.pos + size: self.size + BoxLayout: id: title_panel orientation: 'horizontal' @@ -33,7 +42,7 @@ text: root.title Button: - text: 'O\' + text: 'o-' size_hint: (None, None) size: (dp(50), dp(50)), on_press: root.go_search() diff --git a/android/app/HomeScreen.py b/android/app/HomeScreen.py index 0f0d8e87095..2f17db539de 100644 --- a/android/app/HomeScreen.py +++ b/android/app/HomeScreen.py @@ -3,6 +3,10 @@ class HomeScreen(BoxLayout): + + def __init__(self): + from kivy.lang import Builder + Builder.load_file('HomeScreen.kv') title = StringProperty('Tribler') From 78c84dc20219884bb950bf932934800c1cf718ac Mon Sep 17 00:00:00 2001 From: Paul Brussee Date: Mon, 2 May 2016 20:07:12 +0200 Subject: [PATCH 016/644] refactor app file structure to make kivy happy --- android/app/TriblerApp.py | 59 ---------------------- android/app/main.py | 60 ++++++++++++++++++++++- android/app/{HomeScreen.py => screens.py} | 6 +-- android/app/{HomeScreen.kv => tribler.kv} | 4 +- 4 files changed, 62 insertions(+), 67 deletions(-) delete mode 100644 android/app/TriblerApp.py rename android/app/{HomeScreen.py => screens.py} (75%) rename android/app/{HomeScreen.kv => tribler.kv} (95%) diff --git a/android/app/TriblerApp.py b/android/app/TriblerApp.py deleted file mode 100644 index fd3c409e9bd..00000000000 --- a/android/app/TriblerApp.py +++ /dev/null @@ -1,59 +0,0 @@ -from kivy.app import App - - -class TriblerApp(App): - - def build(self): - from HomeScreen import HomeScreen - return HomeScreen() - - def start_service_triblerd(self): - from jnius import autoclass - service = autoclass('org.tribler.android.ServiceTriblerd') - mActivity = autoclass('org.kivy.android.PythonActivity').mActivity - argument = '' - service.start(mActivity, argument) - - - def on_start(self): - '''Event handler for the `on_start` event which is fired after - initialization (after build() has been called) but before the - application has started running. - ''' - self.start_service_triblerd() - - def on_stop(self): - '''Event handler for the `on_stop` event which is fired when the - application has finished running (i.e. the window is about to be - closed). - ''' - pass - - def on_pause(self): - '''Event handler called when Pause mode is requested. You should - return True if your app can go into Pause mode, otherwise - return False and your application will be stopped (the default). - - You cannot control when the application is going to go into this mode. - It's determined by the Operating System and mostly used for mobile - devices (android/ios) and for resizing. - - The default return value is False. - - .. versionadded:: 1.1.0 - ''' - return True - - def on_resume(self): - '''Event handler called when your application is resuming from - the Pause mode. - - .. versionadded:: 1.1.0 - - .. warning:: - - When resuming, the OpenGL Context might have been damaged / freed. - This is where you can reconstruct some of your OpenGL state - e.g. FBO content. - ''' - pass \ No newline at end of file diff --git a/android/app/main.py b/android/app/main.py index 052e0bd1c6c..e4a3ece0e90 100644 --- a/android/app/main.py +++ b/android/app/main.py @@ -1,4 +1,62 @@ -from TriblerApp import TriblerApp +from kivy.app import App + + +class TriblerApp(App): + + def build(self): + from screens import HomeScreen + return HomeScreen(title='Tribler') + + def start_service_triblerd(self): + from jnius import autoclass + service = autoclass('org.tribler.android.ServiceTriblerd') + mActivity = autoclass('org.kivy.android.PythonActivity').mActivity + argument = '' + service.start(mActivity, argument) + + + def on_start(self): + '''Event handler for the `on_start` event which is fired after + initialization (after build() has been called) but before the + application has started running. + ''' + self.start_service_triblerd() + + def on_stop(self): + '''Event handler for the `on_stop` event which is fired when the + application has finished running (i.e. the window is about to be + closed). + ''' + pass + + def on_pause(self): + '''Event handler called when Pause mode is requested. You should + return True if your app can go into Pause mode, otherwise + return False and your application will be stopped (the default). + + You cannot control when the application is going to go into this mode. + It's determined by the Operating System and mostly used for mobile + devices (android/ios) and for resizing. + + The default return value is False. + + .. versionadded:: 1.1.0 + ''' + return True + + def on_resume(self): + '''Event handler called when your application is resuming from + the Pause mode. + + .. versionadded:: 1.1.0 + + .. warning:: + + When resuming, the OpenGL Context might have been damaged / freed. + This is where you can reconstruct some of your OpenGL state + e.g. FBO content. + ''' + pass if __name__ == '__main__': diff --git a/android/app/HomeScreen.py b/android/app/screens.py similarity index 75% rename from android/app/HomeScreen.py rename to android/app/screens.py index 2f17db539de..0ded5ca74ba 100644 --- a/android/app/HomeScreen.py +++ b/android/app/screens.py @@ -3,12 +3,8 @@ class HomeScreen(BoxLayout): - - def __init__(self): - from kivy.lang import Builder - Builder.load_file('HomeScreen.kv') - title = StringProperty('Tribler') + title = StringProperty() top_pane = ObjectProperty() content_pane = ObjectProperty() diff --git a/android/app/HomeScreen.kv b/android/app/tribler.kv similarity index 95% rename from android/app/HomeScreen.kv rename to android/app/tribler.kv index 8e6026c4bf7..8ec9e36f0bd 100644 --- a/android/app/HomeScreen.kv +++ b/android/app/tribler.kv @@ -35,7 +35,7 @@ Button: text: '<-' size_hint: (None, None) - size: (dp(50), dp(50)), + size: (dp(50), dp(50)) on_press: root.go_back() Label: @@ -44,7 +44,7 @@ Button: text: 'o-' size_hint: (None, None) - size: (dp(50), dp(50)), + size: (dp(50), dp(50)) on_press: root.go_search() BoxLayout: From a972ce6a129c92f4b1be24e6aabef96c638b6d84 Mon Sep 17 00:00:00 2001 From: Paul Brussee Date: Mon, 2 May 2016 21:07:16 +0200 Subject: [PATCH 017/644] rest api port --- android/app/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/app/main.py b/android/app/main.py index e4a3ece0e90..46733bb71e0 100644 --- a/android/app/main.py +++ b/android/app/main.py @@ -11,8 +11,8 @@ def start_service_triblerd(self): from jnius import autoclass service = autoclass('org.tribler.android.ServiceTriblerd') mActivity = autoclass('org.kivy.android.PythonActivity').mActivity - argument = '' - service.start(mActivity, argument) + argument = {'restapi': 8085} + service.start(mActivity, str(argument)) def on_start(self): From 740ec503d808f7ef8e179f50e98a82bf41e79c01 Mon Sep 17 00:00:00 2001 From: Paul Brussee Date: Mon, 2 May 2016 21:40:00 +0200 Subject: [PATCH 018/644] enable rest api --- android/app/service/Triblerd.py | 35 ++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/android/app/service/Triblerd.py b/android/app/service/Triblerd.py index 7a6ac447a5c..a7da8347a25 100644 --- a/android/app/service/Triblerd.py +++ b/android/app/service/Triblerd.py @@ -1,5 +1,10 @@ +import os +import ast + from time import sleep +from kivy.logger import Logger + from Tribler.Core.Session import Session from Tribler.Core.SessionConfig import SessionStartupConfig @@ -16,20 +21,28 @@ def __init__(self): def run(self): - def start_tribler(arg): - self.session = Session(SessionStartupConfig()) - upgrader = self.session.prestart() - while not upgrader.is_done: - sleep(0.1) - self.session.start() + def start_tribler(options): + config = SessionStartupConfig() + config.set_http_api_enabled(True) + config.set_http_api_port(options['restapi']) - while not self.session.lm.initComplete: - sleep(0.2) + self.session = Session(config) - while True: - sleep(1) + Logger.info('Run upgrader...') + upgrader = self.session.prestart() - start_tribler(os.getenv('PYTHON_SERVICE_ARGUMENT')) + if upgrader.failed: + Logger.error('The upgrader failed') + else: + Logger.info('Starting Tribler...') + self.session.start() + Logger.info('Tribler started!') + + """ + Pass through options + """ + options = ast.literal_eval(os.getenv('PYTHON_SERVICE_ARGUMENT')) + start_tribler(options) if __name__ == '__main__': From 9076cc6a1b144e93465ffa741ed83f2163b875f0 Mon Sep 17 00:00:00 2001 From: Paul Brussee Date: Mon, 2 May 2016 21:54:42 +0200 Subject: [PATCH 019/644] use twisted reactor --- android/app/service/Triblerd.py | 64 +++++++++++++++++++++------------ 1 file changed, 42 insertions(+), 22 deletions(-) diff --git a/android/app/service/Triblerd.py b/android/app/service/Triblerd.py index a7da8347a25..0bc5b0ae03b 100644 --- a/android/app/service/Triblerd.py +++ b/android/app/service/Triblerd.py @@ -1,9 +1,14 @@ -import os -import ast +from kivy.logger import Logger +from kivy.support import install_twisted_reactor -from time import sleep +# must be called before importing the reactor +install_twisted_reactor(installSignalHandlers=1) -from kivy.logger import Logger +from twisted.internet import reactor + +import ast +import os +import signal from Tribler.Core.Session import Session from Tribler.Core.SessionConfig import SessionStartupConfig @@ -20,29 +25,44 @@ def __init__(self): def run(self): + """ + Pass through options + """ + options = ast.literal_eval(os.getenv('PYTHON_SERVICE_ARGUMENT')) + self.start_tribler(options) - def start_tribler(options): - config = SessionStartupConfig() - config.set_http_api_enabled(True) - config.set_http_api_port(options['restapi']) - self.session = Session(config) + def start_tribler(self, options): + """ + Main method to startup Tribler. + """ - Logger.info('Run upgrader...') - upgrader = self.session.prestart() + def signal_handler(sig, _): + Logger.info("Received shut down signal %s" % sig) + if not self._stopping: + self._stopping = True + self.session.shutdown() + Logger.info("Tribler shut down") + reactor.stop() + signal.signal(signal.SIGINT, signal_handler) + signal.signal(signal.SIGTERM, signal_handler) - if upgrader.failed: - Logger.error('The upgrader failed') - else: - Logger.info('Starting Tribler...') - self.session.start() - Logger.info('Tribler started!') + Logger.info("Starting Tribler") - """ - Pass through options - """ - options = ast.literal_eval(os.getenv('PYTHON_SERVICE_ARGUMENT')) - start_tribler(options) + config = SessionStartupConfig() + + config.set_http_api_enabled(True) + config.set_http_api_port(options["restapi"]) + + self.session = Session(config) + upgrader = self.session.prestart() + if upgrader.failed: + Logger.info("The upgrader failed: .Tribler directory backed up, aborting") + #reactor.addSystemEventTrigger('after', 'shutdown', os._exit, 1) + reactor.stop() + else: + self.session.start() + Logger.info("Tribler started") if __name__ == '__main__': From f13e9940f5c3b48355295413069d498a5dcecf4e Mon Sep 17 00:00:00 2001 From: Paul Brussee Date: Mon, 2 May 2016 22:16:41 +0200 Subject: [PATCH 020/644] wip HomeScreen --- android/app/screens.py | 6 ++++- android/app/tribler.kv | 50 +++++++++++++++++++++++++++++++++++------- 2 files changed, 47 insertions(+), 9 deletions(-) diff --git a/android/app/screens.py b/android/app/screens.py index 0ded5ca74ba..73676679182 100644 --- a/android/app/screens.py +++ b/android/app/screens.py @@ -25,4 +25,8 @@ def go_back(self): print self def add_video(self): - print self \ No newline at end of file + print self + + +class CameraScreen(BoxLayout): + pass \ No newline at end of file diff --git a/android/app/tribler.kv b/android/app/tribler.kv index 8ec9e36f0bd..1058e9b470d 100644 --- a/android/app/tribler.kv +++ b/android/app/tribler.kv @@ -1,5 +1,29 @@ #:kivy 1.9.2 + +########## + +: + text_size: self.size + font_size: '25sp' + markup: True + + canvas: + Color: + rgba: 1, 1, 1, .5 + + +########## + +: + markup: True + size_hint: (1, .5) + font_size: '25sp' + text_size: self.size + + +########## + orientation: 'vertical' @@ -28,7 +52,7 @@ pos: self.pos size: self.size - BoxLayout: + BarBoxLayout: id: title_panel orientation: 'horizontal' @@ -40,6 +64,9 @@ Label: text: root.title + size_hint: (1, .5) + font_size: '25sp' + text_size: self.size Button: text: 'o-' @@ -47,7 +74,7 @@ size: (dp(50), dp(50)) on_press: root.go_search() - BoxLayout: + BarBoxLayout: id: search_panel orientation: 'horizontal' @@ -58,25 +85,32 @@ text: 'go' on_press: root.go_search() - BoxLayout: + BarBoxLayout: id: tabs_panel orientation: 'horizontal' - Button: + FlatButton: text: '*' + background_color: [1, 1, 1, .5] on_press: root.go_favs() - Button: + FlatButton: text: 'Recent' + background_color: [1, 1, 1, .5] on_press: root.go_recent() - Button: + FlatButton: text: 'My' + background_color: [1, 1, 1, .5] on_press: root.go_mine() - Button: + FlatButton: text: '+' + background_color: [1, 1, 1, 0] on_press: root.add_video() RecycleView: - id: content_pane \ No newline at end of file + id: content_pane + + +########## \ No newline at end of file From 186505a5125956fa6f395ee0b63c52a0c7ccbd9a Mon Sep 17 00:00:00 2001 From: Paul Brussee Date: Tue, 3 May 2016 13:58:32 +0200 Subject: [PATCH 021/644] wip HomeScreen --- android/app/screens/camera.py | 6 ++ android/app/{screens.py => screens/home.py} | 33 +++++---- android/app/tribler.kv | 76 ++++++++------------- 3 files changed, 53 insertions(+), 62 deletions(-) create mode 100644 android/app/screens/camera.py rename android/app/{screens.py => screens/home.py} (69%) diff --git a/android/app/screens/camera.py b/android/app/screens/camera.py new file mode 100644 index 00000000000..802eb602780 --- /dev/null +++ b/android/app/screens/camera.py @@ -0,0 +1,6 @@ +from kivy.uix.screenmanager import Screen +from kivy.properties import ObjectProperty + + +class CameraScreen(Screen): + pass \ No newline at end of file diff --git a/android/app/screens.py b/android/app/screens/home.py similarity index 69% rename from android/app/screens.py rename to android/app/screens/home.py index 73676679182..7fdd6dbd1bc 100644 --- a/android/app/screens.py +++ b/android/app/screens/home.py @@ -1,32 +1,35 @@ -from kivy.uix.boxlayout import BoxLayout +#from kivy.uix.screenmanager import Screen from kivy.properties import ObjectProperty, StringProperty +from kivy.uix.boxlayout import BoxLayout class HomeScreen(BoxLayout): - + title = StringProperty() - + top_pane = ObjectProperty() content_pane = ObjectProperty() - + + def go_back(self): + print self + def go_favs(self): print self - + def go_recent(self): print self - + def go_mine(self): print self - + def go_search(self): print self - - def go_back(self): + + def start_search(self): print self - - def add_video(self): + + def go_menu(self): print self - - -class CameraScreen(BoxLayout): - pass \ No newline at end of file + + def add_video(self): + print self \ No newline at end of file diff --git a/android/app/tribler.kv b/android/app/tribler.kv index 1058e9b470d..013fbe82255 100644 --- a/android/app/tribler.kv +++ b/android/app/tribler.kv @@ -1,37 +1,25 @@ #:kivy 1.9.2 -########## +########## Buttons -: - text_size: self.size - font_size: '25sp' - markup: True - - canvas: - Color: - rgba: 1, 1, 1, .5 - -########## - -: + markup: True - size_hint: (1, .5) - font_size: '25sp' - text_size: self.size + background_color: [0, 0, 0, 0] + font_size: '20sp' + +########## Screens -########## orientation: 'vertical' - + top_pane: top_pane content_pane: content_pane - + canvas.before: - Color: rgba: 1, 1, 1, 1 @@ -42,9 +30,8 @@ BoxLayout: id: top_pane orientation: 'vertical' - + size_hint_y: .2 canvas.before: - Color: rgba: 1, 0, 0, 1 @@ -52,65 +39,60 @@ pos: self.pos size: self.size - BarBoxLayout: + BoxLayout: id: title_panel orientation: 'horizontal' - Button: - text: '<-' - size_hint: (None, None) - size: (dp(50), dp(50)) - on_press: root.go_back() + FlatButton: + text: 'Menu' + on_press: root.go_menu() Label: text: root.title - size_hint: (1, .5) - font_size: '25sp' - text_size: self.size + font_size: '30sp' - Button: - text: 'o-' - size_hint: (None, None) - size: (dp(50), dp(50)) + FlatButton: + text: 'Search' on_press: root.go_search() - BarBoxLayout: + BoxLayout: id: search_panel orientation: 'horizontal' + FlatButton: + text: '<-' + on_press: root.go_back() + TextInput: id: search_bar + hint_text: 'Search Tribler' + on_text_validate: root.start_search() - Button: - text: 'go' - on_press: root.go_search() + FlatButton: + text: 'X' + on_press: search_bar.text = '' - BarBoxLayout: + BoxLayout: id: tabs_panel orientation: 'horizontal' + padding: [10, 10, 0, 10] FlatButton: text: '*' - background_color: [1, 1, 1, .5] on_press: root.go_favs() FlatButton: text: 'Recent' - background_color: [1, 1, 1, .5] on_press: root.go_recent() FlatButton: text: 'My' - background_color: [1, 1, 1, .5] on_press: root.go_mine() FlatButton: text: '+' - background_color: [1, 1, 1, 0] on_press: root.add_video() RecycleView: id: content_pane - - -########## \ No newline at end of file + \ No newline at end of file From d6428c4c02a506ac5964e6892cf16a369f12eee1 Mon Sep 17 00:00:00 2001 From: Paul Brussee Date: Tue, 3 May 2016 13:59:14 +0200 Subject: [PATCH 022/644] package doc --- android/app/screens/__init__.py | 5 +++++ android/app/service/__init__.py | 5 +++++ 2 files changed, 10 insertions(+) create mode 100644 android/app/screens/__init__.py create mode 100644 android/app/service/__init__.py diff --git a/android/app/screens/__init__.py b/android/app/screens/__init__.py new file mode 100644 index 00000000000..9bd21184ac6 --- /dev/null +++ b/android/app/screens/__init__.py @@ -0,0 +1,5 @@ +# Written by P.W.G. Brussee +# see LICENSE.txt for license information +''' +The screens package contains code to show the GUI and navigation logic. +''' \ No newline at end of file diff --git a/android/app/service/__init__.py b/android/app/service/__init__.py new file mode 100644 index 00000000000..f8d50cae8ec --- /dev/null +++ b/android/app/service/__init__.py @@ -0,0 +1,5 @@ +# Written by P.W.G. Brussee +# see LICENSE.txt for license information +''' +The service package contains code to start Tribler as a background service. +''' \ No newline at end of file From 80df293974a3b48a844159ef951ea838b1f3828e Mon Sep 17 00:00:00 2001 From: Paul Brussee Date: Tue, 3 May 2016 13:59:36 +0200 Subject: [PATCH 023/644] refactor Triblerd service --- android/app/main.py | 13 ++++--- android/app/service/Triblerd.py | 66 +++++++-------------------------- 2 files changed, 21 insertions(+), 58 deletions(-) diff --git a/android/app/main.py b/android/app/main.py index 46733bb71e0..58ad418daff 100644 --- a/android/app/main.py +++ b/android/app/main.py @@ -1,19 +1,22 @@ from kivy.app import App - + class TriblerApp(App): def build(self): - from screens import HomeScreen + #from kivy.uix.screenmanager import ScreenManager + #self.screen_manager = ScreenManager() + from screens.home import HomeScreen return HomeScreen(title='Tribler') + #self.screen_manager.add_widget(HomeScreen(name='home')) + #return self.screen_manager def start_service_triblerd(self): from jnius import autoclass service = autoclass('org.tribler.android.ServiceTriblerd') mActivity = autoclass('org.kivy.android.PythonActivity').mActivity - argument = {'restapi': 8085} - service.start(mActivity, str(argument)) - + argument = '' + service.start(mActivity, argument) def on_start(self): '''Event handler for the `on_start` event which is fired after diff --git a/android/app/service/Triblerd.py b/android/app/service/Triblerd.py index 0bc5b0ae03b..9d4f0e9664b 100644 --- a/android/app/service/Triblerd.py +++ b/android/app/service/Triblerd.py @@ -1,69 +1,29 @@ -from kivy.logger import Logger -from kivy.support import install_twisted_reactor - -# must be called before importing the reactor -install_twisted_reactor(installSignalHandlers=1) +import os from twisted.internet import reactor -import ast -import os -import signal - -from Tribler.Core.Session import Session -from Tribler.Core.SessionConfig import SessionStartupConfig +from tribler_plugin import service_maker, Options class Triblerd(object): def __init__(self): - """ + ''' Setup environment - """ - private_root_dir = os.path.realpath(os.path.split(os.environ['ANDROID_PRIVATE'])[0]) + ''' + private_root_dir = os.path.realpath(os.path.split(os.getenv('ANDROID_PRIVATE', '/tmp/cache'))[0]) os.environ['PYTHON_EGG_CACHE'] = os.path.join(private_root_dir, 'cache', '.egg') - - + + def run(self): - """ + ''' Pass through options - """ - options = ast.literal_eval(os.getenv('PYTHON_SERVICE_ARGUMENT')) - self.start_tribler(options) - - - def start_tribler(self, options): - """ - Main method to startup Tribler. - """ - - def signal_handler(sig, _): - Logger.info("Received shut down signal %s" % sig) - if not self._stopping: - self._stopping = True - self.session.shutdown() - Logger.info("Tribler shut down") - reactor.stop() - signal.signal(signal.SIGINT, signal_handler) - signal.signal(signal.SIGTERM, signal_handler) - - Logger.info("Starting Tribler") - - config = SessionStartupConfig() + ''' + options = Options() + Options.parseOptions(options, os.getenv('PYTHON_SERVICE_ARGUMENT', '')) + service_maker.makeService(options) + reactor.run() - config.set_http_api_enabled(True) - config.set_http_api_port(options["restapi"]) - - self.session = Session(config) - upgrader = self.session.prestart() - if upgrader.failed: - Logger.info("The upgrader failed: .Tribler directory backed up, aborting") - #reactor.addSystemEventTrigger('after', 'shutdown', os._exit, 1) - reactor.stop() - else: - self.session.start() - Logger.info("Tribler started") - if __name__ == '__main__': Triblerd().run() \ No newline at end of file From bd6b7afd998c0f82848976031fc463cda531ee0b Mon Sep 17 00:00:00 2001 From: Paul Brussee Date: Tue, 3 May 2016 14:02:13 +0200 Subject: [PATCH 024/644] copy from PR #2151 --- android/app/tribler_plugin.py | 108 ++++++++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) create mode 100644 android/app/tribler_plugin.py diff --git a/android/app/tribler_plugin.py b/android/app/tribler_plugin.py new file mode 100644 index 00000000000..9ef5683581a --- /dev/null +++ b/android/app/tribler_plugin.py @@ -0,0 +1,108 @@ +""" +This twistd plugin enables to start Tribler headless using the twistd command. +""" +import logging +import os +import signal +from time import sleep + +from twisted.application.service import MultiService, IServiceMaker +from twisted.conch import manhole_tap +from twisted.internet import reactor +from twisted.plugin import IPlugin +from twisted.python import usage +from twisted.python.log import msg +from zope.interface import implements + +from Tribler.Core.Session import Session +from Tribler.Core.SessionConfig import SessionStartupConfig + + +class Options(usage.Options): + optParameters = [ + ["manhole", "m", 0, "Enable manhole telnet service listening at the specified port", int], + ["statedir", "s", None, "Use an alternate statedir", str], + ["restapi", "p", 8085, "Use an alternate port for the REST API", int], + ["dispersy", "d", -1, "Use an alternate port for Dispersy", int], + ["libtorrent", "l", -1, "Use an alternate port for libtorrent", int], + ] + + +class TriblerServiceMaker(object): + implements(IServiceMaker, IPlugin) + tapname = "tribler" + description = "Tribler twistd plugin, starts Tribler as a service" + options = Options + + def __init__(self): + """ + Initialize the variables of the TriblerServiceMaker and the logger. + """ + self.session = None + self._stopping = False + + def start_tribler(self, options): + """ + Main method to startup Tribler. + """ + + def signal_handler(sig, _): + msg("Received shut down signal %s" % sig) + if not self._stopping: + self._stopping = True + self.session.shutdown() + msg("Tribler shut down") + reactor.stop() + signal.signal(signal.SIGINT, signal_handler) + signal.signal(signal.SIGTERM, signal_handler) + + msg("Starting Tribler") + + config = SessionStartupConfig() + + if options["statedir"]: + config.set_state_dir(options["statedir"]) + + if options["restapi"] != 0: + config.set_http_api_enabled(True) + config.set_http_api_port(options["restapi"]) + + if options["dispersy"] != -1: + config.set_dispersy_port(options["dispersy"]) + + if options["libtorrent"] != -1: + config.set_listen_port(options["libtorrent"]) + + self.session = Session(config) + upgrader = self.session.prestart() + if upgrader.failed: + msg("The upgrader failed: .Tribler directory backed up, aborting") + reactor.addSystemEventTrigger('after', 'shutdown', os._exit, 1) + reactor.stop() + else: + self.session.start() + msg("Tribler started") + + def makeService(self, options): + """ + Construct a Tribler service. + """ + tribler_service = MultiService() + tribler_service.setName("Tribler") + + manhole_namespace = {} + if options["manhole"]: + port = options["manhole"] + manhole = manhole_tap.makeService({ + 'namespace': manhole_namespace, + 'telnetPort': 'tcp:%d:interface=127.0.0.1' % port, + 'sshPort': None, + 'passwd': os.path.join(os.path.dirname(__file__), 'passwd'), + }) + tribler_service.addService(manhole) + + reactor.callWhenRunning(self.start_tribler, options) + + return tribler_service + +service_maker = TriblerServiceMaker() From 32ebbf465da11bd422f5fdf2dc4abf1450443110 Mon Sep 17 00:00:00 2001 From: Paul Brussee Date: Tue, 3 May 2016 14:12:34 +0200 Subject: [PATCH 025/644] build source --- android/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.sh b/android/build.sh index 861b7d110d8..d8bbfa0a18c 100755 --- a/android/build.sh +++ b/android/build.sh @@ -12,5 +12,5 @@ export PATH="~/.local/bin/:$PATH" cp -R recipes ~/.local/lib/python2.7/site-packages/pythonforandroid/ echo Start build APK -script -c "p4a --copy-libs --debug apk" # uses .p4a config file +script -c "p4a --require-perfect-match --copy-libs --debug apk" # uses .p4a config file From 2dc27dd1302f8f5585c5cbfdae856ff72282040b Mon Sep 17 00:00:00 2001 From: Paul Brussee Date: Tue, 3 May 2016 17:17:20 +0200 Subject: [PATCH 026/644] first demo app with recycleview --- android/Tribler/.gitignore | 8 + android/Tribler/app/.gitignore | 1 + android/Tribler/app/build.gradle | 27 +++ android/Tribler/app/proguard-rules.pro | 17 ++ .../org/tribler/android/ApplicationTest.java | 13 ++ .../Tribler/app/src/main/AndroidManifest.xml | 20 +++ .../Tribler/app/src/main/ic_launcher-web.png | Bin 0 -> 23076 bytes .../main/java/org/tribler/android/Home.java | 42 +++++ .../main/java/org/tribler/android/Video.java | 38 +++++ .../tribler/android/VideosViewAdapter.java | 51 ++++++ .../app/src/main/res/layout/activity_home.xml | 17 ++ .../src/main/res/layout/list_item_video.xml | 36 ++++ .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 2082 bytes .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 1141 bytes .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 3269 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 6303 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 10095 bytes .../app/src/main/res/values-w820dp/dimens.xml | 6 + .../app/src/main/res/values/colors.xml | 8 + .../app/src/main/res/values/dimens.xml | 5 + .../app/src/main/res/values/strings.xml | 3 + .../app/src/main/res/values/styles.xml | 11 ++ .../org/tribler/android/ExampleUnitTest.java | 15 ++ android/Tribler/build.gradle | 23 +++ android/Tribler/gradle.properties | 18 ++ .../Tribler/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 53636 bytes .../gradle/wrapper/gradle-wrapper.properties | 6 + android/Tribler/gradlew | 160 ++++++++++++++++++ android/Tribler/gradlew.bat | 90 ++++++++++ android/Tribler/settings.gradle | 1 + android/tribler-logo.png | Bin 0 -> 5018 bytes 31 files changed, 616 insertions(+) create mode 100644 android/Tribler/.gitignore create mode 100644 android/Tribler/app/.gitignore create mode 100644 android/Tribler/app/build.gradle create mode 100644 android/Tribler/app/proguard-rules.pro create mode 100644 android/Tribler/app/src/androidTest/java/org/tribler/android/ApplicationTest.java create mode 100644 android/Tribler/app/src/main/AndroidManifest.xml create mode 100644 android/Tribler/app/src/main/ic_launcher-web.png create mode 100644 android/Tribler/app/src/main/java/org/tribler/android/Home.java create mode 100644 android/Tribler/app/src/main/java/org/tribler/android/Video.java create mode 100644 android/Tribler/app/src/main/java/org/tribler/android/VideosViewAdapter.java create mode 100644 android/Tribler/app/src/main/res/layout/activity_home.xml create mode 100644 android/Tribler/app/src/main/res/layout/list_item_video.xml create mode 100644 android/Tribler/app/src/main/res/mipmap-hdpi/ic_launcher.png create mode 100644 android/Tribler/app/src/main/res/mipmap-mdpi/ic_launcher.png create mode 100644 android/Tribler/app/src/main/res/mipmap-xhdpi/ic_launcher.png create mode 100644 android/Tribler/app/src/main/res/mipmap-xxhdpi/ic_launcher.png create mode 100644 android/Tribler/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png create mode 100644 android/Tribler/app/src/main/res/values-w820dp/dimens.xml create mode 100644 android/Tribler/app/src/main/res/values/colors.xml create mode 100644 android/Tribler/app/src/main/res/values/dimens.xml create mode 100644 android/Tribler/app/src/main/res/values/strings.xml create mode 100644 android/Tribler/app/src/main/res/values/styles.xml create mode 100644 android/Tribler/app/src/test/java/org/tribler/android/ExampleUnitTest.java create mode 100644 android/Tribler/build.gradle create mode 100644 android/Tribler/gradle.properties create mode 100644 android/Tribler/gradle/wrapper/gradle-wrapper.jar create mode 100644 android/Tribler/gradle/wrapper/gradle-wrapper.properties create mode 100755 android/Tribler/gradlew create mode 100644 android/Tribler/gradlew.bat create mode 100644 android/Tribler/settings.gradle create mode 100644 android/tribler-logo.png diff --git a/android/Tribler/.gitignore b/android/Tribler/.gitignore new file mode 100644 index 00000000000..c6cbe562a42 --- /dev/null +++ b/android/Tribler/.gitignore @@ -0,0 +1,8 @@ +*.iml +.gradle +/local.properties +/.idea/workspace.xml +/.idea/libraries +.DS_Store +/build +/captures diff --git a/android/Tribler/app/.gitignore b/android/Tribler/app/.gitignore new file mode 100644 index 00000000000..796b96d1c40 --- /dev/null +++ b/android/Tribler/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/android/Tribler/app/build.gradle b/android/Tribler/app/build.gradle new file mode 100644 index 00000000000..02e57dafea5 --- /dev/null +++ b/android/Tribler/app/build.gradle @@ -0,0 +1,27 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 23 + buildToolsVersion "23.0.3" + + defaultConfig { + applicationId "org.tribler.android" + minSdkVersion 16 + targetSdkVersion 23 + versionCode 1 + versionName "1.0" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } +} + +dependencies { + compile fileTree(dir: 'libs', include: ['*.jar']) + testCompile 'junit:junit:4.12' + compile 'com.android.support:appcompat-v7:23.3.0' + compile 'com.android.support:recyclerview-v7:23.3.0' +} diff --git a/android/Tribler/app/proguard-rules.pro b/android/Tribler/app/proguard-rules.pro new file mode 100644 index 00000000000..b012dee2c1d --- /dev/null +++ b/android/Tribler/app/proguard-rules.pro @@ -0,0 +1,17 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in /home/paul/android-sdk-linux/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the proguardFiles +# directive in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} diff --git a/android/Tribler/app/src/androidTest/java/org/tribler/android/ApplicationTest.java b/android/Tribler/app/src/androidTest/java/org/tribler/android/ApplicationTest.java new file mode 100644 index 00000000000..bfccdd65deb --- /dev/null +++ b/android/Tribler/app/src/androidTest/java/org/tribler/android/ApplicationTest.java @@ -0,0 +1,13 @@ +package org.tribler.android; + +import android.app.Application; +import android.test.ApplicationTestCase; + +/** + * Testing Fundamentals + */ +public class ApplicationTest extends ApplicationTestCase { + public ApplicationTest() { + super(Application.class); + } +} \ No newline at end of file diff --git a/android/Tribler/app/src/main/AndroidManifest.xml b/android/Tribler/app/src/main/AndroidManifest.xml new file mode 100644 index 00000000000..6532624ac59 --- /dev/null +++ b/android/Tribler/app/src/main/AndroidManifest.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/android/Tribler/app/src/main/ic_launcher-web.png b/android/Tribler/app/src/main/ic_launcher-web.png new file mode 100644 index 0000000000000000000000000000000000000000..2a03cb450add61c8338f80d89292d77cb3352fad GIT binary patch literal 23076 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 literal 0 HcmV?d00001 diff --git a/android/Tribler/app/src/main/java/org/tribler/android/Home.java b/android/Tribler/app/src/main/java/org/tribler/android/Home.java new file mode 100644 index 00000000000..6a3e6176583 --- /dev/null +++ b/android/Tribler/app/src/main/java/org/tribler/android/Home.java @@ -0,0 +1,42 @@ +package org.tribler.android; + +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; + +import android.support.v7.widget.DefaultItemAnimator; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; +import android.support.v7.widget.Toolbar; + +import java.util.ArrayList; +import java.util.List; + +public class Home extends AppCompatActivity { + private List

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 literal 0 HcmV?d00001 diff --git a/android/Tribler/app/src/main/res/values-w820dp/dimens.xml b/android/Tribler/app/src/main/res/values-w820dp/dimens.xml new file mode 100644 index 00000000000..63fc8164446 --- /dev/null +++ b/android/Tribler/app/src/main/res/values-w820dp/dimens.xml @@ -0,0 +1,6 @@ + + + 64dp + diff --git a/android/Tribler/app/src/main/res/values/colors.xml b/android/Tribler/app/src/main/res/values/colors.xml new file mode 100644 index 00000000000..cb2b15e6896 --- /dev/null +++ b/android/Tribler/app/src/main/res/values/colors.xml @@ -0,0 +1,8 @@ + + + #d50000 + #b71c1c + #ffab40 + #43a047 + #1a237e + diff --git a/android/Tribler/app/src/main/res/values/dimens.xml b/android/Tribler/app/src/main/res/values/dimens.xml new file mode 100644 index 00000000000..47c82246738 --- /dev/null +++ b/android/Tribler/app/src/main/res/values/dimens.xml @@ -0,0 +1,5 @@ + + + 16dp + 16dp + diff --git a/android/Tribler/app/src/main/res/values/strings.xml b/android/Tribler/app/src/main/res/values/strings.xml new file mode 100644 index 00000000000..ea00c6dac7b --- /dev/null +++ b/android/Tribler/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + Tribler + diff --git a/android/Tribler/app/src/main/res/values/styles.xml b/android/Tribler/app/src/main/res/values/styles.xml new file mode 100644 index 00000000000..5885930df6d --- /dev/null +++ b/android/Tribler/app/src/main/res/values/styles.xml @@ -0,0 +1,11 @@ + + + + + + diff --git a/android/Tribler/app/src/test/java/org/tribler/android/ExampleUnitTest.java b/android/Tribler/app/src/test/java/org/tribler/android/ExampleUnitTest.java new file mode 100644 index 00000000000..8df7962f4d8 --- /dev/null +++ b/android/Tribler/app/src/test/java/org/tribler/android/ExampleUnitTest.java @@ -0,0 +1,15 @@ +package org.tribler.android; + +import org.junit.Test; + +import static org.junit.Assert.*; + +/** + * To work on unit tests, switch the Test Artifact in the Build Variants view. + */ +public class ExampleUnitTest { + @Test + public void addition_isCorrect() throws Exception { + assertEquals(4, 2 + 2); + } +} \ No newline at end of file diff --git a/android/Tribler/build.gradle b/android/Tribler/build.gradle new file mode 100644 index 00000000000..03bced9f3fb --- /dev/null +++ b/android/Tribler/build.gradle @@ -0,0 +1,23 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. + +buildscript { + repositories { + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:2.1.0' + + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files + } +} + +allprojects { + repositories { + jcenter() + } +} + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/android/Tribler/gradle.properties b/android/Tribler/gradle.properties new file mode 100644 index 00000000000..1d3591c8a4c --- /dev/null +++ b/android/Tribler/gradle.properties @@ -0,0 +1,18 @@ +# Project-wide Gradle settings. + +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. + +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html + +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +# Default value: -Xmx10248m -XX:MaxPermSize=256m +# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 + +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true \ No newline at end of file diff --git a/android/Tribler/gradle/wrapper/gradle-wrapper.jar b/android/Tribler/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..13372aef5e24af05341d49695ee84e5f9b594659 GIT binary patch literal 53636 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ⅅ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 H-+%o-(+5aQ literal 0 HcmV?d00001 diff --git a/android/Tribler/gradle/wrapper/gradle-wrapper.properties b/android/Tribler/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000000..122a0dca2e8 --- /dev/null +++ b/android/Tribler/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Mon Dec 28 10:00:20 PST 2015 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip diff --git a/android/Tribler/gradlew b/android/Tribler/gradlew new file mode 100755 index 00000000000..9d82f789151 --- /dev/null +++ b/android/Tribler/gradlew @@ -0,0 +1,160 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/android/Tribler/gradlew.bat b/android/Tribler/gradlew.bat new file mode 100644 index 00000000000..aec99730b4e --- /dev/null +++ b/android/Tribler/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/android/Tribler/settings.gradle b/android/Tribler/settings.gradle new file mode 100644 index 00000000000..e7b4def49cb --- /dev/null +++ b/android/Tribler/settings.gradle @@ -0,0 +1 @@ +include ':app' diff --git a/android/tribler-logo.png b/android/tribler-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..433cda548c113ef8f066707147663a087f6a9b3d GIT binary patch literal 5018 zcmV;L6J_j)P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qRNAp5A000vSNklIse&qWbSQ|E-gNUI5gmxku5*a=m{X+Z zTq3;!dj43X`;XGk?|5)BM>U4b&I-utrKGK=|F5iATCt>JDaCS%H58oFL(fUON5?^f zHM5s$;+nc$Sh2cd_q9ZZ4-h$fu*fNgh#a=L$VT&uET+d+Q1sOEyXrRWUX6#7Iig%L zAq10#q;9$$f00{U(cuVffSLCQL|%PHU`Qn)?(6WOQk38sO7M(8>|?hYpv;D7lHnFKYm0rst}AjL{6Q@$vX zOtfTi-JU^`uqlI8kib{6@GKD*csKuKh}i4%og(4O`Rn(2`r^G9RZ2lyOo|Cxu2ETYdR zS4}Hp`%w~^-L(R%>2|ASLd{h2AhRAx2oBHMeH}~wi|I|3L?-@f72WQ#x>c$yB3)cV zU;nFhRdG3KfE7X=QCYN+J_@G=K9|t5kcVc~)^#A9IYQN~CIOyZtpod5PbvRiQHf*%DnK{yH~p<*keQ`RiJ!$iFtU{C zy69XQb6rLLgCQl82}qjhja(4Al?WzSb<_v~Q``dkW1?D z$OLrj7>1*p7YmvPX%3ITvAppQk*Dqx`Qo#%LxpqGNJaCfeP#c@{G9o0o?pypeS^pZ zXegCiUvcY&R^is<-M3V$juh$L$=n3p!etew9U4vu0-ldyvZk_ngt zT1&S+2ekKkM$n}rL@qp5WSDC1W(yk;m?!=YGH3{LR<6VM-G5DBtwKKgL}d8xMn1u> zyPjLz=zN38q+-b+uKF+rbXQc6wxF@(f+W|Fj9HS(#G^it$aOv;ht}=iUF5_AL`Dt} z*=ZG<-AuZVdL4~W>@-J%$&3Lx3_w7dgI-FtVKd0#I9URk#~=n;Od~KB!14U^$=1+O z$W$Uz_d7V=8p1hfAEbIi&@lO@Kh@A+GSRA{N5B&kucF=gp@C#}Q!sjiZ=^?pf6Eg@ zd+v+bCxJ_mR*wA8AToWhc>9$^CQa1TXOhUu$ri)o1tLA^(j|P!R zU?J6+Fh1lk1rECzH_({zBr6;YjUukzQ>8Ixm@BK`jVy2%wzp$XxC^J`c zqbKv~3s%{p#x}jb|M7oBR?_E@Dis&u8$>1vG`ZlL+RsJ`BQxChqxY>tFk6yIg~}xJ z9qro_-IM1x$!wcAnM8H>nN7`XqcqJtNAUo}=n;K&Mw*&rwo#l+w)BD+nQD^RMv3R< z(Msm-i|eO1m`tW1kTS^ZGrx^}7T2Y01ew9iNL5H#5Dyf&OGM^&D~PPB&n#|~ssUu8 zl|)qrazE0Z2~rrDDt_-ly^ESJcQlAh0s#TRC%#&p=FLHvV@F2qV_n$dM&27hCIR5* zY}MRcid@9SY$bB#$zjfXb|TZ)YBHADCQ;(iQc-1dQa$ydy0BftxPht@KoZN2dz@|M)6p-UVi3a1^FTxM*fJ@ z8hMJz-at(}>4oKL>Lrm$I>d^K4HpWvQK>hIdyty?b~GubAo(X><&9pX9{=m-upFCf ziRx%~T-LUu1TrZsg=QW5jbp4b^;F!&&%JE)tOR&ZYS=DzydF(=*E0Pp`=*+FN8U>y z(+4&vxJ$iS8IMP9v6Q_s=&$K5G84b1h2)!F9>3EH@99ZB;{J_AUHCV0)Jp$` zMlngoF_(H8E4B_aGwt5lQ4pC4k!s$gE(5xTQfCye@YzRJAJp}f>ybLUmhtf;`rA}S zht^D5nJypE_T%@h;BD!L6MzUh)n3md05PAm=X&9iRy336$8KPcwXG3)v|A$`1(1nW z5+O0~D^In8XEATYD}C~>W@=@%h)V*G@0gDCh@B;L=Nd=jZCV>3tjmU334VA zQ^c7k<~`LaQLCF*DQ>0%dt@JwfKXPvRmvHMTJI^z2$VzuSH47o9Lc0`wDtnJy(zp4 zSt}S+il6^T_`bI+gAoJ~eCICe3lU6yw5Ci<-qCZyhhx@h*XDy9$^15Ycecu8m3S11 zWIF4*AR3d`QwUfrgFzFS9--%j&uxF|Qwuqf>Cu~tuoe=@YTi!fL47R|Z)QlM$TrAZ@TYVBc@(|>F4os75!{TYz!Ig zMUG@*Uihlcx^=15wTn|1G&||X=bo~Zg&fI*0L+sld*nbPC?=~?;>3E(0@uJG0CgrcaXoInk%(2;rNKhb|0J3^&K*Hn!5u2`J{v$RW0R@u@AkA|} zdP?M@vmcS51Tr1p&t6Rylt||6k0zNpqDf|sXdsy^bLlm=LUT=@#!bc`eV=aY{YF9N zfc%<#rfu7TjAZ&3+&Qw0gvVe+oK%UaR{G@(2D6_Py(IGt#j#D6t|%(6k3nWYF3Wwm zA1?qD|AkO#$Ur7UGFe8!0R)gUW-U0W5o;`mY%Oxjg(6p;Byxp;#cp zFBaKxmGF#K8Vw>Dy1Qhg$W^E6wPQqv?qv7pIce7vhdRl`{Cq0lqyt4p?JaWF;r5FF zNoDIaM=Fm=qDA9>Z(U0lW;AzOD|`rY^bVHjGw@uQn^G1Umod;-9=qM{pJi4vAJj=E znt=&!u~;Z^kV{n~=oA_r|GvQHP01A5!}yR2sS z^+Dw!TbagkZwLas7=Q^=Q77~B|JnJ--B-;dGqD8SG9*Y@@Wl=9ia zEl)c{bN!1^LP>-BrB8^{blB;wrv07;NZJ@|>nW7PLD1Hcze59w$A z_=fZBndvKz>mU;oK|5Hkf>fK=q2NQqvS^osHWc}97$im}ziQh2K*je2L+}n^NsUkY z5={JiJYsq9deai0UQQ#kkETgv1S9qe2U6sd57k92I&(>OcWr=J&O2J&#^vEd5K_AI zmka74Q!j$d58n%St3oD=rw-e~{!a#jD+Yv-NlFf6-V|06yKwCe8og_Ye_7te>aQ84 zCw;0UlWc>=85QQDT$nC-`PuLxk}gURgrYdH@D)Cl(k?OqK5yIQ&BrAY2pxO6$R-P^ z>2(#^znc+q#I|-Uo=oHC4fpLVGJH=>dz6H^^t>CZkQuM;I7FX`3m`aEzC1;x@Nr*$ z9(JhQJJ#mjF~?Y5c-(v?&&C~n{%JU%^3aVU^XWcZgNx5oz4NB|?m<1(MVzbkT{x^Z zX^WWyd=J`5ArM#2(dq~1(0$~HzD)1P?d%w<&X6a@nGiTx-`H7yP^5tH1g`eB|b8*7NK363t~@a9sp8Onny7 z#-kI!^a_C!HK>$jk}h6BQ@)o$iIi{r7GJDIG>M7$hZEMd>@ zzqH;@J0JZPH-AsPs2_fi^eC2#hud?jC+m(3WO@XPSPCJN z1QjB1(&T0cuaqF4g{b)K{T7Ul3S@ehkSL6qSCTm{m?1)xh7|us88p+ijmZAc4Vs#T zmB@bIrysD?2tQZZoupB@-vgSDB5vvvpBK64So@_^eh7+!eH7SVp7 znsnPmMk3}=N^0q-QS+JF5<7XlR-}^ zabs$M+=uc|hu><>OfrumRC4iMIGGuKES`=(nuc~c7{DNf>8?Oie9#w=QdQ<#&`u&<<`F&1<@}JQa3!OjGZ; zaBDtMkq`-X2s@i()(_Xpw-rk(5+Z-ZKZ+|99Gn)mO|%YNqHE>e3iz9oKXZf+^C%ux zZ~}xn^G(bOtk*4gv?3vrE&s%X&ZqEH3HG^&7Jyhj|4>2wod>vKJ5=#4k(vwJpRf}` z-Q));CMld$wm)<@4+QI;idl%1zL2SZDhRa`y0k2)z#rVGct!D^V(JeNQxwlDE>diw kaD{W8TBMf}+0xSTe?&4(rL?5SVgLXD07*qoM6N<$g7<2XO#lD@ literal 0 HcmV?d00001 From b988868c468e8e5217422f1baa8d790e634f69cf Mon Sep 17 00:00:00 2001 From: Paul Brussee Date: Tue, 3 May 2016 17:19:09 +0200 Subject: [PATCH 027/644] example data --- .../main/java/org/tribler/android/Home.java | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/android/Tribler/app/src/main/java/org/tribler/android/Home.java b/android/Tribler/app/src/main/java/org/tribler/android/Home.java index 6a3e6176583..c7fb7c08592 100644 --- a/android/Tribler/app/src/main/java/org/tribler/android/Home.java +++ b/android/Tribler/app/src/main/java/org/tribler/android/Home.java @@ -35,7 +35,53 @@ protected void onCreate(Bundle savedInstanceState) { } private void prepareMovieData() { + Video video = new Video("Mad Max: Fury Road", "Action & Adventure", "2015"); + videoList.add(video); + video = new Video("Inside Out", "Animation, Kids & Family", "2015"); + videoList.add(video); + + video = new Video("Star Wars: Episode VII - The Force Awakens", "Action", "2015"); + videoList.add(video); + + video = new Video("Shaun the Sheep", "Animation", "2015"); + videoList.add(video); + + video = new Video("The Martian", "Science Fiction & Fantasy", "2015"); + videoList.add(video); + + video = new Video("Mission: Impossible Rogue Nation", "Action", "2015"); + videoList.add(video); + + video = new Video("Up", "Animation", "2009"); + videoList.add(video); + + video = new Video("Star Trek", "Science Fiction", "2009"); + videoList.add(video); + + video = new Video("The LEGO Movie", "Animation", "2014"); + videoList.add(video); + + video = new Video("Iron Man", "Action & Adventure", "2008"); + videoList.add(video); + + video = new Video("Aliens", "Science Fiction", "1986"); + videoList.add(video); + + video = new Video("Chicken Run", "Animation", "2000"); + videoList.add(video); + + video = new Video("Back to the Future", "Science Fiction", "1985"); + videoList.add(video); + + video = new Video("Raiders of the Lost Ark", "Action & Adventure", "1981"); + videoList.add(video); + + video = new Video("Goldfinger", "Action & Adventure", "1965"); + videoList.add(video); + + video = new Video("Guardians of the Galaxy", "Science Fiction & Fantasy", "2014"); + videoList.add(video); mAdapter.notifyDataSetChanged(); } From 6cbc89357d28235127341576c11a3f81f897ae3f Mon Sep 17 00:00:00 2001 From: Paul Brussee Date: Tue, 3 May 2016 22:22:25 +0200 Subject: [PATCH 028/644] wip 2 types of content: channel & torrent --- android/Tribler/app/build.gradle | 1 + .../org/tribler/android/AbstractContent.java | 25 +++++ .../android/ContentListViewAdapter.java | 99 +++++++++++++++++++ .../main/java/org/tribler/android/Home.java | 98 +++++++++--------- .../org/tribler/android/TriblerChannel.java | 15 +++ .../org/tribler/android/TriblerTorrent.java | 20 ++++ .../main/java/org/tribler/android/Video.java | 38 ------- .../tribler/android/VideosViewAdapter.java | 51 ---------- .../app/src/main/res/layout/activity_home.xml | 6 +- 9 files changed, 211 insertions(+), 142 deletions(-) create mode 100644 android/Tribler/app/src/main/java/org/tribler/android/AbstractContent.java create mode 100644 android/Tribler/app/src/main/java/org/tribler/android/ContentListViewAdapter.java create mode 100644 android/Tribler/app/src/main/java/org/tribler/android/TriblerChannel.java create mode 100644 android/Tribler/app/src/main/java/org/tribler/android/TriblerTorrent.java delete mode 100644 android/Tribler/app/src/main/java/org/tribler/android/Video.java delete mode 100644 android/Tribler/app/src/main/java/org/tribler/android/VideosViewAdapter.java diff --git a/android/Tribler/app/build.gradle b/android/Tribler/app/build.gradle index 02e57dafea5..5ae6891915a 100644 --- a/android/Tribler/app/build.gradle +++ b/android/Tribler/app/build.gradle @@ -22,6 +22,7 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) testCompile 'junit:junit:4.12' + compile 'com.google.code.gson:gson:2.6.2' compile 'com.android.support:appcompat-v7:23.3.0' compile 'com.android.support:recyclerview-v7:23.3.0' } diff --git a/android/Tribler/app/src/main/java/org/tribler/android/AbstractContent.java b/android/Tribler/app/src/main/java/org/tribler/android/AbstractContent.java new file mode 100644 index 00000000000..b01542617fb --- /dev/null +++ b/android/Tribler/app/src/main/java/org/tribler/android/AbstractContent.java @@ -0,0 +1,25 @@ +package org.tribler.android; + +/** + * Deserialization of Json Content + */ +public class AbstractContent { + private String title; + private String image_url; + private String description; + + public String getTitle() { + return title; + } + + public String getImage_url() { + return image_url; + } + + public String getDescription() { + return description; + } + + public AbstractContent() { + } +} diff --git a/android/Tribler/app/src/main/java/org/tribler/android/ContentListViewAdapter.java b/android/Tribler/app/src/main/java/org/tribler/android/ContentListViewAdapter.java new file mode 100644 index 00000000000..0a6cd55e8ce --- /dev/null +++ b/android/Tribler/app/src/main/java/org/tribler/android/ContentListViewAdapter.java @@ -0,0 +1,99 @@ +package org.tribler.android; + +import android.support.v7.widget.RecyclerView; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import java.util.List; + +/** + * Creates visual representation for channels and videos in a list. + */ +public class ContentListViewAdapter extends RecyclerView.Adapter { + + private static final int VIEW_TYPE_CHANNEL = 1; + private static final int VIEW_TYPE_TORRENT = 2; + + private List mData; + + @Override + public int getItemViewType(int position) { + if (mData.get(position) instanceof TriblerChannel) { + return VIEW_TYPE_CHANNEL; + } + return VIEW_TYPE_TORRENT; + } + + abstract class AbstractContentViewHolder extends RecyclerView.ViewHolder { + public TextView title, description; + public ImageView image; + + public AbstractContentViewHolder(View itemView) { + super(itemView); + title = (TextView) itemView.findViewById(R.id.title); + description = (TextView) itemView.findViewById(R.id.description); + image = (ImageView) itemView.findViewById(R.id.image); + } + } + + public class ChannelViewHolderAbstract extends AbstractContentViewHolder { + public TextView videosCount; + + public ChannelViewHolderAbstract(View itemView) { + super(itemView); + videosCount = (TextView) itemView.findViewById(R.id.videosCount); + } + } + + public class VideoViewHolderAbstract extends AbstractContentViewHolder { + public TextView duration; + public TextView bitrate; + + public VideoViewHolderAbstract(View itemView) { + super(itemView); + duration = (TextView) itemView.findViewById(R.id.duration); + bitrate = (TextView) itemView.findViewById(R.id.bitrate); + } + } + + public ContentListViewAdapter(List mData) { + this.mData = mData; + } + + @Override + /** + * @param parent The group to which the view should be added + * @param viewType The + */ + public AbstractContentViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + // Create a new view + View itemView = LayoutInflater.from(parent.getContext()) + .inflate(R.layout.list_item_video, parent, false); + + return new AbstractContentViewHolder(itemView); + } + + @Override + /** + * Replaces the contents of a view (invoked by the layout manager) + * @param holder The holder of the view of an item + * @param position The position of the item in the data set + */ + public void onBindViewHolder(AbstractContentViewHolder holder, int position) { + TorrentItem torrentItem = mData.get(position); + holder.title.setText(torrentItem.getTitle()); + holder.description.setText(torrentItem.getDescription()); + holder.duration.setText(torrentItem.getDuration()); + } + + @Override + /** + * @return The amount of items in the data set (invoked by the layout manager) + */ + public int getItemCount() { + return mData.size(); + } +} \ No newline at end of file diff --git a/android/Tribler/app/src/main/java/org/tribler/android/Home.java b/android/Tribler/app/src/main/java/org/tribler/android/Home.java index c7fb7c08592..b93b7c33de4 100644 --- a/android/Tribler/app/src/main/java/org/tribler/android/Home.java +++ b/android/Tribler/app/src/main/java/org/tribler/android/Home.java @@ -3,85 +3,87 @@ import android.support.v7.app.AppCompatActivity; import android.os.Bundle; -import android.support.v7.widget.DefaultItemAnimator; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; import java.util.ArrayList; -import java.util.List; public class Home extends AppCompatActivity { - private List