created search interface in UI; added AISCL as dependancy; License ch…

…anged to GPLv2
benjaminwinger · Dec 31, 2014 · 4e1487b · 4e1487b
1 parent a3bbdc9
commit 4e1487b
Show file tree

Hide file tree

Showing 37 changed files with 669 additions and 960 deletions.
diff --git a/AIS.iml b/AIS.iml
@@ -33,6 +33,7 @@
     </content>
     <orderEntry type="jdk" jdkName="Maven Android API 19 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="android-support-v7-appcompat" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.android:android:4.1.1.4" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.httpcomponents:httpclient:4.0.1" level="project" />
@@ -42,6 +43,7 @@
     <orderEntry type="library" scope="PROVIDED" name="Maven: xerces:xmlParserAPIs:2.6.2" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: xpp3:xpp3:1.1.4c" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.json:json:20080701" level="project" />
+    <orderEntry type="library" name="Maven: ca.dracode:AISCL:1.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.lucene:lucene-analyzers-common:4.7.0" level="project" />
     <orderEntry type="library" name="Maven: org.apache.lucene:lucene-core:4.7.0" level="project" />
     <orderEntry type="library" name="Maven: org.apache.lucene:lucene-queryparser:4.7.0" level="project" />

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -5,7 +5,7 @@
   ~
   ~ AIS is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ the Free Software Foundation, either version 2 of the License, or
   ~ (at your option) any later version.
   ~
   ~ AIS is distributed in the hope that it will be useful,
@@ -21,7 +21,7 @@
     package="ca.dracode.ais"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:versionCode="1"
-    android:versionName="0.6.1">
+    android:versionName="0.7.0">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
@@ -41,13 +41,19 @@
         android:label="@string/app_name"
         android:theme="@style/AppTheme">
         <activity
-            android:name="ca.dracode.ais.ui.MainActivity"
-            android:label="@string/app_name">
+            android:name=".ui.MainActivity"
+            android:label="@string/app_name"
+            android:launchMode="singleTop">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.SEARCH" />
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
+            <meta-data android:name="android.app.searchable"
+                       android:resource="@xml/searchable"
+                       android:voiceSearchMode=
+                           "showVoiceSearchButton|launchRecognizer"/>
         </activity>
 
         <activity

diff --git a/COPYING.txt b/COPYING.txt
diff --git a/lint.xml b/lint.xml
@@ -5,7 +5,7 @@
   ~
   ~ AIS is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ the Free Software Foundation, either version 2 of the License, or
   ~ (at your option) any later version.
   ~
   ~ AIS is distributed in the hope that it will be useful,

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
   ~
   ~ AIS is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ the Free Software Foundation, either version 2 of the License, or
   ~ (at your option) any later version.
   ~
   ~ AIS is distributed in the hope that it will be useful,
@@ -23,7 +23,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>ca.dracode</groupId>
     <artifactId>ais</artifactId>
-    <version>0.6.1</version>
+    <version>0.7.0</version>
     <packaging>apk</packaging>
     <name>AndroidIndexingService</name>
     <dependencies>
@@ -33,6 +33,11 @@
             <version>4.1.1.4</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>ca.dracode</groupId>
+            <artifactId>AISCL</artifactId>
+            <version>1.1</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.lucene</groupId>
             <artifactId>lucene-analyzers-common</artifactId>

diff --git a/res/layout/activity_main.xml b/res/layout/activity_main.xml
@@ -5,7 +5,7 @@
   ~
   ~ AIS is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ the Free Software Foundation, either version 2 of the License, or
   ~ (at your option) any later version.
   ~
   ~ AIS is distributed in the hope that it will be useful,
@@ -19,18 +19,16 @@
 
 <RelativeLayout 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:layout_width="match_parent" android:layout_height="match_parent"
     android:paddingBottom="@dimen/activity_vertical_margin"
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     tools:context=".MainActivity">
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/hello_world"
-        android:id="@+id/textView1"/>
+    <ExpandableListView
+        android:layout_width="match_parent"
+        android:layout_height="fill_parent"
+        android:id="@+id/list"/>
 
 </RelativeLayout>
diff --git a/res/layout/result_document.xml b/res/layout/result_document.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2014 Dracode Software.
+  ~
+  ~ This file is part of AIS.
+  ~
+  ~ AIS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 2 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ AIS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with AIS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:orientation="vertical">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Document Name"
+        android:textSize="10pt"
+        android:id="@+id/resultTitle"/>
+
+    <ListView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/listView"
+        android:layout_weight="1"/>
+</LinearLayout>
diff --git a/res/layout/result_page.xml b/res/layout/result_page.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2014 Dracode Software.
+  ~
+  ~ This file is part of AIS.
+  ~
+  ~ AIS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 2 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ AIS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with AIS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content">
+
+    <TextView
+        android:layout_width="0px"
+        android:layout_height="wrap_content"
+        android:text="#"
+        android:id="@+id/pagenum"
+        android:layout_weight="1"/>
+
+    <TextView
+        android:layout_width="0px"
+        android:layout_height="wrap_content"
+        android:text="Text"
+        android:id="@+id/text"
+        android:layout_weight="3"/>
+</LinearLayout>
diff --git a/res/menu/aisapplication.xml b/res/menu/aisapplication.xml
@@ -5,7 +5,7 @@
   ~
   ~ AIS is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ the Free Software Foundation, either version 2 of the License, or
   ~ (at your option) any later version.
   ~
   ~ AIS is distributed in the hope that it will be useful,

