Dictionary is now integrated in the app, not downloadable separately

Nilhcem · Feb 3, 2013 · fbec821 · fbec821
1 parent c9458ca
commit fbec821
Show file tree

Hide file tree

Showing 89 changed files with 1,445 additions and 3,207 deletions.
diff --git a/.classpath b/.classpath
@@ -4,6 +4,5 @@
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry kind="lib" path="libs/gcm.jar"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -1,71 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	package="com.nilhcem.frcndict"
-	android:installLocation="preferExternal"
-	android:versionCode="8"
-	android:versionName="1.6.1" >
+    package="com.nilhcem.frcndict"
+    android:installLocation="preferExternal"
+    android:versionCode="9"
+    android:versionName="1.7" >
 
-	<uses-sdk
-	    android:minSdkVersion="7"
-	    android:targetSdkVersion="8" />
-	<uses-permission android:name="android.permission.INTERNET" />
-	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-sdk
+        android:minSdkVersion="7"
+        android:targetSdkVersion="8" />
 
-	<!-- GCM (to receive a push when an update is available) -->
-	<permission android:name="com.nilhcem.frcndict.permission.C2D_MESSAGE"
-	    android:protectionLevel="signature" />
-	<uses-permission android:name="com.nilhcem.frcndict.permission.C2D_MESSAGE" />
-	<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
-	<uses-permission android:name="android.permission.GET_ACCOUNTS" />
-	<uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
-	<application
-		android:icon="@drawable/ic_launcher"
-		android:label="@string/app_name"
-		android:name=".ApplicationController"
-		android:theme="@style/DefaultTheme">
-		<activity
-			android:label="@string/app_name"
-			android:name=".CheckDataActivity"
-			android:noHistory="true"
-			android:configChanges="keyboardHidden|orientation">
-			<intent-filter>
-				<action android:name="android.intent.action.MAIN" />
-				<category android:name="android.intent.category.LAUNCHER" />
-			</intent-filter>
-		</activity>
-		<activity
-			android:name=".updatedb.ImportActivity"
-			android:noHistory="true"
-			android:configChanges="keyboardHidden|orientation" />
-		<activity
-			android:name=".updatedb.UpdateActivity"
-			android:noHistory="true"
-			android:configChanges="keyboardHidden|orientation" />
-		<service android:name=".updatedb.ImportUpdateService" android:label="@string/import_service_label"/>
-		<activity
-			android:name=".search.SearchActivity"
-			android:configChanges="keyboardHidden|orientation" />
-		<activity
-			android:name=".meaning.WordMeaningActivity"
-			android:configChanges="keyboardHidden|orientation" />
-		<activity
-			android:name=".starred.StarredActivity"
-			android:configChanges="keyboardHidden|orientation" />
-		<activity
-			android:name=".settings.SettingsActivity"
-			android:configChanges="keyboardHidden|orientation" />
+    <application
+        android:name=".ApplicationController"
+        android:allowBackup="true"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/DefaultTheme" >
+        <activity
+            android:name="com.nilhcem.frcndict.SplashActivity"
+            android:configChanges="keyboardHidden|orientation"
+            android:noHistory="true" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
 
-		<!-- GCM broadcast receiver -->
-		<receiver android:name="com.google.android.gcm.GCMBroadcastReceiver"
-		    android:permission="com.google.android.c2dm.permission.SEND" >
-			<intent-filter>
-				<action android:name="com.google.android.c2dm.intent.RECEIVE" />
-				<action android:name="com.google.android.c2dm.intent.REGISTRATION" />
-				<category android:name="com.nilhcem.frcndict" />
-			</intent-filter>
-		</receiver>
-		<service android:name=".GCMIntentService" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".search.SearchActivity"
+            android:configChanges="keyboardHidden|orientation" />
+        <activity
+            android:name=".meaning.WordMeaningActivity"
+            android:configChanges="keyboardHidden|orientation" />
+        <activity
+            android:name=".starred.StarredActivity"
+            android:configChanges="keyboardHidden|orientation" />
+        <activity
+            android:name=".settings.SettingsActivity"
+            android:configChanges="keyboardHidden|orientation" />
+    </application>
 
-	</application>
 </manifest>
