From 638b0f7a6fb333203e0ffb475972fa33cf95a174 Mon Sep 17 00:00:00 2001 From: Leszek Kubik Date: Sun, 5 Mar 2017 16:11:16 +0100 Subject: [PATCH 01/46] ReLaunchX 1.0.0, see changelog --- .gitignore | 10 + .idea/compiler.xml | 22 ++ .idea/copyright/profiles_settings.xml | 3 + .idea/gradle.xml | 18 + .idea/misc.xml | 36 ++ .idea/modules.xml | 9 + .idea/runConfigurations.xml | 12 + .idea/vcs.xml | 6 + .project | 33 -- .settings/org.eclipse.jdt.core.prefs | 5 - README | 84 ----- README.md | 212 ++++++++++++ TODO | 16 + app/build.gradle | 35 ++ {libs => app/libs}/ebookParser-1.3.jar | Bin .../src/main/AndroidManifest.xml | 6 +- .../java/com/gacode/relaunchx}/Advanced.java | 283 +++++++++------- .../gacode/relaunchx}/AllApplications.java | 2 +- .../java/com/gacode/relaunchx}/BooksBase.java | 2 +- .../com/gacode/relaunchx}/DeviceInfo.java | 7 +- .../java/com/gacode/relaunchx}/Editor.java | 2 +- .../com/gacode/relaunchx}/EinkScreen.java | 4 +- .../gacode/relaunchx}/FiltersActivity.java | 2 +- .../main/java/com/gacode/relaunchx}/Home.java | 2 +- .../java/com/gacode/relaunchx}/Home1.java | 2 +- .../java/com/gacode/relaunchx}/Library.java | 2 +- .../com/gacode/relaunchx}/ListActions.java | 2 +- .../main/java/com/gacode/relaunchx}/Main.java | 2 +- .../gacode/relaunchx}/N2EpdController.java | 2 +- .../com/gacode/relaunchx}/PowerFunctions.java | 2 +- .../com/gacode/relaunchx}/PrefsActivity.java | 8 +- .../java/com/gacode/relaunchx}/ReLaunch.java | 316 +++++++++--------- .../com/gacode/relaunchx}/ReLaunchApp.java | 10 +- .../gacode/relaunchx}/ResultsActivity.java | 8 +- .../java/com/gacode/relaunchx}/SView.java | 2 +- .../gacode/relaunchx}/ScreenOrientation.java | 2 +- .../com/gacode/relaunchx}/SearchActivity.java | 2 +- .../main/java/com/gacode/relaunchx}/Shop.java | 2 +- .../com/gacode/relaunchx}/TaskManager.java | 2 +- .../com/gacode/relaunchx}/TypesActivity.java | 2 +- .../java/com/gacode/relaunchx}/Viewer.java | 2 +- .../main/res}/drawable-hdpi/arrow_down.png | Bin .../src/main/res}/drawable-hdpi/arrow_up.png | Bin .../src/main/res}/drawable-hdpi/bat1.png | Bin .../src/main/res}/drawable-hdpi/bat2.png | Bin .../src/main/res}/drawable-hdpi/bat3.png | Bin .../src/main/res}/drawable-hdpi/bat4.png | Bin .../src/main/res}/drawable-hdpi/ci_add.png | Bin .../main/res}/drawable-hdpi/ci_arrowdown.png | Bin .../main/res}/drawable-hdpi/ci_arrowup.png | Bin .../res}/drawable-hdpi/ci_associations.png | Bin .../src/main/res}/drawable-hdpi/ci_az.png | Bin .../src/main/res}/drawable-hdpi/ci_books.png | Bin .../src/main/res}/drawable-hdpi/ci_cpu.png | Bin .../main/res}/drawable-hdpi/ci_default.png | Bin .../src/main/res}/drawable-hdpi/ci_del.png | Bin .../main/res}/drawable-hdpi/ci_delsmall.png | Bin .../src/main/res}/drawable-hdpi/ci_edit.png | Bin .../main/res}/drawable-hdpi/ci_eightdir.png | Bin .../src/main/res}/drawable-hdpi/ci_exit.png | Bin .../src/main/res}/drawable-hdpi/ci_fav.png | Bin .../src/main/res}/drawable-hdpi/ci_fava.png | Bin .../src/main/res}/drawable-hdpi/ci_filter.png | Bin .../src/main/res}/drawable-hdpi/ci_gear.png | Bin .../src/main/res}/drawable-hdpi/ci_gear2.png | Bin .../src/main/res}/drawable-hdpi/ci_grid.png | Bin .../src/main/res}/drawable-hdpi/ci_home.png | Bin .../src/main/res}/drawable-hdpi/ci_kill.png | Bin .../main/res}/drawable-hdpi/ci_levelup.png | Bin .../src/main/res}/drawable-hdpi/ci_lock.png | Bin .../src/main/res}/drawable-hdpi/ci_lre.png | Bin .../src/main/res}/drawable-hdpi/ci_lrea.png | Bin .../src/main/res}/drawable-hdpi/ci_ok.png | Bin .../src/main/res}/drawable-hdpi/ci_power.png | Bin .../main/res}/drawable-hdpi/ci_question.png | Bin .../src/main/res}/drawable-hdpi/ci_ram.png | Bin .../src/main/res}/drawable-hdpi/ci_reboot.png | Bin .../src/main/res}/drawable-hdpi/ci_run.png | Bin .../src/main/res}/drawable-hdpi/ci_save.png | Bin .../src/main/res}/drawable-hdpi/ci_search.png | Bin .../src/main/res}/drawable-hdpi/ci_tools.png | Bin .../src/main/res}/drawable-hdpi/ci_wifi.png | Bin .../main/res}/drawable-hdpi/ci_wifiscan.png | Bin .../main/res}/drawable-hdpi/ci_wifisetup.png | Bin .../src/main/res}/drawable-hdpi/dir_ok.png | Bin .../main/res}/drawable-hdpi/file_notok.png | Bin .../src/main/res}/drawable-hdpi/file_ok.png | Bin app/src/main/res/drawable-hdpi/icon.png | Bin 0 -> 1493 bytes .../src/main/res}/drawable-hdpi/install.png | Bin .../main/res}/drawable-hdpi/main_button.xml | 0 .../drawable-hdpi/poweroff_screen_240x240.png | Bin .../src/main/res}/drawable-hdpi/ram.png | Bin .../drawable-hdpi/reboot_screen_240x240.png | Bin .../src/main/res}/drawable-hdpi/wifi_off.png | Bin .../src/main/res}/drawable-hdpi/wifi_on.png | Bin .../main/res}/drawable-mdpi/arrow_down.png | Bin .../src/main/res}/drawable-mdpi/arrow_up.png | Bin .../src/main/res}/drawable-mdpi/bat1.png | Bin .../src/main/res}/drawable-mdpi/bat2.png | Bin .../src/main/res}/drawable-mdpi/bat3.png | Bin .../src/main/res}/drawable-mdpi/bat4.png | Bin .../src/main/res}/drawable-mdpi/ci_add.png | Bin .../main/res}/drawable-mdpi/ci_arrowdown.png | Bin .../main/res}/drawable-mdpi/ci_arrowup.png | Bin .../res}/drawable-mdpi/ci_associations.png | Bin .../src/main/res}/drawable-mdpi/ci_az.png | Bin .../src/main/res}/drawable-mdpi/ci_books.png | Bin .../src/main/res}/drawable-mdpi/ci_cpu.png | Bin .../main/res}/drawable-mdpi/ci_default.png | Bin .../src/main/res}/drawable-mdpi/ci_del.png | Bin .../main/res}/drawable-mdpi/ci_delsmall.png | Bin .../src/main/res}/drawable-mdpi/ci_edit.png | Bin .../main/res}/drawable-mdpi/ci_eightdir.png | Bin .../src/main/res}/drawable-mdpi/ci_exit.png | Bin .../src/main/res}/drawable-mdpi/ci_fav.png | Bin .../src/main/res}/drawable-mdpi/ci_fava.png | Bin .../src/main/res}/drawable-mdpi/ci_filter.png | Bin .../src/main/res}/drawable-mdpi/ci_gear.png | Bin .../src/main/res}/drawable-mdpi/ci_gear2.png | Bin .../src/main/res}/drawable-mdpi/ci_grid.png | Bin .../src/main/res}/drawable-mdpi/ci_home.png | Bin .../src/main/res}/drawable-mdpi/ci_kill.png | Bin .../main/res}/drawable-mdpi/ci_levelup.png | Bin .../src/main/res}/drawable-mdpi/ci_lock.png | Bin .../src/main/res}/drawable-mdpi/ci_lre.png | Bin .../src/main/res}/drawable-mdpi/ci_lrea.png | Bin .../src/main/res}/drawable-mdpi/ci_ok.png | Bin .../src/main/res}/drawable-mdpi/ci_power.png | Bin .../main/res}/drawable-mdpi/ci_question.png | Bin .../src/main/res}/drawable-mdpi/ci_ram.png | Bin .../src/main/res}/drawable-mdpi/ci_reboot.png | Bin .../src/main/res}/drawable-mdpi/ci_run.png | Bin .../src/main/res}/drawable-mdpi/ci_save.png | Bin .../src/main/res}/drawable-mdpi/ci_search.png | Bin .../src/main/res}/drawable-mdpi/ci_tools.png | Bin .../src/main/res}/drawable-mdpi/ci_wifi.png | Bin .../main/res}/drawable-mdpi/ci_wifiscan.png | Bin .../main/res}/drawable-mdpi/ci_wifisetup.png | Bin .../src/main/res}/drawable-mdpi/dir_ok.png | Bin .../main/res}/drawable-mdpi/file_notok.png | Bin .../src/main/res}/drawable-mdpi/file_ok.png | Bin app/src/main/res/drawable-mdpi/icon.png | Bin 0 -> 1051 bytes .../src/main/res}/drawable-mdpi/install.png | Bin .../main/res}/drawable-mdpi/main_button.xml | 0 .../drawable-mdpi/poweroff_screen_240x240.png | Bin .../src/main/res}/drawable-mdpi/ram.png | Bin .../drawable-mdpi/reboot_screen_240x240.png | Bin .../src/main/res}/drawable-mdpi/wifi_off.png | Bin .../src/main/res}/drawable-mdpi/wifi_on.png | Bin .../main/res}/drawable/flist_separator.xml | 0 .../src/main/res}/drawable/title_button.xml | 0 .../main/res}/layout-hdpi/adv_wifi_item.xml | 0 .../main/res}/layout-hdpi/advanced_layout.xml | 12 +- .../res}/layout-hdpi/all_applications.xml | 0 .../res}/layout-hdpi/applications_item.xml | 0 .../src/main/res}/layout-hdpi/bookinfo.xml | 0 .../main/res}/layout-hdpi/cmenu_list_item.xml | 0 .../main/res}/layout-hdpi/editor_layout.xml | 0 .../src/main/res}/layout-hdpi/fileinfo.xml | 10 +- .../main/res}/layout-hdpi/filters_item.xml | 2 +- .../main/res}/layout-hdpi/filters_view.xml | 0 .../main/res}/layout-hdpi/flist_layout.xml | 0 .../src/main/res}/layout-hdpi/main.xml | 0 .../src/main/res}/layout-hdpi/poweroff.xml | 0 .../src/main/res}/layout-hdpi/pref_child.xml | 0 .../src/main/res}/layout-hdpi/prefs_main.xml | 0 .../src/main/res}/layout-hdpi/reboot.xml | 0 .../main/res}/layout-hdpi/results_item.xml | 0 .../main/res}/layout-hdpi/results_layout.xml | 0 .../src/main/res}/layout-hdpi/search.xml | 8 +- .../main/res}/layout-hdpi/service_details.xml | 8 +- .../res}/layout-hdpi/simple_list_item_1.xml | 0 .../main/res}/layout-hdpi/task_details.xml | 2 +- .../res}/layout-hdpi/taskmanager_item.xml | 0 .../res}/layout-hdpi/taskmanager_layout.xml | 4 +- .../main/res}/layout-hdpi/types_layout.xml | 2 +- .../src/main/res}/layout-hdpi/types_view.xml | 0 .../main/res}/layout-hdpi/viewer_layout.xml | 0 .../main/res}/layout-mdpi/adv_wifi_item.xml | 0 .../main/res}/layout-mdpi/advanced_layout.xml | 12 +- .../res}/layout-mdpi/all_applications.xml | 0 .../res}/layout-mdpi/applications_item.xml | 0 .../src/main/res}/layout-mdpi/bookinfo.xml | 0 .../main/res}/layout-mdpi/cmenu_list_item.xml | 0 .../main/res}/layout-mdpi/editor_layout.xml | 0 .../src/main/res}/layout-mdpi/fileinfo.xml | 10 +- .../main/res}/layout-mdpi/filters_item.xml | 2 +- .../main/res}/layout-mdpi/filters_view.xml | 0 .../main/res}/layout-mdpi/flist_layout.xml | 0 .../src/main/res}/layout-mdpi/main.xml | 0 .../src/main/res}/layout-mdpi/poweroff.xml | 0 .../src/main/res}/layout-mdpi/pref_child.xml | 0 .../src/main/res}/layout-mdpi/prefs_main.xml | 0 .../src/main/res}/layout-mdpi/reboot.xml | 0 .../main/res}/layout-mdpi/results_item.xml | 0 .../main/res}/layout-mdpi/results_layout.xml | 0 .../src/main/res}/layout-mdpi/search.xml | 8 +- .../main/res}/layout-mdpi/service_details.xml | 8 +- .../res}/layout-mdpi/simple_list_item_1.xml | 0 .../main/res}/layout-mdpi/task_details.xml | 2 +- .../res}/layout-mdpi/taskmanager_item.xml | 0 .../res}/layout-mdpi/taskmanager_layout.xml | 4 +- .../main/res}/layout-mdpi/types_layout.xml | 2 +- .../src/main/res}/layout-mdpi/types_view.xml | 0 .../main/res}/layout-mdpi/viewer_layout.xml | 0 .../src/main/res}/menu-es/mainmenu.xml | 0 .../src/main/res}/menu-es/resultsmenu.xml | 0 .../src/main/res}/menu-es/searchmenu.xml | 0 .../src/main/res}/menu-ru/mainmenu.xml | 0 .../src/main/res}/menu-ru/resultsmenu.xml | 0 .../src/main/res}/menu-ru/searchmenu.xml | 0 {res => app/src/main/res}/menu/mainmenu.xml | 0 .../src/main/res}/menu/resultsmenu.xml | 0 {res => app/src/main/res}/menu/searchmenu.xml | 0 .../src/main/res}/values-es/arrays.xml | 1 + .../src/main/res}/values-es/changelog.xml | 0 .../src/main/res}/values-es/strings.xml | 127 ++++--- .../src/main/res}/values-ru/changelog.xml | 0 .../src/main/res}/values-ru/strings.xml | 178 +++++----- {res => app/src/main/res}/values/arrays.xml | 1 + .../src/main/res}/values/changelog.xml | 38 ++- {res => app/src/main/res}/values/colors.xml | 0 .../src/main/res}/values/limitations.xml | 4 + app/src/main/res/values/shell.xml | 6 + {res => app/src/main/res}/values/strings.xml | 178 +++++----- {res => app/src/main/res}/values/styles.xml | 0 {res => app/src/main/res}/values/values.xml | 0 {res => app/src/main/res}/xml/prefs.xml | 0 build.gradle | 17 + debug.keystore | Bin 1270 -> 0 bytes gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 53636 bytes gradle/wrapper/gradle-wrapper.properties | 6 + gradlew | 160 +++++++++ gradlew.bat | 90 +++++ proguard.cfg | 40 --- project.properties | 11 - res/drawable-hdpi/icon.png | Bin 3236 -> 0 bytes res/drawable-mdpi/icon.png | Bin 3236 -> 0 bytes res/values/shell.xml | 6 - settings.gradle | 1 + 240 files changed, 1340 insertions(+), 799 deletions(-) create mode 100644 .gitignore create mode 100644 .idea/compiler.xml create mode 100644 .idea/copyright/profiles_settings.xml create mode 100644 .idea/gradle.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/runConfigurations.xml create mode 100644 .idea/vcs.xml delete mode 100644 .project delete mode 100644 .settings/org.eclipse.jdt.core.prefs delete mode 100644 README create mode 100644 README.md create mode 100644 app/build.gradle rename {libs => app/libs}/ebookParser-1.3.jar (100%) rename AndroidManifest.xml => app/src/main/AndroidManifest.xml (96%) rename {src/com/harasoft/relaunch => app/src/main/java/com/gacode/relaunchx}/Advanced.java (73%) rename {src/com/harasoft/relaunch => app/src/main/java/com/gacode/relaunchx}/AllApplications.java (99%) rename {src/com/harasoft/relaunch => app/src/main/java/com/gacode/relaunchx}/BooksBase.java (99%) rename {src/com/harasoft/relaunch => app/src/main/java/com/gacode/relaunchx}/DeviceInfo.java (89%) rename {src/com/harasoft/relaunch => app/src/main/java/com/gacode/relaunchx}/Editor.java (99%) rename {src/com/harasoft/relaunch => app/src/main/java/com/gacode/relaunchx}/EinkScreen.java (98%) rename {src/com/harasoft/relaunch => app/src/main/java/com/gacode/relaunchx}/FiltersActivity.java (99%) rename {src/com/harasoft/relaunch => app/src/main/java/com/gacode/relaunchx}/Home.java (96%) rename {src/com/harasoft/relaunch => app/src/main/java/com/gacode/relaunchx}/Home1.java (96%) rename {src/com/harasoft/relaunch => app/src/main/java/com/gacode/relaunchx}/Library.java (96%) rename {src/com/harasoft/relaunch => app/src/main/java/com/gacode/relaunchx}/ListActions.java (99%) rename {src/com/harasoft/relaunch => app/src/main/java/com/gacode/relaunchx}/Main.java (96%) rename {src/com/harasoft/relaunch => app/src/main/java/com/gacode/relaunchx}/N2EpdController.java (99%) rename {src/com/harasoft/relaunch => app/src/main/java/com/gacode/relaunchx}/PowerFunctions.java (99%) rename {src/com/harasoft/relaunch => app/src/main/java/com/gacode/relaunchx}/PrefsActivity.java (99%) rename {src/com/harasoft/relaunch => app/src/main/java/com/gacode/relaunchx}/ReLaunch.java (93%) rename {src/com/harasoft/relaunch => app/src/main/java/com/gacode/relaunchx}/ReLaunchApp.java (98%) rename {src/com/harasoft/relaunch => app/src/main/java/com/gacode/relaunchx}/ResultsActivity.java (99%) rename {src/com/harasoft/relaunch => app/src/main/java/com/gacode/relaunchx}/SView.java (98%) rename {src/com/harasoft/relaunch => app/src/main/java/com/gacode/relaunchx}/ScreenOrientation.java (94%) rename {src/com/harasoft/relaunch => app/src/main/java/com/gacode/relaunchx}/SearchActivity.java (99%) rename {src/com/harasoft/relaunch => app/src/main/java/com/gacode/relaunchx}/Shop.java (96%) rename {src/com/harasoft/relaunch => app/src/main/java/com/gacode/relaunchx}/TaskManager.java (99%) rename {src/com/harasoft/relaunch => app/src/main/java/com/gacode/relaunchx}/TypesActivity.java (99%) rename {src/com/harasoft/relaunch => app/src/main/java/com/gacode/relaunchx}/Viewer.java (99%) rename {res => app/src/main/res}/drawable-hdpi/arrow_down.png (100%) rename {res => app/src/main/res}/drawable-hdpi/arrow_up.png (100%) rename {res => app/src/main/res}/drawable-hdpi/bat1.png (100%) rename {res => app/src/main/res}/drawable-hdpi/bat2.png (100%) rename {res => app/src/main/res}/drawable-hdpi/bat3.png (100%) rename {res => app/src/main/res}/drawable-hdpi/bat4.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ci_add.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ci_arrowdown.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ci_arrowup.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ci_associations.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ci_az.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ci_books.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ci_cpu.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ci_default.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ci_del.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ci_delsmall.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ci_edit.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ci_eightdir.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ci_exit.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ci_fav.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ci_fava.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ci_filter.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ci_gear.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ci_gear2.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ci_grid.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ci_home.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ci_kill.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ci_levelup.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ci_lock.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ci_lre.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ci_lrea.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ci_ok.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ci_power.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ci_question.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ci_ram.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ci_reboot.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ci_run.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ci_save.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ci_search.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ci_tools.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ci_wifi.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ci_wifiscan.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ci_wifisetup.png (100%) rename {res => app/src/main/res}/drawable-hdpi/dir_ok.png (100%) rename {res => app/src/main/res}/drawable-hdpi/file_notok.png (100%) rename {res => app/src/main/res}/drawable-hdpi/file_ok.png (100%) create mode 100644 app/src/main/res/drawable-hdpi/icon.png rename {res => app/src/main/res}/drawable-hdpi/install.png (100%) rename {res => app/src/main/res}/drawable-hdpi/main_button.xml (100%) rename {res => app/src/main/res}/drawable-hdpi/poweroff_screen_240x240.png (100%) rename {res => app/src/main/res}/drawable-hdpi/ram.png (100%) rename {res => app/src/main/res}/drawable-hdpi/reboot_screen_240x240.png (100%) rename {res => app/src/main/res}/drawable-hdpi/wifi_off.png (100%) rename {res => app/src/main/res}/drawable-hdpi/wifi_on.png (100%) rename {res => app/src/main/res}/drawable-mdpi/arrow_down.png (100%) rename {res => app/src/main/res}/drawable-mdpi/arrow_up.png (100%) rename {res => app/src/main/res}/drawable-mdpi/bat1.png (100%) rename {res => app/src/main/res}/drawable-mdpi/bat2.png (100%) rename {res => app/src/main/res}/drawable-mdpi/bat3.png (100%) rename {res => app/src/main/res}/drawable-mdpi/bat4.png (100%) rename {res => app/src/main/res}/drawable-mdpi/ci_add.png (100%) rename {res => app/src/main/res}/drawable-mdpi/ci_arrowdown.png (100%) rename {res => app/src/main/res}/drawable-mdpi/ci_arrowup.png (100%) rename {res => app/src/main/res}/drawable-mdpi/ci_associations.png (100%) rename {res => app/src/main/res}/drawable-mdpi/ci_az.png (100%) rename {res => app/src/main/res}/drawable-mdpi/ci_books.png (100%) rename {res => app/src/main/res}/drawable-mdpi/ci_cpu.png (100%) rename {res => app/src/main/res}/drawable-mdpi/ci_default.png (100%) rename {res => app/src/main/res}/drawable-mdpi/ci_del.png (100%) rename {res => app/src/main/res}/drawable-mdpi/ci_delsmall.png (100%) rename {res => app/src/main/res}/drawable-mdpi/ci_edit.png (100%) rename {res => app/src/main/res}/drawable-mdpi/ci_eightdir.png (100%) rename {res => app/src/main/res}/drawable-mdpi/ci_exit.png (100%) rename {res => app/src/main/res}/drawable-mdpi/ci_fav.png (100%) rename {res => app/src/main/res}/drawable-mdpi/ci_fava.png (100%) rename {res => app/src/main/res}/drawable-mdpi/ci_filter.png (100%) rename {res => app/src/main/res}/drawable-mdpi/ci_gear.png (100%) rename {res => app/src/main/res}/drawable-mdpi/ci_gear2.png (100%) rename {res => app/src/main/res}/drawable-mdpi/ci_grid.png (100%) rename {res => app/src/main/res}/drawable-mdpi/ci_home.png (100%) rename {res => app/src/main/res}/drawable-mdpi/ci_kill.png (100%) rename {res => app/src/main/res}/drawable-mdpi/ci_levelup.png (100%) rename {res => app/src/main/res}/drawable-mdpi/ci_lock.png (100%) rename {res => app/src/main/res}/drawable-mdpi/ci_lre.png (100%) rename {res => app/src/main/res}/drawable-mdpi/ci_lrea.png (100%) rename {res => app/src/main/res}/drawable-mdpi/ci_ok.png (100%) rename {res => app/src/main/res}/drawable-mdpi/ci_power.png (100%) rename {res => app/src/main/res}/drawable-mdpi/ci_question.png (100%) rename {res => app/src/main/res}/drawable-mdpi/ci_ram.png (100%) rename {res => app/src/main/res}/drawable-mdpi/ci_reboot.png (100%) rename {res => app/src/main/res}/drawable-mdpi/ci_run.png (100%) rename {res => app/src/main/res}/drawable-mdpi/ci_save.png (100%) rename {res => app/src/main/res}/drawable-mdpi/ci_search.png (100%) rename {res => app/src/main/res}/drawable-mdpi/ci_tools.png (100%) rename {res => app/src/main/res}/drawable-mdpi/ci_wifi.png (100%) rename {res => app/src/main/res}/drawable-mdpi/ci_wifiscan.png (100%) rename {res => app/src/main/res}/drawable-mdpi/ci_wifisetup.png (100%) rename {res => app/src/main/res}/drawable-mdpi/dir_ok.png (100%) rename {res => app/src/main/res}/drawable-mdpi/file_notok.png (100%) rename {res => app/src/main/res}/drawable-mdpi/file_ok.png (100%) create mode 100644 app/src/main/res/drawable-mdpi/icon.png rename {res => app/src/main/res}/drawable-mdpi/install.png (100%) rename {res => app/src/main/res}/drawable-mdpi/main_button.xml (100%) rename {res => app/src/main/res}/drawable-mdpi/poweroff_screen_240x240.png (100%) rename {res => app/src/main/res}/drawable-mdpi/ram.png (100%) rename {res => app/src/main/res}/drawable-mdpi/reboot_screen_240x240.png (100%) rename {res => app/src/main/res}/drawable-mdpi/wifi_off.png (100%) rename {res => app/src/main/res}/drawable-mdpi/wifi_on.png (100%) rename {res => app/src/main/res}/drawable/flist_separator.xml (100%) rename {res => app/src/main/res}/drawable/title_button.xml (100%) rename {res => app/src/main/res}/layout-hdpi/adv_wifi_item.xml (100%) rename {res => app/src/main/res}/layout-hdpi/advanced_layout.xml (92%) rename {res => app/src/main/res}/layout-hdpi/all_applications.xml (100%) rename {res => app/src/main/res}/layout-hdpi/applications_item.xml (100%) rename {res => app/src/main/res}/layout-hdpi/bookinfo.xml (100%) rename {res => app/src/main/res}/layout-hdpi/cmenu_list_item.xml (100%) rename {res => app/src/main/res}/layout-hdpi/editor_layout.xml (100%) rename {res => app/src/main/res}/layout-hdpi/fileinfo.xml (93%) rename {res => app/src/main/res}/layout-hdpi/filters_item.xml (99%) rename {res => app/src/main/res}/layout-hdpi/filters_view.xml (100%) rename {res => app/src/main/res}/layout-hdpi/flist_layout.xml (100%) rename {res => app/src/main/res}/layout-hdpi/main.xml (100%) rename {res => app/src/main/res}/layout-hdpi/poweroff.xml (100%) rename {res => app/src/main/res}/layout-hdpi/pref_child.xml (100%) rename {res => app/src/main/res}/layout-hdpi/prefs_main.xml (100%) rename {res => app/src/main/res}/layout-hdpi/reboot.xml (100%) rename {res => app/src/main/res}/layout-hdpi/results_item.xml (100%) rename {res => app/src/main/res}/layout-hdpi/results_layout.xml (100%) rename {res => app/src/main/res}/layout-hdpi/search.xml (95%) rename {res => app/src/main/res}/layout-hdpi/service_details.xml (98%) rename {res => app/src/main/res}/layout-hdpi/simple_list_item_1.xml (100%) rename {res => app/src/main/res}/layout-hdpi/task_details.xml (99%) rename {res => app/src/main/res}/layout-hdpi/taskmanager_item.xml (100%) rename {res => app/src/main/res}/layout-hdpi/taskmanager_layout.xml (98%) rename {res => app/src/main/res}/layout-hdpi/types_layout.xml (99%) rename {res => app/src/main/res}/layout-hdpi/types_view.xml (100%) rename {res => app/src/main/res}/layout-hdpi/viewer_layout.xml (100%) rename {res => app/src/main/res}/layout-mdpi/adv_wifi_item.xml (100%) rename {res => app/src/main/res}/layout-mdpi/advanced_layout.xml (91%) rename {res => app/src/main/res}/layout-mdpi/all_applications.xml (100%) rename {res => app/src/main/res}/layout-mdpi/applications_item.xml (100%) rename {res => app/src/main/res}/layout-mdpi/bookinfo.xml (100%) rename {res => app/src/main/res}/layout-mdpi/cmenu_list_item.xml (100%) rename {res => app/src/main/res}/layout-mdpi/editor_layout.xml (100%) rename {res => app/src/main/res}/layout-mdpi/fileinfo.xml (93%) rename {res => app/src/main/res}/layout-mdpi/filters_item.xml (99%) rename {res => app/src/main/res}/layout-mdpi/filters_view.xml (100%) rename {res => app/src/main/res}/layout-mdpi/flist_layout.xml (100%) rename {res => app/src/main/res}/layout-mdpi/main.xml (100%) rename {res => app/src/main/res}/layout-mdpi/poweroff.xml (100%) rename {res => app/src/main/res}/layout-mdpi/pref_child.xml (100%) rename {res => app/src/main/res}/layout-mdpi/prefs_main.xml (100%) rename {res => app/src/main/res}/layout-mdpi/reboot.xml (100%) rename {res => app/src/main/res}/layout-mdpi/results_item.xml (100%) rename {res => app/src/main/res}/layout-mdpi/results_layout.xml (100%) rename {res => app/src/main/res}/layout-mdpi/search.xml (95%) rename {res => app/src/main/res}/layout-mdpi/service_details.xml (98%) rename {res => app/src/main/res}/layout-mdpi/simple_list_item_1.xml (100%) rename {res => app/src/main/res}/layout-mdpi/task_details.xml (99%) rename {res => app/src/main/res}/layout-mdpi/taskmanager_item.xml (100%) rename {res => app/src/main/res}/layout-mdpi/taskmanager_layout.xml (98%) rename {res => app/src/main/res}/layout-mdpi/types_layout.xml (99%) rename {res => app/src/main/res}/layout-mdpi/types_view.xml (100%) rename {res => app/src/main/res}/layout-mdpi/viewer_layout.xml (100%) rename {res => app/src/main/res}/menu-es/mainmenu.xml (100%) rename {res => app/src/main/res}/menu-es/resultsmenu.xml (100%) rename {res => app/src/main/res}/menu-es/searchmenu.xml (100%) rename {res => app/src/main/res}/menu-ru/mainmenu.xml (100%) rename {res => app/src/main/res}/menu-ru/resultsmenu.xml (100%) rename {res => app/src/main/res}/menu-ru/searchmenu.xml (100%) rename {res => app/src/main/res}/menu/mainmenu.xml (100%) rename {res => app/src/main/res}/menu/resultsmenu.xml (100%) rename {res => app/src/main/res}/menu/searchmenu.xml (100%) rename {res => app/src/main/res}/values-es/arrays.xml (99%) rename {res => app/src/main/res}/values-es/changelog.xml (100%) rename {res => app/src/main/res}/values-es/strings.xml (86%) rename {res => app/src/main/res}/values-ru/changelog.xml (100%) rename {res => app/src/main/res}/values-ru/strings.xml (86%) rename {res => app/src/main/res}/values/arrays.xml (99%) rename {res => app/src/main/res}/values/changelog.xml (86%) rename {res => app/src/main/res}/values/colors.xml (100%) rename {res => app/src/main/res}/values/limitations.xml (83%) create mode 100644 app/src/main/res/values/shell.xml rename {res => app/src/main/res}/values/strings.xml (85%) rename {res => app/src/main/res}/values/styles.xml (100%) rename {res => app/src/main/res}/values/values.xml (100%) rename {res => app/src/main/res}/xml/prefs.xml (100%) create mode 100644 build.gradle delete mode 100644 debug.keystore create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat delete mode 100644 proguard.cfg delete mode 100644 project.properties delete mode 100644 res/drawable-hdpi/icon.png delete mode 100644 res/drawable-mdpi/icon.png delete mode 100644 res/values/shell.xml create mode 100644 settings.gradle diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ea21431 --- /dev/null +++ b/.gitignore @@ -0,0 +1,10 @@ +*.iml +.gradle +/local.properties +/.idea/workspace.xml +/.idea/libraries +.DS_Store +/build +/app/build +/captures +.externalNativeBuild diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..96cc43e --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..7ac24c7 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,18 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..b0a270f --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..43dfb44 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 0000000..7f68460 --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.project b/.project deleted file mode 100644 index 7193920..0000000 --- a/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - ReLaunch - - - - - - com.android.ide.eclipse.adt.ResourceManagerBuilder - - - - - com.android.ide.eclipse.adt.PreCompilerBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - com.android.ide.eclipse.adt.ApkBuilder - - - - - - com.android.ide.eclipse.adt.AndroidNature - org.eclipse.jdt.core.javanature - - diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 6473c0e..0000000 --- a/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,5 +0,0 @@ -#Wed Aug 03 15:49:35 PDT 2011 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.source=1.5 diff --git a/README b/README deleted file mode 100644 index 8bf4a19..0000000 --- a/README +++ /dev/null @@ -1,84 +0,0 @@ -ReLaunch - filemanager / launcher for Nook Simple Touch. - -This is a simple filenamager and/or launcher for Nook Simple Touch. It calls -predefined reader on file selection, In addition it has task manager, task killer, -application manager and file viewer/editor functionality. - -The tool is able to work in two modes: - -1. Application mode -=================== -When ReLaunch is invoked from other launcher (technically speaking when it -invoked using main intent - android.intent.action.MAIN) it works in application mode. - -1.1 filemanager ---------------- -You see a directory structure, you can walk on it. Tap on directory name to go into -the directory, tap on ".." labeled line to go one directory up. - -1.2 on-file actions, single tap -------------------------------- -When you tap on regular file (not a directory) the ReLaunch may perform a few actions, depending -on you settings (see 1.4 for settings details) - -- call explicit package or create intent for that file if such action is defined in - Settings->Associations screen -- for .apk file - install it -- for any other file - open viewer (if file is small enough, see 1.4). Note - that editor can be opened from the viewer -- do nothing if file is too big for viewer and association for that file not found - -1.3 on-file actions, long tap ------------------------------ -On long tap context menu is opened. The file can be added to favorites, marked as read (we -are speaking about ebooks, isn't it?) or removed (with confirmations, see 1.4). -Note that directories can be removed too, even recursively. Be careful! - -1.4 settings (first from left button on top panel) --------------------------------------------------- -Some application-wide settings. Pay attention to "Filter settings" and "Association". - -Filter settings defines which files are visible in file manager. If you define some rules there do not -forget to switch on "Filter result" checkbox in general settings section. - -Association defines action which performs on file tap (according to file's extension) - -1.5 search (second from left button on top panel ------------------------------------------------- -You can search files (books) from any root by some patterns. Note "Show all books" button. By pressing -it you see all files with known extension (see 1.4 associations). - -1.6 last opened files list (third from left button on top panel) ----------------------------------------------------------------- -Each file opened by ReLaunch remembered in last opened files (LIFO order). - -1.7 favorites list (fourth from left button on top panel --------------------------------------------------------- -You can manage favorites list by adding / removing books to it. - -1.8 about (fifth from left button on top panel) ------------------------------------------------ -Application info - - -2. Launcher mode -================ -When ReLanuch is invoked by pressing "Home" (in a NookSimpleTouch case by SoftKey -"home" button), or by pressing "Nook button - > Shop" or "Nook button - > Library" it -works in launcher mode. In that mode it has all standard launcher functionality (task -manager / application manager) in addition to application mode possibilities described above. - -Launcher mode functionality: -- Task manager (tap on memory status, first left bottom button) -- Last used applications (second left bottom button) -- All applications (third left bottom button) - You can launch application by taping on it, or uninstall it by - long tap (context menu opened) -- Favorites applications (fourth left bottom button) -- Battery status (tap on battery status, fifth left bottom button) - - -Notes -===== -Note 1: I build it in debug mode using eclipse. Do not forget to copy -debug.keystore to ~/.android in order to be compatible with old version diff --git a/README.md b/README.md new file mode 100644 index 0000000..4ab690b --- /dev/null +++ b/README.md @@ -0,0 +1,212 @@ +# ReLaunchX - filemanager / launcher for ONYX Boox Max + +ReLaunchX is a versatile reading programs launcher and system-wide shell for Onyx Boox Max. It is a continuation of ReLaunch 1.3.8 made for Nook Simple Touch (also supported by Sony PRS-T1). +It is assumed that the user library is organized in an ordered structure of folders and files have names of books that match their names. +ReLaunchX supports flexible configuration of many on-screen buttons for quick access to certain features of the program and run third party applications. + +Non-obvious possibilities: +* Some functions of the program available only with run as a desktop shell for system.<br> +* Some functions require a device with root-access, or only implemented for Nook Simple Touch (you will receive appropriate notice). +* On-screen scrolling buttons support double click to navigate to the specified number of percents in list and long-click to quickly move to the end (beginning) of the file list. This feature often will not work properly, be careful (you need to enable it in settings). +* If you open with the button, for example, the second-to-read book, it will be after the opening of the first. Thus, you will start in round fashion two (three, etc., depending on the configuration), the last-readed books. + +Note: +I aim to keep compatibility with previously supported devices however the only device on which I can run/debug the app is Onyx Boox Max as of today hence I decided to rename/rebrand the product in order to not cause any confusion. + +# The tool is able to work in two modes: + +### Application mode +When ReLaunch is invoked from other launcher (technically speaking when it invoked using main intent - android.intent.action.MAIN) it works in application mode. + +1. filemanager +You see a directory structure, you can walk on it. Tap on directory name to go into the directory, tap on ".." labeled line to go one directory up. + +2. on-file actions, single tap +When you tap on regular file (not a directory) the ReLaunch may perform a few actions, depending on you settings (see 4.) + * call explicit package or create intent for that file if such action is defined in Settings->Associations screen + * for .apk file - install it + * for any other file - open viewer (if file is small enough, see 4.). Note that editor can be opened from the viewer + * do nothing if file is too big for viewer and association for that file not found + +3. on-file actions, long tap +On long tap context menu is opened. The file can be added to favorites, marked as read (we are speaking about ebooks, isn't it?) or removed (with confirmations, see 4.). +Note that directories can be removed too, even recursively. Be careful! + +4. settings (first from left button on top panel) +Some application-wide settings. Pay attention to "Filter settings" and "Association". +Filter settings defines which files are visible in file manager. If you define some rules there do not forget to switch on "Filter result" checkbox in general settings section. +Association defines action which performs on file tap (according to file's extension) + +5. search (second from left button on top panel +You can search files (books) from any root by some patterns. Note "Show all books" button. By pressing it you see all files with known extension (see 4.). + +6. last opened files list (third from left button on top panel) +Each file opened by ReLaunch remembered in last opened files (LIFO order). + +7. favorites list (fourth from left button on top panel +You can manage favorites list by adding / removing books to it. + +8. about (fifth from left button on top panel) +Application info + +### Launcher mode +When ReLanuch is invoked by pressing "Home" (in a NookSimpleTouch case by SoftKey "home" button), or by pressing "Nook button - > Shop" or "Nook button - > Library" it works in launcher mode. In that mode it has all standard launcher functionality (task manager / application manager) in addition to application mode possibilities described above. + +Launcher mode functionality: +* Task manager (tap on memory status, first left bottom button) +* Last used applications (second left bottom button) +* All applications (third left bottom button) + You can launch application by taping on it, or uninstall it by + long tap (context menu opened) +* Favorites applications (fourth left bottom button) +* Battery status (tap on battery status, fifth left bottom button) + + +# CREDITS +* [ReLaunch project](https://github.com/yiselieren/ReLaunch) +* [CoolReader Engine project](http://sourceforge.net/projects/crengine/) (Eink support code) +* [Android Asset Studio](https://romannurik.github.io/AndroidAssetStudio/index.html) (icons) +* [DefaultIcon](http://www.defaulticon.com/) (icons) +* [Interactivemania](http://www.interactivemania.com/) (icon pack) + + +# CHANGELOG +* 1.0.0 + * fixed partition size and free space view for Onyx Boox Max + * added Onyx Boox Max to supported devices + * changed name to ReLaunchX and icon to differentiate from Legacy ReLaunch app + * changed Application ID to not conflict with Legacy ReLaunch app + * imported legacy project to AndroidStudio + * forked ReLaunch 1.3.8 project + + +## Legacy changelog from ReLaunch + +* 1.3.8 + * added file properties dialog + * rewritten book annotation dialog + * returned function "add to Start folders" +* 1.3.7 + * added annotation window for fb2/epub files + * Back button may be used for folder navigation + * Start Folder, selected from context menu, replaces the old ones + * single line output mode for filenames + * fixed bug, then longpress event fired after doubletap +* 1.3.6 + * updated preferences screen for SONY PRS-T1 + * new option \"Add start folder\" in context menu + * new options for double and long taps on "Favorite applications" button + * disabled fullscreen mode in Preferences activity + * fixed bug with symbol # in file names + * tunable number of columns of All and Favorite applications + * added new variable %f to book name template +* 1.3.5 + * new appearance of preference screen + * added support for Sony PRS-T1 buttons + * added new file associations + * fixed bug with second line of book title disappearance + * added options for clear Favorites and Last opened lists +* 1.3.4 + * showing the book title in two lines + * database cleanup function implemented + * added items separator to files list + * fixed font size for SONY-PRS-T1 in preferences screen + * fixed rename file from tags with a template with line break + * fixed sort order in "Show titles" mode +* 1.3.3 + * interface is partially adapted for SONY-PRS-T1 + * save/restore settings function implemented + * show book titles in Favorites and Last recent opened lists + * a new mechanism of context menu implementation + * fixed bug with battery status intent reciever + * fixed bug of incorrect book series sorting + * fixed some minor bugs +* 1.3.2 + * almost fully implemented file operations (create, rename, copy, move file and folders) + * book title pattern changed + * added context menu item [Rename from fb2/epub tags] + * added saving current position in the directory between calls bookreaders + * fixed sorting in book titles mode +* 1.3.1 + * Option "Show hidden files" added to preferences + * Copy/move file functions added to context menu + * Show book titles functionality implemented for .fb2 and .epub files +* 1.3.0 + * source code cleaning and formatting + * fixed filtering on directories, now not under filtering + * some fixes in search (strange behavior) + * quick scroll in "results screens" fixes + * preferences "save dialog" only after changing something + * added ability configure icon size + * added on-screen scroll buttons for preferences + * added ability to disable (buggy) percentage scroll on Nook + * added extended functionality to Last Used, Favorites and Settings buttons + * added Setup WiFi button to advanced screen + * Advanced, Memory, Battery buttons now configurable + * Full new icons and some layout changes - in original NOOK look and feel. + * Scroll by on-screen buttons changed to satisfy Sony users. + * Lock functionality in Advanced screen. + * some changes in Home button configuration. + * simplify buttons on Preferences screen. + * force screen orientation change (configurable). + * Some fixes in power adapter show when attached. + * Configurable File Manager (now implemented deletion only, sorry) menu items (user can disable). + * Configurable hiding of known (via associations) file extensions (user can enable). + * Configurable hiding of known (via home dirs) parts of directories names (user can enable). + * Fixes in context menu creation for empty dir and leaking of mount sdcard broadcast receiver. +* 1.2.10 + * skipped due quick development +* 1.2.9 + * Home icon changed. + * Spanish translation added. +* 1.2.8 + * Added USB or AC adapter connection information. + * Redone support for Eink Nook display. + * Configurable multicolumn output. + * Close Fav, Lru and so on windows after start reader (configurable). + * Font size for files and directory names (configurable). + * User may have now many home folders. + * User may disable to go up from home folders. + * Smart configurable Home button with distinct reaction to tap, double tap and long tap introduced. + * Fixes: "scroll buttons" sometimes not working; invocation dir from favorites and search results, now shown in main window; search results representation when search from root. +* 1.2.7 + * Preferences Light Theme for Sony reader and mobiles. + * Application and readers invocation code fixes. + * Small layout and visual fixes. +* 1.2.6 + * Source code and resources reformatted, caused by i18n. + * Russian translation. + * WiFi signal strength receive fixed, now with dBm level and "classic" visual output. + * Application and readers detection and invocation code rewritten, many bugfixes. + * Fully redesigned to original White NOOK ST "look and feel". + * Startup as launcher at boot fixes. + * History supporting fixes. +* 1.2.5 + * Source code cleaned, now compiled without warnings. + * Source code prepared to i18n. + * Reading Lists (i.e. FAVs, LRUs) with full UTF8 support. + * Writing Lists (i.e. FAVs, LRUs) now is more frequent. + * Added "Power Off" functionality (in complement to "Reboot") and rewriting implementation. +* 1.2.4 + * Sony PRS-T1 support is added, some layout changes. + * Optional return to main window after application starts from "All Applications" window. +* 1.2.3 + * Context menu items 'Open with ...' and 'Create intent ...' added. Note that these items can be disabled via configuration settings. + * Search root can be comma separated directories list as well as a single directory. +* 1.2.2 + * All configured networks now are present in advanced screen. +* 1.2.1 + * New buttons: scroll up/down by big steps. Note that the step length is configurable. + * New advanced information screen (marked with '#' character). +* 1.2.0 + * New directory navigation, visible scrollbar (see settings). + * gl16 mode (eInk refresh mode) may be set now via settings. +* 1.1.3 + * Check HW and warn if it isn\'t NookSimpleTouch. +* 1.1.2 + * Associations settings allows now to configure explicit applications invocation as well as general intent creation. + * Obsolete 'how to call readers' setting removed. +* 1.1.1 + * New Cancel/Revert buttons in settings screen. +* 1.1.0 + * Task manager / battery manager - just tap on memory or battery status (bottom of the main screen, launcher mode only). \ No newline at end of file diff --git a/TODO b/TODO index 0a3cec0..e45ff6f 100644 --- a/TODO +++ b/TODO @@ -1,3 +1,19 @@ +=============== +== ReLaunchX == +=============== +- connect to Callibre server +- add cloud storage support +- fix or add preference setting for full screen mode with Android OS toolbar +- fix blank screen (screen not refreshed until tapped) on startup, happens on Onyx Boox Max +- fix file system space info in Advanced view hang (currently disabled to prevent app misbehavior) + +DONE +- (DONE) fixed partition size and free space view for Onyx Boox Max +- (DONE) upgrade project from Eclipse to AndroidStudio + +============== +== ReLaunch == +============== gamba69@gmail.com: I left the project for an indefinite period... sorry. ========== diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..6054a07 --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,35 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 7 + buildToolsVersion "25.0.2" + defaultConfig { + applicationId 'com.gacode.relaunchx' + minSdkVersion 7 + targetSdkVersion 15 + versionCode 100000000 + versionName '1.0.0' + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' + } + debug { + jniDebuggable true + } + } + productFlavors { + } + lintOptions { + disable 'MissingTranslation' + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_7 + targetCompatibility JavaVersion.VERSION_1_7 + } +} + +dependencies { + compile files('libs/ebookParser-1.3.jar') +} diff --git a/libs/ebookParser-1.3.jar b/app/libs/ebookParser-1.3.jar similarity index 100% rename from libs/ebookParser-1.3.jar rename to app/libs/ebookParser-1.3.jar diff --git a/AndroidManifest.xml b/app/src/main/AndroidManifest.xml similarity index 96% rename from AndroidManifest.xml rename to app/src/main/AndroidManifest.xml index 23a74cb..928d125 100644 --- a/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,14 +1,12 @@ - + package="com.gacode.relaunchx" > - + diff --git a/src/com/harasoft/relaunch/Advanced.java b/app/src/main/java/com/gacode/relaunchx/Advanced.java similarity index 73% rename from src/com/harasoft/relaunch/Advanced.java rename to app/src/main/java/com/gacode/relaunchx/Advanced.java index e13cedb..9f62c59 100644 --- a/src/com/harasoft/relaunch/Advanced.java +++ b/app/src/main/java/com/gacode/relaunchx/Advanced.java @@ -1,7 +1,6 @@ -package com.harasoft.relaunch; +package com.gacode.relaunchx; import java.io.BufferedReader; -import java.io.DataInputStream; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.IOException; @@ -25,8 +24,11 @@ import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; import android.os.Bundle; +import android.os.Handler; +import android.os.Message; import android.preference.PreferenceManager; import android.text.SpannableString; +import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -49,8 +51,8 @@ public class Advanced extends Activity { Button rebootBtn; Button powerOffBtn; String[] ingnoreFs; - List infos; - int myId = -1; + List volumeInfoList; + WebView infoPanelView; boolean addSView = true; WifiManager wfm; @@ -66,6 +68,14 @@ public class Advanced extends Activity { BroadcastReceiver b2; String connectedSSID; + // I don't like to keep here the static objects but on my device sporadically + // the process Runtime.getRuntime().exec(cmd) hangs indefinitely so I had no better choice + // to avoid crash and/or device reboot (the hung thread becomes invincible). In other words + // I have chosen to keep the "loading..." message when it happens until device reboot. + static Handler volumesInfoUpdate; + static Thread volumesInfoThread; + static String volumesInfoPanelContent; + private void setEinkController() { if (prefs != null) { Integer einkUpdateMode = 1; @@ -162,7 +172,7 @@ public int compare(NetInfo o1, NetInfo o2) { } } - static class Info { + static class VolumeInfo { String dev; String mpoint; String fs; @@ -337,13 +347,6 @@ private String levelToString(int level) { return "[\u25A1\u25A1\u25A1\u25A1\u25A1]"; } - private String sp(int n) { - String rc = ""; - for (int i = 0; i < n; i++) - rc += " "; - return rc; - } - private int getMyId() { int rc = -1; @@ -396,28 +399,32 @@ private List readFile(String fname) { private List execFg(String cmd) { List rc = new ArrayList(); try { - Process p = Runtime.getRuntime().exec(cmd); try { - DataInputStream ds = new DataInputStream(p.getInputStream()); - String line; - while (true) { - line = ds.readLine(); - if (line == null) - break; - rc.add(line); - } - } finally { - p.destroy(); + BufferedReader stdout = new BufferedReader(new InputStreamReader(p.getInputStream())); + while (true) { + String s = stdout.readLine(); + if (s == null) break; + rc.add(s); + } + p.waitFor(); + } + catch (InterruptedException e) { + Log.e("execFg", "Interrupted cmd \"" + cmd + "\"... :" + e); + Thread.currentThread().interrupt(); + } finally { + if(p != null) + p.destroy(); } } catch (IOException e) { + Log.e("execFg", "Problem executing cmd \"" + cmd + "\"... :" + e); } return rc; } - private void createInfo() { - // Filesystem - infos = new ArrayList(); + private void getVolumesInfo() { + // Filesystem + volumeInfoList = new ArrayList(); for (String s : readFile("/proc/mounts")) { String[] f = s.split("\\s+"); if (f.length < 4) @@ -433,7 +440,7 @@ private void createInfo() { } if (ignore) continue; - Info in = new Info(); + VolumeInfo in = new VolumeInfo(); in.dev = f[0]; in.mpoint = f[1]; in.fs = fs; @@ -445,34 +452,49 @@ private void createInfo() { in.ro = false; break; } - in.total = "0"; - in.used = "0"; - in.free = "0"; - for (String l : execFg("df " + in.mpoint)) { - String[] e = l.split("\\s+"); - if (e.length < 6) - continue; - in.total = e[1]; - in.used = e[3]; - in.free = e[5]; - } - - infos.add(in); - } - - // UID - myId = getMyId(); - // Wifi - wfm = (WifiManager) getSystemService(Context.WIFI_SERVICE); - wifiOn = wfm.isWifiEnabled(); - wifiNetworks = readScanResults(wfm); + in.total = "-"; + in.used = "-"; + in.free = "-"; + volumeInfoList.add(in); + } + + for(VolumeInfo in : volumeInfoList) + { + int totalPos = 0; + int usedPos = 0; + int freePos = 0; + List output = execFg("df " + in.mpoint); + for (int i=0; i < output.size(); i++) { + String[] e = output.get(i).split("\\s+"); + if (i == 0) { + //parse the header + for (int j=0; j readScanResults(WifiManager w) { List rc = new ArrayList(); List rc1 = w.getScanResults(); List rc2 = w.getConfiguredNetworks(); + if (rc2 == null) + rc2 = new ArrayList(); connectedSSID = w.getConnectionInfo().getSSID(); @@ -579,6 +601,76 @@ public void onClick(View v) { } } + public void startGetVolumesInfoThread() { + Runnable runnable = new Runnable() { + @Override + public void run() { + getVolumesInfo(); + final int width = infoPanelView.getWidth(); + final int padding = width > 1000? 25 : 5; + StringBuilder sb = new StringBuilder() + .append("") + .append("

