diff --git a/manual/source/android-remote.rst b/manual/source/android-remote.rst index 75c8464..cbdeb20 100644 --- a/manual/source/android-remote.rst +++ b/manual/source/android-remote.rst @@ -11,18 +11,25 @@ Installation ------------ Open the :guilabel:`Google Play Store` app and search for OpenLP. You should -find the `OpenLP - Remote 2`_ app. Now install the app. +find the `OpenLP - Remote 2.0`_ app. Now install the app. .. image:: pics/droid_start.png -You can now start the app and when you do you will see the startup screen. +To use the Android application you must be on the same network as the OpenLP +instance you are going to operate. If your Android device has Celluar data, +you may need to turn it off so that you can communicate with your OpenLP +instance through your Wifi connection. -Settings --------- +You can now start the app and when you do, you will see the startup screen. + +Preferences +----------- + +|droid_menu_button| **Menu button** After the installation is complete and you open the OpenLP Remote app you will need to -configure your settings. Open the settings by touching the menu button in the top right -corner and tapping on :guilabel:`Settings`. This will show the settings screen. +configure your Preferences. Open the preferences by touching the menu button in the top right +corner and tapping on :guilabel:`Preferences`. This will show the Preferences screen. .. image:: pics/droid_right_menu.png @@ -69,17 +76,13 @@ computer. **Hostname or IP:** Enter the :guilabel:`Server on IP address` found in :ref:`remote_tab`. After - entering the IP address in the box select :guilabel:`OK` + entering the IP address in the box then select :guilabel:`OK` **Port:** Enter the :guilabel:`Port number` found in :ref:`remote_tab` and enter it in the box. By default this is 4316. After entering the port number select :guilabel:`OK`. -**Use HTTPS:** - This specifies if HTTPS should be used. **Note:** To use HTTPS you must - setup OpenLP to be secure, see :ref:`secure_server`. - **Username:** Here you can enter a username used for accessing OpenLP remotely. This must be the same as set in :ref:`user_auth`. @@ -92,6 +95,8 @@ computer. Using the Android Remote ------------------------ +|droid_left_menu_button| **Left Menu** + After you have completed the setup you are now ready to use the app. Touch the menu button in the top left corner to see the list of views the app supports. @@ -101,7 +106,7 @@ Service List ^^^^^^^^^^^^ Selecting :guilabel:`Service List` will take you to the Service Manager. -Selecting an item with a in the service manager will immediately take it +Selecting an item in the service manager will immediately make it live on the projection screen and you will stay on the service screen on your device. You can use the arrows buttons shown on the bottom left and right to move to the next slide inside the item. @@ -137,21 +142,61 @@ description. Live View ^^^^^^^^^^ -Selecting :guilabel:`Live View` will display the live view on your Android -device. See the :ref:`main_view` section in the manual for a detailed -description. +Selecting :guilabel:`Live View` will provide an exact copy of what is on +the main display. See the :ref:`main_view` section in the manual for a +detailed description. -.. image:: pics/droid_live_view.png +When using the :guilabel:`Live view` it can be an advantage to use the device in +landscape mode. + +.. image:: pics/droid_live_view_landscape.png + +Search +^^^^^^ + +Selecting :guilabel:`Search` will display the search window. On the search +window you are able to search the OpenLP instance library and add items to +the service or display them to the live display. + +.. image:: pics/droid_search_initial.png + +Selecting the library item to the right of :guilabel:`Select Plugin` will +open the library search menu. Selecting any item on the menu will allow +you to search that library item. + +.. image:: pics/droid_search_menu.png + +Selecting the blank line to the right of :guilabel:`Search Text` will allow you +to enter the text you want to find. The search is the same search you would +make on the instance of OpenLP :ref:`media-manager` and will find parts of the lyrics within a +song if you type in part of the lyrics. When you have typed in your search +criteria, select the search icon in the keyboard to activate the search. + +.. image:: pics/droid_search_text.png + +The search results will be displayed. If no results are shown, please refine +your serch criteria by selecting the search text to make changes. + +When the search results contain what you are looking for, select the item in +the search results. + +.. image:: pics/droid_search_results.png + +After selecting an item from the search results you can choose to :guilabel:`Send Live`, +:guilabel:`Add to Service` or :guilabel:`Cancel`. + +.. image:: pics/droid_search_send_to_menu.png + Alert ^^^^^ -To send an alert to the display, touch the alert button at the top right of the +To send an alert to the live display, touch the alert button at the top right of the screen. |droid_alert_button| **Alert button** -You can send an alert to the display by entering the text in the box and +You can send an alert to the live display by entering the text in the box and clicking on :guilabel:`Process`. The alert will be displayed as you have it configured in :ref:`configure_alerts`. @@ -171,28 +216,32 @@ Using the display blank type gives you the ability to blank your screen to the methods described below. You can find out more about this feature and how it operates on the main computer at :ref:`blank_control`. -**Show Live:** +.. image:: pics/droid_blank.png + +**Live display:** Do not blank, or unblank the display. -**Display Blank:** +**Display Black Only:** Choosing this option will blank your projector to black as if it were shut off. -**Display Theme:** +**Display Theme only:** Choosing this option will show your blank theme only, without lyrics or verses. If you are blanking a song with an assigned theme it will blank to that theme. If no theme is assigned or you are blanking a presentation or image, it will blank to the global theme. -**Display Desktop:** +**Display Desktop background:** Choosing this option will show your desktop wallpaper or a program that you have open on the extended monitor or projector. You can seamlessly switch between the desktop wallpaper or a program and OpenLP by Blank to Desktop. -.. image:: pics/droid_blank.png .. |droid_alert_button| image:: pics/droid_alert_button.png .. |droid_blank_button| image:: pics/droid_blank_button.png +.. |droid_menu_button| image:: pics/droid_menu_button.png +.. |droid_left_menu_button| image:: pics/droid_left_menu_button.png -.. _OpenLP - Remote 2: https://play.google.com/store/apps/details?id=org.openlp.android2 + +.. _OpenLP - Remote 2.0: https://play.google.com/store/apps/details?id=org.openlp.android2 diff --git a/manual/source/configure.rst b/manual/source/configure.rst index a2864e4..af97973 100644 --- a/manual/source/configure.rst +++ b/manual/source/configure.rst @@ -746,7 +746,7 @@ Android and iOS Remotes You can quickly find and download the OpenLP Android or iOS remote apps using your barcode scanner or by clicking on the :guilabel:`download` link. See the sections on -the :ref:`android-remote` and ref:`ios-remote` for more details on how to install +the :ref:`android-remote` and :ref:`ios-remote` for more details on how to install and use them. Finding your IP address diff --git a/manual/source/pics/droid_accept.png b/manual/source/pics/droid_accept.png deleted file mode 100644 index 1ee6318..0000000 Binary files a/manual/source/pics/droid_accept.png and /dev/null differ diff --git a/manual/source/pics/droid_alert.png b/manual/source/pics/droid_alert.png index ed99479..24012e6 100644 Binary files a/manual/source/pics/droid_alert.png and b/manual/source/pics/droid_alert.png differ diff --git a/manual/source/pics/droid_all_apps.png b/manual/source/pics/droid_all_apps.png deleted file mode 100644 index 8e30c82..0000000 Binary files a/manual/source/pics/droid_all_apps.png and /dev/null differ diff --git a/manual/source/pics/droid_blank.png b/manual/source/pics/droid_blank.png index cb1744b..3f37fd6 100644 Binary files a/manual/source/pics/droid_blank.png and b/manual/source/pics/droid_blank.png differ diff --git a/manual/source/pics/droid_blank_type.png b/manual/source/pics/droid_blank_type.png deleted file mode 100644 index 73031eb..0000000 Binary files a/manual/source/pics/droid_blank_type.png and /dev/null differ diff --git a/manual/source/pics/droid_configure.png b/manual/source/pics/droid_configure.png deleted file mode 100644 index 9be15b8..0000000 Binary files a/manual/source/pics/droid_configure.png and /dev/null differ diff --git a/manual/source/pics/droid_connection.png b/manual/source/pics/droid_connection.png deleted file mode 100644 index 0399bde..0000000 Binary files a/manual/source/pics/droid_connection.png and /dev/null differ diff --git a/manual/source/pics/droid_connection_timeout.png b/manual/source/pics/droid_connection_timeout.png deleted file mode 100644 index 7e375af..0000000 Binary files a/manual/source/pics/droid_connection_timeout.png and /dev/null differ diff --git a/manual/source/pics/droid_downloading.png b/manual/source/pics/droid_downloading.png deleted file mode 100644 index ccd32f2..0000000 Binary files a/manual/source/pics/droid_downloading.png and /dev/null differ diff --git a/manual/source/pics/droid_find.png b/manual/source/pics/droid_find.png deleted file mode 100644 index 331e26c..0000000 Binary files a/manual/source/pics/droid_find.png and /dev/null differ diff --git a/manual/source/pics/droid_found1.png b/manual/source/pics/droid_found1.png deleted file mode 100644 index 9d2e530..0000000 Binary files a/manual/source/pics/droid_found1.png and /dev/null differ diff --git a/manual/source/pics/droid_found_add1.png b/manual/source/pics/droid_found_add1.png deleted file mode 100644 index 1319cf0..0000000 Binary files a/manual/source/pics/droid_found_add1.png and /dev/null differ diff --git a/manual/source/pics/droid_found_select1.png b/manual/source/pics/droid_found_select1.png deleted file mode 100644 index c53d86a..0000000 Binary files a/manual/source/pics/droid_found_select1.png and /dev/null differ diff --git a/manual/source/pics/droid_free.png b/manual/source/pics/droid_free.png deleted file mode 100644 index 673453d..0000000 Binary files a/manual/source/pics/droid_free.png and /dev/null differ diff --git a/manual/source/pics/droid_install.png b/manual/source/pics/droid_install.png deleted file mode 100644 index 417664d..0000000 Binary files a/manual/source/pics/droid_install.png and /dev/null differ diff --git a/manual/source/pics/droid_left_menu.png b/manual/source/pics/droid_left_menu.png index 9aa307e..28e9d25 100644 Binary files a/manual/source/pics/droid_left_menu.png and b/manual/source/pics/droid_left_menu.png differ diff --git a/manual/source/pics/droid_left_menu_button.png b/manual/source/pics/droid_left_menu_button.png new file mode 100644 index 0000000..e8b4e4e Binary files /dev/null and b/manual/source/pics/droid_left_menu_button.png differ diff --git a/manual/source/pics/droid_live_list_landscape.png b/manual/source/pics/droid_live_list_landscape.png index e982890..f3e49d0 100644 Binary files a/manual/source/pics/droid_live_list_landscape.png and b/manual/source/pics/droid_live_list_landscape.png differ diff --git a/manual/source/pics/droid_live_list_portrait.png b/manual/source/pics/droid_live_list_portrait.png index 8e2b6a1..384f70c 100644 Binary files a/manual/source/pics/droid_live_list_portrait.png and b/manual/source/pics/droid_live_list_portrait.png differ diff --git a/manual/source/pics/droid_live_view.png b/manual/source/pics/droid_live_view.png deleted file mode 100644 index ff2dce7..0000000 Binary files a/manual/source/pics/droid_live_view.png and /dev/null differ diff --git a/manual/source/pics/droid_live_view_landscape.png b/manual/source/pics/droid_live_view_landscape.png new file mode 100644 index 0000000..e660b9a Binary files /dev/null and b/manual/source/pics/droid_live_view_landscape.png differ diff --git a/manual/source/pics/droid_menu_button.png b/manual/source/pics/droid_menu_button.png new file mode 100644 index 0000000..1d89713 Binary files /dev/null and b/manual/source/pics/droid_menu_button.png differ diff --git a/manual/source/pics/droid_open.png b/manual/source/pics/droid_open.png deleted file mode 100644 index ccc8232..0000000 Binary files a/manual/source/pics/droid_open.png and /dev/null differ diff --git a/manual/source/pics/droid_play.png b/manual/source/pics/droid_play.png deleted file mode 100644 index ff5d030..0000000 Binary files a/manual/source/pics/droid_play.png and /dev/null differ diff --git a/manual/source/pics/droid_port.png b/manual/source/pics/droid_port.png deleted file mode 100644 index 4c77f3b..0000000 Binary files a/manual/source/pics/droid_port.png and /dev/null differ diff --git a/manual/source/pics/droid_preferences1.png b/manual/source/pics/droid_preferences1.png index fed8925..70ae1cb 100644 Binary files a/manual/source/pics/droid_preferences1.png and b/manual/source/pics/droid_preferences1.png differ diff --git a/manual/source/pics/droid_preferences2.png b/manual/source/pics/droid_preferences2.png index f4a0276..4c9f3fe 100644 Binary files a/manual/source/pics/droid_preferences2.png and b/manual/source/pics/droid_preferences2.png differ diff --git a/manual/source/pics/droid_right_menu.png b/manual/source/pics/droid_right_menu.png index d02a8cd..89a847e 100644 Binary files a/manual/source/pics/droid_right_menu.png and b/manual/source/pics/droid_right_menu.png differ diff --git a/manual/source/pics/droid_search_all1.png b/manual/source/pics/droid_search_all1.png deleted file mode 100644 index b23fa84..0000000 Binary files a/manual/source/pics/droid_search_all1.png and /dev/null differ diff --git a/manual/source/pics/droid_search_initial.png b/manual/source/pics/droid_search_initial.png new file mode 100644 index 0000000..0522760 Binary files /dev/null and b/manual/source/pics/droid_search_initial.png differ diff --git a/manual/source/pics/droid_search_menu.png b/manual/source/pics/droid_search_menu.png new file mode 100644 index 0000000..3d89071 Binary files /dev/null and b/manual/source/pics/droid_search_menu.png differ diff --git a/manual/source/pics/droid_search_results.png b/manual/source/pics/droid_search_results.png new file mode 100644 index 0000000..6ba3fa1 Binary files /dev/null and b/manual/source/pics/droid_search_results.png differ diff --git a/manual/source/pics/droid_search_send_to_menu.png b/manual/source/pics/droid_search_send_to_menu.png new file mode 100644 index 0000000..4a49a80 Binary files /dev/null and b/manual/source/pics/droid_search_send_to_menu.png differ diff --git a/manual/source/pics/droid_search_text.png b/manual/source/pics/droid_search_text.png new file mode 100644 index 0000000..45e4db0 Binary files /dev/null and b/manual/source/pics/droid_search_text.png differ diff --git a/manual/source/pics/droid_server.png b/manual/source/pics/droid_server.png deleted file mode 100644 index c888bf9..0000000 Binary files a/manual/source/pics/droid_server.png and /dev/null differ diff --git a/manual/source/pics/droid_service.png b/manual/source/pics/droid_service.png index 6f8ce29..34c05a0 100644 Binary files a/manual/source/pics/droid_service.png and b/manual/source/pics/droid_service.png differ diff --git a/manual/source/pics/droid_settings_return1.png b/manual/source/pics/droid_settings_return1.png deleted file mode 100644 index 86a90b7..0000000 Binary files a/manual/source/pics/droid_settings_return1.png and /dev/null differ diff --git a/manual/source/pics/droid_slide.png b/manual/source/pics/droid_slide.png deleted file mode 100644 index 0c146b5..0000000 Binary files a/manual/source/pics/droid_slide.png and /dev/null differ diff --git a/manual/source/pics/droid_socket_timeout.png b/manual/source/pics/droid_socket_timeout.png deleted file mode 100644 index 271ab81..0000000 Binary files a/manual/source/pics/droid_socket_timeout.png and /dev/null differ diff --git a/manual/source/pics/droid_stage.png b/manual/source/pics/droid_stage.png deleted file mode 100644 index ebc34db..0000000 Binary files a/manual/source/pics/droid_stage.png and /dev/null differ diff --git a/manual/source/pics/droid_stage_view.png b/manual/source/pics/droid_stage_view.png index f6fe5f5..70a2354 100644 Binary files a/manual/source/pics/droid_stage_view.png and b/manual/source/pics/droid_stage_view.png differ diff --git a/manual/source/pics/droid_start.png b/manual/source/pics/droid_start.png index 6fc882e..fe3e00f 100644 Binary files a/manual/source/pics/droid_start.png and b/manual/source/pics/droid_start.png differ diff --git a/manual/source/pics/droid_text.png b/manual/source/pics/droid_text.png index 222ea37..70ae1cb 100644 Binary files a/manual/source/pics/droid_text.png and b/manual/source/pics/droid_text.png differ