diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index 8cc16652d..000000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -androidbible \ No newline at end of file diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml deleted file mode 100644 index 1eb339ccd..000000000 --- a/.idea/codeStyleSettings.xml +++ /dev/null @@ -1,228 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml index c5ee8162c..c82cbdac4 100644 --- a/.idea/inspectionProfiles/Project_Default.xml +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -1,49 +1,17 @@ - + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 0fa1f5670..65ebab99c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -27,6 +27,238 @@ + + + + + + + + + Abstraction issues + + + Android + + + Android Lint + + + Annotations verifyingGroovy + + + Assignment issues + + + Assignment issuesGroovy + + + Bitwise operation issues + + + Class metrics + + + Class structure + + + Cloning issues + + + Code maturity issues + + + Code style issues + + + Compiler issues + + + Concurrency annotation issues + + + Control FlowGroovy + + + Control flow issues + + + Data flow issues + + + Data flow issuesGroovy + + + Declaration redundancy + + + Declaration redundancyGroovy + + + DeclarationGroovy + + + Dependency issues + + + Encapsulation issues + + + Error handling + + + Error handlingGroovy + + + Finalization issues + + + GPath inspectionsGroovy + + + General + + + Google Cloud Endpoints + + + Gradle + + + Groovy + + + HTML + + + Imports + + + Inheritance issues + + + Initialization issues + + + Internationalization issues + + + J2ME issues + + + JUnit issues + + + Java language level issues + + + Java language level migration aids + + + JavaBeans issues + + + Javadoc issues + + + Logging issues + + + Manifest + + + Maven + + + Memory issues + + + Method MetricsGroovy + + + Method metrics + + + Modularization issues + + + Naming ConventionsGroovy + + + Naming conventions + + + Numeric issues + + + Packaging issues + + + Performance issues + + + Portability issues + + + Potentially confusing code constructsGroovy + + + Probable bugs + + + Probable bugsGradle + + + Probable bugsGroovy + + + Properties Files + + + RELAX NG + + + Resource management issues + + + Security issues + + + Serialization issues + + + Spelling + + + StyleGroovy + + + Threading issues + + + Threading issuesGroovy + + + Validity issuesGroovy + + + Visibility issues + + + XML + + + toString() issues + + + + + Convert2Lambda + + + + + diff --git a/Alkitab/build.gradle b/Alkitab/build.gradle index 20f1c0996..c76460f7c 100644 --- a/Alkitab/build.gradle +++ b/Alkitab/build.gradle @@ -17,8 +17,8 @@ android { applicationId 'yuku.alkitab.debug' minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 14000300 - versionName '4.4.0' + versionCode 14000310 + versionName '4.4.1' multiDexEnabled true // Keep this synced with integrate_translations.sh! resConfigs 'af', 'bg', 'cs', 'da', 'de', 'es', 'fr', 'in', 'ja', 'lv', 'ms', 'nl', 'pl', 'pt', 'ro', 'ru', 'th', 'uk', 'vi', 'zh-rCN', 'zh-rTW' diff --git a/Alkitab/src/main/java/yuku/alkitab/base/IsiActivity.java b/Alkitab/src/main/java/yuku/alkitab/base/IsiActivity.java index a8375cbfc..8b0c2a320 100644 --- a/Alkitab/src/main/java/yuku/alkitab/base/IsiActivity.java +++ b/Alkitab/src/main/java/yuku/alkitab/base/IsiActivity.java @@ -2202,7 +2202,7 @@ public void onClick(final Type type, final int arif, final Object source) { final MenuItem menuDictionary = menu.findItem(R.id.menuDictionary); // force-show these items on sw600dp, otherwise never show - final int showAsAction = getResources().getConfiguration().screenWidthDp >= 600 ? MenuItem.SHOW_AS_ACTION_ALWAYS : MenuItem.SHOW_AS_ACTION_NEVER; + final int showAsAction = getResources().getConfiguration().smallestScreenWidthDp >= 600 ? MenuItem.SHOW_AS_ACTION_ALWAYS : MenuItem.SHOW_AS_ACTION_NEVER; menuGuide.setShowAsActionFlags(showAsAction); menuCommentary.setShowAsActionFlags(showAsAction); menuDictionary.setShowAsActionFlags(showAsAction);