") + .append(getResources().getString(R.string.jv_advanced_mount_diskspartitions)) + .append("

") + .append("") + .append("") + .append("") + .append("") + .append("") + .append("") + .append("") + .append("") + .append(""); + for (VolumeInfo i : volumeInfoList) { + sb.append("") + .append("") + .append("") + .append("") + .append("") + .append("") + .append("") + .append(""); + } + sb.append("
") + .append(getResources().getString(R.string.jv_advanced_mount_mountpoint)) + .append("") + .append(getResources().getString(R.string.jv_advanced_mount_FS)) + .append("") + .append(getResources().getString(R.string.jv_advanced_mount_total)) + .append("") + .append(getResources().getString(R.string.jv_advanced_mount_used)) + .append("") + .append(getResources().getString(R.string.jv_advanced_mount_free)) + .append("") + .append(getResources().getString(R.string.jv_advanced_mount_rorw)) + .append("
") + .append(i.mpoint) + .append("") + .append(i.fs) + .append("") + .append(i.total) + .append("") + .append(i.used) + .append("") + .append(i.free) + .append("") + .append((i.ro ? getResources().getString(R.string.jv_advanced_mount_ro) + : getResources().getString(R.string.jv_advanced_mount_rw))) + .append("
"); + volumesInfoPanelContent = sb.toString(); + volumesInfoUpdate.sendEmptyMessage(0); + } + }; + + volumesInfoThread = new Thread(runnable); + volumesInfoThread.setName("GetVolumesInfoThread"); + volumesInfoThread.start(); + } + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -594,7 +686,6 @@ protected void onCreate(Bundle savedInstanceState) { app.setFullScreenIfNecessary(this); setContentView(R.layout.advanced_layout); - createInfo(); // "Advanced functions, info, etc." ((TextView) findViewById(R.id.results_title)).setText(getResources() .getString(R.string.jv_advanced_title)); @@ -656,6 +747,11 @@ public void onScrollStateChanged(AbsListView view, }); } + // Wifi + wfm = (WifiManager) getApplicationContext().getSystemService(Context.WIFI_SERVICE); + wifiOn = wfm.isWifiEnabled(); + wifiNetworks = readScanResults(wfm); + wifiScan = (Button) findViewById(R.id.wifi_scan_btn); wifiScan.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { @@ -753,78 +849,23 @@ public void onClick(View v) { }); // Web info view - WebView wv = (WebView) findViewById(R.id.webview1); - final int ntitle1 = 3; - final int ntitle2 = 8; - // "

Disks/partitions

" - String s = "

" - + getResources().getString( - R.string.jv_advanced_mount_diskspartitions) - + "

"; - s += "" - // + "" - + "" - // + "" - + "" - // + "" - + "" - // + "" - + "" - // + "" - + "" - // + "" - + "" + ""; - for (Info i : infos) - s += "" + "" - + "" - + "" - + "" - + "" - // + "" - + "" + ""; - s += "
" + sp(ntitle1) + "Mount point" + sp(ntitle2) + "" - + sp(ntitle1) - + getResources().getString( - R.string.jv_advanced_mount_mountpoint) - + sp(ntitle2) - + "" + sp(ntitle1) + "FS" + sp(ntitle2) + "" - + sp(ntitle1) - + getResources().getString(R.string.jv_advanced_mount_FS) - + sp(ntitle2) - + "" + sp(ntitle1) + "total" + sp(ntitle2) + - // "" - + sp(ntitle1) - + getResources().getString(R.string.jv_advanced_mount_total) - + sp(ntitle2) - + "" + sp(ntitle1) + "used" + sp(ntitle2) + - // "" - + sp(ntitle1) - + getResources().getString(R.string.jv_advanced_mount_used) - + sp(ntitle2) - + "" + sp(ntitle1) + "free" + sp(ntitle2) + - // "" - + sp(ntitle1) - + getResources().getString(R.string.jv_advanced_mount_free) - + sp(ntitle2) - + "" + sp(ntitle1) + "RO/RW" + sp(ntitle2) + - // "" + sp(ntitle1) - + getResources().getString(R.string.jv_advanced_mount_rorw) - + sp(ntitle2) + "
" - + i.mpoint - + "" - + i.fs - + "" - + i.total - + "" - + i.used - + "" - + i.free - + "" + (i.ro ? "RO" : "RW") + "" - + (i.ro ? getResources().getString( - R.string.jv_advanced_mount_ro) : getResources() - .getString(R.string.jv_advanced_mount_rw)) - + "
"; - wv.loadDataWithBaseURL(null, s, "text/html", "utf-8", null); + infoPanelView = (WebView) findViewById(R.id.info_panel_web_view); + StringBuilder sb = new StringBuilder() + .append("

") + .append("Loading...") + .append("

