diff --git a/document-viewer/src/main/java/org/ebookdroid/common/settings/definitions/BackupPreferences.java b/document-viewer/src/main/java/org/ebookdroid/common/settings/definitions/BackupPreferences.java index 1697a1ac2..efa6269a2 100644 --- a/document-viewer/src/main/java/org/ebookdroid/common/settings/definitions/BackupPreferences.java +++ b/document-viewer/src/main/java/org/ebookdroid/common/settings/definitions/BackupPreferences.java @@ -1,6 +1,6 @@ package org.ebookdroid.common.settings.definitions; -import static org.sufficientlysecure.viewer.R.string.*; +import org.sufficientlysecure.viewer.R; import org.ebookdroid.common.settings.books.BookBackupType; @@ -12,16 +12,16 @@ public interface BackupPreferences { /* =============== Backup settings =============== */ - BooleanPreferenceDefinition BACKUP_ON_EXIT = new BooleanPreferenceDefinition(pref_backuponexit_id, - pref_backuponexit_defvalue); + BooleanPreferenceDefinition BACKUP_ON_EXIT = new BooleanPreferenceDefinition(R.string.pref_backuponexit_id, + R.string.pref_backuponexit_defvalue); - BooleanPreferenceDefinition BACKUP_ON_BOOK_CLOSE = new BooleanPreferenceDefinition(pref_backuponbookclose_id, - pref_backuponbookclose_defvalue); + BooleanPreferenceDefinition BACKUP_ON_BOOK_CLOSE = new BooleanPreferenceDefinition(R.string.pref_backuponbookclose_id, + R.string.pref_backuponbookclose_defvalue); IntegerPreferenceDefinition MAX_NUMBER_OF_AUTO_BACKUPS = new IntegerPreferenceDefinition( - pref_maxnumberofautobackups_id, pref_maxnumberofautobackups_defvalue, pref_maxnumberofautobackups_minvalue, - pref_maxnumberofautobackups_maxvalue); + R.string.pref_maxnumberofautobackups_id, R.string.pref_maxnumberofautobackups_defvalue, R.string.pref_maxnumberofautobackups_minvalue, + R.string.pref_maxnumberofautobackups_maxvalue); EnumPreferenceDefinition BOOK_BACKUP_TYPE = new EnumPreferenceDefinition( - BookBackupType.class, pref_bookbackuptype_id, pref_bookbackuptype_defvalue); + BookBackupType.class, R.string.pref_bookbackuptype_id, R.string.pref_bookbackuptype_defvalue); } diff --git a/document-viewer/src/main/java/org/ebookdroid/common/settings/definitions/BookPreferences.java b/document-viewer/src/main/java/org/ebookdroid/common/settings/definitions/BookPreferences.java index 9baca9887..c735793cb 100644 --- a/document-viewer/src/main/java/org/ebookdroid/common/settings/definitions/BookPreferences.java +++ b/document-viewer/src/main/java/org/ebookdroid/common/settings/definitions/BookPreferences.java @@ -1,48 +1,6 @@ package org.ebookdroid.common.settings.definitions; -import static org.sufficientlysecure.viewer.R.string.pref_align_by_width; -import static org.sufficientlysecure.viewer.R.string.pref_animation_type_none; -import static org.sufficientlysecure.viewer.R.string.pref_autolevels_defvalue; -import static org.sufficientlysecure.viewer.R.string.pref_book_align_id; -import static org.sufficientlysecure.viewer.R.string.pref_book_animation_type_id; -import static org.sufficientlysecure.viewer.R.string.pref_book_autolevels_id; -import static org.sufficientlysecure.viewer.R.string.pref_book_contrast_id; -import static org.sufficientlysecure.viewer.R.string.pref_book_gamma_id; -import static org.sufficientlysecure.viewer.R.string.pref_book_croppages_id; -import static org.sufficientlysecure.viewer.R.string.pref_book_exposure_id; -import static org.sufficientlysecure.viewer.R.string.pref_book_firstpageoffset_defvalue; -import static org.sufficientlysecure.viewer.R.string.pref_book_firstpageoffset_id; -import static org.sufficientlysecure.viewer.R.string.pref_book_firstpageoffset_maxvalue; -import static org.sufficientlysecure.viewer.R.string.pref_book_firstpageoffset_minvalue; -import static org.sufficientlysecure.viewer.R.string.pref_book_id; -import static org.sufficientlysecure.viewer.R.string.pref_book_nightmode_id; -import static org.sufficientlysecure.viewer.R.string.pref_book_posimages_in_nightmode_id; -import static org.sufficientlysecure.viewer.R.string.pref_book_rotation_id; -import static org.sufficientlysecure.viewer.R.string.pref_book_rtl_id; -import static org.sufficientlysecure.viewer.R.string.pref_book_splitpages_id; -import static org.sufficientlysecure.viewer.R.string.pref_book_splitpages_rtl_id; -import static org.sufficientlysecure.viewer.R.string.pref_book_viewmode_id; -import static org.sufficientlysecure.viewer.R.string.pref_contrast_defvalue; -import static org.sufficientlysecure.viewer.R.string.pref_contrast_maxvalue; -import static org.sufficientlysecure.viewer.R.string.pref_contrast_minvalue; -import static org.sufficientlysecure.viewer.R.string.pref_gamma_defvalue; -import static org.sufficientlysecure.viewer.R.string.pref_gamma_maxvalue; -import static org.sufficientlysecure.viewer.R.string.pref_gamma_minvalue; -import static org.sufficientlysecure.viewer.R.string.pref_croppages_defvalue; -import static org.sufficientlysecure.viewer.R.string.pref_exposure_defvalue; -import static org.sufficientlysecure.viewer.R.string.pref_exposure_maxvalue; -import static org.sufficientlysecure.viewer.R.string.pref_exposure_minvalue; -import static org.sufficientlysecure.viewer.R.string.pref_nightmode_defvalue; -import static org.sufficientlysecure.viewer.R.string.pref_posimages_in_nightmode_defvalue; -import static org.sufficientlysecure.viewer.R.string.pref_rotation_unspecified; -import static org.sufficientlysecure.viewer.R.string.pref_rtl_defvalue; -import static org.sufficientlysecure.viewer.R.string.pref_splitpages_defvalue; -import static org.sufficientlysecure.viewer.R.string.pref_splitpages_rtl_defvalue; -import static org.sufficientlysecure.viewer.R.string.pref_tint_color_defvalue; -import static org.sufficientlysecure.viewer.R.string.pref_book_tint_color_id; -import static org.sufficientlysecure.viewer.R.string.pref_tint_defvalue; -import static org.sufficientlysecure.viewer.R.string.pref_book_tint_id; -import static org.sufficientlysecure.viewer.R.string.pref_viewmode_vertical_scroll; +import org.sufficientlysecure.viewer.R; import org.ebookdroid.common.settings.types.DocumentViewMode; import org.ebookdroid.common.settings.types.PageAlign; @@ -58,50 +16,50 @@ public interface BookPreferences { /* =============== Book rendering settings =============== */ - StringPreferenceDefinition BOOK = new StringPreferenceDefinition(pref_book_id, 0); + StringPreferenceDefinition BOOK = new StringPreferenceDefinition(R.string.pref_book_id, 0); - IntegerPreferenceDefinition BOOK_FIRST_PAGE_OFFSET = new IntegerPreferenceDefinition(pref_book_firstpageoffset_id, - pref_book_firstpageoffset_defvalue, pref_book_firstpageoffset_minvalue, pref_book_firstpageoffset_maxvalue); + IntegerPreferenceDefinition BOOK_FIRST_PAGE_OFFSET = new IntegerPreferenceDefinition(R.string.pref_book_firstpageoffset_id, + R.string.pref_book_firstpageoffset_defvalue, R.string.pref_book_firstpageoffset_minvalue, R.string.pref_book_firstpageoffset_maxvalue); - BooleanPreferenceDefinition BOOK_NIGHT_MODE = new BooleanPreferenceDefinition(pref_book_nightmode_id, pref_nightmode_defvalue); + BooleanPreferenceDefinition BOOK_NIGHT_MODE = new BooleanPreferenceDefinition(R.string.pref_book_nightmode_id, R.string.pref_nightmode_defvalue); - BooleanPreferenceDefinition BOOK_NIGHT_MODE_POS_IMAGES = new BooleanPreferenceDefinition(pref_book_posimages_in_nightmode_id, pref_posimages_in_nightmode_defvalue); + BooleanPreferenceDefinition BOOK_NIGHT_MODE_POS_IMAGES = new BooleanPreferenceDefinition(R.string.pref_book_posimages_in_nightmode_id, R.string.pref_posimages_in_nightmode_defvalue); - BooleanPreferenceDefinition BOOK_TINT = new BooleanPreferenceDefinition(pref_book_tint_id, pref_tint_defvalue); + BooleanPreferenceDefinition BOOK_TINT = new BooleanPreferenceDefinition(R.string.pref_book_tint_id, R.string.pref_tint_defvalue); - IntegerPreferenceDefinition BOOK_TINT_COLOR = new IntegerPreferenceDefinition(pref_book_tint_color_id, pref_tint_color_defvalue); + IntegerPreferenceDefinition BOOK_TINT_COLOR = new IntegerPreferenceDefinition(R.string.pref_book_tint_color_id, R.string.pref_tint_color_defvalue); - IntegerPreferenceDefinition BOOK_CONTRAST = new IntegerPreferenceDefinition(pref_book_contrast_id, - pref_contrast_defvalue, pref_contrast_minvalue, pref_contrast_maxvalue); + IntegerPreferenceDefinition BOOK_CONTRAST = new IntegerPreferenceDefinition(R.string.pref_book_contrast_id, + R.string.pref_contrast_defvalue, R.string.pref_contrast_minvalue, R.string.pref_contrast_maxvalue); - IntegerPreferenceDefinition BOOK_GAMMA = new IntegerPreferenceDefinition(pref_book_gamma_id, - pref_gamma_defvalue, pref_gamma_minvalue, pref_gamma_maxvalue); + IntegerPreferenceDefinition BOOK_GAMMA = new IntegerPreferenceDefinition(R.string.pref_book_gamma_id, + R.string.pref_gamma_defvalue, R.string.pref_gamma_minvalue, R.string.pref_gamma_maxvalue); - IntegerPreferenceDefinition BOOK_EXPOSURE = new IntegerPreferenceDefinition(pref_book_exposure_id, - pref_exposure_defvalue, pref_exposure_minvalue, pref_exposure_maxvalue); + IntegerPreferenceDefinition BOOK_EXPOSURE = new IntegerPreferenceDefinition(R.string.pref_book_exposure_id, + R.string.pref_exposure_defvalue, R.string.pref_exposure_minvalue, R.string.pref_exposure_maxvalue); - BooleanPreferenceDefinition BOOK_AUTO_LEVELS = new BooleanPreferenceDefinition(pref_book_autolevels_id, pref_autolevels_defvalue); + BooleanPreferenceDefinition BOOK_AUTO_LEVELS = new BooleanPreferenceDefinition(R.string.pref_book_autolevels_id, R.string.pref_autolevels_defvalue); - BooleanPreferenceDefinition BOOK_SPLIT_PAGES = new BooleanPreferenceDefinition(pref_book_splitpages_id, - pref_splitpages_defvalue); + BooleanPreferenceDefinition BOOK_SPLIT_PAGES = new BooleanPreferenceDefinition(R.string.pref_book_splitpages_id, + R.string.pref_splitpages_defvalue); - BooleanPreferenceDefinition BOOK_SPLIT_RTL = new BooleanPreferenceDefinition(pref_book_splitpages_rtl_id, - pref_splitpages_rtl_defvalue); + BooleanPreferenceDefinition BOOK_SPLIT_RTL = new BooleanPreferenceDefinition(R.string.pref_book_splitpages_rtl_id, + R.string.pref_splitpages_rtl_defvalue); - BooleanPreferenceDefinition BOOK_CROP_PAGES = new BooleanPreferenceDefinition(pref_book_croppages_id, - pref_croppages_defvalue); + BooleanPreferenceDefinition BOOK_CROP_PAGES = new BooleanPreferenceDefinition(R.string.pref_book_croppages_id, + R.string.pref_croppages_defvalue); EnumPreferenceDefinition BOOK_ROTATION = new EnumPreferenceDefinition( - RotationType.class, pref_book_rotation_id, pref_rotation_unspecified); + RotationType.class, R.string.pref_book_rotation_id, R.string.pref_rotation_unspecified); EnumPreferenceDefinition BOOK_VIEW_MODE = new EnumPreferenceDefinition( - DocumentViewMode.class, pref_book_viewmode_id, pref_viewmode_vertical_scroll); + DocumentViewMode.class, R.string.pref_book_viewmode_id, R.string.pref_viewmode_vertical_scroll); EnumPreferenceDefinition BOOK_PAGE_ALIGN = new EnumPreferenceDefinition(PageAlign.class, - pref_book_align_id, pref_align_by_width); + R.string.pref_book_align_id, R.string.pref_align_by_width); EnumPreferenceDefinition BOOK_ANIMATION_TYPE = new EnumPreferenceDefinition( - PageAnimationType.class, pref_book_animation_type_id, pref_animation_type_none); + PageAnimationType.class, R.string.pref_book_animation_type_id, R.string.pref_animation_type_none); - BooleanPreferenceDefinition BOOK_RTL= new BooleanPreferenceDefinition(pref_book_rtl_id, pref_rtl_defvalue); + BooleanPreferenceDefinition BOOK_RTL= new BooleanPreferenceDefinition(R.string.pref_book_rtl_id, R.string.pref_rtl_defvalue); } diff --git a/document-viewer/src/main/java/org/ebookdroid/common/settings/definitions/LibPreferences.java b/document-viewer/src/main/java/org/ebookdroid/common/settings/definitions/LibPreferences.java index 638847bbf..e614b96c4 100644 --- a/document-viewer/src/main/java/org/ebookdroid/common/settings/definitions/LibPreferences.java +++ b/document-viewer/src/main/java/org/ebookdroid/common/settings/definitions/LibPreferences.java @@ -1,21 +1,6 @@ package org.ebookdroid.common.settings.definitions; -import static org.sufficientlysecure.viewer.R.string.pref_autoscanremovable_defvalue; -import static org.sufficientlysecure.viewer.R.string.pref_autoscanremovable_id; -import static org.sufficientlysecure.viewer.R.string.pref_brautoscandir_defvalue; -import static org.sufficientlysecure.viewer.R.string.pref_brautoscandir_id; -import static org.sufficientlysecure.viewer.R.string.pref_brfiletypes; -import static org.sufficientlysecure.viewer.R.string.pref_brsearchbookquery_id; -import static org.sufficientlysecure.viewer.R.string.pref_cachelocation_defvalue; -import static org.sufficientlysecure.viewer.R.string.pref_cachelocation_id; -import static org.sufficientlysecure.viewer.R.string.pref_shownotifications_defvalue; -import static org.sufficientlysecure.viewer.R.string.pref_shownotifications_id; -import static org.sufficientlysecure.viewer.R.string.pref_showremovable_defvalue; -import static org.sufficientlysecure.viewer.R.string.pref_showremovable_id; -import static org.sufficientlysecure.viewer.R.string.pref_showscanning_defvalue; -import static org.sufficientlysecure.viewer.R.string.pref_showscanning_id; -import static org.sufficientlysecure.viewer.R.string.pref_usebookcase_defvalue; -import static org.sufficientlysecure.viewer.R.string.pref_usebookcase_id; +import org.sufficientlysecure.viewer.R; import org.ebookdroid.common.settings.base.FileTypeFilterPreferenceDefinition; import org.ebookdroid.common.settings.types.CacheLocation; @@ -29,29 +14,29 @@ public interface LibPreferences { /* =============== Browser settings =============== */ - BooleanPreferenceDefinition USE_BOOK_CASE = new BooleanPreferenceDefinition(pref_usebookcase_id, - pref_usebookcase_defvalue); + BooleanPreferenceDefinition USE_BOOK_CASE = new BooleanPreferenceDefinition(R.string.pref_usebookcase_id, + R.string.pref_usebookcase_defvalue); - FileListPreferenceDefinition AUTO_SCAN_DIRS = new FileListPreferenceDefinition(pref_brautoscandir_id, - pref_brautoscandir_defvalue); + FileListPreferenceDefinition AUTO_SCAN_DIRS = new FileListPreferenceDefinition(R.string.pref_brautoscandir_id, + R.string.pref_brautoscandir_defvalue); - StringPreferenceDefinition SEARCH_BOOK_QUERY = new StringPreferenceDefinition(pref_brsearchbookquery_id, 0); + StringPreferenceDefinition SEARCH_BOOK_QUERY = new StringPreferenceDefinition(R.string.pref_brsearchbookquery_id, 0); - FileTypeFilterPreferenceDefinition FILE_TYPE_FILTER = new FileTypeFilterPreferenceDefinition(pref_brfiletypes); + FileTypeFilterPreferenceDefinition FILE_TYPE_FILTER = new FileTypeFilterPreferenceDefinition(R.string.pref_brfiletypes); EnumPreferenceDefinition CACHE_LOCATION = new EnumPreferenceDefinition( - CacheLocation.class, pref_cachelocation_id, pref_cachelocation_defvalue); + CacheLocation.class, R.string.pref_cachelocation_id, R.string.pref_cachelocation_defvalue); - BooleanPreferenceDefinition AUTO_SCAN_REMOVABLE_MEDIA = new BooleanPreferenceDefinition(pref_autoscanremovable_id, - pref_autoscanremovable_defvalue); + BooleanPreferenceDefinition AUTO_SCAN_REMOVABLE_MEDIA = new BooleanPreferenceDefinition(R.string.pref_autoscanremovable_id, + R.string.pref_autoscanremovable_defvalue); - BooleanPreferenceDefinition SHOW_REMOVABLE_MEDIA = new BooleanPreferenceDefinition(pref_showremovable_id, - pref_showremovable_defvalue); + BooleanPreferenceDefinition SHOW_REMOVABLE_MEDIA = new BooleanPreferenceDefinition(R.string.pref_showremovable_id, + R.string.pref_showremovable_defvalue); - BooleanPreferenceDefinition SHOW_SCANNING_MEDIA = new BooleanPreferenceDefinition(pref_showscanning_id, - pref_showscanning_defvalue); + BooleanPreferenceDefinition SHOW_SCANNING_MEDIA = new BooleanPreferenceDefinition(R.string.pref_showscanning_id, + R.string.pref_showscanning_defvalue); - BooleanPreferenceDefinition SHOW_NOTIFICATIONS = new BooleanPreferenceDefinition(pref_shownotifications_id, - pref_shownotifications_defvalue); + BooleanPreferenceDefinition SHOW_NOTIFICATIONS = new BooleanPreferenceDefinition(R.string.pref_shownotifications_id, + R.string.pref_shownotifications_defvalue); } diff --git a/document-viewer/src/main/java/org/ebookdroid/common/settings/types/ToastPosition.java b/document-viewer/src/main/java/org/ebookdroid/common/settings/types/ToastPosition.java index 84f174ddb..5f0916b87 100644 --- a/document-viewer/src/main/java/org/ebookdroid/common/settings/types/ToastPosition.java +++ b/document-viewer/src/main/java/org/ebookdroid/common/settings/types/ToastPosition.java @@ -1,7 +1,7 @@ package org.ebookdroid.common.settings.types; import static android.view.Gravity.*; -import static org.sufficientlysecure.viewer.R.string.*; +import org.sufficientlysecure.viewer.R; import org.ebookdroid.EBookDroidApp; @@ -12,27 +12,27 @@ public enum ToastPosition implements ResourceConstant { /** * */ - Invisible(pref_toastposition_invisible, 0), + Invisible(R.string.pref_toastposition_invisible, 0), /** * */ - LeftTop(pref_toastposition_lefttop, LEFT | TOP), + LeftTop(R.string.pref_toastposition_lefttop, LEFT | TOP), /** * */ - RightTop(pref_toastposition_righttop, RIGHT | TOP), + RightTop(R.string.pref_toastposition_righttop, RIGHT | TOP), /** * */ - LeftBottom(pref_toastposition_leftbottom, LEFT | BOTTOM), + LeftBottom(R.string.pref_toastposition_leftbottom, LEFT | BOTTOM), /** * */ - Bottom(pref_toastposition_bottom, CENTER | BOTTOM), + Bottom(R.string.pref_toastposition_bottom, CENTER | BOTTOM), /** * */ - RightBottom(pref_toastposition_righbottom, RIGHT | BOTTOM); + RightBottom(R.string.pref_toastposition_righbottom, RIGHT | BOTTOM); public final int position; private final String resValue; diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 000000000..369ea72e8 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,20 @@ +# Project-wide Gradle settings. + +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. + +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html + +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +# Default value: -Xmx10248m -XX:MaxPermSize=256m +# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 + +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true + +android.nonFinalResIds=false