diff --git a/README.md b/README.md
@@ -31,8 +31,9 @@ To generate dictionary data, please see the **dbparser** git branch.
 Steps to do before releasing the application
 ---------------------------------------------
 
-- Open `ant.properties` and set `logging.level=0`
-- Launch `ant clean release`
+- Update dictionary data
+- Open `ant.properties` and set `logging.level=0` + the `database.version`
+- Launch `ant clean config release`
 - Sign application and run `zipalign` (See Android Developers Documentation)
 
 

diff --git a/ant.config.java b/ant.config.java
@@ -4,29 +4,14 @@
 // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 package com.nilhcem.frcndict.core;
 
-import android.text.TextUtils;
-
-import com.nilhcem.frcndict.core.Config;
-import com.nilhcem.frcndict.utils.Compatibility;
-
 public final class Config {
 	private Config() {
 		throw new UnsupportedOperationException();
 	}
 
-	/** Dictionary URL */
-	public static final String DICT_URL = "@DICT.URL@";
-
-	/** Google Cloud Messaging */
-	public static final String GCM_SENDER_ID = "@GCM.SENDER.ID@";
-	public static final String GCM_SERVER_URL = "@GCM.SERVER.URL@";
-
 	/** Logging level: 0:none, 1:error, 2:warn, 3:info, 4:debug */
 	public static final int LOGLEVEL = @LOGGING.LEVEL@;
 
-	public static boolean isGcmEnabled() {
-		return (Compatibility.isCompatible(8)
-			&& !TextUtils.isEmpty(Config.GCM_SENDER_ID)
-			&& !TextUtils.isEmpty(Config.GCM_SERVER_URL));
-	}
+	/** Database version (will be displayed in the About dialog) */
+	public static final String DATABASE_VERSION = "@DATABASE.VERSION@";
 }
diff --git a/ant.properties b/ant.properties
@@ -1,11 +1,3 @@
-# Dictionary URL
-dict.url=http://cfdict.chine-informations.com/
-
 # Logging level (0: no log, 1: error, 2: e+info, 3: e+i+warning, 4: e+i+w+debug)
 logging.level=4
-
-# Google Cloud Messaging (used to push updates). Keep empty to remove this feature.
-gcm.sender.id=
-gcm.server.url=
-#gcm.sender.id=467141088242
-#gcm.server.url=http://frcndict.appspot.com/gcm/
+database.version=2013-02-03
diff --git a/assets/about/about-fr.html b/assets/about/about-fr.html
@@ -26,7 +26,7 @@
 	<a href="mailto:nilhcem@gmail.com">nilhcem@gmail.com</a><br />
 	<hr />
 
-	<div class="main-line">Icone "loupe" par Sirea (CC-by)</div>
+	<div class="main-line">Icone "loupe" par Sirea</div>
 	<a href="http://www.rw-designer.com/icon-detail/5345">http://www.rw-designer.com/icon-detail/5345</a><br /><br />
 
 	<div id="button-container">

diff --git a/assets/about/about-zh-simplified.html b/assets/about/about-zh-simplified.html
@@ -26,7 +26,7 @@
 	<a href="mailto:nilhcem@gmail.com">nilhcem@gmail.com</a><br />
 	<hr />
 
-	<div class="main-line">放大镜图标由Sirea创造(CC-by)</div>
+	<div class="main-line">放大镜图标由Sirea创造</div>
 	<a href="http://www.rw-designer.com/icon-detail/5345">http://www.rw-designer.com/icon-detail/5345</a><br /><br />
 
 	<div id="button-container">

diff --git a/assets/about/about-zh.html b/assets/about/about-zh.html
@@ -26,7 +26,7 @@
 	<a href="mailto:nilhcem@gmail.com">nilhcem@gmail.com</a><br />
 	<hr />
 
-	<div class="main-line">放大鏡圖標由Sirea創造(CC-by)</div>
+	<div class="main-line">放大鏡圖標由Sirea創造</div>
 	<a href="http://www.rw-designer.com/icon-detail/5345">http://www.rw-designer.com/icon-detail/5345</a><br /><br />
 
 	<div id="button-container">