"); + infoPanelView.loadDataWithBaseURL(null, sb.toString(), "text/html", "utf-8", null); + + volumesInfoUpdate = new Handler() { + @Override + public void handleMessage(Message msg) { + infoPanelView.loadDataWithBaseURL(null, volumesInfoPanelContent, "text/html", "utf-8", null); + } + }; + + if (volumesInfoThread == null || volumesInfoThread.isAlive() == false) { + startGetVolumesInfoThread(); + } ScreenOrientation.set(this, prefs); } diff --git a/src/com/harasoft/relaunch/AllApplications.java b/app/src/main/java/com/gacode/relaunchx/AllApplications.java similarity index 99% rename from src/com/harasoft/relaunch/AllApplications.java rename to app/src/main/java/com/gacode/relaunchx/AllApplications.java index 577f3ef..5603096 100644 --- a/src/com/harasoft/relaunch/AllApplications.java +++ b/app/src/main/java/com/gacode/relaunchx/AllApplications.java @@ -1,4 +1,4 @@ -package com.harasoft.relaunch; +package com.gacode.relaunchx; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/com/harasoft/relaunch/BooksBase.java b/app/src/main/java/com/gacode/relaunchx/BooksBase.java similarity index 99% rename from src/com/harasoft/relaunch/BooksBase.java rename to app/src/main/java/com/gacode/relaunchx/BooksBase.java index 71e477c..ed8762b 100644 --- a/src/com/harasoft/relaunch/BooksBase.java +++ b/app/src/main/java/com/gacode/relaunchx/BooksBase.java @@ -1,4 +1,4 @@ -package com.harasoft.relaunch; +package com.gacode.relaunchx; import java.io.ByteArrayOutputStream; import java.util.regex.Pattern; diff --git a/src/com/harasoft/relaunch/DeviceInfo.java b/app/src/main/java/com/gacode/relaunchx/DeviceInfo.java similarity index 89% rename from src/com/harasoft/relaunch/DeviceInfo.java rename to app/src/main/java/com/gacode/relaunchx/DeviceInfo.java index 7e27a36..13c7b4b 100644 --- a/src/com/harasoft/relaunch/DeviceInfo.java +++ b/app/src/main/java/com/gacode/relaunchx/DeviceInfo.java @@ -1,4 +1,4 @@ -package com.harasoft.relaunch; +package com.gacode.relaunchx; /** * originate from CoolReader @@ -23,6 +23,7 @@ public class DeviceInfo { public final static boolean SONY_NAVIGATION_KEYS; public final static boolean USE_CUSTOM_TOAST; public final static boolean AMOLED_SCREEN; + public final static boolean EINK_ONYX; static { MANUFACTURER = getBuildField("MANUFACTURER"); @@ -40,7 +41,9 @@ public class DeviceInfo { && DEVICE.toLowerCase().contentEquals("zoom2"); EINK_SONY = MANUFACTURER.toLowerCase().contentEquals("sony") && MODEL.contentEquals("PRS-T1"); - EINK_SCREEN = EINK_SONY || EINK_NOOK; // TODO: set to true for eink + EINK_ONYX = MANUFACTURER.toLowerCase().contentEquals("onyx") + && MODEL.contentEquals("max"); + EINK_SCREEN = EINK_SONY || EINK_NOOK || EINK_ONYX; // TODO: set to true for eink // devices like Nook Touch NOOK_NAVIGATION_KEYS = EINK_NOOK; // TODO: add autodetect diff --git a/src/com/harasoft/relaunch/Editor.java b/app/src/main/java/com/gacode/relaunchx/Editor.java similarity index 99% rename from src/com/harasoft/relaunch/Editor.java rename to app/src/main/java/com/gacode/relaunchx/Editor.java index 610a22b..5a55de2 100644 --- a/src/com/harasoft/relaunch/Editor.java +++ b/app/src/main/java/com/gacode/relaunchx/Editor.java @@ -1,4 +1,4 @@ -package com.harasoft.relaunch; +package com.gacode.relaunchx; import java.io.BufferedReader; import java.io.BufferedWriter; diff --git a/src/com/harasoft/relaunch/EinkScreen.java b/app/src/main/java/com/gacode/relaunchx/EinkScreen.java similarity index 98% rename from src/com/harasoft/relaunch/EinkScreen.java rename to app/src/main/java/com/gacode/relaunchx/EinkScreen.java index e5e1581..126d025 100644 --- a/src/com/harasoft/relaunch/EinkScreen.java +++ b/app/src/main/java/com/gacode/relaunchx/EinkScreen.java @@ -1,11 +1,11 @@ -package com.harasoft.relaunch; +package com.gacode.relaunchx; /** * originate from CoolReader * http://http://sourceforge.net/projects/crengine/ */ -import com.harasoft.relaunch.N2EpdController; +import com.gacode.relaunchx.N2EpdController; import android.view.View; public class EinkScreen { diff --git a/src/com/harasoft/relaunch/FiltersActivity.java b/app/src/main/java/com/gacode/relaunchx/FiltersActivity.java similarity index 99% rename from src/com/harasoft/relaunch/FiltersActivity.java rename to app/src/main/java/com/gacode/relaunchx/FiltersActivity.java index 1bd920f..49b2306 100644 --- a/src/com/harasoft/relaunch/FiltersActivity.java +++ b/app/src/main/java/com/gacode/relaunchx/FiltersActivity.java @@ -1,4 +1,4 @@ -package com.harasoft.relaunch; +package com.gacode.relaunchx; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/com/harasoft/relaunch/Home.java b/app/src/main/java/com/gacode/relaunchx/Home.java similarity index 96% rename from src/com/harasoft/relaunch/Home.java rename to app/src/main/java/com/gacode/relaunchx/Home.java index 66241a1..b35dcc2 100644 --- a/src/com/harasoft/relaunch/Home.java +++ b/app/src/main/java/com/gacode/relaunchx/Home.java @@ -1,4 +1,4 @@ -package com.harasoft.relaunch; +package com.gacode.relaunchx; import android.app.Activity; import android.app.PendingIntent; diff --git a/src/com/harasoft/relaunch/Home1.java b/app/src/main/java/com/gacode/relaunchx/Home1.java similarity index 96% rename from src/com/harasoft/relaunch/Home1.java rename to app/src/main/java/com/gacode/relaunchx/Home1.java index e462d92..3f9d3eb 100644 --- a/src/com/harasoft/relaunch/Home1.java +++ b/app/src/main/java/com/gacode/relaunchx/Home1.java @@ -1,4 +1,4 @@ -package com.harasoft.relaunch; +package com.gacode.relaunchx; import android.app.Activity; import android.app.PendingIntent; diff --git a/src/com/harasoft/relaunch/Library.java b/app/src/main/java/com/gacode/relaunchx/Library.java similarity index 96% rename from src/com/harasoft/relaunch/Library.java rename to app/src/main/java/com/gacode/relaunchx/Library.java index fbeaf4c..476b4cf 100644 --- a/src/com/harasoft/relaunch/Library.java +++ b/app/src/main/java/com/gacode/relaunchx/Library.java @@ -1,4 +1,4 @@ -package com.harasoft.relaunch; +package com.gacode.relaunchx; import android.app.Activity; import android.app.PendingIntent; diff --git a/src/com/harasoft/relaunch/ListActions.java b/app/src/main/java/com/gacode/relaunchx/ListActions.java similarity index 99% rename from src/com/harasoft/relaunch/ListActions.java rename to app/src/main/java/com/gacode/relaunchx/ListActions.java index 1514cbb..4c79e66 100644 --- a/src/com/harasoft/relaunch/ListActions.java +++ b/app/src/main/java/com/gacode/relaunchx/ListActions.java @@ -1,4 +1,4 @@ -package com.harasoft.relaunch; +package com.gacode.relaunchx; import java.util.ArrayList; import java.util.Collections; diff --git a/src/com/harasoft/relaunch/Main.java b/app/src/main/java/com/gacode/relaunchx/Main.java similarity index 96% rename from src/com/harasoft/relaunch/Main.java rename to app/src/main/java/com/gacode/relaunchx/Main.java index 44aad42..8881da6 100644 --- a/src/com/harasoft/relaunch/Main.java +++ b/app/src/main/java/com/gacode/relaunchx/Main.java @@ -1,4 +1,4 @@ -package com.harasoft.relaunch; +package com.gacode.relaunchx; import android.app.Activity; import android.app.PendingIntent; diff --git a/src/com/harasoft/relaunch/N2EpdController.java b/app/src/main/java/com/gacode/relaunchx/N2EpdController.java similarity index 99% rename from src/com/harasoft/relaunch/N2EpdController.java rename to app/src/main/java/com/gacode/relaunchx/N2EpdController.java index 56104b2..8896a3b 100644 --- a/src/com/harasoft/relaunch/N2EpdController.java +++ b/app/src/main/java/com/gacode/relaunchx/N2EpdController.java @@ -1,4 +1,4 @@ -package com.harasoft.relaunch; +package com.gacode.relaunchx; /** * originate from CoolReader diff --git a/src/com/harasoft/relaunch/PowerFunctions.java b/app/src/main/java/com/gacode/relaunchx/PowerFunctions.java similarity index 99% rename from src/com/harasoft/relaunch/PowerFunctions.java rename to app/src/main/java/com/gacode/relaunchx/PowerFunctions.java index 544ce7d..042a4fe 100644 --- a/src/com/harasoft/relaunch/PowerFunctions.java +++ b/app/src/main/java/com/gacode/relaunchx/PowerFunctions.java @@ -1,4 +1,4 @@ -package com.harasoft.relaunch; +package com.gacode.relaunchx; import java.io.DataOutputStream; import java.io.File; diff --git a/src/com/harasoft/relaunch/PrefsActivity.java b/app/src/main/java/com/gacode/relaunchx/PrefsActivity.java similarity index 99% rename from src/com/harasoft/relaunch/PrefsActivity.java rename to app/src/main/java/com/gacode/relaunchx/PrefsActivity.java index 56c691f..ebe95d8 100644 --- a/src/com/harasoft/relaunch/PrefsActivity.java +++ b/app/src/main/java/com/gacode/relaunchx/PrefsActivity.java @@ -1,4 +1,4 @@ -package com.harasoft.relaunch; +package com.gacode.relaunchx; import java.util.ArrayList; import java.util.List; @@ -283,7 +283,7 @@ public void onClick(DialogInterface dialog, }); builder.setNegativeButton( getResources().getString( - R.string.jv_relaunch_no), + R.string.jv_relaunchx_no), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int whichButton) { @@ -315,7 +315,7 @@ public void onClick(DialogInterface dialog, }); builder.setNegativeButton( getResources().getString( - R.string.jv_relaunch_no), + R.string.jv_relaunchx_no), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int whichButton) { @@ -347,7 +347,7 @@ public void onClick(DialogInterface dialog, }); builder.setNegativeButton( getResources().getString( - R.string.jv_relaunch_no), + R.string.jv_relaunchx_no), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int whichButton) { diff --git a/src/com/harasoft/relaunch/ReLaunch.java b/app/src/main/java/com/gacode/relaunchx/ReLaunch.java similarity index 93% rename from src/com/harasoft/relaunch/ReLaunch.java rename to app/src/main/java/com/gacode/relaunchx/ReLaunch.java index 110ca32..5c84292 100644 --- a/src/com/harasoft/relaunch/ReLaunch.java +++ b/app/src/main/java/com/gacode/relaunchx/ReLaunch.java @@ -1,4 +1,4 @@ -package com.harasoft.relaunch; +package com.gacode.relaunchx; import java.io.BufferedReader; import java.io.File; @@ -147,7 +147,7 @@ public class ReLaunch extends Activity { static boolean useLibrary = false; boolean useDirViewer = false; static public boolean filterMyself = true; - static public String selfName = "com.harasoft.relaunch.Main"; + static public String selfName = "com.gacode.relaunchx.Main"; String[] allowedModels; String[] allowedDevices; String[] allowedManufacts; @@ -178,13 +178,13 @@ public class ReLaunch extends Activity { private void actionSwitchWiFi() { WifiManager wifiManager; - wifiManager = (WifiManager) this.getSystemService(Context.WIFI_SERVICE); + wifiManager = (WifiManager) this.getApplicationContext().getSystemService(Context.WIFI_SERVICE); if (wifiManager.isWifiEnabled()) { // "WiFi is off" Toast.makeText( ReLaunch.this, getResources().getString( - R.string.jv_relaunch_turning_wifi_off), + R.string.jv_relaunchx_turning_wifi_off), Toast.LENGTH_SHORT).show(); wifiManager.setWifiEnabled(false); } else { @@ -192,7 +192,7 @@ private void actionSwitchWiFi() { Toast.makeText( ReLaunch.this, getResources().getString( - R.string.jv_relaunch_turning_wifi_on), + R.string.jv_relaunchx_turning_wifi_on), Toast.LENGTH_SHORT).show(); wifiManager.setWifiEnabled(true); } @@ -311,11 +311,11 @@ private void checkDevice(String dev, String man, String model, "text/html", "utf-8", null); // "Wrong model !" builder.setTitle(getResources().getString( - R.string.jv_relaunch_wrong_model)); + R.string.jv_relaunchx_wrong_model)); builder.setView(wv); // "YES" builder.setPositiveButton( - getResources().getString(R.string.jv_relaunch_yes), + getResources().getString(R.string.jv_relaunchx_yes), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int whichButton) { @@ -327,7 +327,7 @@ public void onClick(DialogInterface dialog, }); // "NO" builder.setNegativeButton( - getResources().getString(R.string.jv_relaunch_no), + getResources().getString(R.string.jv_relaunchx_no), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int whichButton) { @@ -822,13 +822,13 @@ private void refreshBottomInfo() { if (memLevel != null) { // "M free" memLevel.setText(mi.availMem / 1048576L - + getResources().getString(R.string.jv_relaunch_m_free)); + + getResources().getString(R.string.jv_relaunchx_m_free)); memLevel.setCompoundDrawablesWithIntrinsicBounds(null, null, getResources().getDrawable(R.drawable.ram), null); } // Wifi status - WifiManager wfm = (WifiManager) getSystemService(Context.WIFI_SERVICE); + WifiManager wfm = (WifiManager) this.getApplicationContext().getSystemService(Context.WIFI_SERVICE); if (battTitle != null) { if (wfm.isWifiEnabled()) { String nowConnected = wfm.getConnectionInfo().getSSID(); @@ -836,7 +836,7 @@ private void refreshBottomInfo() { battTitle.setText(nowConnected); } else { battTitle.setText(getResources().getString( - R.string.jv_relaunch_wifi_is_on)); + R.string.jv_relaunchx_wifi_is_on)); } battTitle.setCompoundDrawablesWithIntrinsicBounds( getResources().getDrawable(R.drawable.wifi_on), null, @@ -844,7 +844,7 @@ private void refreshBottomInfo() { } else { // "WiFi is off" battTitle.setText(getResources().getString( - R.string.jv_relaunch_wifi_is_off)); + R.string.jv_relaunchx_wifi_is_off)); battTitle.setCompoundDrawablesWithIntrinsicBounds( getResources().getDrawable(R.drawable.wifi_off), null, null, null); @@ -944,7 +944,7 @@ public boolean onSingleTapConfirmed(MotionEvent e) { R.array.output_columns_names); final CharSequence[] columnsmode = new CharSequence[columns.length + 1]; columnsmode[0] = getResources().getString( - R.string.jv_relaunch_default); + R.string.jv_relaunchx_default); for (int i = 0; i < columns.length; i++) { columnsmode[i + 1] = columns[i]; } @@ -963,7 +963,7 @@ public boolean onSingleTapConfirmed(MotionEvent e) { ReLaunch.this); // "Select application" builder.setTitle(getResources().getString( - R.string.jv_relaunch_select_columns)); + R.string.jv_relaunchx_select_columns)); builder.setSingleChoiceItems(columnsmode, checked, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int i) { @@ -1282,7 +1282,7 @@ else if (rdrs.size() == 1) // "Select application" builder.setTitle(getResources() .getString( - R.string.jv_relaunch_select_application)); + R.string.jv_relaunchx_select_application)); builder.setSingleChoiceItems(applications, -1, new DialogInterface.OnClickListener() { public void onClick( @@ -1353,97 +1353,97 @@ else if (fn.endsWith("fb2") || fn.endsWith("fb2.zip") || fn.endsWith("epub")) } if (menuType == 0) { if (prefs.getBoolean("useFileManagerFunctions", true)) { - aList.add(getString(R.string.jv_relaunch_create_folder)); + aList.add(getString(R.string.jv_relaunchx_create_folder)); if (fileOp != 0) { - aList.add(getString(R.string.jv_relaunch_paste)); + aList.add(getString(R.string.jv_relaunchx_paste)); } } } else if (menuType == 1) { if ((!app.isStartDir(fullName)) && (prefs.getBoolean("showAddStartDir", false))) { - aList.add(getString(R.string.jv_relaunch_set_startdir)); - aList.add(getString(R.string.jv_relaunch_add_startdir)); + aList.add(getString(R.string.jv_relaunchx_set_startdir)); + aList.add(getString(R.string.jv_relaunchx_add_startdir)); } if (!app.contains("favorites", fullName, app.DIR_TAG)) - aList.add(getString(R.string.jv_relaunch_add)); + aList.add(getString(R.string.jv_relaunchx_add)); if (prefs.getBoolean("useFileManagerFunctions", true)) { File d = new File(fullName); String[] allEntries = d.list(); - aList.add(getString(R.string.jv_relaunch_create_folder)); - aList.add(getString(R.string.jv_relaunch_rename)); - aList.add(getString(R.string.jv_relaunch_move)); + aList.add(getString(R.string.jv_relaunchx_create_folder)); + aList.add(getString(R.string.jv_relaunchx_rename)); + aList.add(getString(R.string.jv_relaunchx_move)); if (fileOp != 0) { - aList.add(getString(R.string.jv_relaunch_paste)); + aList.add(getString(R.string.jv_relaunchx_paste)); } if (allEntries != null && allEntries.length > 0) { - aList.add(getString(R.string.jv_relaunch_delete_non_emp_dir)); + aList.add(getString(R.string.jv_relaunchx_delete_non_emp_dir)); } else { - aList.add(getString(R.string.jv_relaunch_delete_emp_dir)); + aList.add(getString(R.string.jv_relaunchx_delete_emp_dir)); } } - aList.add(getString(R.string.jv_relaunch_fileinfo)); + aList.add(getString(R.string.jv_relaunchx_fileinfo)); } else if (menuType == 2) { - aList.add(getString(R.string.jv_relaunch_bookinfo)); + aList.add(getString(R.string.jv_relaunchx_bookinfo)); if (!app.contains("favorites", dr, fn)) { - aList.add(getString(R.string.jv_relaunch_add)); + aList.add(getString(R.string.jv_relaunchx_add)); } if (app.history.containsKey(fullName)) { if (app.history.get(fullName) == app.READING) { - aList.add(getString(R.string.jv_relaunch_mark)); + aList.add(getString(R.string.jv_relaunchx_mark)); } else if (app.history.get(fullName) == app.FINISHED) { - aList.add(getString(R.string.jv_relaunch_unmark)); + aList.add(getString(R.string.jv_relaunchx_unmark)); } - aList.add(getString(R.string.jv_relaunch_unmarkall)); + aList.add(getString(R.string.jv_relaunchx_unmarkall)); } else { - aList.add(getString(R.string.jv_relaunch_mark)); + aList.add(getString(R.string.jv_relaunchx_mark)); } if (prefs.getBoolean("openWith", true)) - aList.add(getString(R.string.jv_relaunch_openwith)); + aList.add(getString(R.string.jv_relaunchx_openwith)); if (prefs.getBoolean("createIntent", false)) - aList.add(getString(R.string.jv_relaunch_createintent)); + aList.add(getString(R.string.jv_relaunchx_createintent)); if (prefs.getBoolean("useFileManagerFunctions", true)) { if (!prefs.getBoolean("showBookTitles", false)) - aList.add(getString(R.string.jv_relaunch_tags_rename)); - aList.add(getString(R.string.jv_relaunch_create_folder)); + aList.add(getString(R.string.jv_relaunchx_tags_rename)); + aList.add(getString(R.string.jv_relaunchx_create_folder)); if (!prefs.getBoolean("showBookTitles", false)) - aList.add(getString(R.string.jv_relaunch_rename)); - aList.add(getString(R.string.jv_relaunch_copy)); - aList.add(getString(R.string.jv_relaunch_move)); + aList.add(getString(R.string.jv_relaunchx_rename)); + aList.add(getString(R.string.jv_relaunchx_copy)); + aList.add(getString(R.string.jv_relaunchx_move)); if (fileOp != 0) - aList.add(getString(R.string.jv_relaunch_paste)); - aList.add(getString(R.string.jv_relaunch_delete)); + aList.add(getString(R.string.jv_relaunchx_paste)); + aList.add(getString(R.string.jv_relaunchx_delete)); } - aList.add(getString(R.string.jv_relaunch_fileinfo)); + aList.add(getString(R.string.jv_relaunchx_fileinfo)); } else if (menuType == 3) { if (!app.contains("favorites", dr, fn)) { - aList.add(getString(R.string.jv_relaunch_add)); + aList.add(getString(R.string.jv_relaunchx_add)); } if (app.history.containsKey(fullName)) { if (app.history.get(fullName) == app.READING) { - aList.add(getString(R.string.jv_relaunch_mark)); + aList.add(getString(R.string.jv_relaunchx_mark)); } else if (app.history.get(fullName) == app.FINISHED) { - aList.add(getString(R.string.jv_relaunch_unmark)); + aList.add(getString(R.string.jv_relaunchx_unmark)); } - aList.add(getString(R.string.jv_relaunch_unmarkall)); + aList.add(getString(R.string.jv_relaunchx_unmarkall)); } else { - aList.add(getString(R.string.jv_relaunch_mark)); + aList.add(getString(R.string.jv_relaunchx_mark)); } if (prefs.getBoolean("openWith", true)) - aList.add(getString(R.string.jv_relaunch_openwith)); + aList.add(getString(R.string.jv_relaunchx_openwith)); if (prefs.getBoolean("createIntent", false)) - aList.add(getString(R.string.jv_relaunch_createintent)); + aList.add(getString(R.string.jv_relaunchx_createintent)); if (prefs.getBoolean("useFileManagerFunctions", true)) { - aList.add(getString(R.string.jv_relaunch_create_folder)); + aList.add(getString(R.string.jv_relaunchx_create_folder)); if (!prefs.getBoolean("showBookTitles", false)) - aList.add(getString(R.string.jv_relaunch_rename)); - aList.add(getString(R.string.jv_relaunch_copy)); - aList.add(getString(R.string.jv_relaunch_move)); + aList.add(getString(R.string.jv_relaunchx_rename)); + aList.add(getString(R.string.jv_relaunchx_copy)); + aList.add(getString(R.string.jv_relaunchx_move)); if (fileOp != 0) - aList.add(getString(R.string.jv_relaunch_paste)); - aList.add(getString(R.string.jv_relaunch_delete)); + aList.add(getString(R.string.jv_relaunchx_paste)); + aList.add(getString(R.string.jv_relaunchx_delete)); } - aList.add(getString(R.string.jv_relaunch_fileinfo)); + aList.add(getString(R.string.jv_relaunchx_fileinfo)); } - aList.add(getString(R.string.jv_relaunch_cancel)); + aList.add(getString(R.string.jv_relaunchx_cancel)); final int pos = position; final String[] list = aList.toArray(new String[aList.size()]); @@ -1454,47 +1454,47 @@ else if (fn.endsWith("fb2") || fn.endsWith("fb2.zip") || fn.endsWith("epub")) builder.setAdapter(cmAdapter, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int item) { String s = list[item]; - if (s.equalsIgnoreCase(getString(R.string.jv_relaunch_cancel))) + if (s.equalsIgnoreCase(getString(R.string.jv_relaunchx_cancel))) onContextMenuSelected(CNTXT_MENU_CANCEL, pos); - else if (s.equalsIgnoreCase(getString(R.string.jv_relaunch_delete))) + else if (s.equalsIgnoreCase(getString(R.string.jv_relaunchx_delete))) onContextMenuSelected(CNTXT_MENU_DELETE_F, pos); - else if (s.equalsIgnoreCase(getString(R.string.jv_relaunch_delete_emp_dir))) + else if (s.equalsIgnoreCase(getString(R.string.jv_relaunchx_delete_emp_dir))) onContextMenuSelected(CNTXT_MENU_DELETE_D_EMPTY, pos); - else if (s.equalsIgnoreCase(getString(R.string.jv_relaunch_delete_non_emp_dir))) + else if (s.equalsIgnoreCase(getString(R.string.jv_relaunchx_delete_non_emp_dir))) onContextMenuSelected(CNTXT_MENU_DELETE_D_NON_EMPTY, pos); - else if (s.equalsIgnoreCase(getString(R.string.jv_relaunch_add))) + else if (s.equalsIgnoreCase(getString(R.string.jv_relaunchx_add))) onContextMenuSelected(CNTXT_MENU_ADD, pos); - else if (s.equalsIgnoreCase(getString(R.string.jv_relaunch_mark))) + else if (s.equalsIgnoreCase(getString(R.string.jv_relaunchx_mark))) onContextMenuSelected(CNTXT_MENU_MARK_FINISHED, pos); - else if (s.equalsIgnoreCase(getString(R.string.jv_relaunch_unmark))) + else if (s.equalsIgnoreCase(getString(R.string.jv_relaunchx_unmark))) onContextMenuSelected(CNTXT_MENU_MARK_READING, pos); - else if (s.equalsIgnoreCase(getString(R.string.jv_relaunch_unmarkall))) + else if (s.equalsIgnoreCase(getString(R.string.jv_relaunchx_unmarkall))) onContextMenuSelected(CNTXT_MENU_MARK_FORGET, pos); - else if (s.equalsIgnoreCase(getString(R.string.jv_relaunch_createintent))) + else if (s.equalsIgnoreCase(getString(R.string.jv_relaunchx_createintent))) onContextMenuSelected(CNTXT_MENU_INTENT, pos); - else if (s.equalsIgnoreCase(getString(R.string.jv_relaunch_openwith))) + else if (s.equalsIgnoreCase(getString(R.string.jv_relaunchx_openwith))) onContextMenuSelected(CNTXT_MENU_OPENWITH, pos); - else if (s.equalsIgnoreCase(getString(R.string.jv_relaunch_copy))) + else if (s.equalsIgnoreCase(getString(R.string.jv_relaunchx_copy))) onContextMenuSelected(CNTXT_MENU_COPY_FILE, pos); - else if (s.equalsIgnoreCase(getString(R.string.jv_relaunch_move))) + else if (s.equalsIgnoreCase(getString(R.string.jv_relaunchx_move))) onContextMenuSelected(CNTXT_MENU_MOVE_FILE, pos); - else if (s.equalsIgnoreCase(getString(R.string.jv_relaunch_paste))) + else if (s.equalsIgnoreCase(getString(R.string.jv_relaunchx_paste))) onContextMenuSelected(CNTXT_MENU_PASTE, pos); - else if (s.equalsIgnoreCase(getString(R.string.jv_relaunch_rename))) + else if (s.equalsIgnoreCase(getString(R.string.jv_relaunchx_rename))) onContextMenuSelected(CNTXT_MENU_RENAME, pos); - else if (s.equalsIgnoreCase(getString(R.string.jv_relaunch_create_folder))) + else if (s.equalsIgnoreCase(getString(R.string.jv_relaunchx_create_folder))) onContextMenuSelected(CNTXT_MENU_CREATE_DIR, pos); - else if (s.equalsIgnoreCase(getString(R.string.jv_relaunch_move_dir))) + else if (s.equalsIgnoreCase(getString(R.string.jv_relaunchx_move_dir))) onContextMenuSelected(CNTXT_MENU_MOVE_DIR, pos); - else if (s.equalsIgnoreCase(getString(R.string.jv_relaunch_tags_rename))) + else if (s.equalsIgnoreCase(getString(R.string.jv_relaunchx_tags_rename))) onContextMenuSelected(CNTXT_MENU_TAGS_RENAME, pos); - else if (s.equalsIgnoreCase(getString(R.string.jv_relaunch_set_startdir))) + else if (s.equalsIgnoreCase(getString(R.string.jv_relaunchx_set_startdir))) onContextMenuSelected(CNTXT_MENU_SET_STARTDIR, pos); - else if (s.equalsIgnoreCase(getString(R.string.jv_relaunch_add_startdir))) + else if (s.equalsIgnoreCase(getString(R.string.jv_relaunchx_add_startdir))) onContextMenuSelected(CNTXT_MENU_ADD_STARTDIR, pos); - else if (s.equalsIgnoreCase(getString(R.string.jv_relaunch_bookinfo))) + else if (s.equalsIgnoreCase(getString(R.string.jv_relaunchx_bookinfo))) onContextMenuSelected(CNTXT_MENU_SHOW_BOOKINFO, pos); - else if (s.equalsIgnoreCase(getString(R.string.jv_relaunch_fileinfo))) + else if (s.equalsIgnoreCase(getString(R.string.jv_relaunchx_fileinfo))) onContextMenuSelected(CNTXT_MENU_FILE_INFO, pos); } }); @@ -1518,7 +1518,7 @@ public boolean onTouch(View v, MotionEvent event) { upScroll.setText(app.scrollStep + "%"); } else { upScroll.setText(getResources() - .getString(R.string.jv_relaunch_prev)); + .getString(R.string.jv_relaunchx_prev)); } class upScrlSimpleOnGestureListener extends SimpleOnGestureListener { @Override @@ -1635,7 +1635,7 @@ public void run() { downScroll.setText(app.scrollStep + "%"); } else { downScroll.setText(getResources().getString( - R.string.jv_relaunch_next)); + R.string.jv_relaunchx_next)); } class dnScrlSimpleOnGestureListener extends SimpleOnGestureListener { @Override @@ -1810,7 +1810,7 @@ private void start(Intent i) { Toast.makeText( ReLaunch.this, getResources().getString( - R.string.jv_relaunch_activity_not_found), + R.string.jv_relaunchx_activity_not_found), Toast.LENGTH_LONG).show(); } } @@ -1979,7 +1979,7 @@ public boolean onSingleTapConfirmed(MotionEvent e) { intent.putExtra( "title", getResources().getString( - R.string.jv_relaunch_lru_a)); + R.string.jv_relaunchx_lru_a)); startActivity(intent); return true; } @@ -2016,7 +2016,7 @@ public boolean onSingleTapConfirmed(MotionEvent e) { intent.putExtra( "title", getResources().getString( - R.string.jv_relaunch_all_a)); + R.string.jv_relaunchx_all_a)); startActivity(intent); return true; } @@ -2050,7 +2050,7 @@ private boolean processEvent(String action) { if (prefs.getString(action, "RELAUNCH").equals("RELAUNCH")) { Intent intent = new Intent(ReLaunch.this, AllApplications.class); intent.putExtra("list", "app_favorites"); - intent.putExtra("title", getResources().getString(R.string.jv_relaunch_fav_a)); + intent.putExtra("title", getResources().getString(R.string.jv_relaunchx_fav_a)); startActivity(intent); } else if (prefs.getString(action, "RELAUNCH").equals("RUN")) { actionRun(prefs.getString(action + "app", "%%")); @@ -2615,10 +2615,10 @@ public boolean onTouch(View v, MotionEvent event) { "text/html", "utf-8", null); // "What's new" builder.setTitle(getResources().getString( - R.string.jv_relaunch_whats_new)); + R.string.jv_relaunchx_whats_new)); builder.setView(wv); builder.setPositiveButton( - getResources().getString(R.string.jv_relaunch_ok), + getResources().getString(R.string.jv_relaunchx_ok), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int whichButton) { @@ -2809,7 +2809,7 @@ public boolean onContextMenuSelected(int itemId, int mPos) { AlertDialog.Builder builder = new AlertDialog.Builder(ReLaunch.this); // "Select application" builder.setTitle(getResources().getString( - R.string.jv_relaunch_select_application)); + R.string.jv_relaunchx_select_application)); builder.setSingleChoiceItems(happlications, -1, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int i) { @@ -2819,7 +2819,7 @@ public void onClick(DialogInterface dialog, int i) { } }); builder.setNegativeButton( - getResources().getString(R.string.jv_relaunch_cancel), + getResources().getString(R.string.jv_relaunchx_cancel), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int whichButton) { @@ -2855,7 +2855,7 @@ public void onClick(DialogInterface dialog, AlertDialog.Builder builder = new AlertDialog.Builder(ReLaunch.this); // "Select intent type" builder.setTitle(getResources().getString( - R.string.jv_relaunch_select_intent_type)); + R.string.jv_relaunchx_select_intent_type)); builder.setSingleChoiceItems(intents, -1, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int i) { @@ -2874,27 +2874,27 @@ public void onClick(DialogInterface dialog, int i) { // "Activity not found" builder1.setTitle(getResources() .getString( - R.string.jv_relaunch_activity_not_found_title)); + R.string.jv_relaunchx_activity_not_found_title)); // "Activity for file \"" + fullName + // "\" with type \"" + intents[i] + // "\" not found" builder1.setMessage(getResources() .getString( - R.string.jv_relaunch_activity_not_found_text1) + R.string.jv_relaunchx_activity_not_found_text1) + " \"" + fullName + "\" " + getResources() .getString( - R.string.jv_relaunch_activity_not_found_text2) + R.string.jv_relaunchx_activity_not_found_text2) + " \"" + intents[i] + "\" " + getResources() .getString( - R.string.jv_relaunch_activity_not_found_text3)); + R.string.jv_relaunchx_activity_not_found_text3)); builder1.setPositiveButton(getResources() - .getString(R.string.jv_relaunch_ok), + .getString(R.string.jv_relaunchx_ok), new DialogInterface.OnClickListener() { public void onClick( DialogInterface dialog, @@ -2907,7 +2907,7 @@ public void onClick( }); // "Other" builder.setPositiveButton( - getResources().getString(R.string.jv_relaunch_other), + getResources().getString(R.string.jv_relaunchx_other), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int whichButton) { @@ -2915,13 +2915,13 @@ public void onClick(DialogInterface dialog, ReLaunch.this); // "Intent type" builder1.setTitle(getResources().getString( - R.string.jv_relaunch_intent_type)); + R.string.jv_relaunchx_intent_type)); final EditText input = new EditText(ReLaunch.this); input.setText("application/"); builder1.setView(input); // "Ok" builder1.setPositiveButton(getResources() - .getString(R.string.jv_relaunch_ok), + .getString(R.string.jv_relaunchx_ok), new DialogInterface.OnClickListener() { public void onClick( DialogInterface dialog, @@ -2944,31 +2944,31 @@ public void onClick( // "Activity not found" builder2.setTitle(getResources() .getString( - R.string.jv_relaunch_activity_not_found_title)); + R.string.jv_relaunchx_activity_not_found_title)); // "Activity for file \"" + // fullName + "\" with type \"" // + input.getText() + // "\" not found" builder2.setMessage(getResources() .getString( - R.string.jv_relaunch_activity_not_found_text1) + R.string.jv_relaunchx_activity_not_found_text1) + " \"" + fullName + "\" " + getResources() .getString( - R.string.jv_relaunch_activity_not_found_text2) + R.string.jv_relaunchx_activity_not_found_text2) + " \"" + input.getText() + "\" " + getResources() .getString( - R.string.jv_relaunch_activity_not_found_text3)); + R.string.jv_relaunchx_activity_not_found_text3)); // "OK" builder2.setPositiveButton( getResources() .getString( - R.string.jv_relaunch_ok), + R.string.jv_relaunchx_ok), new DialogInterface.OnClickListener() { public void onClick( DialogInterface dialog, @@ -2984,7 +2984,7 @@ public void onClick( }); // "Cancel" builder.setNegativeButton( - getResources().getString(R.string.jv_relaunch_cancel), + getResources().getString(R.string.jv_relaunchx_cancel), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int whichButton) { @@ -3000,18 +3000,18 @@ public void onClick(DialogInterface dialog, AlertDialog.Builder builder = new AlertDialog.Builder(this); // "Delete file warning" builder.setTitle(getResources().getString( - R.string.jv_relaunch_del_file_title)); + R.string.jv_relaunchx_del_file_title)); // "Are you sure to delete file \"" + fname + "\" ?" builder.setMessage(getResources().getString( - R.string.jv_relaunch_del_file_text1) + R.string.jv_relaunchx_del_file_text1) + " \"" + fname + "\" " + getResources().getString( - R.string.jv_relaunch_del_file_text2)); + R.string.jv_relaunchx_del_file_text2)); // "Yes" builder.setPositiveButton( - getResources().getString(R.string.jv_relaunch_yes), + getResources().getString(R.string.jv_relaunchx_yes), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int whichButton) { @@ -3024,7 +3024,7 @@ public void onClick(DialogInterface dialog, }); // "No" builder.setNegativeButton( - getResources().getString(R.string.jv_relaunch_no), + getResources().getString(R.string.jv_relaunchx_no), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int whichButton) { @@ -3042,18 +3042,18 @@ public void onClick(DialogInterface dialog, AlertDialog.Builder builder = new AlertDialog.Builder(this); // "Delete empty directory warning" builder.setTitle(getResources().getString( - R.string.jv_relaunch_del_em_dir_title)); + R.string.jv_relaunchx_del_em_dir_title)); // "Are you sure to delete empty directory \"" + fname + "\" ?" builder.setMessage(getResources().getString( - R.string.jv_relaunch_del_em_dir_text1) + R.string.jv_relaunchx_del_em_dir_text1) + " \"" + fname + "\" " + getResources().getString( - R.string.jv_relaunch_del_em_dir_text2)); + R.string.jv_relaunchx_del_em_dir_text2)); // "Yes" builder.setPositiveButton( - getResources().getString(R.string.jv_relaunch_yes), + getResources().getString(R.string.jv_relaunchx_yes), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int whichButton) { @@ -3066,7 +3066,7 @@ public void onClick(DialogInterface dialog, }); // "No" builder.setNegativeButton( - getResources().getString(R.string.jv_relaunch_no), + getResources().getString(R.string.jv_relaunchx_no), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int whichButton) { @@ -3084,19 +3084,19 @@ public void onClick(DialogInterface dialog, AlertDialog.Builder builder = new AlertDialog.Builder(this); // "Delete non empty directory warning" builder.setTitle(getResources().getString( - R.string.jv_relaunch_del_ne_dir_title)); + R.string.jv_relaunchx_del_ne_dir_title)); // "Are you sure to delete non-empty directory \"" + fname + // "\" (dangerous) ?" builder.setMessage(getResources().getString( - R.string.jv_relaunch_del_ne_dir_text1) + R.string.jv_relaunchx_del_ne_dir_text1) + " \"" + fname + "\" " + getResources().getString( - R.string.jv_relaunch_del_ne_dir_text2)); + R.string.jv_relaunchx_del_ne_dir_text2)); // "Yes" builder.setPositiveButton( - getResources().getString(R.string.jv_relaunch_yes), + getResources().getString(R.string.jv_relaunchx_yes), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int whichButton) { @@ -3109,7 +3109,7 @@ public void onClick(DialogInterface dialog, }); // "No" builder.setNegativeButton( - getResources().getString(R.string.jv_relaunch_no), + getResources().getString(R.string.jv_relaunchx_no), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int whichButton) { @@ -3177,12 +3177,12 @@ else if ((fileOp == CNTXT_MENU_MOVE_FILE) || (fileOp == CNTXT_MENU_MOVE_DIR)) } else { AlertDialog.Builder builder = new AlertDialog.Builder(this); builder.setTitle(getResources().getString( - R.string.jv_relaunch_error_title)); + R.string.jv_relaunchx_error_title)); builder.setMessage(getResources().getString( - R.string.jv_relaunch_paste_fail_text) + R.string.jv_relaunchx_paste_fail_text) + " " + fileOpFile); builder.setNeutralButton( - getResources().getString(R.string.jv_relaunch_ok), + getResources().getString(R.string.jv_relaunchx_ok), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int whichButton) { @@ -3209,10 +3209,10 @@ else if (fname.endsWith("epub")) input.setText(newName); builder.setView(input); builder.setTitle(getResources().getString( - R.string.jv_relaunch_rename_title)); + R.string.jv_relaunchx_rename_title)); // "OK" builder.setPositiveButton( - getResources().getString(R.string.jv_relaunch_ok), + getResources().getString(R.string.jv_relaunchx_ok), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int whichButton) { @@ -3227,12 +3227,12 @@ public void onClick(DialogInterface dialog, } else { AlertDialog.Builder builder = new AlertDialog.Builder(mThis); builder.setTitle(getResources().getString( - R.string.jv_relaunch_error_title)); + R.string.jv_relaunchx_error_title)); builder.setMessage(getResources().getString( - R.string.jv_relaunch_rename_fail_text) + R.string.jv_relaunchx_rename_fail_text) + " " + fname); builder.setNeutralButton( - getResources().getString(R.string.jv_relaunch_ok), + getResources().getString(R.string.jv_relaunchx_ok), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int whichButton) { @@ -3245,7 +3245,7 @@ public void onClick(DialogInterface dialog, }); // "Cancel" builder.setNegativeButton( - getResources().getString(R.string.jv_relaunch_cancel), + getResources().getString(R.string.jv_relaunchx_cancel), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int whichButton) { @@ -3266,10 +3266,10 @@ public void onClick(DialogInterface dialog, input.selectAll(); builder.setView(input); builder.setTitle(getResources().getString( - R.string.jv_relaunch_rename_title)); + R.string.jv_relaunchx_rename_title)); // "OK" builder.setPositiveButton( - getResources().getString(R.string.jv_relaunch_ok), + getResources().getString(R.string.jv_relaunchx_ok), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int whichButton) { @@ -3284,12 +3284,12 @@ public void onClick(DialogInterface dialog, } else { AlertDialog.Builder builder = new AlertDialog.Builder(mThis); builder.setTitle(getResources().getString( - R.string.jv_relaunch_error_title)); + R.string.jv_relaunchx_error_title)); builder.setMessage(getResources().getString( - R.string.jv_relaunch_rename_fail_text) + R.string.jv_relaunchx_rename_fail_text) + " " + fname); builder.setNeutralButton( - getResources().getString(R.string.jv_relaunch_ok), + getResources().getString(R.string.jv_relaunchx_ok), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int whichButton) { @@ -3302,7 +3302,7 @@ public void onClick(DialogInterface dialog, }); // "Cancel" builder.setNegativeButton( - getResources().getString(R.string.jv_relaunch_cancel), + getResources().getString(R.string.jv_relaunchx_cancel), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int whichButton) { @@ -3320,10 +3320,10 @@ public void onClick(DialogInterface dialog, final EditText input = new EditText(this); builder.setView(input); builder.setTitle(getResources().getString( - R.string.jv_relaunch_create_folder_title)); + R.string.jv_relaunchx_create_folder_title)); // "OK" builder.setPositiveButton( - getResources().getString(R.string.jv_relaunch_ok), + getResources().getString(R.string.jv_relaunchx_ok), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int whichButton) { @@ -3348,12 +3348,12 @@ public void onClick(DialogInterface dialog, } else { AlertDialog.Builder builder = new AlertDialog.Builder(mThis); builder.setTitle(getResources().getString( - R.string.jv_relaunch_error_title)); + R.string.jv_relaunchx_error_title)); builder.setMessage(getResources().getString( - R.string.jv_relaunch_create_folder_fail_text) + R.string.jv_relaunchx_create_folder_fail_text) + " " + newFullName); builder.setNeutralButton( - getResources().getString(R.string.jv_relaunch_ok), + getResources().getString(R.string.jv_relaunchx_ok), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int whichButton) { @@ -3366,7 +3366,7 @@ public void onClick(DialogInterface dialog, }); // "Cancel" builder.setNegativeButton( - getResources().getString(R.string.jv_relaunch_cancel), + getResources().getString(R.string.jv_relaunchx_cancel), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int whichButton) { @@ -3473,14 +3473,14 @@ public boolean onKeyDown(int keyCode, KeyEvent event) { // "This is a launcher!" .setTitle( getResources().getString( - R.string.jv_relaunch_launcher)) + R.string.jv_relaunchx_launcher)) // "Are you sure you want to quit ?" .setMessage( getResources().getString( - R.string.jv_relaunch_launcher_text)) + R.string.jv_relaunchx_launcher_text)) // "YES" .setPositiveButton( - getResources().getString(R.string.jv_relaunch_yes), + getResources().getString(R.string.jv_relaunchx_yes), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { @@ -3489,7 +3489,7 @@ public void onClick(DialogInterface dialog, }) // "NO" .setNegativeButton( - getResources().getString(R.string.jv_relaunch_no), + getResources().getString(R.string.jv_relaunchx_no), null).show(); } return true; @@ -3518,7 +3518,7 @@ private void menuLastopened() { intent.putExtra("list", "lastOpened"); // "Last opened" intent.putExtra("title", - getResources().getString(R.string.jv_relaunch_lru)); + getResources().getString(R.string.jv_relaunchx_lru)); intent.putExtra("rereadOnStart", true); startActivity(intent); } @@ -3528,7 +3528,7 @@ private void menuFavorites() { intent.putExtra("list", "favorites"); // "Favorites" intent.putExtra("title", - getResources().getString(R.string.jv_relaunch_fav)); + getResources().getString(R.string.jv_relaunchx_fav)); intent.putExtra("rereadOnStart", true); setEinkController(); // ??? not needed startActivity(intent); @@ -3559,7 +3559,7 @@ private void menuHome() { } AlertDialog.Builder builder = new AlertDialog.Builder(ReLaunch.this); // "Select home directory" - builder.setTitle(R.string.jv_relaunch_home); + builder.setTitle(R.string.jv_relaunchx_home); builder.setSingleChoiceItems(hhomes, -1, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int i) { @@ -3568,7 +3568,7 @@ public void onClick(DialogInterface dialog, int i) { } }); builder.setNegativeButton( - getResources().getString(R.string.jv_relaunch_cancel), + getResources().getString(R.string.jv_relaunchx_cancel), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int whichButton) { dialog.dismiss(); @@ -3592,7 +3592,7 @@ private void screenHome() { Intent intent = new Intent(ReLaunch.this, ResultsActivity.class); intent.putExtra("list", "homeList"); intent.putExtra("title", - getResources().getString(R.string.jv_relaunch_home)); + getResources().getString(R.string.jv_relaunchx_home)); intent.putExtra("rereadOnStart", true); startActivity(intent); } @@ -3651,20 +3651,20 @@ private void menuSort() { final String[] orderList; if (prefs.getBoolean("showBookTitles", false)) { orderList = new String[4]; - orderList[0] = getString(R.string.jv_relaunch_sort_file_dir); - orderList[1] = getString(R.string.jv_relaunch_sort_file_rev); - orderList[2] = getString(R.string.jv_relaunch_sort_title_dir); - orderList[3] = getString(R.string.jv_relaunch_sort_title_rev); + orderList[0] = getString(R.string.jv_relaunchx_sort_file_dir); + orderList[1] = getString(R.string.jv_relaunchx_sort_file_rev); + orderList[2] = getString(R.string.jv_relaunchx_sort_title_dir); + orderList[3] = getString(R.string.jv_relaunchx_sort_title_rev); } else { orderList = new String[2]; - orderList[0] = getString(R.string.jv_relaunch_sort_file_dir); - orderList[1] = getString(R.string.jv_relaunch_sort_file_rev); + orderList[0] = getString(R.string.jv_relaunchx_sort_file_dir); + orderList[1] = getString(R.string.jv_relaunchx_sort_file_rev); } int sortMode = prefs.getInt("sortMode", 0); if (sortMode > orderList.length - 1) sortMode = 0; AlertDialog.Builder builder = new AlertDialog.Builder(ReLaunch.this); - builder.setTitle(R.string.jv_relaunch_sort_header); + builder.setTitle(R.string.jv_relaunchx_sort_header); builder.setSingleChoiceItems(orderList, sortMode, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int i) { @@ -3677,7 +3677,7 @@ public void onClick(DialogInterface dialog, int i) { } }); builder.setNegativeButton( - getResources().getString(R.string.jv_relaunch_cancel), + getResources().getString(R.string.jv_relaunchx_cancel), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int whichButton) { dialog.dismiss(); @@ -3858,7 +3858,7 @@ private void showFileInfo(String filename) { final Dialog dialog = new Dialog(this); dialog.getWindow().requestFeature(Window.FEATURE_NO_TITLE); -// dialog.setTitle(getString(R.string.jv_relaunch_fileinfo_title)); +// dialog.setTitle(getString(R.string.jv_relaunchx_fileinfo_title)); dialog.setContentView(R.layout.fileinfo); LinearLayout llSize = (LinearLayout) dialog.findViewById(R.id.llSize); if (file.isDirectory()) diff --git a/src/com/harasoft/relaunch/ReLaunchApp.java b/app/src/main/java/com/gacode/relaunchx/ReLaunchApp.java similarity index 98% rename from src/com/harasoft/relaunch/ReLaunchApp.java rename to app/src/main/java/com/gacode/relaunchx/ReLaunchApp.java index 6bb56fd..cbd560c 100644 --- a/src/com/harasoft/relaunch/ReLaunchApp.java +++ b/app/src/main/java/com/gacode/relaunchx/ReLaunchApp.java @@ -1,4 +1,4 @@ -package com.harasoft.relaunch; +package com.gacode.relaunchx; import java.io.BufferedReader; import java.io.File; @@ -74,8 +74,8 @@ public class ReLaunchApp extends Application { public int FLT_NEW_AND_READING; public boolean filters_and; - public final String BACKUP_DIR = "/sdcard/.relaunch"; - public final String DATA_DIR = "/data/data/com.harasoft.relaunch"; + public final String BACKUP_DIR = "/sdcard/.relaunchx"; + public final String DATA_DIR = "/data/data/com.gacode.relaunchx"; public HashMap history = new HashMap(); public HashMap columns = new HashMap(); @@ -785,8 +785,8 @@ public boolean copyPrefs(String from, String to) { String dst = toDir.getAbsolutePath() + "/files/" + f; copyFile(src, dst, true); } - String src = fromDir.getAbsolutePath() + "/shared_prefs/com.harasoft.relaunch_preferences.xml"; - String dst = toDir.getAbsolutePath() + "/shared_prefs/com.harasoft.relaunch_preferences.xml"; + String src = fromDir.getAbsolutePath() + "/shared_prefs/com.gacode.relaunchx_preferences.xml"; + String dst = toDir.getAbsolutePath() + "/shared_prefs/com.gacode.relaunchx_preferences.xml"; // boolean ret = copyFile(src, dst, true); if (!copyFile(src, dst, true)) return false; diff --git a/src/com/harasoft/relaunch/ResultsActivity.java b/app/src/main/java/com/gacode/relaunchx/ResultsActivity.java similarity index 99% rename from src/com/harasoft/relaunch/ResultsActivity.java rename to app/src/main/java/com/gacode/relaunchx/ResultsActivity.java index 51d314a..9917c6a 100644 --- a/src/com/harasoft/relaunch/ResultsActivity.java +++ b/app/src/main/java/com/gacode/relaunchx/ResultsActivity.java @@ -1,4 +1,4 @@ -package com.harasoft.relaunch; +package com.gacode.relaunchx; import java.io.File; import java.util.ArrayList; @@ -658,7 +658,7 @@ public void onClick(View v) { ResultsActivity.this); // "Select application" builder.setTitle(getResources().getString( - R.string.jv_relaunch_select_columns)); + R.string.jv_relaunchx_select_columns)); builder.setSingleChoiceItems(columnsmode, checked, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int i) { @@ -866,7 +866,7 @@ public void onClick( upScroll.setText(app.scrollStep + "%"); } else { upScroll.setText(getResources() - .getString(R.string.jv_relaunch_prev)); + .getString(R.string.jv_relaunchx_prev)); } class upScrlSimpleOnGestureListener extends SimpleOnGestureListener { @Override @@ -983,7 +983,7 @@ public void run() { downScroll.setText(app.scrollStep + "%"); } else { downScroll.setText(getResources().getString( - R.string.jv_relaunch_next)); + R.string.jv_relaunchx_next)); } class dnScrlSimpleOnGestureListener extends SimpleOnGestureListener { @Override diff --git a/src/com/harasoft/relaunch/SView.java b/app/src/main/java/com/gacode/relaunchx/SView.java similarity index 98% rename from src/com/harasoft/relaunch/SView.java rename to app/src/main/java/com/gacode/relaunchx/SView.java index 58c19e2..2e0c7b1 100644 --- a/src/com/harasoft/relaunch/SView.java +++ b/app/src/main/java/com/gacode/relaunchx/SView.java @@ -1,4 +1,4 @@ -package com.harasoft.relaunch; +package com.gacode.relaunchx; import android.content.Context; import android.content.SharedPreferences; diff --git a/src/com/harasoft/relaunch/ScreenOrientation.java b/app/src/main/java/com/gacode/relaunchx/ScreenOrientation.java similarity index 94% rename from src/com/harasoft/relaunch/ScreenOrientation.java rename to app/src/main/java/com/gacode/relaunchx/ScreenOrientation.java index 56b4504..294abd5 100644 --- a/src/com/harasoft/relaunch/ScreenOrientation.java +++ b/app/src/main/java/com/gacode/relaunchx/ScreenOrientation.java @@ -1,4 +1,4 @@ -package com.harasoft.relaunch; +package com.gacode.relaunchx; import android.app.Activity; import android.content.SharedPreferences; diff --git a/src/com/harasoft/relaunch/SearchActivity.java b/app/src/main/java/com/gacode/relaunchx/SearchActivity.java similarity index 99% rename from src/com/harasoft/relaunch/SearchActivity.java rename to app/src/main/java/com/gacode/relaunchx/SearchActivity.java index d687c4b..f1998ed 100644 --- a/src/com/harasoft/relaunch/SearchActivity.java +++ b/app/src/main/java/com/gacode/relaunchx/SearchActivity.java @@ -1,4 +1,4 @@ -package com.harasoft.relaunch; +package com.gacode.relaunchx; import java.io.File; import java.util.ArrayList; diff --git a/src/com/harasoft/relaunch/Shop.java b/app/src/main/java/com/gacode/relaunchx/Shop.java similarity index 96% rename from src/com/harasoft/relaunch/Shop.java rename to app/src/main/java/com/gacode/relaunchx/Shop.java index 246226c..d4977be 100644 --- a/src/com/harasoft/relaunch/Shop.java +++ b/app/src/main/java/com/gacode/relaunchx/Shop.java @@ -1,4 +1,4 @@ -package com.harasoft.relaunch; +package com.gacode.relaunchx; import android.app.Activity; import android.app.PendingIntent; diff --git a/src/com/harasoft/relaunch/TaskManager.java b/app/src/main/java/com/gacode/relaunchx/TaskManager.java similarity index 99% rename from src/com/harasoft/relaunch/TaskManager.java rename to app/src/main/java/com/gacode/relaunchx/TaskManager.java index 9c77156..6f13676 100644 --- a/src/com/harasoft/relaunch/TaskManager.java +++ b/app/src/main/java/com/gacode/relaunchx/TaskManager.java @@ -1,4 +1,4 @@ -package com.harasoft.relaunch; +package com.gacode.relaunchx; import java.io.BufferedReader; import java.io.FileInputStream; diff --git a/src/com/harasoft/relaunch/TypesActivity.java b/app/src/main/java/com/gacode/relaunchx/TypesActivity.java similarity index 99% rename from src/com/harasoft/relaunch/TypesActivity.java rename to app/src/main/java/com/gacode/relaunchx/TypesActivity.java index f24b806..83fa1a4 100644 --- a/src/com/harasoft/relaunch/TypesActivity.java +++ b/app/src/main/java/com/gacode/relaunchx/TypesActivity.java @@ -1,4 +1,4 @@ -package com.harasoft.relaunch; +package com.gacode.relaunchx; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/com/harasoft/relaunch/Viewer.java b/app/src/main/java/com/gacode/relaunchx/Viewer.java similarity index 99% rename from src/com/harasoft/relaunch/Viewer.java rename to app/src/main/java/com/gacode/relaunchx/Viewer.java index d28e990..ec749cd 100644 --- a/src/com/harasoft/relaunch/Viewer.java +++ b/app/src/main/java/com/gacode/relaunchx/Viewer.java @@ -1,4 +1,4 @@ -package com.harasoft.relaunch; +package com.gacode.relaunchx; import java.io.BufferedReader; import java.io.File; diff --git a/res/drawable-hdpi/arrow_down.png b/app/src/main/res/drawable-hdpi/arrow_down.png similarity index 100% rename from res/drawable-hdpi/arrow_down.png rename to app/src/main/res/drawable-hdpi/arrow_down.png diff --git a/res/drawable-hdpi/arrow_up.png b/app/src/main/res/drawable-hdpi/arrow_up.png similarity index 100% rename from res/drawable-hdpi/arrow_up.png rename to app/src/main/res/drawable-hdpi/arrow_up.png diff --git a/res/drawable-hdpi/bat1.png b/app/src/main/res/drawable-hdpi/bat1.png similarity index 100% rename from res/drawable-hdpi/bat1.png rename to app/src/main/res/drawable-hdpi/bat1.png diff --git a/res/drawable-hdpi/bat2.png b/app/src/main/res/drawable-hdpi/bat2.png similarity index 100% rename from res/drawable-hdpi/bat2.png rename to app/src/main/res/drawable-hdpi/bat2.png diff --git a/res/drawable-hdpi/bat3.png b/app/src/main/res/drawable-hdpi/bat3.png similarity index 100% rename from res/drawable-hdpi/bat3.png rename to app/src/main/res/drawable-hdpi/bat3.png diff --git a/res/drawable-hdpi/bat4.png b/app/src/main/res/drawable-hdpi/bat4.png similarity index 100% rename from res/drawable-hdpi/bat4.png rename to app/src/main/res/drawable-hdpi/bat4.png diff --git a/res/drawable-hdpi/ci_add.png b/app/src/main/res/drawable-hdpi/ci_add.png similarity index 100% rename from res/drawable-hdpi/ci_add.png rename to app/src/main/res/drawable-hdpi/ci_add.png diff --git a/res/drawable-hdpi/ci_arrowdown.png b/app/src/main/res/drawable-hdpi/ci_arrowdown.png similarity index 100% rename from res/drawable-hdpi/ci_arrowdown.png rename to app/src/main/res/drawable-hdpi/ci_arrowdown.png diff --git a/res/drawable-hdpi/ci_arrowup.png b/app/src/main/res/drawable-hdpi/ci_arrowup.png similarity index 100% rename from res/drawable-hdpi/ci_arrowup.png rename to app/src/main/res/drawable-hdpi/ci_arrowup.png diff --git a/res/drawable-hdpi/ci_associations.png b/app/src/main/res/drawable-hdpi/ci_associations.png similarity index 100% rename from res/drawable-hdpi/ci_associations.png rename to app/src/main/res/drawable-hdpi/ci_associations.png diff --git a/res/drawable-hdpi/ci_az.png b/app/src/main/res/drawable-hdpi/ci_az.png similarity index 100% rename from res/drawable-hdpi/ci_az.png rename to app/src/main/res/drawable-hdpi/ci_az.png diff --git a/res/drawable-hdpi/ci_books.png b/app/src/main/res/drawable-hdpi/ci_books.png similarity index 100% rename from res/drawable-hdpi/ci_books.png rename to app/src/main/res/drawable-hdpi/ci_books.png diff --git a/res/drawable-hdpi/ci_cpu.png b/app/src/main/res/drawable-hdpi/ci_cpu.png similarity index 100% rename from res/drawable-hdpi/ci_cpu.png rename to app/src/main/res/drawable-hdpi/ci_cpu.png diff --git a/res/drawable-hdpi/ci_default.png b/app/src/main/res/drawable-hdpi/ci_default.png similarity index 100% rename from res/drawable-hdpi/ci_default.png rename to app/src/main/res/drawable-hdpi/ci_default.png diff --git a/res/drawable-hdpi/ci_del.png b/app/src/main/res/drawable-hdpi/ci_del.png similarity index 100% rename from res/drawable-hdpi/ci_del.png rename to app/src/main/res/drawable-hdpi/ci_del.png diff --git a/res/drawable-hdpi/ci_delsmall.png b/app/src/main/res/drawable-hdpi/ci_delsmall.png similarity index 100% rename from res/drawable-hdpi/ci_delsmall.png rename to app/src/main/res/drawable-hdpi/ci_delsmall.png diff --git a/res/drawable-hdpi/ci_edit.png b/app/src/main/res/drawable-hdpi/ci_edit.png similarity index 100% rename from res/drawable-hdpi/ci_edit.png rename to app/src/main/res/drawable-hdpi/ci_edit.png diff --git a/res/drawable-hdpi/ci_eightdir.png b/app/src/main/res/drawable-hdpi/ci_eightdir.png similarity index 100% rename from res/drawable-hdpi/ci_eightdir.png rename to app/src/main/res/drawable-hdpi/ci_eightdir.png diff --git a/res/drawable-hdpi/ci_exit.png b/app/src/main/res/drawable-hdpi/ci_exit.png similarity index 100% rename from res/drawable-hdpi/ci_exit.png rename to app/src/main/res/drawable-hdpi/ci_exit.png diff --git a/res/drawable-hdpi/ci_fav.png b/app/src/main/res/drawable-hdpi/ci_fav.png similarity index 100% rename from res/drawable-hdpi/ci_fav.png rename to app/src/main/res/drawable-hdpi/ci_fav.png diff --git a/res/drawable-hdpi/ci_fava.png b/app/src/main/res/drawable-hdpi/ci_fava.png similarity index 100% rename from res/drawable-hdpi/ci_fava.png rename to app/src/main/res/drawable-hdpi/ci_fava.png diff --git a/res/drawable-hdpi/ci_filter.png b/app/src/main/res/drawable-hdpi/ci_filter.png similarity index 100% rename from res/drawable-hdpi/ci_filter.png rename to app/src/main/res/drawable-hdpi/ci_filter.png diff --git a/res/drawable-hdpi/ci_gear.png b/app/src/main/res/drawable-hdpi/ci_gear.png similarity index 100% rename from res/drawable-hdpi/ci_gear.png rename to app/src/main/res/drawable-hdpi/ci_gear.png diff --git a/res/drawable-hdpi/ci_gear2.png b/app/src/main/res/drawable-hdpi/ci_gear2.png similarity index 100% rename from res/drawable-hdpi/ci_gear2.png rename to app/src/main/res/drawable-hdpi/ci_gear2.png diff --git a/res/drawable-hdpi/ci_grid.png b/app/src/main/res/drawable-hdpi/ci_grid.png similarity index 100% rename from res/drawable-hdpi/ci_grid.png rename to app/src/main/res/drawable-hdpi/ci_grid.png diff --git a/res/drawable-hdpi/ci_home.png b/app/src/main/res/drawable-hdpi/ci_home.png similarity index 100% rename from res/drawable-hdpi/ci_home.png rename to app/src/main/res/drawable-hdpi/ci_home.png diff --git a/res/drawable-hdpi/ci_kill.png b/app/src/main/res/drawable-hdpi/ci_kill.png similarity index 100% rename from res/drawable-hdpi/ci_kill.png rename to app/src/main/res/drawable-hdpi/ci_kill.png diff --git a/res/drawable-hdpi/ci_levelup.png b/app/src/main/res/drawable-hdpi/ci_levelup.png similarity index 100% rename from res/drawable-hdpi/ci_levelup.png rename to app/src/main/res/drawable-hdpi/ci_levelup.png diff --git a/res/drawable-hdpi/ci_lock.png b/app/src/main/res/drawable-hdpi/ci_lock.png similarity index 100% rename from res/drawable-hdpi/ci_lock.png rename to app/src/main/res/drawable-hdpi/ci_lock.png diff --git a/res/drawable-hdpi/ci_lre.png b/app/src/main/res/drawable-hdpi/ci_lre.png similarity index 100% rename from res/drawable-hdpi/ci_lre.png rename to app/src/main/res/drawable-hdpi/ci_lre.png diff --git a/res/drawable-hdpi/ci_lrea.png b/app/src/main/res/drawable-hdpi/ci_lrea.png similarity index 100% rename from res/drawable-hdpi/ci_lrea.png rename to app/src/main/res/drawable-hdpi/ci_lrea.png diff --git a/res/drawable-hdpi/ci_ok.png b/app/src/main/res/drawable-hdpi/ci_ok.png similarity index 100% rename from res/drawable-hdpi/ci_ok.png rename to app/src/main/res/drawable-hdpi/ci_ok.png diff --git a/res/drawable-hdpi/ci_power.png b/app/src/main/res/drawable-hdpi/ci_power.png similarity index 100% rename from res/drawable-hdpi/ci_power.png rename to app/src/main/res/drawable-hdpi/ci_power.png diff --git a/res/drawable-hdpi/ci_question.png b/app/src/main/res/drawable-hdpi/ci_question.png similarity index 100% rename from res/drawable-hdpi/ci_question.png rename to app/src/main/res/drawable-hdpi/ci_question.png diff --git a/res/drawable-hdpi/ci_ram.png b/app/src/main/res/drawable-hdpi/ci_ram.png similarity index 100% rename from res/drawable-hdpi/ci_ram.png rename to app/src/main/res/drawable-hdpi/ci_ram.png diff --git a/res/drawable-hdpi/ci_reboot.png b/app/src/main/res/drawable-hdpi/ci_reboot.png similarity index 100% rename from res/drawable-hdpi/ci_reboot.png rename to app/src/main/res/drawable-hdpi/ci_reboot.png diff --git a/res/drawable-hdpi/ci_run.png b/app/src/main/res/drawable-hdpi/ci_run.png similarity index 100% rename from res/drawable-hdpi/ci_run.png rename to app/src/main/res/drawable-hdpi/ci_run.png diff --git a/res/drawable-hdpi/ci_save.png b/app/src/main/res/drawable-hdpi/ci_save.png similarity index 100% rename from res/drawable-hdpi/ci_save.png rename to app/src/main/res/drawable-hdpi/ci_save.png diff --git a/res/drawable-hdpi/ci_search.png b/app/src/main/res/drawable-hdpi/ci_search.png similarity index 100% rename from res/drawable-hdpi/ci_search.png rename to app/src/main/res/drawable-hdpi/ci_search.png diff --git a/res/drawable-hdpi/ci_tools.png b/app/src/main/res/drawable-hdpi/ci_tools.png similarity index 100% rename from res/drawable-hdpi/ci_tools.png rename to app/src/main/res/drawable-hdpi/ci_tools.png diff --git a/res/drawable-hdpi/ci_wifi.png b/app/src/main/res/drawable-hdpi/ci_wifi.png similarity index 100% rename from res/drawable-hdpi/ci_wifi.png rename to app/src/main/res/drawable-hdpi/ci_wifi.png diff --git a/res/drawable-hdpi/ci_wifiscan.png b/app/src/main/res/drawable-hdpi/ci_wifiscan.png similarity index 100% rename from res/drawable-hdpi/ci_wifiscan.png rename to app/src/main/res/drawable-hdpi/ci_wifiscan.png diff --git a/res/drawable-hdpi/ci_wifisetup.png b/app/src/main/res/drawable-hdpi/ci_wifisetup.png similarity index 100% rename from res/drawable-hdpi/ci_wifisetup.png rename to app/src/main/res/drawable-hdpi/ci_wifisetup.png diff --git a/res/drawable-hdpi/dir_ok.png b/app/src/main/res/drawable-hdpi/dir_ok.png similarity index 100% rename from res/drawable-hdpi/dir_ok.png rename to app/src/main/res/drawable-hdpi/dir_ok.png diff --git a/res/drawable-hdpi/file_notok.png b/app/src/main/res/drawable-hdpi/file_notok.png similarity index 100% rename from res/drawable-hdpi/file_notok.png rename to app/src/main/res/drawable-hdpi/file_notok.png diff --git a/res/drawable-hdpi/file_ok.png b/app/src/main/res/drawable-hdpi/file_ok.png similarity index 100% rename from res/drawable-hdpi/file_ok.png rename to app/src/main/res/drawable-hdpi/file_ok.png diff --git a/app/src/main/res/drawable-hdpi/icon.png b/app/src/main/res/drawable-hdpi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..358765f505fb6a4c991edd6dce2a6c6eae9f7cc0 GIT binary patch literal 1493 zcmV;`1uFW9P)wy9|0 zm;+uO^i5KY5ELr$_Hbw^UNDb=cp(ZA8;_flDP!F>jV9Tc-836_AG5Qw^ZoWe|Cyc1 zw*>GaPAk5CjU=s-S=nLU9B^c!E{L z#q)Gx3kb-&g3Zm%FJ@+Dig$N+6CDnR=U!Eu;gXh?hLlQWTuV#Kbx~2#7C{id;Km1o zB}tMqK>RgSBoaYKM+c0IjBJo3Su2r99DyJ`3J9x%>YrU* zT^l-`?sEX(J{>P=Jv}|b!NI{_B@#&~0NnM6$2`d&AOS%T?)CNc%JTB^W%6(72stkw zuK?oX<4KdrBuq_Bt&_{;O9-L6n0;dm1n5I^bMu(NVE7gQ@P&d{0)%5~X=xGk_xFFF zm6g?n5PA_RAWv>?u6}=i|EpL9l$Vz$SX^9ulbf6S>fVP!QV>X`(jQJvP96Z#Xf#k# zQoA3|;(&^-}eK|y*t4=C0FIUEj1NJxOh#6(tHpVJDm z*=$f(R|hhg3=9SXE08z~=gvibB&L+a8lZ!N1AS6b zQX4|ZO%TLC%N-Jl1jJ%-*h4ag)X>ntx{_D}bbfxWPfkvL04QuSUKK<_Nt_0RS(!{G zz)L8XmzS(~66XP7DyyrjP+wmU*VosKds0jQq98RjH8HNFm;uC=l2`-O+S;nWxw&E0 zq#x@~J3BjYe0&^mEC^+u#2O%fORh|gV&T+9cb@cY0b#gwl=Q3tVMt?RW6;;v=U0r+ z8W69b04DXndk{a00R-Bche*7O`3i)M88vGj6lp*h4nLFj<0)(?hq@K#6|}at291r4 zjK71$1R%T~R9jmMPN$Rcw|Le8@hgf!Mlm-3{t^l0u&yAs0O7r`%F0UC*P=NK2ygeO z)oQRpX8F}4(h1GC%hcT23kkm$Ty(FMa<1yK$6RT9(6;XEL3B}t`H z#`ol70uT-YZ};F70sj9%p_&InsZb9k;~O>-u+iW%qL?Y3YQmOprNq{UCOXJeg(p#NQ7juAmdwbmj0|SEP z<>jw68qLq^>+4WfRz^Fa4kx(A0YKW};h}MAYU(q+UhlrWy$x?TiGr)CtY@uOD>ynj z`mLa#;7b5FK?r$hC-veu?o$*cDwRqxIyyRGx7$BmSXh9)y*;?NxWMP5AY6J)AP53d zQc|F>un=Cpdh zUXhcNBNvOs@g9!{#l>NP{d;()RZ|}wpq>bIj!qdi>b$=%1`y|Rx!xZf9Q@JU-Ms<; zXPKFq4y)Dr-XH2yX&sEC<!*JK22gmT&$g(s00000NkvXXu0mjfoY|_9 literal 0 HcmV?d00001 diff --git a/res/drawable-hdpi/install.png b/app/src/main/res/drawable-hdpi/install.png similarity index 100% rename from res/drawable-hdpi/install.png rename to app/src/main/res/drawable-hdpi/install.png diff --git a/res/drawable-hdpi/main_button.xml b/app/src/main/res/drawable-hdpi/main_button.xml similarity index 100% rename from res/drawable-hdpi/main_button.xml rename to app/src/main/res/drawable-hdpi/main_button.xml diff --git a/res/drawable-hdpi/poweroff_screen_240x240.png b/app/src/main/res/drawable-hdpi/poweroff_screen_240x240.png similarity index 100% rename from res/drawable-hdpi/poweroff_screen_240x240.png rename to app/src/main/res/drawable-hdpi/poweroff_screen_240x240.png diff --git a/res/drawable-hdpi/ram.png b/app/src/main/res/drawable-hdpi/ram.png similarity index 100% rename from res/drawable-hdpi/ram.png rename to app/src/main/res/drawable-hdpi/ram.png diff --git a/res/drawable-hdpi/reboot_screen_240x240.png b/app/src/main/res/drawable-hdpi/reboot_screen_240x240.png similarity index 100% rename from res/drawable-hdpi/reboot_screen_240x240.png rename to app/src/main/res/drawable-hdpi/reboot_screen_240x240.png diff --git a/res/drawable-hdpi/wifi_off.png b/app/src/main/res/drawable-hdpi/wifi_off.png similarity index 100% rename from res/drawable-hdpi/wifi_off.png rename to app/src/main/res/drawable-hdpi/wifi_off.png diff --git a/res/drawable-hdpi/wifi_on.png b/app/src/main/res/drawable-hdpi/wifi_on.png similarity index 100% rename from res/drawable-hdpi/wifi_on.png rename to app/src/main/res/drawable-hdpi/wifi_on.png diff --git a/res/drawable-mdpi/arrow_down.png b/app/src/main/res/drawable-mdpi/arrow_down.png similarity index 100% rename from res/drawable-mdpi/arrow_down.png rename to app/src/main/res/drawable-mdpi/arrow_down.png diff --git a/res/drawable-mdpi/arrow_up.png b/app/src/main/res/drawable-mdpi/arrow_up.png similarity index 100% rename from res/drawable-mdpi/arrow_up.png rename to app/src/main/res/drawable-mdpi/arrow_up.png diff --git a/res/drawable-mdpi/bat1.png b/app/src/main/res/drawable-mdpi/bat1.png similarity index 100% rename from res/drawable-mdpi/bat1.png rename to app/src/main/res/drawable-mdpi/bat1.png diff --git a/res/drawable-mdpi/bat2.png b/app/src/main/res/drawable-mdpi/bat2.png similarity index 100% rename from res/drawable-mdpi/bat2.png rename to app/src/main/res/drawable-mdpi/bat2.png diff --git a/res/drawable-mdpi/bat3.png b/app/src/main/res/drawable-mdpi/bat3.png similarity index 100% rename from res/drawable-mdpi/bat3.png rename to app/src/main/res/drawable-mdpi/bat3.png diff --git a/res/drawable-mdpi/bat4.png b/app/src/main/res/drawable-mdpi/bat4.png similarity index 100% rename from res/drawable-mdpi/bat4.png rename to app/src/main/res/drawable-mdpi/bat4.png diff --git a/res/drawable-mdpi/ci_add.png b/app/src/main/res/drawable-mdpi/ci_add.png similarity index 100% rename from res/drawable-mdpi/ci_add.png rename to app/src/main/res/drawable-mdpi/ci_add.png diff --git a/res/drawable-mdpi/ci_arrowdown.png b/app/src/main/res/drawable-mdpi/ci_arrowdown.png similarity index 100% rename from res/drawable-mdpi/ci_arrowdown.png rename to app/src/main/res/drawable-mdpi/ci_arrowdown.png diff --git a/res/drawable-mdpi/ci_arrowup.png b/app/src/main/res/drawable-mdpi/ci_arrowup.png similarity index 100% rename from res/drawable-mdpi/ci_arrowup.png rename to app/src/main/res/drawable-mdpi/ci_arrowup.png diff --git a/res/drawable-mdpi/ci_associations.png b/app/src/main/res/drawable-mdpi/ci_associations.png similarity index 100% rename from res/drawable-mdpi/ci_associations.png rename to app/src/main/res/drawable-mdpi/ci_associations.png diff --git a/res/drawable-mdpi/ci_az.png b/app/src/main/res/drawable-mdpi/ci_az.png similarity index 100% rename from res/drawable-mdpi/ci_az.png rename to app/src/main/res/drawable-mdpi/ci_az.png diff --git a/res/drawable-mdpi/ci_books.png b/app/src/main/res/drawable-mdpi/ci_books.png similarity index 100% rename from res/drawable-mdpi/ci_books.png rename to app/src/main/res/drawable-mdpi/ci_books.png diff --git a/res/drawable-mdpi/ci_cpu.png b/app/src/main/res/drawable-mdpi/ci_cpu.png similarity index 100% rename from res/drawable-mdpi/ci_cpu.png rename to app/src/main/res/drawable-mdpi/ci_cpu.png diff --git a/res/drawable-mdpi/ci_default.png b/app/src/main/res/drawable-mdpi/ci_default.png similarity index 100% rename from res/drawable-mdpi/ci_default.png rename to app/src/main/res/drawable-mdpi/ci_default.png diff --git a/res/drawable-mdpi/ci_del.png b/app/src/main/res/drawable-mdpi/ci_del.png similarity index 100% rename from res/drawable-mdpi/ci_del.png rename to app/src/main/res/drawable-mdpi/ci_del.png diff --git a/res/drawable-mdpi/ci_delsmall.png b/app/src/main/res/drawable-mdpi/ci_delsmall.png similarity index 100% rename from res/drawable-mdpi/ci_delsmall.png rename to app/src/main/res/drawable-mdpi/ci_delsmall.png diff --git a/res/drawable-mdpi/ci_edit.png b/app/src/main/res/drawable-mdpi/ci_edit.png similarity index 100% rename from res/drawable-mdpi/ci_edit.png rename to app/src/main/res/drawable-mdpi/ci_edit.png diff --git a/res/drawable-mdpi/ci_eightdir.png b/app/src/main/res/drawable-mdpi/ci_eightdir.png similarity index 100% rename from res/drawable-mdpi/ci_eightdir.png rename to app/src/main/res/drawable-mdpi/ci_eightdir.png diff --git a/res/drawable-mdpi/ci_exit.png b/app/src/main/res/drawable-mdpi/ci_exit.png similarity index 100% rename from res/drawable-mdpi/ci_exit.png rename to app/src/main/res/drawable-mdpi/ci_exit.png diff --git a/res/drawable-mdpi/ci_fav.png b/app/src/main/res/drawable-mdpi/ci_fav.png similarity index 100% rename from res/drawable-mdpi/ci_fav.png rename to app/src/main/res/drawable-mdpi/ci_fav.png diff --git a/res/drawable-mdpi/ci_fava.png b/app/src/main/res/drawable-mdpi/ci_fava.png similarity index 100% rename from res/drawable-mdpi/ci_fava.png rename to app/src/main/res/drawable-mdpi/ci_fava.png diff --git a/res/drawable-mdpi/ci_filter.png b/app/src/main/res/drawable-mdpi/ci_filter.png similarity index 100% rename from res/drawable-mdpi/ci_filter.png rename to app/src/main/res/drawable-mdpi/ci_filter.png diff --git a/res/drawable-mdpi/ci_gear.png b/app/src/main/res/drawable-mdpi/ci_gear.png similarity index 100% rename from res/drawable-mdpi/ci_gear.png rename to app/src/main/res/drawable-mdpi/ci_gear.png diff --git a/res/drawable-mdpi/ci_gear2.png b/app/src/main/res/drawable-mdpi/ci_gear2.png similarity index 100% rename from res/drawable-mdpi/ci_gear2.png rename to app/src/main/res/drawable-mdpi/ci_gear2.png diff --git a/res/drawable-mdpi/ci_grid.png b/app/src/main/res/drawable-mdpi/ci_grid.png similarity index 100% rename from res/drawable-mdpi/ci_grid.png rename to app/src/main/res/drawable-mdpi/ci_grid.png diff --git a/res/drawable-mdpi/ci_home.png b/app/src/main/res/drawable-mdpi/ci_home.png similarity index 100% rename from res/drawable-mdpi/ci_home.png rename to app/src/main/res/drawable-mdpi/ci_home.png diff --git a/res/drawable-mdpi/ci_kill.png b/app/src/main/res/drawable-mdpi/ci_kill.png similarity index 100% rename from res/drawable-mdpi/ci_kill.png rename to app/src/main/res/drawable-mdpi/ci_kill.png diff --git a/res/drawable-mdpi/ci_levelup.png b/app/src/main/res/drawable-mdpi/ci_levelup.png similarity index 100% rename from res/drawable-mdpi/ci_levelup.png rename to app/src/main/res/drawable-mdpi/ci_levelup.png diff --git a/res/drawable-mdpi/ci_lock.png b/app/src/main/res/drawable-mdpi/ci_lock.png similarity index 100% rename from res/drawable-mdpi/ci_lock.png rename to app/src/main/res/drawable-mdpi/ci_lock.png diff --git a/res/drawable-mdpi/ci_lre.png b/app/src/main/res/drawable-mdpi/ci_lre.png similarity index 100% rename from res/drawable-mdpi/ci_lre.png rename to app/src/main/res/drawable-mdpi/ci_lre.png diff --git a/res/drawable-mdpi/ci_lrea.png b/app/src/main/res/drawable-mdpi/ci_lrea.png similarity index 100% rename from res/drawable-mdpi/ci_lrea.png rename to app/src/main/res/drawable-mdpi/ci_lrea.png diff --git a/res/drawable-mdpi/ci_ok.png b/app/src/main/res/drawable-mdpi/ci_ok.png similarity index 100% rename from res/drawable-mdpi/ci_ok.png rename to app/src/main/res/drawable-mdpi/ci_ok.png diff --git a/res/drawable-mdpi/ci_power.png b/app/src/main/res/drawable-mdpi/ci_power.png similarity index 100% rename from res/drawable-mdpi/ci_power.png rename to app/src/main/res/drawable-mdpi/ci_power.png diff --git a/res/drawable-mdpi/ci_question.png b/app/src/main/res/drawable-mdpi/ci_question.png similarity index 100% rename from res/drawable-mdpi/ci_question.png rename to app/src/main/res/drawable-mdpi/ci_question.png diff --git a/res/drawable-mdpi/ci_ram.png b/app/src/main/res/drawable-mdpi/ci_ram.png similarity index 100% rename from res/drawable-mdpi/ci_ram.png rename to app/src/main/res/drawable-mdpi/ci_ram.png diff --git a/res/drawable-mdpi/ci_reboot.png b/app/src/main/res/drawable-mdpi/ci_reboot.png similarity index 100% rename from res/drawable-mdpi/ci_reboot.png rename to app/src/main/res/drawable-mdpi/ci_reboot.png diff --git a/res/drawable-mdpi/ci_run.png b/app/src/main/res/drawable-mdpi/ci_run.png similarity index 100% rename from res/drawable-mdpi/ci_run.png rename to app/src/main/res/drawable-mdpi/ci_run.png diff --git a/res/drawable-mdpi/ci_save.png b/app/src/main/res/drawable-mdpi/ci_save.png similarity index 100% rename from res/drawable-mdpi/ci_save.png rename to app/src/main/res/drawable-mdpi/ci_save.png diff --git a/res/drawable-mdpi/ci_search.png b/app/src/main/res/drawable-mdpi/ci_search.png similarity index 100% rename from res/drawable-mdpi/ci_search.png rename to app/src/main/res/drawable-mdpi/ci_search.png diff --git a/res/drawable-mdpi/ci_tools.png b/app/src/main/res/drawable-mdpi/ci_tools.png similarity index 100% rename from res/drawable-mdpi/ci_tools.png rename to app/src/main/res/drawable-mdpi/ci_tools.png diff --git a/res/drawable-mdpi/ci_wifi.png b/app/src/main/res/drawable-mdpi/ci_wifi.png similarity index 100% rename from res/drawable-mdpi/ci_wifi.png rename to app/src/main/res/drawable-mdpi/ci_wifi.png diff --git a/res/drawable-mdpi/ci_wifiscan.png b/app/src/main/res/drawable-mdpi/ci_wifiscan.png similarity index 100% rename from res/drawable-mdpi/ci_wifiscan.png rename to app/src/main/res/drawable-mdpi/ci_wifiscan.png diff --git a/res/drawable-mdpi/ci_wifisetup.png b/app/src/main/res/drawable-mdpi/ci_wifisetup.png similarity index 100% rename from res/drawable-mdpi/ci_wifisetup.png rename to app/src/main/res/drawable-mdpi/ci_wifisetup.png diff --git a/res/drawable-mdpi/dir_ok.png b/app/src/main/res/drawable-mdpi/dir_ok.png similarity index 100% rename from res/drawable-mdpi/dir_ok.png rename to app/src/main/res/drawable-mdpi/dir_ok.png diff --git a/res/drawable-mdpi/file_notok.png b/app/src/main/res/drawable-mdpi/file_notok.png similarity index 100% rename from res/drawable-mdpi/file_notok.png rename to app/src/main/res/drawable-mdpi/file_notok.png diff --git a/res/drawable-mdpi/file_ok.png b/app/src/main/res/drawable-mdpi/file_ok.png similarity index 100% rename from res/drawable-mdpi/file_ok.png rename to app/src/main/res/drawable-mdpi/file_ok.png diff --git a/app/src/main/res/drawable-mdpi/icon.png b/app/src/main/res/drawable-mdpi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..59e99cc283044e1a92adb5365c0a78a502fbf702 GIT binary patch literal 1051 zcmV+$1mydPP)vrlu978m71=)75oI0 zsEDf~X%wxWMuZplPTU%RUd3pJBLqmfNV;?(JMY5?FC z02CsZP#gf1xm=xA zt5pyIUn~|&WME@s1G>Ar%ZVShwzi4{oGhlht? zHk+ZUstUHZx1qkiK4%i55jZ(Hf!^L;2!%o{=;r2TSY2JsnS^KrNaQ^pPg2C2nwr4v zc7sl*6P$^H2+YmR`EG7*63giH^fVX@20@cwUS6^pI6FH_YOmF5VSRmFFo}W)w6(SQ zWHMRaJMqQE1(-~x2P8-)NOpv1LR11I^yla2(AU=ofj}TB6GAm1Ist;3WWs1PLNFN2 zSrY{jpeV`*0C|_teY7MKBO@bleSMviCJG`z({$2VNRWE-Xp~74k|2<2pLim0|2UmT zbqMNGvJ#TKhzs4wxbTa%j243cS^LS6LXsPq=tl|3ALddwvRtl|7K;Ve*4A=9I;1XJ zMcoH-A>jA>+1kIlx{~IFhM+z^K4!0!N~KbIS4yrF$kkG%Qc3etFK8Ri(nvH76azdN zaRx9gV@>xtupU?NjX0ur<#bRn{X#s{|mb$vS-eHVyc`YWw=AVIv z+S}V3XJ%$Ty4~(K9*;*JjYf$}S#DDtQxt_vCexkSZ2memHT7X{Z|@ZUHOUh8Z#tV* z1pqIMMx(Z_uC68?k0&~i{>54<`NlyAB`jTqLLm!=} zcez~3O7O@=M@Mhx=jZSEjQ5PuBx2EMG$oCAwroZs5zGmeH)GibsPzA$Mz @@ -102,6 +103,7 @@ android:paddingLeft="5.3dp" android:paddingRight="5.3dp" android:paddingTop="5.3dp" + android:textColor="@color/normal_fg" android:text="@string/advanced_layout_switch_wifi_off" > @@ -118,6 +120,7 @@ android:paddingLeft="11dp" android:paddingRight="11dp" android:paddingTop="5.3dp" + android:textColor="@color/normal_fg" android:text="@string/advanced_layout_setting_wifi" > @@ -133,7 +136,7 @@ android:padding="2.7dp" > @@ -175,6 +179,7 @@ android:paddingLeft="11dp" android:paddingRight="11dp" android:paddingTop="5.3dp" + android:textColor="@color/normal_fg" android:text="@string/advanced_layout_reboot" > @@ -191,6 +196,7 @@ android:paddingLeft="11dp" android:paddingRight="11dp" android:paddingTop="5.3dp" + android:textColor="@color/normal_fg" android:text="@string/advanced_layout_poweroff" > diff --git a/res/layout-hdpi/all_applications.xml b/app/src/main/res/layout-hdpi/all_applications.xml similarity index 100% rename from res/layout-hdpi/all_applications.xml rename to app/src/main/res/layout-hdpi/all_applications.xml diff --git a/res/layout-hdpi/applications_item.xml b/app/src/main/res/layout-hdpi/applications_item.xml similarity index 100% rename from res/layout-hdpi/applications_item.xml rename to app/src/main/res/layout-hdpi/applications_item.xml diff --git a/res/layout-hdpi/bookinfo.xml b/app/src/main/res/layout-hdpi/bookinfo.xml similarity index 100% rename from res/layout-hdpi/bookinfo.xml rename to app/src/main/res/layout-hdpi/bookinfo.xml diff --git a/res/layout-hdpi/cmenu_list_item.xml b/app/src/main/res/layout-hdpi/cmenu_list_item.xml similarity index 100% rename from res/layout-hdpi/cmenu_list_item.xml rename to app/src/main/res/layout-hdpi/cmenu_list_item.xml diff --git a/res/layout-hdpi/editor_layout.xml b/app/src/main/res/layout-hdpi/editor_layout.xml similarity index 100% rename from res/layout-hdpi/editor_layout.xml rename to app/src/main/res/layout-hdpi/editor_layout.xml diff --git a/res/layout-hdpi/fileinfo.xml b/app/src/main/res/layout-hdpi/fileinfo.xml similarity index 93% rename from res/layout-hdpi/fileinfo.xml rename to app/src/main/res/layout-hdpi/fileinfo.xml index 467f48b..cc9a503 100644 --- a/res/layout-hdpi/fileinfo.xml +++ b/app/src/main/res/layout-hdpi/fileinfo.xml @@ -22,7 +22,7 @@ @@ -45,7 +45,7 @@ @@ -67,7 +67,7 @@ @@ -89,7 +89,7 @@ @@ -111,7 +111,7 @@ diff --git a/res/layout-hdpi/filters_item.xml b/app/src/main/res/layout-hdpi/filters_item.xml similarity index 99% rename from res/layout-hdpi/filters_item.xml rename to app/src/main/res/layout-hdpi/filters_item.xml index 83b8d6b..2539fb7 100644 --- a/res/layout-hdpi/filters_item.xml +++ b/app/src/main/res/layout-hdpi/filters_item.xml @@ -84,7 +84,7 @@ diff --git a/res/layout-hdpi/types_view.xml b/app/src/main/res/layout-hdpi/types_view.xml similarity index 100% rename from res/layout-hdpi/types_view.xml rename to app/src/main/res/layout-hdpi/types_view.xml diff --git a/res/layout-hdpi/viewer_layout.xml b/app/src/main/res/layout-hdpi/viewer_layout.xml similarity index 100% rename from res/layout-hdpi/viewer_layout.xml rename to app/src/main/res/layout-hdpi/viewer_layout.xml diff --git a/res/layout-mdpi/adv_wifi_item.xml b/app/src/main/res/layout-mdpi/adv_wifi_item.xml similarity index 100% rename from res/layout-mdpi/adv_wifi_item.xml rename to app/src/main/res/layout-mdpi/adv_wifi_item.xml diff --git a/res/layout-mdpi/advanced_layout.xml b/app/src/main/res/layout-mdpi/advanced_layout.xml similarity index 91% rename from res/layout-mdpi/advanced_layout.xml rename to app/src/main/res/layout-mdpi/advanced_layout.xml index b90fc55..a414a1d 100644 --- a/res/layout-mdpi/advanced_layout.xml +++ b/app/src/main/res/layout-mdpi/advanced_layout.xml @@ -66,7 +66,7 @@ @@ -102,6 +103,7 @@ android:paddingLeft="8dp" android:paddingRight="8dp" android:paddingTop="8dp" + android:textColor="@color/normal_fg" android:text="@string/advanced_layout_switch_wifi_off" > @@ -118,6 +120,7 @@ android:paddingLeft="16dp" android:paddingRight="16dp" android:paddingTop="8dp" + android:textColor="@color/normal_fg" android:text="@string/advanced_layout_setting_wifi" > @@ -133,7 +136,7 @@ android:padding="4dp" > @@ -175,6 +179,7 @@ android:paddingLeft="16dp" android:paddingRight="16dp" android:paddingTop="8dp" + android:textColor="@color/normal_fg" android:text="@string/advanced_layout_reboot" > @@ -191,6 +196,7 @@ android:paddingLeft="16dp" android:paddingRight="16dp" android:paddingTop="8dp" + android:textColor="@color/normal_fg" android:text="@string/advanced_layout_poweroff" > diff --git a/res/layout-mdpi/all_applications.xml b/app/src/main/res/layout-mdpi/all_applications.xml similarity index 100% rename from res/layout-mdpi/all_applications.xml rename to app/src/main/res/layout-mdpi/all_applications.xml diff --git a/res/layout-mdpi/applications_item.xml b/app/src/main/res/layout-mdpi/applications_item.xml similarity index 100% rename from res/layout-mdpi/applications_item.xml rename to app/src/main/res/layout-mdpi/applications_item.xml diff --git a/res/layout-mdpi/bookinfo.xml b/app/src/main/res/layout-mdpi/bookinfo.xml similarity index 100% rename from res/layout-mdpi/bookinfo.xml rename to app/src/main/res/layout-mdpi/bookinfo.xml diff --git a/res/layout-mdpi/cmenu_list_item.xml b/app/src/main/res/layout-mdpi/cmenu_list_item.xml similarity index 100% rename from res/layout-mdpi/cmenu_list_item.xml rename to app/src/main/res/layout-mdpi/cmenu_list_item.xml diff --git a/res/layout-mdpi/editor_layout.xml b/app/src/main/res/layout-mdpi/editor_layout.xml similarity index 100% rename from res/layout-mdpi/editor_layout.xml rename to app/src/main/res/layout-mdpi/editor_layout.xml diff --git a/res/layout-mdpi/fileinfo.xml b/app/src/main/res/layout-mdpi/fileinfo.xml similarity index 93% rename from res/layout-mdpi/fileinfo.xml rename to app/src/main/res/layout-mdpi/fileinfo.xml index 98ea753..41a9fe7 100644 --- a/res/layout-mdpi/fileinfo.xml +++ b/app/src/main/res/layout-mdpi/fileinfo.xml @@ -22,7 +22,7 @@ @@ -45,7 +45,7 @@ @@ -67,7 +67,7 @@ @@ -89,7 +89,7 @@ @@ -111,7 +111,7 @@ diff --git a/res/layout-mdpi/filters_item.xml b/app/src/main/res/layout-mdpi/filters_item.xml similarity index 99% rename from res/layout-mdpi/filters_item.xml rename to app/src/main/res/layout-mdpi/filters_item.xml index 2442b2b..86e95ab 100644 --- a/res/layout-mdpi/filters_item.xml +++ b/app/src/main/res/layout-mdpi/filters_item.xml @@ -84,7 +84,7 @@ diff --git a/res/layout-mdpi/types_view.xml b/app/src/main/res/layout-mdpi/types_view.xml similarity index 100% rename from res/layout-mdpi/types_view.xml rename to app/src/main/res/layout-mdpi/types_view.xml diff --git a/res/layout-mdpi/viewer_layout.xml b/app/src/main/res/layout-mdpi/viewer_layout.xml similarity index 100% rename from res/layout-mdpi/viewer_layout.xml rename to app/src/main/res/layout-mdpi/viewer_layout.xml diff --git a/res/menu-es/mainmenu.xml b/app/src/main/res/menu-es/mainmenu.xml similarity index 100% rename from res/menu-es/mainmenu.xml rename to app/src/main/res/menu-es/mainmenu.xml diff --git a/res/menu-es/resultsmenu.xml b/app/src/main/res/menu-es/resultsmenu.xml similarity index 100% rename from res/menu-es/resultsmenu.xml rename to app/src/main/res/menu-es/resultsmenu.xml diff --git a/res/menu-es/searchmenu.xml b/app/src/main/res/menu-es/searchmenu.xml similarity index 100% rename from res/menu-es/searchmenu.xml rename to app/src/main/res/menu-es/searchmenu.xml diff --git a/res/menu-ru/mainmenu.xml b/app/src/main/res/menu-ru/mainmenu.xml similarity index 100% rename from res/menu-ru/mainmenu.xml rename to app/src/main/res/menu-ru/mainmenu.xml diff --git a/res/menu-ru/resultsmenu.xml b/app/src/main/res/menu-ru/resultsmenu.xml similarity index 100% rename from res/menu-ru/resultsmenu.xml rename to app/src/main/res/menu-ru/resultsmenu.xml diff --git a/res/menu-ru/searchmenu.xml b/app/src/main/res/menu-ru/searchmenu.xml similarity index 100% rename from res/menu-ru/searchmenu.xml rename to app/src/main/res/menu-ru/searchmenu.xml diff --git a/res/menu/mainmenu.xml b/app/src/main/res/menu/mainmenu.xml similarity index 100% rename from res/menu/mainmenu.xml rename to app/src/main/res/menu/mainmenu.xml diff --git a/res/menu/resultsmenu.xml b/app/src/main/res/menu/resultsmenu.xml similarity index 100% rename from res/menu/resultsmenu.xml rename to app/src/main/res/menu/resultsmenu.xml diff --git a/res/menu/searchmenu.xml b/app/src/main/res/menu/searchmenu.xml similarity index 100% rename from res/menu/searchmenu.xml rename to app/src/main/res/menu/searchmenu.xml diff --git a/res/values-es/arrays.xml b/app/src/main/res/values-es/arrays.xml similarity index 99% rename from res/values-es/arrays.xml rename to app/src/main/res/values-es/arrays.xml index a4eb75a..eedd40d 100644 --- a/res/values-es/arrays.xml +++ b/app/src/main/res/values-es/arrays.xml @@ -53,6 +53,7 @@ proc sysfs cgroup + debugfs 3 diff --git a/res/values-es/changelog.xml b/app/src/main/res/values-es/changelog.xml similarity index 100% rename from res/values-es/changelog.xml rename to app/src/main/res/values-es/changelog.xml diff --git a/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml similarity index 86% rename from res/values-es/strings.xml rename to app/src/main/res/values-es/strings.xml index f8e3c87..1f859ce 100644 --- a/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -1,9 +1,10 @@ - + - ReLaunch - <h2>Esta aplicación está diseñada sólo para - el Nook Simple Touch y el Sony - PRS-T1</h2><br><center><b>¿Desea + ReLaunchX + <h2>Esta aplicación está diseñada sólo para:<br> + el Nook Simple Touch<br> + el Sony PRS-T1<br> + el ONYX Boox Max</h2><br><center><b>¿Desea continuar?</b></center> Activar WiFi Configuración WiFi @@ -154,69 +155,63 @@ Cancelar Database operations Do you really want to cleanup cache? - ¡Modelo erroneo! - Sí - NO - M libre - WiFi OFF - WiFi ON - Seleccionar aplicación - Aplicaciones usadas recientemente - Todas las aplicaciones - Aplicaciones favoritas - Lista de cambios - OK - Añadir a favoritos - Marcar como leído - Quitar marca de leído - Olvidar todas las marcas - Obrir con ... - Crear cadena de eventos ... - Copy - Move - Paste - Eliminar - ¡No eliminar carpetas vacías! - Eliminar carpetas vacías - Cancelar - Seleccionar tipo de evento - Acción no encontrada - Acción no encontrada - Acción para archivo - de tipo - no encontrado - Otro - Tipo de evento - Eliminar advertencia de archivo - Estás seguro de eliminar el archivo - \? - Borrar advertencia de carpeta vacía - Está seguro de elimina carpeta vacía - \? - Peligro, borrar carpeta no vacía - Está seguro de borrar carpeta no vacía - (acto potencialmente peligroso) \? - ¡Esto es un lanzador! - Estás seguro de que quieres salir ? - Abierto recientemente - Favoritos - Home - Elegir columnas - Por defecto - WiFi está activada - WiFi está desactivado - anterior - próximo + ¡Modelo erroneo! + Sí + NO + M libre + WiFi OFF + WiFi ON + Seleccionar aplicación + Aplicaciones usadas recientemente + Todas las aplicaciones + Aplicaciones favoritas + Lista de cambios + OK + Añadir a favoritos + Marcar como leído + Quitar marca de leído + Olvidar todas las marcas + Obrir con ... + Crear cadena de eventos ... + Copy + Move + Paste + Eliminar + ¡No eliminar carpetas vacías! + Eliminar carpetas vacías + Cancelar + Seleccionar tipo de evento + Acción no encontrada + Acción no encontrada + Acción para archivo + de tipo + no encontrado + Otro + Tipo de evento + Eliminar advertencia de archivo + Estás seguro de eliminar el archivo + \? + Borrar advertencia de carpeta vacía + Está seguro de elimina carpeta vacía + \? + Peligro, borrar carpeta no vacía + Está seguro de borrar carpeta no vacía + (acto potencialmente peligroso) \? + ¡Esto es un lanzador! + Estás seguro de que quieres salir ? + Abierto recientemente + Favoritos + Home + Elegir columnas + Por defecto + WiFi está activada + WiFi está desactivado + anterior + próximo Acción no encontrado! - <h1><center>ReLaunch</center></h1><center><b>lanzador - para el lector electrónico Nook Simple - Touch</b></center><br><center>Versión: - <b> - </b></center><br><center>Código - fuente: <a - href=\"https://github.com/yiselieren/ReLaunch\">git://github.com/yiselieren/ReLaunch.git</a></center> - + <h1><center>ReLaunchX</center></h1><center><b>lanzador\n\t\tpara el lector electrónico</b></center><br><center>Versión:\n\t\t<b> + </b></center><br><center>Código\n\t\tfuente: <a\n\t\thref=\"https://github.com/Leszek111/ReLaunchX\">https://github.com/Leszek111/ReLaunchX.git</a></center>\n\t OK Ver histórico de cambios (changelog) Histórico de cambios diff --git a/res/values-ru/changelog.xml b/app/src/main/res/values-ru/changelog.xml similarity index 100% rename from res/values-ru/changelog.xml rename to app/src/main/res/values-ru/changelog.xml diff --git a/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml similarity index 86% rename from res/values-ru/strings.xml rename to app/src/main/res/values-ru/strings.xml index 69507d7..fb6ed4a 100644 --- a/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -1,8 +1,10 @@ - ReLaunch - <h2>Эта программа разработана для Nook Simple - Touch или Sony PRS-T1!</h2><br><center><b>Хотите + ReLaunchX + <h2>Эта программа разработана для:<br> + Nook Simple Touch<br> + Sony PRS-T1<br> + ONYX Boox Max</h2><br><center><b>Хотите продолжить?</b></center> Выкл. WiFi Настройка WiFi @@ -162,96 +164,90 @@ открытые\"? Вы действительно хотите очистить список \"Избранное\"? - Не верная модель устройства! - Да - Нет - M своб. - WiFi выкл. - WiFi ВКЛ. - Выберите приложение - Недавно запущеные приложения - Все приложения - Избранные приложения - Список изменений - OK - Добавить в \"Избранное\" - Отметить как прочтенное - Снять пометку о прочтении - Снять все пометки - Открыть с помощью... - Создать событие... - Копировать - Переместить - Переместить - Вставить - Создать новую папку... - Введите имя новой папки - Не удалось создать папку - Переименовать... - Введите новое имя файла - Удалить - Удалить НЕ ПУСТУЮ папку! - Удалить пустую папку - Отмена - Выберите вид события - Действие не найдено - Действие не найдено - Действие для файла - типа - не найдено - Другое - Вид события - Предупреждение - Вы действительно хотите удалить файл - \? - Предупреждение - Вы действительно хотите удалить пустую папку + Не верная модель устройства! + Да + Нет + M своб. + WiFi выкл. + WiFi ВКЛ. + Выберите приложение + Недавно запущеные приложения + Все приложения + Избранные приложения + Список изменений + OK + Добавить в \"Избранное\" + Отметить как прочтенное + Снять пометку о прочтении + Снять все пометки + Открыть с помощью... + Создать событие... + Копировать + Переместить + Переместить + Вставить + Создать новую папку... + Введите имя новой папки + Не удалось создать папку + Переименовать... + Введите новое имя файла + Удалить + Удалить НЕ ПУСТУЮ папку! + Удалить пустую папку + Отмена + Выберите вид события + Действие не найдено + Действие не найдено + Действие для файла + типа + не найдено + Другое + Вид события + Предупреждение + Вы действительно хотите удалить файл + \? + Предупреждение + Вы действительно хотите удалить пустую папку - \? - Предупреждение - Вы действительно хотите удалить НЕ ПУСТУЮ папку + \? + Предупреждение + Вы действительно хотите удалить НЕ ПУСТУЮ папку - (потенциально опасное действие)? - Ошибка - Не удалось скопировать/переместить - Не удалось переименовать - Режим рабочего стола! - Вы действительно хотите выйти? - Недавно открытые - Избранное - Домашние папки - Вывод данной папки - По умолчанию - WiFi ВКЛЮЧЕН - WiFi выключен - пред. - след. - Показать названия книг - Показать файлы - Переименовать по тегам fb2/epub… - Сортировать файлы по - имени файла А-Я - имени файла Я-А - алфавиту А-Я - алфавиту Я-А - Аннотация - Свойства - Свойства файла - Имя: - Размер: - Дата: - Владелец: - Разрешения: + (потенциально опасное действие)? + Ошибка + Не удалось скопировать/переместить + Не удалось переименовать + Режим рабочего стола! + Вы действительно хотите выйти? + Недавно открытые + Избранное + Домашние папки + Вывод данной папки + По умолчанию + WiFi ВКЛЮЧЕН + WiFi выключен + пред. + след. + Показать названия книг + Показать файлы + Переименовать по тегам fb2/epub… + Сортировать файлы по + имени файла А-Я + имени файла Я-А + алфавиту А-Я + алфавиту Я-А + Аннотация + Свойства + Свойства файла + Имя: + Размер: + Дата: + Владелец: + Разрешения: Действие не найдено! - <h1><center>ReLaunch</center></h1><center><b>Запуск - программ чтения книг и рабочий стол для Nook Simple - Touch</b></center><br><center>Version: - <b> - </b></center><br><center>Source - code: <a - href=\"https://github.com/yiselieren/ReLaunch\">git://github.com/yiselieren/ReLaunch.git</a></center> - + <h1><center>ReLaunchX</center></h1><center><b>Запуск\n\t\tпрограмм чтения книг и рабочий стол</b></center><br><center>Version:\n\t\t<b> + </b></center><br><center>Source\n\t\tcode: <a\n\t\thref=\"https://github.com/Leszek111/ReLaunchX\">https://github.com/Leszek111/ReLaunchX.git</a></center>\n\t OK Справка Справка @@ -614,8 +610,8 @@ Показывать полный путь в строке заголовка Показывать имя папки в строке заголовка Полный путь к папке - Добавить к Начальным папкам - Установить Начальной папкой + Добавить к Начальным папкам + Установить Начальной папкой Ничего не делать Открыть \"Избранные приложения\" Выполнить приложение diff --git a/res/values/arrays.xml b/app/src/main/res/values/arrays.xml similarity index 99% rename from res/values/arrays.xml rename to app/src/main/res/values/arrays.xml index d577576..40c742a 100644 --- a/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -53,6 +53,7 @@ proc sysfs cgroup + debugfs 3 diff --git a/res/values/changelog.xml b/app/src/main/res/values/changelog.xml similarity index 86% rename from res/values/changelog.xml rename to app/src/main/res/values/changelog.xml index 46fb868..69e8be8 100644 --- a/res/values/changelog.xml +++ b/app/src/main/res/values/changelog.xml @@ -2,25 +2,30 @@ - <b>HELP</b><br> - ReLaunch is a versatile reading programs launcher and system-wide shell for Nook Simple Touch (also supported by Sony PRS-T1).<br> + <b>HELP</b><br> + ReLaunchX is a versatile reading programs launcher and system-wide shell for Onyx Boox Max. + It is a continuation of ReLaunch 1.3.8 made for Nook Simple Touch (also supported by Sony PRS-T1).<br> It is assumed that the user library is organized in an ordered structure - of folders and files have names of books that match their names.<br> - ReLaunch supports flexible configuration of many on-screen buttons for quick - access to certain features of the program and run third party applications.<br> - Non-obvious possibilities:<br> - - Some functions of the program available only with run as a desktop shell for system.<br> + of folders and files have names of books that match their names.<br> + ReLaunchX supports flexible configuration of many on-screen buttons for quick + access to certain features of the program and run third party applications.<br> + Non-obvious possibilities:<br> + - Some functions of the program available only with run as a desktop shell for system.<br> - Some functions require a device with root-access, or only implemented for - Nook Simple Touch (you will receive appropriate notice).<br> + Nook Simple Touch (you will receive appropriate notice).<br> - On-screen scrolling buttons support double click to navigate to the specified number of percents in list and long-click to quickly move to the end (beginning) of the file list. - This feature often will not work properly, be careful (you need to enable it in settings).<br> + This feature often will not work properly, be careful (you need to enable it in settings).<br> - If you open with the button, for example, the second-to-read book, it will be after the opening of the first. - Thus, you will start in round fashion two (three, etc., depending on the configuration), the last-readed books.<br> - <br> + Thus, you will start in round fashion two (three, etc., depending on the configuration), the last-readed books.<br> + <br> <b>APPRECIATIONS</b><br> + - ReLaunch project<br> + &nbsp;&nbsp;<a href="https://github.com/yiselieren/ReLaunch">https://github.com/yiselieren/ReLaunch</a><br> + - Android Asset Studio (icons)<br> + &nbsp;&nbsp;<a href="https://romannurik.github.io/AndroidAssetStudio/index.html">https://romannurik.github.io/AndroidAssetStudio/index.html</a><br> - CoolReader Engine project (Eink support code)<br> &nbsp;&nbsp;<a href="http://sourceforge.net/projects/crengine/">http://sourceforge.net/projects/crengine/</a><br> - Interactivemania (icons pack)<br> @@ -28,8 +33,17 @@ &nbsp;&nbsp;<a href="http://www.defaulticon.com/">http://www.defaulticon.com/</a><br> <br> - + <b>CHANGELOG</b><br> + <b>1.0.0</b><br> + - fixed partition size and free space view for Onyx Boox Max<br> + - added Onyx Boox Max to supported devices<br> + - changed name to ReLaunchX and icon to differentiate from Legacy ReLaunch app<br> + - changed Application ID to not conflict with Legacy ReLaunch app<br> + - imported legacy project to AndroidStudio<br> + - forked ReLaunch 1.3.8 project<br> + <br> + <b>Legacy changelog from ReLaunch</b><br> <b>1.3.8</b><br> - added file properties dialog<br> - rewritten book annotation dialog<br> diff --git a/res/values/colors.xml b/app/src/main/res/values/colors.xml similarity index 100% rename from res/values/colors.xml rename to app/src/main/res/values/colors.xml diff --git a/res/values/limitations.xml b/app/src/main/res/values/limitations.xml similarity index 83% rename from res/values/limitations.xml rename to app/src/main/res/values/limitations.xml index 1886c46..8078153 100644 --- a/res/values/limitations.xml +++ b/app/src/main/res/values/limitations.xml @@ -4,17 +4,21 @@ zoom2 EBX-5047 + Max BarnesAndNobble sony + ONYX NOOK PRS-T1 + Max NOOK + Max \ No newline at end of file diff --git a/app/src/main/res/values/shell.xml b/app/src/main/res/values/shell.xml new file mode 100644 index 0000000..ee95f44 --- /dev/null +++ b/app/src/main/res/values/shell.xml @@ -0,0 +1,6 @@ + + + + /system/bin/sh - + + \ No newline at end of file diff --git a/res/values/strings.xml b/app/src/main/res/values/strings.xml similarity index 85% rename from res/values/strings.xml rename to app/src/main/res/values/strings.xml index f927e87..25fb78e 100644 --- a/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,8 +1,10 @@ - ReLaunch - <h2>The tool is for Nook Simple Touch or Sony - PRS-T1 only!</h2><br><center><b>Continue + ReLaunchX + <h2>The tool is made for:<br> + Nook Simple Touch<br> + Sony PRS-T1<br> + ONYX Boox Max</h2><br><center><b>Continue anyway ?</b></center> WiFi off Setup WiFi @@ -163,94 +165,88 @@ Do you really want to clear Favorites list? - Wrong model! - YES - NO - M free - WiFi is off - WiFi is ON - Select application - Last recently used applications - All applications - Favorite applications - What\'s new - OK - Add to favorites - Mark as read - Remove \"read\" mark - Forget all marks - Open with ... - Create Intent ... - Copy - Move - Move - Paste - Rename... - Create new folder... - Enter the name of new folder - Unable to create the folder - Enter new name of file - Delete - Delete NON-EMPTY directory! - Delete empty directory - Cancel - Select intent type - Activity not found - Activity not found - Activity for file - with type - not found - Other - Intent type - Delete file warning - Are you sure to delete file - \? - Delete empty directory warning - Are you sure to delete empty directory - \? - Delete non empty directory warning - Are you sure to delete non-empty directory - (dangerous) \? - Error - Unable to copy/move - Unable to rename - This is a launcher! - Are you sure you want to quit ? - Last opened - Favorites - Home - Select columns - Default - WiFi is ON - WiFi is off - prev - next - Show book titles - Show file names - Rename file with fb2/epub tags... - Sort the files in the order by - filename A-Z - filename Z-A - by alphabetical order A-Z - by alphabetical order Z-A - Show annotation - Properties - File Properties - Name: - Size: - Date: - Owner: - Permissions: + Wrong model! + YES + NO + M free + WiFi is off + WiFi is ON + Select application + Last recently used applications + All applications + Favorite applications + What\'s new + OK + Add to favorites + Mark as read + Remove \"read\" mark + Forget all marks + Open with ... + Create Intent ... + Copy + Move + Move + Paste + Rename... + Create new folder... + Enter the name of new folder + Unable to create the folder + Enter new name of file + Delete + Delete NON-EMPTY directory! + Delete empty directory + Cancel + Select intent type + Activity not found + Activity not found + Activity for file + with type + not found + Other + Intent type + Delete file warning + Are you sure to delete file + \? + Delete empty directory warning + Are you sure to delete empty directory + \? + Delete non empty directory warning + Are you sure to delete non-empty directory + (dangerous) \? + Error + Unable to copy/move + Unable to rename + This is a launcher! + Are you sure you want to quit ? + Last opened + Favorites + Home + Select columns + Default + WiFi is ON + WiFi is off + prev + next + Show book titles + Show file names + Rename file with fb2/epub tags... + Sort the files in the order by + filename A-Z + filename Z-A + by alphabetical order A-Z + by alphabetical order Z-A + Show annotation + Properties + File Properties + Name: + Size: + Date: + Owner: + Permissions: Activity not found! - <h1><center>ReLaunch</center></h1><center><b>Reader - launcher for Nook Simple - Touch</b></center><br><center>Version: - <b> - </b></center><br><center>Source - code: <a - href=\"https://github.com/yiselieren/ReLaunch\">git://github.com/yiselieren/ReLaunch.git</a></center> - + <h1><center>ReLaunchX</center></h1><center><b> E-ink reader launcher</b></center><br><center>Version:\n\t\t<b> + </b></center><br><center>Source\n\t\tcode: <a\n\t\thref=\"https://github.com/Leszek111/ReLaunchX\">https://github.com/Leszek111/ReLaunchX.git</a></center>\n\t OK Information Information @@ -592,8 +588,8 @@ Show full directory path in title Show current directory name in title Show full directory path in title - Add to Start folders - Set as Start folder + Add to Start folders + Set as Start folder Nothing Open \"Favorite applications\" window Run application diff --git a/res/values/styles.xml b/app/src/main/res/values/styles.xml similarity index 100% rename from res/values/styles.xml rename to app/src/main/res/values/styles.xml diff --git a/res/values/values.xml b/app/src/main/res/values/values.xml similarity index 100% rename from res/values/values.xml rename to app/src/main/res/values/values.xml diff --git a/res/xml/prefs.xml b/app/src/main/res/xml/prefs.xml similarity index 100% rename from res/xml/prefs.xml rename to app/src/main/res/xml/prefs.xml diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..f12ec4a --- /dev/null +++ b/build.gradle @@ -0,0 +1,17 @@ +// 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.3.0' + } +} +allprojects { + repositories { + jcenter() + } +} + +dependencies { +} diff --git a/debug.keystore b/debug.keystore deleted file mode 100644 index 47a67c4a13b86cbdbcb4023f4eda29f692472c36..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1270 zcmezO_TO6u1_mY|W&~sY#JrTE{LGY;)TGk%?9@u2xM4)pOGluZy#`H8I}P~QxU|_A zSs1mL1Q{7w8CaT_ma6#)J==2P;e^R@3-l&1Io|l={Y`A%szZzUwk|)PWnVh;#Riu} ze`aT_xw5FE@>5-1Z>H5f(SndPwdQkeZ0EI%@8&#CIrd?)J7i4a769ep0YJekuzKDmgY$_I>#mC z++A>>J@@)g;jrwiMIR102hL^WSh$F}mtnii*Aoe<{Kfprj^F0q(A`_(YvUVd&Bv2I z>233@k}_AVz1#m@wYh&Mar)91-ZLhxz=~3#voF^Dy`1}7ba~oi*`=b&KdO`?)0iIDW=|H{+OWiN;RCz)fZ%_9 zWj;Fts!n7`IP{sXPd59rqwwQw#&W%knyImKZ*M#IM{v!`(CO+-rN8BV1#8CX*`5?L z$fyfc7Apze=(+4;w@=;FyP@Czh2OfBX>YV{*G>Lto`x66uaeK1=kkZ8zEEA%Dzmnk zdGhaBnPr!Ys@S6;W^j#rnwO6fQBXnUR4J*?GVqWCpscWZAnVy>GV9-1=r|w)qB`nVwvy83e5Zxr%!~yb-kj zb*I~~uJ-2X(uv%?{VbmsJ!Gi2|L1n?&vCeyhBMk$pm=<^kS^qJCi~ zUr%*@_S$r@la(*S@eco^JDDTzHVW4%pMSBxAm~1)TlE5?>*BoG$MlSu{-ji7ua$jr YQt!cbURAC?0%gl`7#Su;&zyY~08-o%LI3~& diff --git a/gradle/wrapper/gradle-wrapper.jar b/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/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..515cb2a --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Sun Mar 05 00:24:25 CET 2017 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..9d82f78 --- /dev/null +++ b/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/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..aec9973 --- /dev/null +++ b/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/proguard.cfg b/proguard.cfg deleted file mode 100644 index b1cdf17..0000000 --- a/proguard.cfg +++ /dev/null @@ -1,40 +0,0 @@ --optimizationpasses 5 --dontusemixedcaseclassnames --dontskipnonpubliclibraryclasses --dontpreverify --verbose --optimizations !code/simplification/arithmetic,!field/*,!class/merging/* - --keep public class * extends android.app.Activity --keep public class * extends android.app.Application --keep public class * extends android.app.Service --keep public class * extends android.content.BroadcastReceiver --keep public class * extends android.content.ContentProvider --keep public class * extends android.app.backup.BackupAgentHelper --keep public class * extends android.preference.Preference --keep public class com.android.vending.licensing.ILicensingService - --keepclasseswithmembernames class * { - native ; -} - --keepclasseswithmembers class * { - public (android.content.Context, android.util.AttributeSet); -} - --keepclasseswithmembers class * { - public (android.content.Context, android.util.AttributeSet, int); -} - --keepclassmembers class * extends android.app.Activity { - public void *(android.view.View); -} - --keepclassmembers enum * { - public static **[] values(); - public static ** valueOf(java.lang.String); -} - --keep class * implements android.os.Parcelable { - public static final android.os.Parcelable$Creator *; -} diff --git a/project.properties b/project.properties deleted file mode 100644 index 5a70945..0000000 --- a/project.properties +++ /dev/null @@ -1,11 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system use, -# "ant.properties", and override values to adapt the script to your -# project structure. - -# Project target. -target=android-7 diff --git a/res/drawable-hdpi/icon.png b/res/drawable-hdpi/icon.png deleted file mode 100644 index 1136e426d288e553b5df784b1b30b136a7dfb449..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3236 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 LY%Qv=o(cZ}R8{7g diff --git a/res/drawable-mdpi/icon.png b/res/drawable-mdpi/icon.png deleted file mode 100644 index 1136e426d288e553b5df784b1b30b136a7dfb449..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3236 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 LY%Qv=o(cZ}R8{7g diff --git a/res/values/shell.xml b/res/values/shell.xml deleted file mode 100644 index 51c65cb..0000000 --- a/res/values/shell.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - /system/bin/sh - - - \ No newline at end of file diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..e7b4def --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +include ':app' From 910b4f461feec7370eb5f7408e2025aade8815df Mon Sep 17 00:00:00 2001 From: Leszek Kubik Date: Sat, 11 Mar 2017 07:53:58 +0100 Subject: [PATCH 02/46] Fix full screen toggle for Ice Cream Sandwich and newer --- .../main/java/com/gacode/relaunchx/Advanced.java | 2 ++ .../java/com/gacode/relaunchx/AllApplications.java | 2 ++ app/src/main/java/com/gacode/relaunchx/Editor.java | 2 ++ .../java/com/gacode/relaunchx/FiltersActivity.java | 2 ++ .../main/java/com/gacode/relaunchx/ReLaunch.java | 1 + .../java/com/gacode/relaunchx/ReLaunchApp.java | 14 +++++++++++--- .../java/com/gacode/relaunchx/ResultsActivity.java | 2 ++ .../java/com/gacode/relaunchx/SearchActivity.java | 2 ++ .../java/com/gacode/relaunchx/TaskManager.java | 2 ++ .../java/com/gacode/relaunchx/TypesActivity.java | 2 ++ app/src/main/java/com/gacode/relaunchx/Viewer.java | 2 ++ 11 files changed, 30 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/gacode/relaunchx/Advanced.java b/app/src/main/java/com/gacode/relaunchx/Advanced.java index 9f62c59..dcde241 100644 --- a/app/src/main/java/com/gacode/relaunchx/Advanced.java +++ b/app/src/main/java/com/gacode/relaunchx/Advanced.java @@ -32,6 +32,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.view.Window; import android.webkit.WebView; import android.widget.AbsListView; import android.widget.BaseAdapter; @@ -684,6 +685,7 @@ protected void onCreate(Bundle savedInstanceState) { app = ((ReLaunchApp) getApplicationContext()); app.setFullScreenIfNecessary(this); + requestWindowFeature(Window.FEATURE_NO_TITLE); setContentView(R.layout.advanced_layout); // "Advanced functions, info, etc." diff --git a/app/src/main/java/com/gacode/relaunchx/AllApplications.java b/app/src/main/java/com/gacode/relaunchx/AllApplications.java index 5603096..e00bc50 100644 --- a/app/src/main/java/com/gacode/relaunchx/AllApplications.java +++ b/app/src/main/java/com/gacode/relaunchx/AllApplications.java @@ -22,6 +22,7 @@ import android.view.View; import android.view.ViewGroup; import android.view.ContextMenu.ContextMenuInfo; +import android.view.Window; import android.widget.AbsListView; import android.widget.AdapterView; import android.widget.ArrayAdapter; @@ -205,6 +206,7 @@ public void onCreate(Bundle savedInstanceState) { setEinkController(); app = ((ReLaunchApp) getApplicationContext()); app.setFullScreenIfNecessary(this); + requestWindowFeature(Window.FEATURE_NO_TITLE); setContentView(R.layout.all_applications); icons = app.getIcons(); diff --git a/app/src/main/java/com/gacode/relaunchx/Editor.java b/app/src/main/java/com/gacode/relaunchx/Editor.java index 5a55de2..499a667 100644 --- a/app/src/main/java/com/gacode/relaunchx/Editor.java +++ b/app/src/main/java/com/gacode/relaunchx/Editor.java @@ -18,6 +18,7 @@ import android.text.Editable; import android.text.TextWatcher; import android.view.View; +import android.view.Window; import android.widget.Button; import android.widget.EditText; @@ -156,6 +157,7 @@ protected void onCreate(Bundle savedInstanceState) { app = (ReLaunchApp) getApplicationContext(); app.setFullScreenIfNecessary(this); + requestWindowFeature(Window.FEATURE_NO_TITLE); setContentView(R.layout.editor_layout); // Read parameters diff --git a/app/src/main/java/com/gacode/relaunchx/FiltersActivity.java b/app/src/main/java/com/gacode/relaunchx/FiltersActivity.java index 49b2306..50b3aae 100644 --- a/app/src/main/java/com/gacode/relaunchx/FiltersActivity.java +++ b/app/src/main/java/com/gacode/relaunchx/FiltersActivity.java @@ -14,6 +14,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.view.Window; import android.widget.AdapterView; import android.widget.ArrayAdapter; import android.widget.Button; @@ -199,6 +200,7 @@ protected void onCreate(Bundle savedInstanceState) { // Create global storage with values app = (ReLaunchApp) getApplicationContext(); app.setFullScreenIfNecessary(this); + requestWindowFeature(Window.FEATURE_NO_TITLE); setContentView(R.layout.filters_view); lv = (ListView) findViewById(R.id.filters_lv); diff --git a/app/src/main/java/com/gacode/relaunchx/ReLaunch.java b/app/src/main/java/com/gacode/relaunchx/ReLaunch.java index 5c84292..c81871a 100644 --- a/app/src/main/java/com/gacode/relaunchx/ReLaunch.java +++ b/app/src/main/java/com/gacode/relaunchx/ReLaunch.java @@ -1913,6 +1913,7 @@ public void onCreate(Bundle savedInstanceState) { useHome = true; app.fullScreen = prefs.getBoolean("fullScreen", true); app.setFullScreenIfNecessary(this); + requestWindowFeature(Window.FEATURE_NO_TITLE); if (app.dataBase == null) app.dataBase = new BooksBase(this); diff --git a/app/src/main/java/com/gacode/relaunchx/ReLaunchApp.java b/app/src/main/java/com/gacode/relaunchx/ReLaunchApp.java index cbd560c..2a2227f 100644 --- a/app/src/main/java/com/gacode/relaunchx/ReLaunchApp.java +++ b/app/src/main/java/com/gacode/relaunchx/ReLaunchApp.java @@ -26,6 +26,7 @@ import android.content.SharedPreferences; import android.graphics.drawable.Drawable; import android.net.Uri; +import android.os.Build; import android.preference.PreferenceManager; import android.util.Log; import android.view.Window; @@ -753,14 +754,21 @@ public void onClick(DialogInterface dialog, public void setFullScreenIfNecessary(Activity a) { if (fullScreen) { - a.requestWindowFeature(Window.FEATURE_NO_TITLE); - a.getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, - WindowManager.LayoutParams.FLAG_FULLSCREEN); + if (Build.VERSION.SDK_INT >= 14) { + a.sendBroadcast(new Intent("hide_status_bar")); + } + a.getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN); + } else { + if (Build.VERSION.SDK_INT >= 14) { + a.sendBroadcast(new Intent("show_status_bar")); + } + a.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN); } } public void generalOnResume(String name, Activity a) { Log.d(TAG, "--- onResume(" + name + ")"); + setFullScreenIfNecessary(a); } public boolean copyPrefs(String from, String to) { diff --git a/app/src/main/java/com/gacode/relaunchx/ResultsActivity.java b/app/src/main/java/com/gacode/relaunchx/ResultsActivity.java index 9917c6a..f3dc46a 100644 --- a/app/src/main/java/com/gacode/relaunchx/ResultsActivity.java +++ b/app/src/main/java/com/gacode/relaunchx/ResultsActivity.java @@ -44,6 +44,7 @@ import android.view.ViewGroup; import android.view.ContextMenu.ContextMenuInfo; import android.view.GestureDetector.SimpleOnGestureListener; +import android.view.Window; import android.widget.AbsListView; import android.widget.AdapterView; import android.widget.ArrayAdapter; @@ -521,6 +522,7 @@ protected void onCreate(Bundle savedInstanceState) { app = ((ReLaunchApp) getApplicationContext()); app.setFullScreenIfNecessary(this); + requestWindowFeature(Window.FEATURE_NO_TITLE); setContentView(R.layout.results_layout); icons = app.getIcons(); diff --git a/app/src/main/java/com/gacode/relaunchx/SearchActivity.java b/app/src/main/java/com/gacode/relaunchx/SearchActivity.java index f1998ed..41f9ba7 100644 --- a/app/src/main/java/com/gacode/relaunchx/SearchActivity.java +++ b/app/src/main/java/com/gacode/relaunchx/SearchActivity.java @@ -18,6 +18,7 @@ import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; +import android.view.Window; import android.view.inputmethod.EditorInfo; import android.view.inputmethod.InputMethodManager; import android.widget.ArrayAdapter; @@ -296,6 +297,7 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); app = ((ReLaunchApp) getApplicationContext()); app.setFullScreenIfNecessary(this); + requestWindowFeature(Window.FEATURE_NO_TITLE); setContentView(R.layout.search); SEARCH_FILE = getResources().getInteger(R.integer.SEARCH_FILE); diff --git a/app/src/main/java/com/gacode/relaunchx/TaskManager.java b/app/src/main/java/com/gacode/relaunchx/TaskManager.java index 6f13676..1f68b88 100644 --- a/app/src/main/java/com/gacode/relaunchx/TaskManager.java +++ b/app/src/main/java/com/gacode/relaunchx/TaskManager.java @@ -29,6 +29,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.view.Window; import android.view.WindowManager; import android.view.View.OnClickListener; import android.widget.AbsListView; @@ -1010,6 +1011,7 @@ protected void onCreate(Bundle savedInstanceState) { app = ((ReLaunchApp) getApplicationContext()); app.setFullScreenIfNecessary(this); pm = getPackageManager(); + requestWindowFeature(Window.FEATURE_NO_TITLE); setContentView(R.layout.taskmanager_layout); doNotKillLabels = getResources().getStringArray( diff --git a/app/src/main/java/com/gacode/relaunchx/TypesActivity.java b/app/src/main/java/com/gacode/relaunchx/TypesActivity.java index 83fa1a4..19e758a 100644 --- a/app/src/main/java/com/gacode/relaunchx/TypesActivity.java +++ b/app/src/main/java/com/gacode/relaunchx/TypesActivity.java @@ -16,6 +16,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.view.Window; import android.widget.BaseAdapter; import android.widget.Button; import android.widget.EditText; @@ -348,6 +349,7 @@ protected void onCreate(Bundle savedInstanceState) { // Global storage app = ((ReLaunchApp) getApplicationContext()); app.setFullScreenIfNecessary(this); + requestWindowFeature(Window.FEATURE_NO_TITLE); setContentView(R.layout.types_view); icons = app.getIcons(); diff --git a/app/src/main/java/com/gacode/relaunchx/Viewer.java b/app/src/main/java/com/gacode/relaunchx/Viewer.java index ec749cd..5fb653a 100644 --- a/app/src/main/java/com/gacode/relaunchx/Viewer.java +++ b/app/src/main/java/com/gacode/relaunchx/Viewer.java @@ -14,6 +14,7 @@ import android.os.Bundle; import android.preference.PreferenceManager; import android.view.View; +import android.view.Window; import android.widget.Button; import android.widget.EditText; import android.widget.ImageButton; @@ -68,6 +69,7 @@ protected void onCreate(Bundle savedInstanceState) { prefs = PreferenceManager.getDefaultSharedPreferences(getBaseContext()); app = (ReLaunchApp) getApplicationContext(); app.setFullScreenIfNecessary(this); + requestWindowFeature(Window.FEATURE_NO_TITLE); setContentView(R.layout.viewer_layout); // Read parameters From 103c47879c9ac30e4bdf25dc36a89534a5d78e70 Mon Sep 17 00:00:00 2001 From: Leszek Kubik Date: Sat, 11 Mar 2017 12:16:10 +0100 Subject: [PATCH 03/46] Add file sorting options: by extension, by modification date --- .../java/com/gacode/relaunchx/ReLaunch.java | 119 ++++++++++++------ app/src/main/res/values/strings.xml | 6 +- 2 files changed, 88 insertions(+), 37 deletions(-) diff --git a/app/src/main/java/com/gacode/relaunchx/ReLaunch.java b/app/src/main/java/com/gacode/relaunchx/ReLaunch.java index c81871a..6df17ef 100644 --- a/app/src/main/java/com/gacode/relaunchx/ReLaunch.java +++ b/app/src/main/java/com/gacode/relaunchx/ReLaunch.java @@ -2,10 +2,7 @@ import java.io.BufferedReader; import java.io.File; -import java.io.IOException; -import java.io.InputStream; import java.io.InputStreamReader; -import java.io.OutputStream; import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; @@ -21,7 +18,7 @@ import ebook.EBook; import ebook.parser.InstantParser; import ebook.parser.Parser; -import android.R.style; + import android.app.Activity; import android.app.ActivityManager; import android.app.AlertDialog; @@ -66,7 +63,6 @@ import android.view.View.OnTouchListener; import android.view.ViewGroup; import android.view.Window; -import android.view.WindowManager; import android.webkit.WebView; import android.widget.AdapterView; import android.view.LayoutInflater; @@ -134,6 +130,10 @@ public class ReLaunch extends Activity { final static int SORT_FILES_DESC = 1; final static int SORT_TITLES_ASC = 2; final static int SORT_TITLES_DESC = 3; + final static int SORT_FILE_EXTENSION_ASC = 2; + final static int SORT_FILE_EXTENSION_DESC = 3; + final static int SORT_FILE_DATE_ASC = 4; + final static int SORT_FILE_DATE_DESC = 5; String currentRoot = "/sdcard"; Integer currentPosition = -1; List> itemsArray; @@ -918,7 +918,7 @@ else if (level < 75) private void drawDirectory(String root, Integer startPosition) { File dir = new File(root); File[] allEntries = dir.listFiles(); - List files = new ArrayList(); + List files = new ArrayList(); List dirs = new ArrayList(); setEinkController(); @@ -1099,7 +1099,7 @@ public boolean onTouch(View v, MotionEvent event) { else if (!prefs.getBoolean("filterResults", false) || app.filterFile(dir.getAbsolutePath(), entry.getName())) - files.add(entry.getName()); + files.add(entry); } } Collections.sort(dirs); @@ -1122,19 +1122,23 @@ else if (!prefs.getBoolean("filterResults", false) itemsArray.add(item); } List> fileItemsArray = new ArrayList>(); - for (String f : files) { - if ((f.startsWith(".")) && (!prefs.getBoolean("showHidden", false))) + for (File f : files) { + String fname = f.getName(); + if ((fname.startsWith(".")) && (!prefs.getBoolean("showHidden", false))) continue; HashMap item = new HashMap(); if (prefs.getBoolean("showBookTitles", false)) - item.put("sname", app.dataBase.getEbookName(dir.getAbsolutePath(), f, prefs.getString("bookTitleFormat", "%t[\n%a][. %s][-%n]"))); + item.put("sname", app.dataBase.getEbookName(dir.getAbsolutePath(), fname, prefs.getString("bookTitleFormat", "%t[\n%a][. %s][-%n]"))); else - item.put("sname", f); - item.put("name", f); + item.put("sname", fname); + item.put("name", fname); item.put("dname", dir.getAbsolutePath()); - item.put("fname", dir.getAbsolutePath() + "/" + f); + item.put("fname", dir.getAbsolutePath() + "/" + fname); item.put("type", "file"); - item.put("reader", app.readerName(f)); + item.put("date", String.valueOf(f.lastModified())); + item.put("reader", app.readerName(fname)); + String[] fparts = fname.split("[.]"); + item.put("extension", fparts.length > 1 ? fparts[fparts.length -1] : ""); fileItemsArray.add(item); } @@ -3622,20 +3626,33 @@ private void hideLayout(int id) { private List> sortFiles( List> array, String field, boolean order) { class ArrayComparator implements Comparator { - String key; + String primaryKey; + String secondaryKey; - ArrayComparator(String key) { - this.key = key; + ArrayComparator(String primarykey, String secondaryKey) { + this.primaryKey = primarykey; + this.secondaryKey = secondaryKey; } public int compare(Object lhs, Object rhs) { - return ((HashMap) lhs).get(key) + int eq = ((HashMap) lhs).get(primaryKey) .compareToIgnoreCase( - ((HashMap) rhs).get(key)); + ((HashMap) rhs).get(primaryKey)); + if (eq == 0 && secondaryKey != null) { + eq = ((HashMap) lhs).get(secondaryKey) + .compareToIgnoreCase( + ((HashMap) rhs).get(secondaryKey)); + } + + return eq; } } Object[] arr = array.toArray(); - ArrayComparator comparator = new ArrayComparator(field); + String secondField = null; + if (field == "extension" || field == "date") { + secondField = "name"; + } + ArrayComparator comparator = new ArrayComparator(field, secondField); Arrays.sort(arr, comparator); List> ret = new ArrayList>(); if (order) { @@ -3657,9 +3674,13 @@ private void menuSort() { orderList[2] = getString(R.string.jv_relaunchx_sort_title_dir); orderList[3] = getString(R.string.jv_relaunchx_sort_title_rev); } else { - orderList = new String[2]; + orderList = new String[6]; orderList[0] = getString(R.string.jv_relaunchx_sort_file_dir); orderList[1] = getString(R.string.jv_relaunchx_sort_file_rev); + orderList[2] = getString(R.string.jv_relaunchx_sort_extension_dir); + orderList[3] = getString(R.string.jv_relaunchx_sort_extension_rev); + orderList[4] = getString(R.string.jv_relaunchx_sort_date_dir); + orderList[5] = getString(R.string.jv_relaunchx_sort_date_dir); } int sortMode = prefs.getInt("sortMode", 0); if (sortMode > orderList.length - 1) @@ -3700,21 +3721,47 @@ public void onDestroy() { } private void setSortMode(int i) { - if ((!prefs.getBoolean("showBookTitles", false)) && (i > 1)) - i = 0; - if (i == SORT_FILES_ASC) { - sortType[0] = "name"; - sortOrder[0] = true; - } else if (i == SORT_FILES_DESC) { - sortType[0] = "name"; - sortOrder[0] = false; - } else if (i == SORT_TITLES_ASC) { - sortType[0] = "sname"; - sortOrder[0] = true; - } else if (i == SORT_TITLES_DESC) { - sortType[0] = "sname"; - sortOrder[0] = false; - } + if ((!prefs.getBoolean("showBookTitles", false))) { + if (i > 5) { + i = 0; + } + if (i == SORT_FILES_ASC) { + sortType[0] = "name"; + sortOrder[0] = true; + } else if (i == SORT_FILES_DESC) { + sortType[0] = "name"; + sortOrder[0] = false; + } else if (i == SORT_FILE_EXTENSION_ASC) { + sortType[0] = "extension"; + sortOrder[0] = true; + } else if (i == SORT_FILE_EXTENSION_DESC) { + sortType[0] = "extension"; + sortOrder[0] = false; + } else if (i == SORT_FILE_DATE_ASC) { + sortType[0] = "date"; + sortOrder[0] = true; + } else if (i == SORT_FILE_DATE_ASC) { + sortType[0] = "date"; + sortOrder[0] = false; + } + } else { + if (i > 3) { + i = 0; + } + if (i == SORT_FILES_ASC) { + sortType[0] = "name"; + sortOrder[0] = true; + } else if (i == SORT_FILES_DESC) { + sortType[0] = "name"; + sortOrder[0] = false; + } else if (i == SORT_TITLES_ASC) { + sortType[0] = "sname"; + sortOrder[0] = true; + } else if (i == SORT_TITLES_DESC) { + sortType[0] = "sname"; + sortOrder[0] = false; + } + } } @Override diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 25fb78e..200b3fb 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -596,5 +596,9 @@ Authors: Series: Title: - + filetype A-Z + filetype Z-A + date newest + date oldest + From 6678fa2839526c57d396ed302f1a53ca48c733be Mon Sep 17 00:00:00 2001 From: Leszek Kubik Date: Sun, 19 Mar 2017 15:49:10 +0100 Subject: [PATCH 04/46] File list sort and view changes. New File manager setting 'Show file details' --- .gitignore | 1 - .../markdown-navigator/profiles_settings.xml | 3 + ReLaunchX.iml | 19 + app/app.iml | 107 ++ .../java/com/gacode/relaunchx/Advanced.java | 1441 ++++++++--------- .../java/com/gacode/relaunchx/BooksBase.java | 57 +- .../java/com/gacode/relaunchx/Editor.java | 8 +- .../com/gacode/relaunchx/ListActions.java | 22 +- .../java/com/gacode/relaunchx/ReLaunch.java | 502 +++--- .../com/gacode/relaunchx/ReLaunchApp.java | 2 +- .../com/gacode/relaunchx/ResultsActivity.java | 56 +- .../java/com/gacode/relaunchx/Viewer.java | 4 +- app/src/main/res/layout-hdpi/flist_layout.xml | 12 + app/src/main/res/layout-mdpi/flist_layout.xml | 12 + app/src/main/res/values/strings.xml | 28 +- app/src/main/res/xml/prefs.xml | 14 +- 16 files changed, 1237 insertions(+), 1051 deletions(-) create mode 100644 .idea/markdown-navigator/profiles_settings.xml create mode 100644 ReLaunchX.iml create mode 100644 app/app.iml diff --git a/.gitignore b/.gitignore index ea21431..355f015 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -*.iml .gradle /local.properties /.idea/workspace.xml diff --git a/.idea/markdown-navigator/profiles_settings.xml b/.idea/markdown-navigator/profiles_settings.xml new file mode 100644 index 0000000..57927c5 --- /dev/null +++ b/.idea/markdown-navigator/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/ReLaunchX.iml b/ReLaunchX.iml new file mode 100644 index 0000000..429ba3c --- /dev/null +++ b/ReLaunchX.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/app.iml b/app/app.iml new file mode 100644 index 0000000..ff21258 --- /dev/null +++ b/app/app.iml @@ -0,0 +1,107 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/gacode/relaunchx/Advanced.java b/app/src/main/java/com/gacode/relaunchx/Advanced.java index dcde241..aef35cb 100644 --- a/app/src/main/java/com/gacode/relaunchx/Advanced.java +++ b/app/src/main/java/com/gacode/relaunchx/Advanced.java @@ -1,16 +1,5 @@ package com.gacode.relaunchx; -import java.io.BufferedReader; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStreamReader; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - import android.app.Activity; import android.content.BroadcastReceiver; import android.content.ComponentName; @@ -37,578 +26,548 @@ import android.widget.AbsListView; import android.widget.BaseAdapter; import android.widget.Button; -import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.ListView; import android.widget.TextView; -import android.widget.Toast; + +import java.io.BufferedReader; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStreamReader; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; public class Advanced extends Activity { - final static String TAG = "Advanced"; - - SharedPreferences prefs; - ReLaunchApp app; - Button rebootBtn; - Button powerOffBtn; - String[] ingnoreFs; - List volumeInfoList; + final static String TAG = "Advanced"; + + SharedPreferences prefs; + ReLaunchApp app; + Button rebootBtn; + Button powerOffBtn; WebView infoPanelView; - boolean addSView = true; - - WifiManager wfm; - boolean wifiOn = false; - Button wifiOnOff; - Button wifiScan; - List wifiNetworks = new ArrayList(); - WiFiAdapter adapter; - ListView lv_wifi; - IntentFilter i1; - IntentFilter i2; - BroadcastReceiver b1; - BroadcastReceiver b2; - String connectedSSID; + boolean addSView = true; + + WifiManager wfm; + Button wifiOnOff; + Button wifiScan; + List wifiNetworks = new ArrayList(); + WiFiAdapter adapter; + ListView lv_wifi; + IntentFilter i1; + IntentFilter i2; + BroadcastReceiver b1; + BroadcastReceiver b2; + String connectedSSID; // I don't like to keep here the static objects but on my device sporadically // the process Runtime.getRuntime().exec(cmd) hangs indefinitely so I had no better choice // to avoid crash and/or device reboot (the hung thread becomes invincible). In other words // I have chosen to keep the "loading..." message when it happens until device reboot. - static Handler volumesInfoUpdate; - static Thread volumesInfoThread; - static String volumesInfoPanelContent; - - private void setEinkController() { - if (prefs != null) { - Integer einkUpdateMode = 1; - try { - einkUpdateMode = Integer.parseInt(prefs.getString( - "einkUpdateMode", "1")); - } catch (Exception e) { - einkUpdateMode = 1; - } - if (einkUpdateMode < -1 || einkUpdateMode > 2) - einkUpdateMode = 1; - if (einkUpdateMode >= 0) { - EinkScreen.UpdateMode = einkUpdateMode; - - Integer einkUpdateInterval = 10; - try { - einkUpdateInterval = Integer.parseInt(prefs.getString( - "einkUpdateInterval", "10")); - } catch (Exception e) { - einkUpdateInterval = 10; - } - if (einkUpdateInterval < 0 || einkUpdateInterval > 100) - einkUpdateInterval = 10; - EinkScreen.UpdateModeInterval = einkUpdateInterval; - - EinkScreen.PrepareController(null, false); - } - } - } - - static class NetInfo { - static int unknownLevel = -5000; - String SSID; - String extra; - int level; - int netId; - boolean inrange; - boolean configured; - - NetInfo(String s, int id, boolean in, boolean conf) { - SSID = s; - extra = ""; - level = unknownLevel; - netId = id; - inrange = in; - configured = conf; - } - - NetInfo(String s, boolean in, boolean conf) { - SSID = s; - extra = ""; - level = unknownLevel; - netId = 0; - inrange = in; - configured = conf; - } - - NetInfo(String s, String e, int id, boolean in, boolean conf) { - SSID = s; - extra = e; - level = unknownLevel; - netId = id; - inrange = in; - configured = conf; - } - - NetInfo(String s, String e, boolean in, boolean conf) { - SSID = s; - extra = e; - level = unknownLevel; - netId = 0; - inrange = in; - configured = conf; - } - } - - public class NetInfoComparator implements java.util.Comparator { - public int compare(NetInfo o1, NetInfo o2) { - if (connectedSSID != null && connectedSSID.equals(o1.SSID)) { - return -1; - } - if (connectedSSID != null && connectedSSID.equals(o2.SSID)) { - return 1; - } - if (o1.inrange && !o2.inrange) - return -1; - if (!o1.inrange && o2.inrange) - return 1; - if (o1.level < o2.level) - return 1; - if (o1.level > o2.level) - return -1; - return o1.SSID.compareToIgnoreCase(o2.SSID); - } - } - - static class VolumeInfo { - String dev; - String mpoint; - String fs; - String total; - String used; - String free; - boolean ro; - - public void dump(String p) { - /* - * Log.d(TAG, p + " dev=\"" + dev + "\" mpoint=\"" + mpoint + - * "\" fs=\"" + fs + "\" used=\"" + used + " total=\"" + total + - * "\" free=\"" + free + "\" ro=" + ro); - */ - } - } - - private void Trace(String t, String s) { - // Log.d(t, s); - } - - static class ViewHolder { - TextView tv1; - TextView tv2; - TextView tv3; - ImageView iv; - } - - class WiFiAdapter extends BaseAdapter { - final Context cntx; - - WiFiAdapter(Context context) { - cntx = context; - } - - public int getCount() { - return wifiNetworks.size(); - } - - public Object getItem(int position) { - return wifiNetworks.get(position); - } - - public long getItemId(int position) { - return 0; - } - - public View getView(final int position, View convertView, - ViewGroup parent) { - ViewHolder holder; - View v = convertView; - if (v == null) { - LayoutInflater vi = (LayoutInflater) getApplicationContext() - .getSystemService(Context.LAYOUT_INFLATER_SERVICE); - v = vi.inflate(R.layout.adv_wifi_item, null); - holder = new ViewHolder(); - holder.tv1 = (TextView) v.findViewById(R.id.wf_ssid); - holder.tv2 = (TextView) v.findViewById(R.id.wf_capabilities); - holder.tv3 = (TextView) v.findViewById(R.id.wf_other); - holder.iv = (ImageView) v.findViewById(R.id.wf_icon); - v.setTag(holder); - } else - holder = (ViewHolder) v.getTag(); - TextView tv1 = holder.tv1; - TextView tv2 = holder.tv2; - TextView tv3 = holder.tv3; - ImageView iv = holder.iv; - final WifiInfo winfo = wfm.getConnectionInfo(); - final NetInfo item = wifiNetworks.get(position); - if (item != null) { - if (item.inrange && item.configured) { - tv1.setBackgroundColor(getResources().getColor( - R.color.file_reading_bg)); - tv1.setTextColor(getResources().getColor( - R.color.file_reading_fg)); - tv2.setBackgroundColor(getResources().getColor( - R.color.file_reading_bg)); - tv2.setTextColor(getResources().getColor( - R.color.file_reading_fg)); - tv3.setBackgroundColor(getResources().getColor( - R.color.file_reading_bg)); - tv3.setTextColor(getResources().getColor( - R.color.file_reading_fg)); - iv.setImageDrawable(getResources().getDrawable( - R.drawable.file_ok)); - } else { - tv1.setBackgroundColor(getResources().getColor( - R.color.file_finished_bg)); - tv1.setTextColor(getResources().getColor( - R.color.file_finished_fg)); - tv2.setBackgroundColor(getResources().getColor( - R.color.file_finished_bg)); - tv2.setTextColor(getResources().getColor( - R.color.file_finished_fg)); - tv3.setBackgroundColor(getResources().getColor( - R.color.file_finished_bg)); - tv3.setTextColor(getResources().getColor( - R.color.file_finished_fg)); - iv.setImageDrawable(getResources().getDrawable( - R.drawable.file_notok)); - } - - if (item.SSID.equals(winfo.getSSID())) { - SpannableString s1 = new SpannableString(item.SSID); - s1.setSpan(Typeface.BOLD, 0, item.SSID.length(), 0); - tv1.setText(s1); - if (item.extra.equals("")) - tv2.setText(""); - else { - SpannableString s2 = new SpannableString(item.extra); - s2.setSpan(Typeface.BOLD, 0, item.extra.length(), 0); - tv2.setText(s2); - } - int ipAddress = winfo.getIpAddress(); - // "Connected, IP: %d.%d.%d.%d" - String s = String.format( - getResources().getString( - R.string.jv_advanced_connected) - + " %d.%d.%d.%d", (ipAddress & 0xff), - (ipAddress >> 8 & 0xff), (ipAddress >> 16 & 0xff), - (ipAddress >> 24 & 0xff)); - int sl1 = s.length(); - // ", Level: " - s += ", " - + getResources().getString( - R.string.jv_advanced_level) + " " - + item.level + "dBm " + levelToString(item.level); - SpannableString s3 = new SpannableString(s); - s3.setSpan(Typeface.BOLD, 0, sl1, 0); - tv3.setText(s3); - } else { - SpannableString s1 = new SpannableString(item.SSID); - s1.setSpan(Typeface.BOLD, 0, item.SSID.length(), 0); - tv1.setText(s1); - tv2.setText(item.extra); - String s; - if (item.inrange) - // "Level: " - s = getResources() - .getString(R.string.jv_advanced_level) - + " " - + item.level - + "dBm " - + levelToString(item.level); - else - // "Not in range" - s = getResources().getString( - R.string.jv_advanced_notrange); - if (!item.configured) - // ", not configured" - s += ", " - + getResources().getString( - R.string.jv_advanced_not_configured); - tv3.setText(s); - } - } - return v; - } - } - - private String levelToString(int level) { - if (level >= -56) - return "[\u25A0\u25A0\u25A0\u25A0\u25A0]"; - if (level >= -63) - return "[\u25A0\u25A0\u25A0\u25A0\u25A1]"; - if (level >= -70) - return "[\u25A0\u25A0\u25A0\u25A1\u25A1]"; - if (level >= -77) - return "[\u25A0\u25A0\u25A1\u25A1\u25A1]"; - if (level >= -84) - return "[\u25A0\u25A1\u25A1\u25A1\u25A1]"; - return "[\u25A1\u25A1\u25A1\u25A1\u25A1]"; - } - - private int getMyId() { - int rc = -1; - - for (String l : execFg("id")) { - Pattern p = Pattern.compile("uid=(\\d+)\\("); - Matcher m = p.matcher(l); - if (m.find()) { - try { - rc = Integer.parseInt(m.group(1)); - } catch (NumberFormatException e) { - rc = -1; - } - if (rc != -1) - return rc; - } - } - return rc; - } - - // Read file and return result as list of strings - private List readFile(String fname) { - BufferedReader br; - String readLine; - List rc = new ArrayList(); - try { - br = new BufferedReader(new InputStreamReader(new FileInputStream( - fname)), 1000); - } catch (FileNotFoundException e) { - return rc; - } - try { - while ((readLine = br.readLine()) != null) - rc.add(readLine); - } catch (IOException e) { - try { - br.close(); - } catch (IOException e1) { - } - return rc; - } - try { - br.close(); - } catch (IOException e) { - } - - return rc; - } - - // Execute foreground command and return result as list of strings - private List execFg(String cmd) { - List rc = new ArrayList(); - try { - Process p = Runtime.getRuntime().exec(cmd); - try { + static Handler filesystemInfoUpdate; + static Thread filesystemInfoThread; + static String filesystemInfoPanelContent; + + private void setEinkController() { + if (prefs != null) { + Integer einkUpdateMode = 1; + try { + einkUpdateMode = Integer.parseInt(prefs.getString( + "einkUpdateMode", "1")); + } catch (Exception e) { + einkUpdateMode = 1; + } + if (einkUpdateMode < -1 || einkUpdateMode > 2) + einkUpdateMode = 1; + if (einkUpdateMode >= 0) { + EinkScreen.UpdateMode = einkUpdateMode; + + Integer einkUpdateInterval = 10; + try { + einkUpdateInterval = Integer.parseInt(prefs.getString( + "einkUpdateInterval", "10")); + } catch (Exception e) { + einkUpdateInterval = 10; + } + if (einkUpdateInterval < 0 || einkUpdateInterval > 100) + einkUpdateInterval = 10; + EinkScreen.UpdateModeInterval = einkUpdateInterval; + + EinkScreen.PrepareController(null, false); + } + } + } + + static class NetInfo { + static int unknownLevel = -5000; + String SSID; + String extra; + int level; + int netId; + boolean inrange; + boolean configured; + + NetInfo(String s, int id, boolean in, boolean conf) { + SSID = s; + extra = ""; + level = unknownLevel; + netId = id; + inrange = in; + configured = conf; + } + + NetInfo(String s, boolean in, boolean conf) { + SSID = s; + extra = ""; + level = unknownLevel; + netId = 0; + inrange = in; + configured = conf; + } + + NetInfo(String s, String e, int id, boolean in, boolean conf) { + SSID = s; + extra = e; + level = unknownLevel; + netId = id; + inrange = in; + configured = conf; + } + + NetInfo(String s, String e, boolean in, boolean conf) { + SSID = s; + extra = e; + level = unknownLevel; + netId = 0; + inrange = in; + configured = conf; + } + } + + public class NetInfoComparator implements java.util.Comparator { + public int compare(NetInfo o1, NetInfo o2) { + if (connectedSSID != null && connectedSSID.equals(o1.SSID)) { + return -1; + } + if (connectedSSID != null && connectedSSID.equals(o2.SSID)) { + return 1; + } + if (o1.inrange && !o2.inrange) + return -1; + if (!o1.inrange && o2.inrange) + return 1; + if (o1.level < o2.level) + return 1; + if (o1.level > o2.level) + return -1; + return o1.SSID.compareToIgnoreCase(o2.SSID); + } + } + + static class FilesystemVolumeInfo { + String dev; + String mpoint; + String fs; + String total; + String used; + String free; + boolean ro; + } + + static class ViewHolder { + TextView tv1; + TextView tv2; + TextView tv3; + ImageView iv; + } + + class WiFiAdapter extends BaseAdapter { + final Context cntx; + + WiFiAdapter(Context context) { + cntx = context; + } + + public int getCount() { + return wifiNetworks.size(); + } + + public Object getItem(int position) { + return wifiNetworks.get(position); + } + + public long getItemId(int position) { + return 0; + } + + public View getView(final int position, View convertView, ViewGroup parent) { + ViewHolder holder; + View v = convertView; + if (v == null) { + LayoutInflater vi = (LayoutInflater) app.getSystemService(Context.LAYOUT_INFLATER_SERVICE); + v = vi.inflate(R.layout.adv_wifi_item, null); + if (v == null) { + return null; + } + holder = new ViewHolder(); + holder.tv1 = (TextView) v.findViewById(R.id.wf_ssid); + holder.tv2 = (TextView) v.findViewById(R.id.wf_capabilities); + holder.tv3 = (TextView) v.findViewById(R.id.wf_other); + holder.iv = (ImageView) v.findViewById(R.id.wf_icon); + v.setTag(holder); + } else { + holder = (ViewHolder) v.getTag(); + } + TextView tv1 = holder.tv1; + TextView tv2 = holder.tv2; + TextView tv3 = holder.tv3; + ImageView iv = holder.iv; + final WifiInfo winfo = wfm.getConnectionInfo(); + final NetInfo item = wifiNetworks.get(position); + if (item != null) { + int backgroundColor; + int textColor; + if (item.inrange && item.configured) { + backgroundColor = getResources().getColor(R.color.file_reading_bg); + textColor = getResources().getColor(R.color.file_reading_fg); + iv.setImageDrawable(getResources().getDrawable(R.drawable.file_ok)); + } else { + backgroundColor = getResources().getColor(R.color.file_finished_bg); + textColor = getResources().getColor(R.color.file_finished_fg); + iv.setImageDrawable(getResources().getDrawable(R.drawable.file_notok)); + } + tv1.setBackgroundColor(backgroundColor); + tv1.setTextColor(textColor); + tv2.setBackgroundColor(backgroundColor); + tv2.setTextColor(textColor); + tv3.setBackgroundColor(backgroundColor); + tv3.setTextColor(textColor); + + if (item.SSID.equals(winfo.getSSID())) { + SpannableString s1 = new SpannableString(item.SSID); + s1.setSpan(Typeface.BOLD, 0, item.SSID.length(), 0); + tv1.setText(s1); + if (item.extra.equals("")) { + tv2.setText(""); + } else { + SpannableString s2 = new SpannableString(item.extra); + s2.setSpan(Typeface.BOLD, 0, item.extra.length(), 0); + tv2.setText(s2); + } + int ipAddress = winfo.getIpAddress(); + // "Connected, IP: %d.%d.%d.%d" + String s = String.format( + getResources().getString( + R.string.jv_advanced_connected) + + " %d.%d.%d.%d", (ipAddress & 0xff), + (ipAddress >> 8 & 0xff), (ipAddress >> 16 & 0xff), + (ipAddress >> 24 & 0xff)); + int sl1 = s.length(); + // ", Level: " + s += ", " + + getResources().getString( + R.string.jv_advanced_level) + " " + + item.level + "dBm " + levelToString(item.level); + SpannableString s3 = new SpannableString(s); + s3.setSpan(Typeface.BOLD, 0, sl1, 0); + tv3.setText(s3); + } else { + SpannableString s1 = new SpannableString(item.SSID); + s1.setSpan(Typeface.BOLD, 0, item.SSID.length(), 0); + tv1.setText(s1); + tv2.setText(item.extra); + String s; + if (item.inrange) { + // "Level: " + s = getResources() + .getString(R.string.jv_advanced_level) + + " " + + item.level + + "dBm " + + levelToString(item.level); + } else { + // "Not in range" + s = getResources().getString( + R.string.jv_advanced_notrange); + } + if (!item.configured) { + // ", not configured" + s += ", " + + getResources().getString( + R.string.jv_advanced_not_configured); + } + tv3.setText(s); + } + } + return v; + } + } + + private String levelToString(int level) { + if (level >= -56) + return "[\u25A0\u25A0\u25A0\u25A0\u25A0]"; + if (level >= -63) + return "[\u25A0\u25A0\u25A0\u25A0\u25A1]"; + if (level >= -70) + return "[\u25A0\u25A0\u25A0\u25A1\u25A1]"; + if (level >= -77) + return "[\u25A0\u25A0\u25A1\u25A1\u25A1]"; + if (level >= -84) + return "[\u25A0\u25A1\u25A1\u25A1\u25A1]"; + return "[\u25A1\u25A1\u25A1\u25A1\u25A1]"; + } + + // Read file and return result as list of strings + private List readFile(String fname) { + BufferedReader br; + String readLine; + List rc = new ArrayList(); + try { + br = new BufferedReader(new InputStreamReader(new FileInputStream( + fname)), 1000); + } catch (FileNotFoundException e) { + return rc; + } + try { + while ((readLine = br.readLine()) != null) + rc.add(readLine); + } catch (IOException e) { + try { + br.close(); + } catch (IOException e1) { + //emply + } + return rc; + } + try { + br.close(); + } catch (IOException e) { + //emply + } + + return rc; + } + + // Execute foreground command and return result as list of strings + private List execFg(String cmd) { + List rc = new ArrayList(); + try { + Process p = Runtime.getRuntime().exec(cmd); + try { BufferedReader stdout = new BufferedReader(new InputStreamReader(p.getInputStream())); while (true) { String s = stdout.readLine(); if (s == null) break; rc.add(s); } - p.waitFor(); - } - catch (InterruptedException e) { - Log.e("execFg", "Interrupted cmd \"" + cmd + "\"... :" + e); - Thread.currentThread().interrupt(); } finally { - if(p != null) - p.destroy(); - } - } catch (IOException e) { - Log.e("execFg", "Problem executing cmd \"" + cmd + "\"... :" + e); - } - return rc; - } - - private void getVolumesInfo() { - // Filesystem - volumeInfoList = new ArrayList(); - for (String s : readFile("/proc/mounts")) { - String[] f = s.split("\\s+"); - if (f.length < 4) - continue; - String fs = f[2]; - String flags = f[3]; - String[] f1 = flags.split(","); - boolean ignore = false; - for (int i = 0; i < ingnoreFs.length; i++) - if (ingnoreFs[i].equals(fs)) { - ignore = true; - break; - } - if (ignore) - continue; - VolumeInfo in = new VolumeInfo(); - in.dev = f[0]; - in.mpoint = f[1]; - in.fs = fs; - for (int i = 0; i < f1.length; i++) - if (f1[i].equals("ro")) { - in.ro = true; - break; - } else if (f1[i].equals("rw")) { - in.ro = false; - break; - } - + if (p != null) { + p.destroy(); + } + } + } catch (IOException e) { + Log.e("execFg", "Problem executing cmd \"" + cmd + "\"... :" + e); + } + return rc; + } + + private List getFilesytemInfo() { + String[] ingnoreFs = getResources() + .getStringArray(R.array.filesystems_to_ignore); + + ArrayList fsInfo = new ArrayList(); + for (String line : readFile("/proc/mounts")) { + String[] fsMount = line.split("\\s+"); + if (fsMount.length < 4) { + continue; + } + String fs = fsMount[2]; + String flagsString = fsMount[3]; + boolean ignore = false; + for (String ingnoreF : ingnoreFs) { + if (ingnoreF.equals(fs)) { + ignore = true; + break; + } + } + if (ignore) + continue; + FilesystemVolumeInfo in = new FilesystemVolumeInfo(); + in.dev = fsMount[0]; + in.mpoint = fsMount[1]; + in.fs = fs; + String[] flags = flagsString.split(","); + for (String flag : flags) { + if (flag.equals("ro")) { + in.ro = true; + break; + } else if (flag.equals("rw")) { + in.ro = false; + break; + } + } in.total = "-"; in.used = "-"; in.free = "-"; - volumeInfoList.add(in); + fsInfo.add(in); } - for(VolumeInfo in : volumeInfoList) - { + for (FilesystemVolumeInfo in : fsInfo) { int totalPos = 0; int usedPos = 0; int freePos = 0; List output = execFg("df " + in.mpoint); - for (int i=0; i < output.size(); i++) { - String[] e = output.get(i).split("\\s+"); + for (int i = 0; i < output.size(); i++) { + String[] dfLine = output.get(i).split("\\s+"); if (i == 0) { //parse the header - for (int j=0; j readScanResults(WifiManager w) { - List rc = new ArrayList(); - List rc1 = w.getScanResults(); - List rc2 = w.getConfiguredNetworks(); + private List readScanResults(WifiManager w) { + List rc = new ArrayList(); + List rc1 = w.getScanResults(); + List rc2 = w.getConfiguredNetworks(); if (rc2 == null) rc2 = new ArrayList(); - connectedSSID = w.getConnectionInfo().getSSID(); - - if (rc1 == null) { - // No scan results - just copy configured networks to returned value - for (WifiConfiguration wc : rc2) - rc.add(new NetInfo(wc.SSID, wc.networkId, false, true)); - Collections.sort(rc, new NetInfoComparator()); - return rc; - } - - // Merge uniq scanresult items with configured network info - for (ScanResult s : rc1) { - boolean alreadyHere = false; - for (NetInfo s1 : rc) - if (s1.SSID.equals(s.SSID)) { - alreadyHere = true; - s1.level = s.level; - break; - } - if (!alreadyHere) { - boolean in = false; - for (WifiConfiguration wc : rc2) { - String ssid = wc.SSID; - if (ssid.startsWith("\"") && ssid.endsWith("\"")) - ssid = ssid.substring(1, ssid.length() - 1); - if (ssid.equals(s.SSID)) { - rc.add(new NetInfo(ssid, s.capabilities, wc.networkId, - true, true)); - rc.get(rc.size() - 1).level = s.level; - in = true; - break; - } - } - if (!in) - // In range but not configured - rc.add(new NetInfo(s.SSID, s.capabilities, true, false)); - rc.get(rc.size() - 1).level = s.level; - } - } - - // Add confiured but not active networks - for (WifiConfiguration wc : rc2) { - String ssid = wc.SSID; - if (ssid.startsWith("\"") && ssid.endsWith("\"")) - ssid = ssid.substring(1, ssid.length() - 1); - boolean alreadyHere = false; - for (NetInfo s : rc) - if (s.SSID.equals(ssid)) { - alreadyHere = true; - break; - } - if (!alreadyHere) - rc.add(new NetInfo(ssid, false, true)); - } - Collections.sort(rc, new NetInfoComparator()); - return rc; - } - - private void updateWiFiInfo() { - wifiOnOff.setEnabled(true); - if (wifiOn) { - // "Turn WiFi off" - wifiOnOff.setText(getResources().getString( - R.string.jv_advanced_turn_wifi_off)); - wifiOnOff.setCompoundDrawablesWithIntrinsicBounds(getResources() - .getDrawable(R.drawable.wifi_off), getResources() - .getDrawable(R.drawable.ci_wifi), getResources() - .getDrawable(R.drawable.wifi_off), null); - wifiOnOff.setOnClickListener(new View.OnClickListener() { - public void onClick(View v) { - wfm.setWifiEnabled(false); - // "Turning WiFi off" - wifiOnOff.setText(getResources().getString( - R.string.jv_advanced_turning_wifi_off)); - wifiOnOff.setEnabled(false); - } - }); - wifiNetworks = readScanResults(wfm); - setEinkController(); - adapter.notifyDataSetChanged(); - wifiScan.setEnabled(true); - } else { - // "Turn WiFi on" - wifiOnOff.setText(getResources().getString( - R.string.jv_advanced_turn_wifi_on)); - wifiOnOff.setCompoundDrawablesWithIntrinsicBounds(getResources() - .getDrawable(R.drawable.wifi_on), getResources() - .getDrawable(R.drawable.ci_wifi), getResources() - .getDrawable(R.drawable.wifi_on), null); - wifiOnOff.setOnClickListener(new View.OnClickListener() { - public void onClick(View v) { - wfm.setWifiEnabled(true); - // "Turning WiFi on" - wifiOnOff.setText(getResources().getString( - R.string.jv_advanced_turning_wifi_on)); - wifiOnOff.setEnabled(false); - } - }); - wifiNetworks.clear(); - setEinkController(); - adapter.notifyDataSetChanged(); - wifiScan.setEnabled(false); - } - } + connectedSSID = w.getConnectionInfo().getSSID(); + + if (rc1 == null) { + // No scan results - just copy configured networks to returned value + for (WifiConfiguration wc : rc2) { + rc.add(new NetInfo(wc.SSID, wc.networkId, false, true)); + } + Collections.sort(rc, new NetInfoComparator()); + return rc; + } + + // Merge uniq scanresult items with configured network info + for (ScanResult s : rc1) { + boolean alreadyHere = false; + for (NetInfo s1 : rc) { + if (s1.SSID.equals(s.SSID)) { + alreadyHere = true; + s1.level = s.level; + break; + } + } + if (!alreadyHere) { + boolean in = false; + for (WifiConfiguration wc : rc2) { + String ssid = wc.SSID; + if (ssid.startsWith("\"") && ssid.endsWith("\"")) { + ssid = ssid.substring(1, ssid.length() - 1); + } + if (ssid.equals(s.SSID)) { + rc.add(new NetInfo(ssid, s.capabilities, wc.networkId, + true, true)); + rc.get(rc.size() - 1).level = s.level; + in = true; + break; + } + } + if (!in) { + // In range but not configured + rc.add(new NetInfo(s.SSID, s.capabilities, true, false)); + } + rc.get(rc.size() - 1).level = s.level; + } + } + + // Add confiured but not active networks + for (WifiConfiguration wc : rc2) { + String ssid = wc.SSID; + if (ssid.startsWith("\"") && ssid.endsWith("\"")) { + ssid = ssid.substring(1, ssid.length() - 1); + } + boolean alreadyHere = false; + for (NetInfo s : rc) { + if (s.SSID.equals(ssid)) { + alreadyHere = true; + break; + } + } + if (!alreadyHere) { + rc.add(new NetInfo(ssid, false, true)); + } + } + Collections.sort(rc, new NetInfoComparator()); + return rc; + } + + private void updateWiFiInfo() { + wifiOnOff.setEnabled(true); + if (wfm.isWifiEnabled()) { + // "Turn WiFi off" + wifiOnOff.setText(getResources().getString( + R.string.jv_advanced_turn_wifi_off)); + wifiOnOff.setCompoundDrawablesWithIntrinsicBounds(getResources() + .getDrawable(R.drawable.wifi_off), getResources() + .getDrawable(R.drawable.ci_wifi), getResources() + .getDrawable(R.drawable.wifi_off), null); + wifiOnOff.setOnClickListener(new View.OnClickListener() { + public void onClick(View v) { + wfm.setWifiEnabled(false); + // "Turning WiFi off" + wifiOnOff.setText(getResources().getString( + R.string.jv_advanced_turning_wifi_off)); + wifiOnOff.setEnabled(false); + } + }); + wifiNetworks = readScanResults(wfm); + setEinkController(); + adapter.notifyDataSetChanged(); + wifiScan.setEnabled(true); + } else { + // "Turn WiFi on" + wifiOnOff.setText(getResources().getString( + R.string.jv_advanced_turn_wifi_on)); + wifiOnOff.setCompoundDrawablesWithIntrinsicBounds(getResources() + .getDrawable(R.drawable.wifi_on), getResources() + .getDrawable(R.drawable.ci_wifi), getResources() + .getDrawable(R.drawable.wifi_on), null); + wifiOnOff.setOnClickListener(new View.OnClickListener() { + public void onClick(View v) { + wfm.setWifiEnabled(true); + // "Turning WiFi on" + wifiOnOff.setText(getResources().getString( + R.string.jv_advanced_turning_wifi_on)); + wifiOnOff.setEnabled(false); + } + }); + wifiNetworks.clear(); + setEinkController(); + adapter.notifyDataSetChanged(); + wifiScan.setEnabled(false); + } + } public void startGetVolumesInfoThread() { Runnable runnable = new Runnable() { @Override public void run() { - getVolumesInfo(); + List fsInfo = getFilesytemInfo(); final int width = infoPanelView.getWidth(); - final int padding = width > 1000? 25 : 5; + final int padding = width > 1000 ? 25 : 5; StringBuilder sb = new StringBuilder() .append("") - .append("

