upto version 1.9.1, fix ui.

namndev · Oct 9, 2015 · 3ee5137 · 3ee5137
1 parent 758e685
commit 3ee5137
Show file tree

Hide file tree

Showing 44 changed files with 5,716 additions and 5,643 deletions.
diff --git a/.cproject b/.cproject
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="0.1964178027">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.1964178027" moduleId="org.eclipse.cdt.core.settings" name="Default">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactName="${ProjName}" buildProperties="" description="" id="0.1964178027" name="Default" parent="org.eclipse.cdt.build.core.prefbase.cfg">
+					<folderInfo id="0.1964178027." name="/" resourcePath="">
+						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.1480971489" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">
+							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.1480971489.2112606797" name=""/>
+							<builder id="org.eclipse.cdt.build.core.settings.default.builder.1794942653" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
+							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.44389707" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
+							<tool id="org.eclipse.cdt.build.core.settings.holder.772069090" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1035889812" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
+							</tool>
+							<tool id="org.eclipse.cdt.build.core.settings.holder.737940369" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">
+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.514608008" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
+							</tool>
+							<tool id="org.eclipse.cdt.build.core.settings.holder.1082237759" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">
+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.501786944" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
+							</tool>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="QDict.null.1809202139" name="QDict"/>
+	</storageModule>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="0.1964178027">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+</cproject>
diff --git a/.externalToolBuilders/org.eclipse.cdt.managedbuilder.core.genmakebuilder.launch b/.externalToolBuilders/org.eclipse.cdt.managedbuilder.core.genmakebuilder.launch
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_DISABLED_BUILDER" value="org.eclipse.cdt.managedbuilder.core.genmakebuilder"/>
+<mapAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+</launchConfiguration>
diff --git a/.project b/.project
@@ -5,6 +5,16 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+				<dictionary>
+					<key>LaunchConfigHandle</key>
+					<value>&lt;project&gt;/.externalToolBuilders/org.eclipse.cdt.managedbuilder.core.genmakebuilder.launch</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
 			<arguments>
@@ -25,9 +35,19 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>org.eclipse.cdt.core.ccnature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
 	</natures>
 </projectDescription>
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -1,23 +1,24 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.annie.dictionary"
-    android:versionCode="20150613"
+    android:versionCode="20151009"
     android:versionName="@string/app_version" >
 
     <uses-sdk
         android:minSdkVersion="9"
-        android:targetSdkVersion="16" />
+        android:targetSdkVersion="23" />
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
 
     <application
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppOrangeTheme" >
-        <activity android:name=".MainActivity" >
+        <activity
+            android:name=".MainActivity"
+            android:launchMode="singleTop" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -28,7 +29,8 @@
             android:name=".SettingsActivity"
             android:exported="false"
             android:label="@string/settings_lable"
-            android:theme="@style/AppOrangeThemeWithActionBar" />
+            android:launchMode="singleTop" />
+
         <service android:name=".service.QDictService" >
         </service>
 

diff --git a/README.md b/README.md
diff --git a/assets/fonts/SanFranciscoRegular.ttf b/assets/fonts/SanFranciscoRegular.ttf
diff --git a/assets/whatsnew.txt b/assets/whatsnew.txt
@@ -7,4 +7,4 @@ QDict.
  - Improvements and bug fixes.
  - Added speech to text.
 
-* Version 1.0.2 [20/11/2014]
+* Version 1.0.2 [20/11/2014]
diff --git a/libs/android-support-v4.jar b/libs/android-support-v4.jar
diff --git a/project.properties b/project.properties
@@ -11,7 +11,7 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-21
+target=android-23
 android.library.reference.1=../Appcompat
 android.library.reference.2=../MadmanLib
 proguard.config=proguard.cfg
diff --git a/res/layout-finger/drop_down_list_item.xml b/res/layout-finger/drop_down_list_item.xml
@@ -15,7 +15,7 @@
         android:contentDescription="Icon"
         tools:ignore="HardcodedText" />
 
-    <TextView
+    <com.mmt.widget.QTextView
         android:id="@+id/description"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"

diff --git a/res/layout-finger/system_window_decorators.xml b/res/layout-finger/system_window_decorators.xml
@@ -24,7 +24,7 @@
             android:scaleType="center"
             android:src="@drawable/ic_menu" />
 
-        <EditText
+        <com.mmt.widget.QEditText
             android:id="@+id/search_edt"
             android:layout_width="0dp"
             android:layout_height="wrap_content"

diff --git a/res/layout-land/menu_frame.xml b/res/layout-land/menu_frame.xml
@@ -31,7 +31,7 @@
         android:background="?attr/colorPrimaryDark"
         android:orientation="horizontal" >
 
-        <Button
+        <com.mmt.widget.QButton
             android:id="@+id/action_about"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -50,7 +50,7 @@
             android:layout_height="match_parent"
             android:background="@color/mmt_grey_500" />
 
-        <Button
+        <com.mmt.widget.QButton
             android:id="@+id/action_share"
             android:layout_width="match_parent"
             android:layout_height="match_parent"

diff --git a/res/layout/about.xml b/res/layout/about.xml
@@ -16,7 +16,7 @@
         android:src="@drawable/ic_launcher" >
     </ImageView>
 