diff --git a/res/menu/main.xml b/res/menu/main.xml
@@ -1,11 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   ~ Copyright 2014 Dracode Software.
   ~
   ~ This file is part of AIS.
   ~
   ~ AIS is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ the Free Software Foundation, either version 2 of the License, or
   ~ (at your option) any later version.
   ~
   ~ AIS is distributed in the hope that it will be useful,
@@ -18,11 +19,10 @@
   -->
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-
+    <item android:title="@string/action_settings"
+          android:id="@+id/action_settings"/>
     <item
-        android:id="@+id/action_settings"
-        android:orderInCategory="100"
-        android:showAsAction="never"
-        android:title="@string/action_settings" />
-
-</menu>
+        android:id="@+id/menu_search"
+        android:title="Search"
+        android:showAsAction="ifRoom|collapseActionView"/>
+</menu>
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
@@ -5,7 +5,7 @@
   ~
   ~ AIS is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ the Free Software Foundation, either version 2 of the License, or
   ~ (at your option) any later version.
   ~
   ~ AIS is distributed in the hope that it will be useful,

diff --git a/res/values-sw720dp-land/dimens.xml b/res/values-sw720dp-land/dimens.xml
@@ -5,7 +5,7 @@
   ~
   ~ AIS is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ the Free Software Foundation, either version 2 of the License, or
   ~ (at your option) any later version.
   ~
   ~ AIS is distributed in the hope that it will be useful,

diff --git a/res/values-v11/styles.xml b/res/values-v11/styles.xml
@@ -5,7 +5,7 @@
   ~
   ~ AIS is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ the Free Software Foundation, either version 2 of the License, or
   ~ (at your option) any later version.
   ~
   ~ AIS is distributed in the hope that it will be useful,

diff --git a/res/values-v14/styles.xml b/res/values-v14/styles.xml
@@ -5,7 +5,7 @@
   ~
   ~ AIS is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ the Free Software Foundation, either version 2 of the License, or
   ~ (at your option) any later version.
   ~
   ~ AIS is distributed in the hope that it will be useful,

diff --git a/res/values/dimens.xml b/res/values/dimens.xml
@@ -5,7 +5,7 @@
   ~
   ~ AIS is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ the Free Software Foundation, either version 2 of the License, or
   ~ (at your option) any later version.
   ~
   ~ AIS is distributed in the hope that it will be useful,

diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -5,7 +5,7 @@
   ~
   ~ AIS is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ the Free Software Foundation, either version 2 of the License, or
   ~ (at your option) any later version.
   ~
   ~ AIS is distributed in the hope that it will be useful,
@@ -33,4 +33,6 @@
         index created by the Android Indexing Service. All data stored in the index will be
         available to the service.</string>
     <string name="ais_permission_title">Connect to AIS Indexer</string>
+    <string name="search_label">AIS</string>
+    <string name="search_prompt">Search Device Files</string>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
@@ -5,7 +5,7 @@
   ~
   ~ AIS is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ the Free Software Foundation, either version 2 of the License, or
   ~ (at your option) any later version.
   ~
   ~ AIS is distributed in the hope that it will be useful,

diff --git a/res/xml/prefs.xml b/res/xml/prefs.xml
@@ -7,7 +7,7 @@
   ~
   ~ AIS is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ the Free Software Foundation, either version 2 of the License, or
   ~ (at your option) any later version.
   ~
   ~ AIS is distributed in the hope that it will be useful,

diff --git a/res/xml/searchable.xml b/res/xml/searchable.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2014 Dracode Software.
+  ~
+  ~ This file is part of AIS.
+  ~
+  ~ AIS is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 2 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ AIS is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with AIS.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<searchable xmlns:android="http://schemas.android.com/apk/res/android"
+            android:label="@string/search_label"
+            android:hint="@string/search_prompt">
+</searchable>
diff --git a/src/ca/dracode/ais/alarm/Alarm.java b/src/ca/dracode/ais/alarm/Alarm.java
@@ -5,7 +5,7 @@
  *
  * AIS is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
+ * the Free Software Foundation, either version 2 of the License, or
  * (at your option) any later version.
  *
  * AIS is distributed in the hope that it will be useful,

diff --git a/src/ca/dracode/ais/alarm/AutoStart.java b/src/ca/dracode/ais/alarm/AutoStart.java
@@ -5,7 +5,7 @@
  *
  * AIS is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
+ * the Free Software Foundation, either version 2 of the License, or
  * (at your option) any later version.
  *
  * AIS is distributed in the hope that it will be useful,