diff --git a/.gradle/2.2.1/taskArtifacts/cache.properties b/.gradle/2.2.1/taskArtifacts/cache.properties new file mode 100644 index 0000000..87be7d0 --- /dev/null +++ b/.gradle/2.2.1/taskArtifacts/cache.properties @@ -0,0 +1 @@ +#Tue Sep 01 17:12:15 IST 2015 diff --git a/.gradle/2.2.1/taskArtifacts/cache.properties.lock b/.gradle/2.2.1/taskArtifacts/cache.properties.lock new file mode 100644 index 0000000..daa7cee Binary files /dev/null and b/.gradle/2.2.1/taskArtifacts/cache.properties.lock differ diff --git a/.gradle/2.2.1/taskArtifacts/fileHashes.bin b/.gradle/2.2.1/taskArtifacts/fileHashes.bin new file mode 100644 index 0000000..d510686 Binary files /dev/null and b/.gradle/2.2.1/taskArtifacts/fileHashes.bin differ diff --git a/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin b/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin new file mode 100644 index 0000000..5566b7b Binary files /dev/null and b/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin differ diff --git a/.gradle/2.2.1/taskArtifacts/outputFileStates.bin b/.gradle/2.2.1/taskArtifacts/outputFileStates.bin new file mode 100644 index 0000000..6b430be Binary files /dev/null and b/.gradle/2.2.1/taskArtifacts/outputFileStates.bin differ diff --git a/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin b/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin new file mode 100644 index 0000000..49d92f8 Binary files /dev/null and b/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin differ diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..97626ba --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index afade3d..8d2df47 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -6,6 +6,12 @@ diff --git a/.idea/libraries/support_annotations_23_0_0.xml b/.idea/libraries/support_annotations_23_0_0.xml new file mode 100644 index 0000000..d9910df --- /dev/null +++ b/.idea/libraries/support_annotations_23_0_0.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/support_v4_23_0_0.xml b/.idea/libraries/support_v4_23_0_0.xml new file mode 100644 index 0000000..582e273 --- /dev/null +++ b/.idea/libraries/support_v4_23_0_0.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 282c756..4716600 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,5 +1,32 @@ + + + + + + + @@ -10,7 +37,7 @@ - + diff --git a/.idea/modules.xml b/.idea/modules.xml index 4402953..d9dcd60 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -3,6 +3,7 @@ + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 6564d52..94a25f7 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 6f9c01e..ef6b9c2 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,7 +1,23 @@ + + - + + + + + + + + + + + + + + @@ -29,11 +45,41 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + @@ -41,11 +87,1334 @@ + + + + + + + + + - + @@ -72,6 +1441,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -82,8 +1508,42 @@ + + + + - + + + + + + + + + + - + - + - + + - + + - - + + + + @@ -226,11 +1727,47 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Olam.iml b/Olam.iml index 397f459..86be8c2 100644 --- a/Olam.iml +++ b/Olam.iml @@ -1,20 +1,19 @@ - + - + - - - - - - + - + + + + \ No newline at end of file diff --git a/app/app.iml b/app/app.iml new file mode 100644 index 0000000..0557b17 --- /dev/null +++ b/app/app.iml @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index a57f9c6..550dc75 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 17 + compileSdkVersion 23 buildToolsVersion "23.0.0" defaultConfig { applicationId "com.olam" minSdkVersion 9 - targetSdkVersion 17 + targetSdkVersion 23 } buildTypes { @@ -19,5 +19,5 @@ android { } dependencies { - compile 'com.android.support:support-v4:18.0.0' + compile 'com.android.support:support-v4:23.0.0' } diff --git a/app/src/main/java/com/olam/MainSearch.java b/app/src/main/java/com/olam/MainSearch.java index 1d8b04b..0c6d639 100644 --- a/app/src/main/java/com/olam/MainSearch.java +++ b/app/src/main/java/com/olam/MainSearch.java @@ -98,7 +98,7 @@ public void onClick(View v) { editText = (EditText) findViewById(R.id.editText1); String searchString = editText.getText().toString(); - if(searchString != null && !searchString.isEmpty()) { + if(searchString.trim().length() != 0 && !searchString.isEmpty()) { resLayout.removeAllViews(); new doSearch().execute(); } @@ -121,7 +121,7 @@ public boolean onEditorAction(TextView v, int actionId, KeyEvent event) { //do something String searchString = editText.getText().toString(); - if(searchString != null && !searchString.isEmpty()) { + if(searchString.trim().length() != 0 && !searchString.isEmpty()) { resLayout.removeAllViews(); new doSearch().execute(); } @@ -246,6 +246,23 @@ protected String doInBackground(String... params) { // TODO Auto-generated method stub EditText editText = (EditText) findViewById(R.id.editText1); searchString = editText.getText().toString(); + + //Logic for cancelling out apostrophe from entered query. + if (searchString.contains("'")) { + + /* + temp is a StringBuilder used to store searchString after filtering out + apostrophe. + */ + StringBuilder temp = new StringBuilder(); + for (char c : searchString.toCharArray()) { + if (c != '\'') + temp.append(c); + } + searchString = temp.toString(); + if (searchString.trim().equals("")) + searchString = ":"; + } Log.v(TAG, searchString); if(searchString != null && !searchString.isEmpty()) {