") - .append(getResources().getString(R.string.jv_advanced_mount_diskspartitions)) - .append("

") - .append("") - .append("") - .append("") - .append("") - .append("") - .append("") - .append("") - .append("") - .append(""); - for (FilesystemVolumeInfo i : fsInfo) { - sb.append("") - .append("") - .append("") - .append("") - .append("") - .append("") - .append("") - .append(""); - } - sb.append("
") - .append(getResources().getString(R.string.jv_advanced_mount_mountpoint)) - .append("") - .append(getResources().getString(R.string.jv_advanced_mount_FS)) - .append("") - .append(getResources().getString(R.string.jv_advanced_mount_total)) - .append("") - .append(getResources().getString(R.string.jv_advanced_mount_used)) - .append("") - .append(getResources().getString(R.string.jv_advanced_mount_free)) - .append("") - .append(getResources().getString(R.string.jv_advanced_mount_rorw)) - .append("
") - .append(i.mpoint) - .append("") - .append(i.fs) - .append("") - .append(i.total) - .append("") - .append(i.used) - .append("") - .append(i.free) - .append("") - .append((i.ro ? getResources().getString(R.string.jv_advanced_mount_ro) - : getResources().getString(R.string.jv_advanced_mount_rw))) - .append("
"); - filesystemInfoPanelContent = sb.toString(); - filesystemInfoUpdate.sendEmptyMessage(0); - } - }; + public String getStorageUsageDetailedInfo() { + List fileSystemsToSkip = Arrays.asList( + getResources().getStringArray(R.array.filesystems_to_ignore)); + List fsInfo = FileSystem.getFilesytemInfo(fileSystemsToSkip); + final int width = infoPanelView.getWidth(); + final int padding = width > 1000 ? 25 : 5; + StringBuilder sb = new StringBuilder() + .append("") + .append("