-    <TextView
+    <com.mmt.widget.QTextView
         android:id="@+id/tv_app_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -26,21 +26,19 @@
         android:layout_toRightOf="@id/iv_icon"
         android:text="@string/app_name"
         android:textAppearance="?android:attr/textAppearanceLarge"
-        android:textColor="@color/mmt_black" >
-    </TextView>
+        android:textColor="@color/mmt_black" />
 
-    <TextView
+    <com.mmt.widget.QTextView
         android:id="@+id/tv_app_version_label"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignLeft="@id/tv_app_name"
         android:layout_below="@id/tv_app_name"
         android:text="@string/app_version_label"
         android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textColor="@color/mmt_black" >
-    </TextView>
+        android:textColor="@color/mmt_black" />
 
-    <TextView
+    <com.mmt.widget.QTextView
         android:id="@+id/tv_app_version"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -49,8 +47,7 @@
         android:layout_toRightOf="@id/tv_app_version_label"
         android:text="@string/app_version"
         android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textColor="@color/mmt_black" >
-    </TextView>
+        android:textColor="@color/mmt_black" />
 
     <LinearLayout
         android:id="@+id/author"
@@ -61,14 +58,14 @@
         android:gravity="center_horizontal"
         android:orientation="horizontal" >
 
-        <TextView
+        <com.mmt.widget.QTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/app_author_label"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:textColor="@color/mmt_black" />
 
-        <TextView
+        <com.mmt.widget.QTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="5dp"
@@ -86,14 +83,14 @@
         android:gravity="center_horizontal"
         android:orientation="horizontal" >
 
-        <TextView
+        <com.mmt.widget.QTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/app_license_label"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="@color/mmt_black" />
 
-        <TextView
+        <com.mmt.widget.QTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/app_license"
@@ -110,14 +107,14 @@
         android:gravity="center_horizontal"
         android:orientation="horizontal" >
 
-        <TextView
+        <com.mmt.widget.QTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/app_email_label"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="@color/mmt_black" />
 
-        <TextView
+        <com.mmt.widget.QTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:autoLink="web"

diff --git a/res/layout/capture_window.xml b/res/layout/capture_window.xml
@@ -10,7 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="@dimen/action_width" >
 
-        <TextView
+        <com.mmt.widget.QTextView
             android:id="@+id/tv_title"
             android:layout_width="match_parent"
             android:layout_height="match_parent"

diff --git a/res/layout/content_frame.xml b/res/layout/content_frame.xml
@@ -27,6 +27,7 @@
                 android:id="@+id/main_toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
+                android:fitsSystemWindows="true"
                 android:background="@color/mmt_white"
                 mmt:theme="@style/ActionBar" />
 

diff --git a/res/layout/fragment_recent.xml b/res/layout/fragment_recent.xml
@@ -10,7 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="@dimen/second_bar_height" >
 
-        <TextView
+        <com.mmt.widget.QTextView
             android:id="@+id/tv_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -20,7 +20,7 @@
             android:textColor="@color/mmt_black"
             android:textSize="28.0sp" />
 
-        <TextView
+        <com.mmt.widget.QTextView
             android:id="@+id/tv_count"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -38,7 +38,7 @@
         android:layout_height="match_parent"
         android:layout_below="@+id/layout_title" >
 
-        <TextView
+        <com.mmt.widget.QTextView
             android:id="@+id/tv_empty"
             android:layout_width="match_parent"
             android:layout_height="match_parent"

diff --git a/res/layout/layout_drag.xml b/res/layout/layout_drag.xml
@@ -59,7 +59,7 @@
             android:src="?attr/icon_actionVoice" />
     </LinearLayout>
 
-    <TextView
+    <com.mmt.widget.QTextView
         android:id="@+id/tv_info_search"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

diff --git a/res/layout/layout_list_dict.xml b/res/layout/layout_list_dict.xml
@@ -23,7 +23,7 @@
             android:contentDescription="@string/app_name"
             android:src="@drawable/ic_back_white" />
 
-        <TextView
+        <com.mmt.widget.QTextView
             android:id="@+id/tv_dict_count"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
@@ -47,7 +47,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" >
 
-        <TextView
+        <com.mmt.widget.QTextView
             android:id="@+id/tv_empty"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -57,7 +57,7 @@
             android:textColor="@color/mmt_white"
             android:textStyle="italic" />
 
-        <Button
+        <com.mmt.widget.QButton
             android:id="@+id/goto_ftp_server"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

diff --git a/res/layout/layout_search.xml b/res/layout/layout_search.xml
@@ -20,7 +20,7 @@
             android:src="?attr/icon_actionBack"
             android:visibility="invisible" />
 
-        <TextView
+        <com.mmt.widget.QTextView
             android:id="@+id/tv_title"
             android:layout_width="match_parent"
             android:layout_height="match_parent"

diff --git a/res/layout/listitem_check.xml b/res/layout/listitem_check.xml
@@ -13,7 +13,7 @@
         android:background="@drawable/drag"
         android:contentDescription="@string/app_name" />
 
-    <CheckedTextView
+    <com.mmt.widget.QCheckedTextView
         android:id="@+id/text"
         android:layout_width="match_parent"
         android:layout_height="match_parent"