diff --git a/assets/about/about.html b/assets/about/about.html
@@ -26,7 +26,7 @@
 	<a href="mailto:nilhcem@gmail.com">nilhcem@gmail.com</a><br />
 	<hr />
 
-	<div class="main-line">Magnifier icon made by Sirea (CC-by)</div>
+	<div class="main-line">Magnifier icon made by Sirea</div>
 	<a href="http://www.rw-designer.com/icon-detail/5345">http://www.rw-designer.com/icon-detail/5345</a><br /><br />
 
 	<div id="button-container">

diff --git a/assets/databases/cfdict.zip b/assets/databases/cfdict.zip
diff --git a/build.xml b/build.xml
@@ -95,10 +95,8 @@
 		<!-- Copy the configuration file, replacing tokens in the file. -->
 		<copy file="ant.config.java" tofile="${config-target-file}" overwrite="true" encoding="utf-8">
 			<filterset>
-				<filter token="DICT.URL" value="${dict.url}" />
 				<filter token="LOGGING.LEVEL" value="${logging.level}" />
-				<filter token="GCM.SENDER.ID" value="${gcm.sender.id}" />
-				<filter token="GCM.SERVER.URL" value="${gcm.server.url}" />
+				<filter token="DATABASE.VERSION" value="${database.version}" />
 			</filterset>
 		</copy>
 	</target>

diff --git a/libs/gcm.jar b/libs/gcm.jar
diff --git a/res/drawable-hdpi/checkbox_on_background.png b/res/drawable-hdpi/checkbox_on_background.png
diff --git a/res/drawable-hdpi/ic_delete.png b/res/drawable-hdpi/ic_delete.png
diff --git a/res/drawable-hdpi/ic_menu_help.png b/res/drawable-hdpi/ic_menu_help.png
diff --git a/res/drawable-hdpi/presence_online.png b/res/drawable-hdpi/presence_online.png
diff --git a/res/drawable-hdpi/stat_notify_sync.png b/res/drawable-hdpi/stat_notify_sync.png
diff --git a/res/drawable-ldpi/checkbox_on_background.png b/res/drawable-ldpi/checkbox_on_background.png
diff --git a/res/drawable-ldpi/ic_delete.png b/res/drawable-ldpi/ic_delete.png
diff --git a/res/drawable-ldpi/ic_menu_help.png b/res/drawable-ldpi/ic_menu_help.png
diff --git a/res/drawable-ldpi/presence_online.png b/res/drawable-ldpi/presence_online.png
diff --git a/res/drawable-ldpi/stat_notify_sync.png b/res/drawable-ldpi/stat_notify_sync.png
diff --git a/res/drawable-mdpi/checkbox_on_background.png b/res/drawable-mdpi/checkbox_on_background.png
diff --git a/res/drawable-mdpi/ic_delete.png b/res/drawable-mdpi/ic_delete.png
diff --git a/res/drawable-mdpi/ic_menu_help.png b/res/drawable-mdpi/ic_menu_help.png
diff --git a/res/drawable-mdpi/presence_online.png b/res/drawable-mdpi/presence_online.png
diff --git a/res/drawable-mdpi/stat_notify_sync.png b/res/drawable-mdpi/stat_notify_sync.png
diff --git a/res/drawable-xhdpi/checkbox_on_background.png b/res/drawable-xhdpi/checkbox_on_background.png
diff --git a/res/drawable-xhdpi/ic_delete.png b/res/drawable-xhdpi/ic_delete.png
diff --git a/res/drawable-xhdpi/ic_menu_help.png b/res/drawable-xhdpi/ic_menu_help.png
diff --git a/res/drawable-xhdpi/presence_online.png b/res/drawable-xhdpi/presence_online.png
diff --git a/res/drawable-xhdpi/stat_notify_sync.png b/res/drawable-xhdpi/stat_notify_sync.png
diff --git a/res/drawable/import_text_bg.xml b/res/drawable/import_text_bg.xml
diff --git a/res/drawable/progress_bar.xml b/res/drawable/progress_bar.xml
diff --git a/res/layout/core_progress_bar.xml b/res/layout/core_progress_bar.xml
diff --git a/res/layout/import_update_data.xml b/res/layout/import_update_data.xml