") + .append(getResources().getString(R.string.jv_advanced_mount_diskspartitions)) + .append("

") + .append("") + .append("") + .append("") + .append("") + .append("") + .append("") + .append("") + .append("") + .append(""); + for (FileSystem.MountInfo i : fsInfo) { + sb.append("") + .append("") + .append("") + .append("") + .append("") + .append("") + .append("") + .append(""); + } + sb.append("
") + .append(getResources().getString(R.string.jv_advanced_mount_mountpoint)) + .append("") + .append(getResources().getString(R.string.jv_advanced_mount_FS)) + .append("") + .append(getResources().getString(R.string.jv_advanced_mount_total)) + .append("") + .append(getResources().getString(R.string.jv_advanced_mount_used)) + .append("") + .append(getResources().getString(R.string.jv_advanced_mount_free)) + .append("") + .append(getResources().getString(R.string.jv_advanced_mount_rorw)) + .append("
") + .append(i.mpoint) + .append("") + .append(i.fs) + .append("") + .append(FileSystem.bytesToString(i.total)) + .append("") + .append(FileSystem.bytesToString(i.used)) + .append("") + .append(FileSystem.bytesToString(i.free)) + .append("") + .append((i.ro ? getResources().getString(R.string.jv_advanced_mount_ro) + : getResources().getString(R.string.jv_advanced_mount_rw))) + .append("
"); + //filesystemInfoPanelContent = sb.toString(); + return sb.toString(); + } + + private String getStorageUsageInfo() { + FileSystem.MountInfo primaryStorage = FileSystem.getExternalStorageInfo(); + FileSystem.MountInfo secondaryStorage = FileSystem.getSecondaryStorageInfo(); + DecimalFormat df = new DecimalFormat("#"); + String primaryStorageUsage = "0"; + String secondaryStorageUsage = "0"; + if (primaryStorage != null) { + primaryStorageUsage = df.format(100 * ((double)primaryStorage.used / primaryStorage.total)); + } + if (secondaryStorage != null) { + secondaryStorageUsage = df.format(100 * ((double)secondaryStorage.used / secondaryStorage.total)); + } + + Display display = getWindowManager().getDefaultDisplay(); + DisplayMetrics displayMetrics = new DisplayMetrics(); + display.getMetrics(displayMetrics); + + //On physically bigger screens I want to make the bars proportionally thicker + int barHeight = (int)(display.getHeight() / displayMetrics.density)/32; + Resources r = getResources(); + StringBuilder sb = new StringBuilder() + .append("") + + .append("

