Further updates to app: small code improvements; remove redundant files.

jhellingman · Nov 9, 2019 · 86db506 · 86db506
1 parent 9be66ae
commit 86db506
Show file tree

Hide file tree

Showing 13 changed files with 24 additions and 179 deletions.
diff --git a/Stemmer/build.gradle b/Stemmer/build.gradle
@@ -8,6 +8,6 @@ jar {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     testImplementation 'junit:junit:4.12'
-    sourceCompatibility = 1.7
-    targetCompatibility = 1.7
+    sourceCompatibility = 1.8
+    targetCompatibility = 1.8
 }
diff --git a/Stemmer/stemmer.iml b/Stemmer/stemmer.iml
@@ -15,7 +15,7 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
     <output url="file://$MODULE_DIR$/build/classes/java/main" />
     <output-test url="file://$MODULE_DIR$/build/classes/java/test" />
     <exclude-output />

diff --git a/app/app.iml b/app/app.iml
@@ -4,8 +4,8 @@
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
         <option name="GRADLE_PROJECT_PATH" value=":app" />
-        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.5.1" />
-        <option name="LAST_KNOWN_AGP_VERSION" value="3.5.1" />
+        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.5.2" />
+        <option name="LAST_KNOWN_AGP_VERSION" value="3.5.2" />
       </configuration>
     </facet>
     <facet type="android" name="Android">

diff --git a/app/build.gradle b/app/build.gradle
@@ -1,5 +1,9 @@
 apply plugin: 'com.android.application'
 
+//dependencies {
+//    implementation 'com.google.firebase:firebase-analytics:17.2.1'
+//}
+
 android {
     compileSdkVersion 28
     buildToolsVersion '28.0.3'
@@ -27,3 +31,5 @@ dependencies {
     api 'com.readystatesoftware.sqliteasset:sqliteassethelper:2.0.1'
     implementation project(':stemmer')
 }
+
+// apply plugin: 'com.google.gms.google-services'
diff --git a/app/manifest-merger-release-report.txt b/app/manifest-merger-release-report.txt
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="ph.bohol.dictionaryapp"
-    android:versionCode="5"
-    android:versionName="1.4">
+    android:versionCode="7"
+    android:versionName="1.3">
 
-    <!--  <uses-permission android:name="android.permission.INTERNET" > 
-    </uses-permission> -->
+    <!--
+    <uses-permission android:name="android.permission.INTERNET" >
+    </uses-permission>
+    -->
 
     <application
         android:allowBackup="true"
@@ -24,7 +26,7 @@
             <meta-data android:name="android.app.searchable"
                 android:resource="@xml/searchable" />
         </activity>
-        
+
         <activity
             android:name="ph.bohol.dictionaryapp.ShowEntryActivity"
             android:label="@string/title_activity_show_entry"

diff --git a/app/src/main/assets/databases/dictionary_database.zip b/app/src/main/assets/databases/dictionary_database.zip
diff --git a/app/src/main/java/ph/bohol/dictionaryapp/DictionaryDatabase.java b/app/src/main/java/ph/bohol/dictionaryapp/DictionaryDatabase.java
@@ -42,7 +42,9 @@ public final class DictionaryDatabase extends SQLiteAssetHelper
     private static final Map<Integer, Spanned> entryCache = Collections.synchronizedMap(new EntryCache(ENTRY_CACHE_SIZE));
     private static final int ROOT_CACHE_SIZE = 1000;
     private static final Map<String, Boolean> rootCache = Collections.synchronizedMap(new RootCache(ROOT_CACHE_SIZE));
+
     private static DictionaryDatabase instance = null;
+
     private Context context = null;
 
     /**

diff --git a/app/src/main/java/ph/bohol/dictionaryapp/DictionaryPreferenceActivity.java b/app/src/main/java/ph/bohol/dictionaryapp/DictionaryPreferenceActivity.java
@@ -23,7 +23,6 @@ public class DictionaryPreferenceActivity extends PreferenceActivity
     public static final String VALUE_MEASURE_ORIGINAL = "original";
     public static final String VALUE_MEASURE_METRIC = "metric";
 
-
     private ListPreference searchFontSizeListPreference;
     private ListPreference presentationFontSizeListPreference;
     private ListPreference presentationStyleListPreference;
@@ -57,7 +56,6 @@ protected final void onResume() {
         sharedPreferences.registerOnSharedPreferenceChangeListener(this);
     }
 
-
     private String presentationStyleToText(final String presentationStyle) {
         if (presentationStyle.equalsIgnoreCase(EntryTransformer.STYLE_STRUCTURAL)) {
             return getString(R.string.presentation_structural);

diff --git a/app/src/main/res/layout/about_dialog.xml b/app/src/main/res/layout/about_dialog.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"

diff --git a/app/src/main/res/raw/about.txt b/app/src/main/res/raw/about.txt
@@ -5,7 +5,7 @@
 <br>published by Cornell University, Southeast Asia Program
 <br>and the Linguistic Society of the Philippines, 1972.
 
-<br>Version 1.4 of 3 November 2019.
+<br>Version 1.3 of 9 November 2019.
 
 <br><br><br><br><br><br><br><b>www.bohol.ph</b>
 

diff --git a/build.gradle b/build.gradle
@@ -2,23 +2,17 @@
 buildscript {
     repositories {
         jcenter()
-        maven {
-            url 'https://maven.google.com/'
-            name 'Google'
-        }
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.1'
+        classpath 'com.android.tools.build:gradle:3.5.2'
+        // classpath 'com.google.gms:google-services:4.3.2'
     }
 }
 
 allprojects {
     repositories {
         jcenter()
-        maven {
-            url 'https://maven.google.com/'
-            name 'Google'
-        }
+        google()
     }
 }
diff --git a/import-summary.txt b/import-summary.txt