" + r.getString(R.string.jv_advanced_mount_storage) +"

") + .append(""); + + if (primaryStorage != null) { + String headline = MessageFormat.format("", + "1:", + r.getString(R.string.jv_advanced_mount_total), FileSystem.bytesToString(primaryStorage.total), + r.getString(R.string.jv_advanced_mount_used), FileSystem.bytesToString(primaryStorage.used), + r.getString(R.string.jv_advanced_mount_free), FileSystem.bytesToString(primaryStorage.free)); + sb.append("") + .append(headline) + .append("") + .append("") + .append("") + .append(""); + } + + if (secondaryStorage != null) { + String headline = MessageFormat.format("", + "2:", + r.getString(R.string.jv_advanced_mount_total), FileSystem.bytesToString(secondaryStorage.total), + r.getString(R.string.jv_advanced_mount_used), FileSystem.bytesToString(secondaryStorage.used), + r.getString(R.string.jv_advanced_mount_free), FileSystem.bytesToString(secondaryStorage.free)); + sb.append("") + .append(headline) + .append("") + .append("") + .append("") + .append(""); + } + sb.append("
{0}{1} {2}{3} {4}{5} {6}
{0}{1} {2}{3} {4}{5} {6}
") + .append("

" + r.getString(R.string.jv_advanced_mount_details) + "

"); - filesystemInfoThread = new Thread(runnable); - filesystemInfoThread.setName("GetVolumesInfoThread"); - filesystemInfoThread.start(); + return sb.toString(); } @Override @@ -815,22 +734,7 @@ public void onClick(View v) { // Web info view infoPanelView = (WebView) findViewById(R.id.info_panel_web_view); - StringBuilder sb = new StringBuilder() - .append("

") - .append(getResources().getString(R.string.jv_advanced_mount_loading)) - .append("

"); - infoPanelView.loadDataWithBaseURL(null, sb.toString(), "text/html", "utf-8", null); - - filesystemInfoUpdate = new Handler() { - @Override - public void handleMessage(Message msg) { - infoPanelView.loadDataWithBaseURL(null, filesystemInfoPanelContent, "text/html", "utf-8", null); - } - }; - - if (filesystemInfoThread == null || filesystemInfoThread.isAlive() == false) { - startGetVolumesInfoThread(); - } + infoPanelView.loadDataWithBaseURL(null, getStorageUsageInfo(), "text/html", "utf-8", null); ScreenOrientation.set(this, prefs); } @@ -839,8 +743,6 @@ public void handleMessage(Message msg) { protected void onDestroy() { unregisterReceiver(b1); unregisterReceiver(b2); - filesystemInfoThread.interrupt(); - filesystemInfoThread = null; super.onDestroy(); } diff --git a/app/src/main/java/com/gacode/relaunchx/FileSystem.java b/app/src/main/java/com/gacode/relaunchx/FileSystem.java new file mode 100644 index 0000000..a95600c --- /dev/null +++ b/app/src/main/java/com/gacode/relaunchx/FileSystem.java @@ -0,0 +1,193 @@ +package com.gacode.relaunchx; + +import android.os.Environment; +import android.os.StatFs; +import android.text.TextUtils; + +import java.io.BufferedReader; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStreamReader; +import java.text.DecimalFormat; +import java.util.ArrayList; +import java.util.List; + + +public class FileSystem { + + public static class MountInfo { + String dev; + String mpoint; + String fs; + long total; + long used; + long free; + boolean ro; + } + + /** + * Read text file + * @param fname - file path + * @return file content + */ + private static List readTextFile(String fname) { + BufferedReader bufferedReader; + String line; + List returnCollection = new ArrayList(); + try { + bufferedReader = new BufferedReader(new InputStreamReader(new FileInputStream(fname)), 1000); + } catch (FileNotFoundException e) { + return returnCollection; + } + + try { + while ((line = bufferedReader.readLine()) != null) { + returnCollection.add(line); + } + } catch (IOException e) { + return returnCollection; + } + finally { + try { + bufferedReader.close(); + } catch (IOException e) { + } + } + + return returnCollection; + } + + public static List getFilesytemInfo(List fileSystemsToSkip) { + ArrayList mountInfoList = new ArrayList(); + for (String line : readTextFile("/proc/mounts")) { + String[] fsMount = line.split("\\s+"); + if (fsMount.length < 4) { + continue; + } + String fileSystem = fsMount[2]; + String flagsString = fsMount[3]; + if (fileSystemsToSkip.contains(fileSystem)) { + continue; + } + MountInfo mountInfo = new MountInfo(); + mountInfo.dev = fsMount[0]; + mountInfo.mpoint = fsMount[1]; + mountInfo.fs = fileSystem; + String[] flags = flagsString.split(","); + for (String flag : flags) { + if (flag.equals("ro")) { + mountInfo.ro = true; + break; + } else if (flag.equals("rw")) { + mountInfo.ro = false; + break; + } + } + mountInfo.total = 0; + mountInfo.used = 0; + mountInfo.free = 0; + mountInfoList.add(mountInfo); + } + + for (MountInfo mountInfo : mountInfoList) { + try { + StatFs statFs = new StatFs(mountInfo.mpoint); + long total = ((long) statFs.getBlockCount() * (long) statFs.getBlockSize()); + long free = (statFs.getAvailableBlocks() * (long) statFs.getBlockSize()); + mountInfo.used = total - free; + mountInfo.free = free; + mountInfo.total = total; + } catch (Exception e) { + e.printStackTrace(); + } + } + return mountInfoList; + } + + /** + * Convert bytes to x.x human readable string + * @param size in bytes + * @return x.x [GMK]B string + */ + public static String bytesToString(long size) + { + final long KB = 1 * 1024; + final long MB = KB * 1024; + final long GB = MB * 1024; + DecimalFormat df = new DecimalFormat("#.#"); + + if (size >= GB) return df.format((double)size / GB) + "GB"; + if (size >= MB) return df.format((double)size / MB) + "MB"; + if (size >= KB) return df.format((double)size / KB) + "KB"; + return df.format(size) + "B "; + } + + /** + * Get External storage info + * @return + */ + public static MountInfo getExternalStorageInfo() { + if (!Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) { + return null; + }; + try { + MountInfo mountInfo = new MountInfo(); + mountInfo.mpoint = Environment.getExternalStorageDirectory().getAbsolutePath(); + StatFs statFs = new StatFs(mountInfo.mpoint); + long total = ((long) statFs.getBlockCount() * (long) statFs.getBlockSize()); + long free = (statFs.getAvailableBlocks() * (long) statFs.getBlockSize()); + mountInfo.used = total - free; + mountInfo.free = free; + mountInfo.total = total; + return mountInfo; + } catch (Exception e){ + e.printStackTrace(); + return null; + } + } + + /** + * Discover removable SD card storage directory + * @return + */ + private static File getRemovableStorage() { + final String value = System.getenv("SECONDARY_STORAGE"); + if (!TextUtils.isEmpty(value)) { + final String[] paths = value.split(":"); + for (String path : paths) { + File file = new File(path); + if (file.isDirectory() && path.toLowerCase().contains("sd")) { + return file; + } + } + } + return null; + } + + /** + * Get removable SD card storage info + * @return + */ + public static MountInfo getSecondaryStorageInfo() { + File sd = getRemovableStorage(); + if (sd == null) { + return null; + }; + try { + MountInfo mountInfo = new MountInfo(); + mountInfo.mpoint = sd.getAbsolutePath(); + StatFs statFs = new StatFs(mountInfo.mpoint); + long total = ((long) statFs.getBlockCount() * (long) statFs.getBlockSize()); + long free = (statFs.getAvailableBlocks() * (long) statFs.getBlockSize()); + mountInfo.used = total - free; + mountInfo.free = free; + mountInfo.total = total; + return mountInfo; + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } +} diff --git a/app/src/main/java/com/gacode/relaunchx/ReLaunch.java b/app/src/main/java/com/gacode/relaunchx/ReLaunch.java index 2d5ae3d..0d814fc 100644 --- a/app/src/main/java/com/gacode/relaunchx/ReLaunch.java +++ b/app/src/main/java/com/gacode/relaunchx/ReLaunch.java @@ -82,6 +82,8 @@ import android.widget.TextView; import android.widget.Toast; +import static com.gacode.relaunchx.FileSystem.bytesToString; + public class ReLaunch extends Activity { @@ -643,18 +645,7 @@ public int compare(String a, String b) { String fileSizeDate = ""; if (displayFileSizeAndDate && item.type == FsItemType.File) { - if (item.size / 104857.6 > 0) { - String size = String.valueOf((int) (item.size / 104857.6)); - size = size.substring(0, size.length() - 1) + "." + size.substring(size.length() - 1); - fileSizeDate += getResources().getString(R.string.jv_relaunchx_fileinfo_size) + " " + size + " MB"; - } else if (item.size / 102.4 > 0) { - String size = String.valueOf((int) (item.size / 102.4)); - size = size.substring(0, size.length() - 1) + "." + size.substring(size.length() - 1); - fileSizeDate += getResources().getString(R.string.jv_relaunchx_fileinfo_size) + " " + size + " KB"; - } else { - String size = String.valueOf(item.size); - fileSizeDate += getResources().getString(R.string.jv_relaunchx_fileinfo_size) + " " + size + " B "; - } + fileSizeDate += getResources().getString(R.string.jv_relaunchx_fileinfo_size) + " " + bytesToString(item.size); final SimpleDateFormat fileDateFormat = new SimpleDateFormat("yyyy.MM.dd"); fileSizeDate += " " + getResources().getString(R.string.jv_relaunchx_fileinfo_date) + " " + String.valueOf(fileDateFormat.format(item.date)); diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 98b5ae9..128c58f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -97,12 +97,12 @@ Power Off confirmation Are you sure to power off your device ? Disks/partitions - Mount point + Mount point: FS - total - used - free - RO/RW + Total: + Used: + Free: + RO/RW: RO RW Implemented only on NOOK Simple Touch. @@ -600,7 +600,6 @@ ↑ File Extension ↓ File Modification Date ↑ File Modification Date - Loading filesystem info... ↓ File Size ↑ File Size Show file details @@ -608,5 +607,7 @@ Don\'t show file size and file modification date. (no author) (no title) + Storage info + tap to see details From 02810e0cc312a854aadf87dbffce476ddc02e077 Mon Sep 17 00:00:00 2001 From: Leszek Kubik Date: Sun, 26 Mar 2017 17:41:30 +0200 Subject: [PATCH 07/46] Add setting to choose Storage Info View. Fix few invisible strings. New release 1.2.0 --- README.md | 5 ++ app/build.gradle | 4 +- app/src/main/AndroidManifest.xml | 2 +- .../java/com/gacode/relaunchx/Advanced.java | 53 ++++++---------- .../java/com/gacode/relaunchx/DeviceInfo.java | 10 +++ .../com/gacode/relaunchx/PowerFunctions.java | 9 +-- .../java/com/gacode/relaunchx/ReLaunch.java | 61 +++++++++++-------- app/src/main/res/drawable-hdpi/rectangle.xml | 5 ++ app/src/main/res/drawable-mdpi/rectangle.xml | 5 ++ app/src/main/res/layout-hdpi/bookinfo.xml | 6 ++ .../main/res/layout-hdpi/editor_layout.xml | 2 + app/src/main/res/layout-hdpi/fileinfo.xml | 5 +- app/src/main/res/layout-hdpi/filters_item.xml | 3 + app/src/main/res/layout-hdpi/filters_view.xml | 4 ++ .../main/res/layout-hdpi/results_layout.xml | 3 + app/src/main/res/layout-hdpi/search.xml | 3 + .../main/res/layout-hdpi/service_details.xml | 2 + app/src/main/res/layout-hdpi/task_details.xml | 2 + .../res/layout-hdpi/taskmanager_layout.xml | 3 + app/src/main/res/layout-hdpi/types_layout.xml | 2 + app/src/main/res/layout-hdpi/types_view.xml | 3 + .../main/res/layout-hdpi/viewer_layout.xml | 1 + app/src/main/res/layout-mdpi/bookinfo.xml | 6 ++ .../main/res/layout-mdpi/editor_layout.xml | 2 + app/src/main/res/layout-mdpi/fileinfo.xml | 5 +- app/src/main/res/layout-mdpi/filters_item.xml | 2 + app/src/main/res/layout-mdpi/filters_view.xml | 3 + .../main/res/layout-mdpi/results_layout.xml | 3 + app/src/main/res/layout-mdpi/search.xml | 3 + .../main/res/layout-mdpi/service_details.xml | 2 + app/src/main/res/layout-mdpi/task_details.xml | 2 + .../res/layout-mdpi/taskmanager_layout.xml | 3 + app/src/main/res/layout-mdpi/types_layout.xml | 2 + app/src/main/res/layout-mdpi/types_view.xml | 3 + .../main/res/layout-mdpi/viewer_layout.xml | 1 + app/src/main/res/values/strings.xml | 5 +- app/src/main/res/xml/prefs.xml | 10 +++ 37 files changed, 172 insertions(+), 73 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/rectangle.xml create mode 100644 app/src/main/res/drawable-mdpi/rectangle.xml diff --git a/README.md b/README.md index b2980f9..e7cb70c 100644 --- a/README.md +++ b/README.md @@ -71,6 +71,11 @@ Launcher mode functionality: # CHANGELOG +* 1.2.0 + * Added nice graphical storage info view. + * Added preference "Advanced Settings > Appearance > Storage Info View", enabled adds the old filesystem details print to Storage info view. + * Fixed app hungs due to signal interrupted exec() by using Android API. + * Fixed text visibility on a few views (in few places text was white on white). * 1.1.0 * Added more file sorting options * Added new setting for File Manager 'Show file details' diff --git a/app/build.gradle b/app/build.gradle index 09a3b79..38fc01b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId 'com.gacode.relaunchx' minSdkVersion 7 targetSdkVersion 15 - versionCode 100100000 - versionName '1.1.0' + versionCode 100200000 + versionName '1.2.0' } buildTypes { release { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 928d125..87deed9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -8,7 +8,7 @@ - + fileSystemsToSkip = Arrays.asList( getResources().getStringArray(R.array.filesystems_to_ignore)); List fsInfo = FileSystem.getFilesytemInfo(fileSystemsToSkip); - final int width = infoPanelView.getWidth(); - final int padding = width > 1000 ? 25 : 5; StringBuilder sb = new StringBuilder() - .append("") - .append("

") - .append(getResources().getString(R.string.jv_advanced_mount_diskspartitions)) - .append("

") .append("") .append("") - .append("") - .append("") - .append("") - .append("") - .append("") - .append("") .append(""); for (FileSystem.MountInfo i : fsInfo) { sb.append("") .append("") - .append("") - .append("") - .append("") - .append("") - .append("") .append(""); } sb.append("
") + .append("") .append(getResources().getString(R.string.jv_advanced_mount_mountpoint)) - .append("") + .append("") .append(getResources().getString(R.string.jv_advanced_mount_FS)) - .append("") + .append("") .append(getResources().getString(R.string.jv_advanced_mount_total)) - .append("") + .append("") .append(getResources().getString(R.string.jv_advanced_mount_used)) - .append("") + .append("") .append(getResources().getString(R.string.jv_advanced_mount_free)) - .append("") + .append("") .append(getResources().getString(R.string.jv_advanced_mount_rorw)) - .append("
") .append(i.mpoint) - .append("") + .append("") .append(i.fs) - .append("") + .append("") .append(FileSystem.bytesToString(i.total)) - .append("") + .append("") .append(FileSystem.bytesToString(i.used)) - .append("") + .append("") .append(FileSystem.bytesToString(i.free)) - .append("") + .append("") .append((i.ro ? getResources().getString(R.string.jv_advanced_mount_ro) : getResources().getString(R.string.jv_advanced_mount_rw))) .append("
"); - //filesystemInfoPanelContent = sb.toString(); return sb.toString(); } @@ -500,10 +479,13 @@ private String getStorageUsageInfo() { //On physically bigger screens I want to make the bars proportionally thicker int barHeight = (int)(display.getHeight() / displayMetrics.density)/32; + int fontSize = 100 + (int)((display.getWidth() / displayMetrics.density)/20 - 20); Resources r = getResources(); StringBuilder sb = new StringBuilder() .append(" - - - - \ No newline at end of file diff --git a/app/src/main/res/xml/prefs.xml b/app/src/main/res/xml/prefs.xml index ed1a31b..15bc1c1 100644 --- a/app/src/main/res/xml/prefs.xml +++ b/app/src/main/res/xml/prefs.xml @@ -8,7 +8,7 @@ android:entries="@array/work_mode_names" android:entryValues="@array/work_mode_values" android:key="workMode" - android:layout="@+layout/pref_child" + android:layout="@layout/pref_child" android:persistent="true" android:selectable="true" android:title="@string/pref_i_workMode_title" /> @@ -18,7 +18,7 @@ android:entries="@array/screen_orientation_names" android:entryValues="@array/screen_orientation_values" android:key="screenOrientation" - android:layout="@+layout/pref_child" + android:layout="@layout/pref_child" android:persistent="true" android:selectable="true" android:title="@string/pref_i_screenOrientation_title" /> @@ -26,7 +26,7 @@ @@ -182,7 +182,7 @@ android:defaultValue="10" android:enabled="true" android:key="einkUpdateInterval" - android:layout="@+layout/pref_child" + android:layout="@layout/pref_child" android:persistent="true" android:selectable="true" android:summary="@string/pref_i_einkUpdateInterval_sum" @@ -191,7 +191,7 @@ @@ -282,7 +282,7 @@ android:entries="@array/output_columns_names" android:entryValues="@array/output_columns_values" android:key="columnsHomeList" - android:layout="@+layout/pref_child" + android:layout="@layout/pref_child" android:persistent="true" android:selectable="true" android:title="@string/pref_i_columnsHomeList_title" /> @@ -292,7 +292,7 @@ android:entries="@array/output_columns_names" android:entryValues="@array/output_columns_values" android:key="columnsLRU" - android:layout="@+layout/pref_child" + android:layout="@layout/pref_child" android:persistent="true" android:selectable="true" android:title="@string/pref_i_columnsLRU_title" /> @@ -302,7 +302,7 @@ android:entries="@array/output_columns_names" android:entryValues="@array/output_columns_values" android:key="columnsFAV" - android:layout="@+layout/pref_child" + android:layout="@layout/pref_child" android:persistent="true" android:selectable="true" android:title="@string/pref_i_columnsFAV_title" /> @@ -312,7 +312,7 @@ android:entries="@array/output_columns_names" android:entryValues="@array/output_columns_values" android:key="columnsSearch" - android:layout="@+layout/pref_child" + android:layout="@layout/pref_child" android:persistent="true" android:selectable="true" android:title="@string/pref_i_columnsSearch_title" /> @@ -322,7 +322,7 @@ android:entries="@array/output_columns_names" android:entryValues="@array/output_columns_values" android:key="columnsAppAll" - android:layout="@+layout/pref_child" + android:layout="@layout/pref_child" android:persistent="true" android:selectable="true" android:title="@string/pref_i_columnsAppAll_title" /> @@ -332,7 +332,7 @@ android:entries="@array/output_columns_names" android:entryValues="@array/output_columns_values" android:key="columnsAppFav" - android:layout="@+layout/pref_child" + android:layout="@layout/pref_child" android:persistent="true" android:selectable="true" android:title="@string/pref_i_columnsAppFav_title" /> @@ -342,7 +342,7 @@ android:entries="@array/output_columns_intensity_names" android:entryValues="@array/output_columns_intensity_values" android:key="columnsAlgIntensity" - android:layout="@+layout/pref_child" + android:layout="@layout/pref_child" android:persistent="true" android:selectable="true" android:title="@string/pref_i_columnsAlgIntensity_title" /> @@ -350,19 +350,19 @@ @@ -451,7 +451,7 @@ android:entries="@array/home_button_actions_names" android:entryValues="@array/home_button_actions_values" android:key="homeButtonDT" - android:layout="@+layout/pref_child" + android:layout="@layout/pref_child" android:persistent="true" android:selectable="true" android:title="@string/pref_i_homeButtonDT_title" /> @@ -461,7 +461,7 @@ android:entries="@array/home_button_actions_names" android:entryValues="@array/home_button_actions_values" android:key="homeButtonLT" - android:layout="@+layout/pref_child" + android:layout="@layout/pref_child" android:persistent="true" android:selectable="true" android:title="@string/pref_i_homeButtonLT_title" /> @@ -471,7 +471,7 @@ android:entries="@array/lru_button_actions_names" android:entryValues="@array/lru_button_actions_values" android:key="lruButtonST" - android:layout="@+layout/pref_child" + android:layout="@layout/pref_child" android:persistent="true" android:selectable="true" android:title="@string/pref_i_lruButtonST_title" /> @@ -481,7 +481,7 @@ android:entries="@array/lru_button_actions_names" android:entryValues="@array/lru_button_actions_values" android:key="lruButtonDT" - android:layout="@+layout/pref_child" + android:layout="@layout/pref_child" android:persistent="true" android:selectable="true" android:title="@string/pref_i_lruButtonDT_title" /> @@ -491,7 +491,7 @@ android:entries="@array/lru_button_actions_names" android:entryValues="@array/lru_button_actions_values" android:key="lruButtonLT" - android:layout="@+layout/pref_child" + android:layout="@layout/pref_child" android:persistent="true" android:selectable="true" android:title="@string/pref_i_lruButtonLT_title" /> @@ -501,7 +501,7 @@ android:entries="@array/fav_button_actions_names" android:entryValues="@array/fav_button_actions_values" android:key="favButtonST" - android:layout="@+layout/pref_child" + android:layout="@layout/pref_child" android:persistent="true" android:selectable="true" android:title="@string/pref_i_favButtonST_title" /> @@ -511,7 +511,7 @@ android:entries="@array/fav_button_actions_names" android:entryValues="@array/fav_button_actions_values" android:key="favButtonDT" - android:layout="@+layout/pref_child" + android:layout="@layout/pref_child" android:persistent="true" android:selectable="true" android:title="@string/pref_i_favButtonDT_title" /> @@ -521,7 +521,7 @@ android:entries="@array/fav_button_actions_names" android:entryValues="@array/fav_button_actions_values" android:key="favButtonLT" - android:layout="@+layout/pref_child" + android:layout="@layout/pref_child" android:persistent="true" android:selectable="true" android:title="@string/pref_i_favButtonLT_title" /> @@ -531,7 +531,7 @@ android:entries="@array/settings_button_actions_names" android:entryValues="@array/settings_button_actions_values" android:key="settingsButtonST" - android:layout="@+layout/pref_child" + android:layout="@layout/pref_child" android:persistent="true" android:selectable="true" android:title="@string/pref_i_settingsButtonST_title" /> @@ -541,7 +541,7 @@ android:entries="@array/settings_button_actions_names" android:entryValues="@array/settings_button_actions_values" android:key="settingsButtonDT" - android:layout="@+layout/pref_child" + android:layout="@layout/pref_child" android:persistent="true" android:selectable="true" android:title="@string/pref_i_settingsButtonDT_title" /> @@ -551,7 +551,7 @@ android:entries="@array/settings_button_actions_names" android:entryValues="@array/settings_button_actions_values" android:key="settingsButtonLT" - android:layout="@+layout/pref_child" + android:layout="@layout/pref_child" android:persistent="true" android:selectable="true" android:title="@string/pref_i_settingsButtonLT_title" /> @@ -561,7 +561,7 @@ android:entries="@array/advanced_button_actions_names" android:entryValues="@array/advanced_button_actions_values" android:key="advancedButtonST" - android:layout="@+layout/pref_child" + android:layout="@layout/pref_child" android:persistent="true" android:selectable="true" android:title="@string/pref_i_advancedButtonST_title" /> @@ -571,7 +571,7 @@ android:entries="@array/advanced_button_actions_names" android:entryValues="@array/advanced_button_actions_values" android:key="advancedButtonDT" - android:layout="@+layout/pref_child" + android:layout="@layout/pref_child" android:persistent="true" android:selectable="true" android:title="@string/pref_i_advancedButtonDT_title" /> @@ -581,7 +581,7 @@ android:entries="@array/advanced_button_actions_names" android:entryValues="@array/advanced_button_actions_values" android:key="advancedButtonLT" - android:layout="@+layout/pref_child" + android:layout="@layout/pref_child" android:persistent="true" android:selectable="true" android:title="@string/pref_i_advancedButtonLT_title" /> @@ -591,7 +591,7 @@ android:entries="@array/mem_button_actions_names" android:entryValues="@array/mem_button_actions_values" android:key="memButtonST" - android:layout="@+layout/pref_child" + android:layout="@layout/pref_child" android:persistent="true" android:selectable="true" android:title="@string/pref_i_memButtonST_title" /> @@ -601,7 +601,7 @@ android:entries="@array/mem_button_actions_names" android:entryValues="@array/mem_button_actions_values" android:key="memButtonDT" - android:layout="@+layout/pref_child" + android:layout="@layout/pref_child" android:persistent="true" android:selectable="true" android:title="@string/pref_i_memButtonDT_title" /> @@ -611,7 +611,7 @@ android:entries="@array/mem_button_actions_names" android:entryValues="@array/mem_button_actions_values" android:key="memButtonLT" - android:layout="@+layout/pref_child" + android:layout="@layout/pref_child" android:persistent="true" android:selectable="true" android:title="@string/pref_i_memButtonLT_title" /> @@ -621,7 +621,7 @@ android:entries="@array/bat_button_actions_names" android:entryValues="@array/bat_button_actions_values" android:key="batButtonST" - android:layout="@+layout/pref_child" + android:layout="@layout/pref_child" android:persistent="true" android:selectable="true" android:title="@string/pref_i_batButtonST_title" /> @@ -631,7 +631,7 @@ android:entries="@array/bat_button_actions_names" android:entryValues="@array/bat_button_actions_values" android:key="batButtonDT" - android:layout="@+layout/pref_child" + android:layout="@layout/pref_child" android:persistent="true" android:selectable="true" android:title="@string/pref_i_batButtonDT_title" /> @@ -641,7 +641,7 @@ android:entries="@array/bat_button_actions_names" android:entryValues="@array/bat_button_actions_values" android:key="batButtonLT" - android:layout="@+layout/pref_child" + android:layout="@layout/pref_child" android:persistent="true" android:selectable="true" android:title="@string/pref_i_batButtonLT_title" /> @@ -651,7 +651,7 @@ android:entries="@array/appfav_button_actions_names" android:entryValues="@array/appfav_button_actions_values" android:key="appFavButtonST" - android:layout="@+layout/pref_child" + android:layout="@layout/pref_child" android:persistent="true" android:selectable="true" android:title="@string/pref_i_appFavButtonST_title" /> @@ -661,7 +661,7 @@ android:entries="@array/appfav_button_actions_names" android:entryValues="@array/appfav_button_actions_values" android:key="appFavButtonDT" - android:layout="@+layout/pref_child" + android:layout="@layout/pref_child" android:persistent="true" android:selectable="true" android:title="@string/pref_i_appFavButtonDT_title" /> @@ -671,7 +671,7 @@ android:entries="@array/appfav_button_actions_names" android:entryValues="@array/appfav_button_actions_values" android:key="appFavButtonLT" - android:layout="@+layout/pref_child" + android:layout="@layout/pref_child" android:persistent="true" android:selectable="true" android:title="@string/pref_i_appFavButtonLT_title" /> @@ -680,7 +680,7 @@ diff --git a/build.gradle b/build.gradle index 05222be..feeb451 100644 --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,11 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { repositories { + google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.1' + classpath 'com.android.tools.build:gradle:3.0.1' } } allprojects { diff --git a/gradle.properties b/gradle.properties index ee0eb7c..d2e6a90 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ ANDROID_BUILD_MIN_SDK_VERSION=7 ANDROID_BUILD_TARGET_SDK_VERSION=15 -ANDROID_BUILD_TOOLS_VERSION=25.0.3 -ANDROID_BUILD_SDK_VERSION=25 +ANDROID_BUILD_TOOLS_VERSION=26.0.2 +ANDROID_BUILD_SDK_VERSION=26 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f102848..b311839 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Mar 05 00:24:25 CET 2017 +#Tue Nov 14 23:44:52 CET 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip \ No newline at end of file +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip From 81b137cf4979a9ff777adebc1d5cf9b2e905aca2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Ja=C5=9Bkiewicz?= Date: Thu, 18 Jan 2018 17:41:37 +0100 Subject: [PATCH 17/46] Fixed bug: add file to favorites. When adding to favorites from context menu, files was treated as directories. --- app/src/main/java/com/gacode/relaunchx/ReLaunch.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/gacode/relaunchx/ReLaunch.java b/app/src/main/java/com/gacode/relaunchx/ReLaunch.java index 4a2e44c..afeee8d 100644 --- a/app/src/main/java/com/gacode/relaunchx/ReLaunch.java +++ b/app/src/main/java/com/gacode/relaunchx/ReLaunch.java @@ -2813,7 +2813,7 @@ public boolean onContextMenuSelected(int itemId, int mPos) { app.addStartDir(fullName); break; case CNTXT_MENU_ADD: - if (type.equals("file")) + if (type == FsItemType.File) app.addToList("favorites", dname, fname, false); else app.addToList("favorites", fullName, app.DIR_TAG, false); From 32676868c8d4d708118b840da56c9765a5b6d245 Mon Sep 17 00:00:00 2001 From: Leszek Kubik Date: Mon, 22 Jan 2018 19:43:52 +0100 Subject: [PATCH 18/46] HDPI layout. UI speed improvements. --- .idea/misc.xml | 3 - app/app.iml | 9 + .../java/com/gacode/relaunchx/Advanced.java | 3 +- .../com/gacode/relaunchx/AllApplications.java | 3 +- .../java/com/gacode/relaunchx/Editor.java | 3 +- .../com/gacode/relaunchx/FiltersActivity.java | 5 +- .../com/gacode/relaunchx/PrefsActivity.java | 11 +- .../java/com/gacode/relaunchx/ReLaunch.java | 313 +++++++++--------- .../com/gacode/relaunchx/ReLaunchApp.java | 27 +- .../com/gacode/relaunchx/ResultsActivity.java | 54 +-- .../com/gacode/relaunchx/SearchActivity.java | 7 +- .../gacode/relaunchx/SizeManipulation.java | 79 +++++ .../com/gacode/relaunchx/TaskManager.java | 7 +- .../com/gacode/relaunchx/TypesActivity.java | 5 +- .../gacode/relaunchx/ViewManipulation.java | 17 - .../java/com/gacode/relaunchx/Viewer.java | 3 +- app/src/main/res/drawable-hdpi/arrow_down.png | Bin 384 -> 570 bytes app/src/main/res/drawable-hdpi/arrow_up.png | Bin 384 -> 563 bytes app/src/main/res/drawable-hdpi/bat1.png | Bin 459 -> 664 bytes app/src/main/res/drawable-hdpi/bat2.png | Bin 496 -> 777 bytes app/src/main/res/drawable-hdpi/bat3.png | Bin 507 -> 798 bytes app/src/main/res/drawable-hdpi/bat4.png | Bin 523 -> 860 bytes app/src/main/res/drawable-hdpi/ci_add.png | Bin 906 -> 1055 bytes .../main/res/drawable-hdpi/ci_arrowdown.png | Bin 866 -> 1130 bytes app/src/main/res/drawable-hdpi/ci_arrowup.png | Bin 859 -> 1157 bytes .../res/drawable-hdpi/ci_associations.png | Bin 1549 -> 2181 bytes app/src/main/res/drawable-hdpi/ci_az.png | Bin 2041 -> 2758 bytes app/src/main/res/drawable-hdpi/ci_books.png | Bin 1720 -> 2343 bytes app/src/main/res/drawable-hdpi/ci_cpu.png | Bin 1928 -> 2535 bytes app/src/main/res/drawable-hdpi/ci_default.png | Bin 1180 -> 1550 bytes app/src/main/res/drawable-hdpi/ci_del.png | Bin 1564 -> 2178 bytes .../main/res/drawable-hdpi/ci_delsmall.png | Bin 1064 -> 1521 bytes app/src/main/res/drawable-hdpi/ci_edit.png | Bin 1305 -> 2003 bytes .../main/res/drawable-hdpi/ci_eightdir.png | Bin 2029 -> 2793 bytes app/src/main/res/drawable-hdpi/ci_exit.png | Bin 1638 -> 2295 bytes app/src/main/res/drawable-hdpi/ci_fav.png | Bin 1765 -> 2341 bytes app/src/main/res/drawable-hdpi/ci_fava.png | Bin 1794 -> 2389 bytes app/src/main/res/drawable-hdpi/ci_filter.png | Bin 1156 -> 1669 bytes app/src/main/res/drawable-hdpi/ci_gear.png | Bin 2242 -> 2930 bytes app/src/main/res/drawable-hdpi/ci_gear2.png | Bin 2283 -> 3100 bytes app/src/main/res/drawable-hdpi/ci_grid.png | Bin 1689 -> 2237 bytes app/src/main/res/drawable-hdpi/ci_home.png | Bin 1672 -> 2329 bytes app/src/main/res/drawable-hdpi/ci_kill.png | Bin 1709 -> 2349 bytes app/src/main/res/drawable-hdpi/ci_levelup.png | Bin 906 -> 1222 bytes app/src/main/res/drawable-hdpi/ci_lock.png | Bin 1519 -> 2092 bytes app/src/main/res/drawable-hdpi/ci_lre.png | Bin 1666 -> 2043 bytes app/src/main/res/drawable-hdpi/ci_lrea.png | Bin 1719 -> 2151 bytes app/src/main/res/drawable-hdpi/ci_ok.png | Bin 1351 -> 1935 bytes app/src/main/res/drawable-hdpi/ci_power.png | Bin 2497 -> 3345 bytes .../main/res/drawable-hdpi/ci_question.png | Bin 1546 -> 2187 bytes app/src/main/res/drawable-hdpi/ci_ram.png | Bin 1534 -> 2190 bytes app/src/main/res/drawable-hdpi/ci_reboot.png | Bin 1615 -> 3362 bytes app/src/main/res/drawable-hdpi/ci_run.png | Bin 1126 -> 1504 bytes app/src/main/res/drawable-hdpi/ci_save.png | Bin 1341 -> 1946 bytes app/src/main/res/drawable-hdpi/ci_search.png | Bin 1587 -> 2247 bytes app/src/main/res/drawable-hdpi/ci_tools.png | Bin 1945 -> 2716 bytes app/src/main/res/drawable-hdpi/ci_wifi.png | Bin 1866 -> 2482 bytes .../main/res/drawable-hdpi/ci_wifiscan.png | Bin 1702 -> 2372 bytes .../main/res/drawable-hdpi/ci_wifisetup.png | Bin 1772 -> 2438 bytes app/src/main/res/drawable-hdpi/dir_ok.png | Bin 1180 -> 1926 bytes app/src/main/res/drawable-hdpi/file_notok.png | Bin 1773 -> 2284 bytes app/src/main/res/drawable-hdpi/file_ok.png | Bin 1401 -> 1922 bytes app/src/main/res/drawable-hdpi/icon.png | Bin 1493 -> 1655 bytes app/src/main/res/drawable-hdpi/install.png | Bin 1229 -> 1567 bytes app/src/main/res/drawable-hdpi/ram.png | Bin 751 -> 1094 bytes app/src/main/res/drawable-hdpi/wifi_off.png | Bin 767 -> 805 bytes app/src/main/res/drawable-hdpi/wifi_on.png | Bin 797 -> 749 bytes .../main/res/layout-hdpi/adv_wifi_item.xml | 20 +- .../main/res/layout-hdpi/advanced_layout.xml | 87 ++--- .../main/res/layout-hdpi/all_applications.xml | 15 +- .../res/layout-hdpi/applications_item.xml | 24 +- app/src/main/res/layout-hdpi/bookinfo.xml | 33 +- .../main/res/layout-hdpi/cmenu_list_item.xml | 6 +- .../main/res/layout-hdpi/editor_layout.xml | 49 ++- app/src/main/res/layout-hdpi/fileinfo.xml | 49 +-- app/src/main/res/layout-hdpi/filters_item.xml | 33 +- app/src/main/res/layout-hdpi/filters_view.xml | 29 +- app/src/main/res/layout-hdpi/flist_layout.xml | 27 +- app/src/main/res/layout-hdpi/lock_screen.xml | 52 +-- app/src/main/res/layout-hdpi/main.xml | 122 ++++--- app/src/main/res/layout-hdpi/poweroff.xml | 6 +- app/src/main/res/layout-hdpi/pref_child.xml | 14 +- app/src/main/res/layout-hdpi/prefs_main.xml | 22 +- app/src/main/res/layout-hdpi/reboot.xml | 6 +- app/src/main/res/layout-hdpi/results_item.xml | 18 +- .../main/res/layout-hdpi/results_layout.xml | 39 +-- app/src/main/res/layout-hdpi/search.xml | 58 ++-- .../main/res/layout-hdpi/service_details.xml | 75 +++-- .../res/layout-hdpi/simple_list_item_1.xml | 4 +- app/src/main/res/layout-hdpi/task_details.xml | 55 ++- .../main/res/layout-hdpi/taskmanager_item.xml | 27 +- .../res/layout-hdpi/taskmanager_layout.xml | 49 ++- app/src/main/res/layout-hdpi/types_layout.xml | 44 +-- app/src/main/res/layout-hdpi/types_view.xml | 24 +- .../main/res/layout-hdpi/viewer_layout.xml | 45 ++- .../main/res/layout-mdpi/advanced_layout.xml | 3 +- .../main/res/layout-mdpi/all_applications.xml | 3 +- app/src/main/res/layout-mdpi/bookinfo.xml | 3 +- .../main/res/layout-mdpi/editor_layout.xml | 3 +- app/src/main/res/layout-mdpi/filters_view.xml | 6 +- app/src/main/res/layout-mdpi/main.xml | 54 ++- app/src/main/res/layout-mdpi/prefs_main.xml | 6 +- .../main/res/layout-mdpi/results_layout.xml | 6 +- app/src/main/res/layout-mdpi/search.xml | 4 +- .../main/res/layout-mdpi/service_details.xml | 3 +- app/src/main/res/layout-mdpi/task_details.xml | 3 +- .../main/res/layout-mdpi/taskmanager_item.xml | 3 +- .../res/layout-mdpi/taskmanager_layout.xml | 6 +- app/src/main/res/layout-mdpi/types_view.xml | 6 +- .../main/res/layout-mdpi/viewer_layout.xml | 3 +- app/src/main/res/values/limitations.xml | 3 + app/src/main/res/values/strings.xml | 41 +-- app/src/main/res/values/styles.xml | 9 +- app/src/main/res/xml/prefs.xml | 43 +-- 114 files changed, 878 insertions(+), 911 deletions(-) create mode 100644 app/src/main/java/com/gacode/relaunchx/SizeManipulation.java delete mode 100644 app/src/main/java/com/gacode/relaunchx/ViewManipulation.java mode change 100644 => 100755 app/src/main/res/drawable-hdpi/arrow_down.png mode change 100644 => 100755 app/src/main/res/drawable-hdpi/arrow_up.png mode change 100644 => 100755 app/src/main/res/drawable-hdpi/bat1.png mode change 100644 => 100755 app/src/main/res/drawable-hdpi/bat2.png mode change 100644 => 100755 app/src/main/res/drawable-hdpi/bat3.png mode change 100644 => 100755 app/src/main/res/drawable-hdpi/bat4.png mode change 100644 => 100755 app/src/main/res/drawable-hdpi/ci_add.png mode change 100644 => 100755 app/src/main/res/drawable-hdpi/ci_arrowdown.png mode change 100644 => 100755 app/src/main/res/drawable-hdpi/ci_arrowup.png mode change 100644 => 100755 app/src/main/res/drawable-hdpi/ci_associations.png mode change 100644 => 100755 app/src/main/res/drawable-hdpi/ci_az.png mode change 100644 => 100755 app/src/main/res/drawable-hdpi/ci_books.png mode change 100644 => 100755 app/src/main/res/drawable-hdpi/ci_cpu.png mode change 100644 => 100755 app/src/main/res/drawable-hdpi/ci_default.png mode change 100644 => 100755 app/src/main/res/drawable-hdpi/ci_del.png mode change 100644 => 100755 app/src/main/res/drawable-hdpi/ci_delsmall.png mode change 100644 => 100755 app/src/main/res/drawable-hdpi/ci_edit.png mode change 100644 => 100755 app/src/main/res/drawable-hdpi/ci_eightdir.png mode change 100644 => 100755 app/src/main/res/drawable-hdpi/ci_exit.png mode change 100644 => 100755 app/src/main/res/drawable-hdpi/ci_fav.png mode change 100644 => 100755 app/src/main/res/drawable-hdpi/ci_fava.png mode change 100644 => 100755 app/src/main/res/drawable-hdpi/ci_filter.png mode change 100644 => 100755 app/src/main/res/drawable-hdpi/ci_gear.png mode change 100644 => 100755 app/src/main/res/drawable-hdpi/ci_gear2.png mode change 100644 => 100755 app/src/main/res/drawable-hdpi/ci_grid.png mode change 100644 => 100755 app/src/main/res/drawable-hdpi/ci_home.png mode change 100644 => 100755 app/src/main/res/drawable-hdpi/ci_kill.png mode change 100644 => 100755 app/src/main/res/drawable-hdpi/ci_levelup.png mode change 100644 => 100755 app/src/main/res/drawable-hdpi/ci_lock.png mode change 100644 => 100755 app/src/main/res/drawable-hdpi/ci_lre.png mode change 100644 => 100755 app/src/main/res/drawable-hdpi/ci_lrea.png mode change 100644 => 100755 app/src/main/res/drawable-hdpi/ci_ok.png mode change 100644 => 100755 app/src/main/res/drawable-hdpi/ci_power.png mode change 100644 => 100755 app/src/main/res/drawable-hdpi/ci_question.png mode change 100644 => 100755 app/src/main/res/drawable-hdpi/ci_ram.png mode change 100644 => 100755 app/src/main/res/drawable-hdpi/ci_reboot.png mode change 100644 => 100755 app/src/main/res/drawable-hdpi/ci_run.png mode change 100644 => 100755 app/src/main/res/drawable-hdpi/ci_save.png mode change 100644 => 100755 app/src/main/res/drawable-hdpi/ci_search.png mode change 100644 => 100755 app/src/main/res/drawable-hdpi/ci_tools.png mode change 100644 => 100755 app/src/main/res/drawable-hdpi/ci_wifi.png mode change 100644 => 100755 app/src/main/res/drawable-hdpi/ci_wifiscan.png mode change 100644 => 100755 app/src/main/res/drawable-hdpi/ci_wifisetup.png mode change 100644 => 100755 app/src/main/res/drawable-hdpi/dir_ok.png mode change 100644 => 100755 app/src/main/res/drawable-hdpi/file_notok.png mode change 100644 => 100755 app/src/main/res/drawable-hdpi/file_ok.png mode change 100644 => 100755 app/src/main/res/drawable-hdpi/icon.png mode change 100644 => 100755 app/src/main/res/drawable-hdpi/install.png mode change 100644 => 100755 app/src/main/res/drawable-hdpi/ram.png mode change 100644 => 100755 app/src/main/res/drawable-hdpi/wifi_off.png mode change 100644 => 100755 app/src/main/res/drawable-hdpi/wifi_on.png diff --git a/.idea/misc.xml b/.idea/misc.xml index c653db3..3963879 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,8 +1,5 @@ - - -