Search is now not case sensitive; search UI modify 4.7.4

paizhangliu · paizhangliu · commit 7bbe04f0fd52 · 2021-02-07T13:22:09.000+08:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "com.macindex.macindex"
         minSdkVersion 23
         targetSdkVersion 30
-        versionCode 19
-        versionName "4.7.3"
+        versionCode 20
+        versionName "4.7.4"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
diff --git a/app/src/main/java/com/macindex/macindex/MachineHelper.java b/app/src/main/java/com/macindex/macindex/MachineHelper.java
@@ -1058,7 +1058,7 @@ public int[] searchHelper(final String columnName, final String searchInput, fin
                 for (int machineToVerify : finalPositions) {
                     String[] rawUndefinedQuery = getUndefined(machineToVerify, columnName).split("~");
                     for (String resultToVerify : rawUndefinedQuery) {
-                        if (resultToVerify.equals(searchInput)) {
+                        if (resultToVerify.equalsIgnoreCase(searchInput)) {
                             verifiedPositions.add(machineToVerify);
                             break;
                         }
diff --git a/app/src/main/java/com/macindex/macindex/SearchActivity.java b/app/src/main/java/com/macindex/macindex/SearchActivity.java
@@ -3,11 +3,13 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.widget.TextViewCompat;
 
 import android.animation.LayoutTransition;
 import android.app.AlertDialog;
 import android.app.ProgressDialog;
 import android.graphics.Color;
+import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.Menu;
@@ -32,8 +34,6 @@ public class SearchActivity extends AppCompatActivity {
 
     private TextView textResult = null;
 
-    private TextView textIllegalInput = null;
-
     private LinearLayout currentLayout = null;
 
     private Spinner filtersSpinner = null;
@@ -276,9 +276,6 @@ private void disableCheck() {
     private void initSearch() {
         searchText = findViewById(R.id.searchInput);
         textResult = findViewById(R.id.textResult);
-        textResult.setVisibility(View.GONE);
-        textIllegalInput = findViewById(R.id.textIllegalInput);
-        textIllegalInput.setVisibility(View.GONE);
         currentLayout = findViewById(R.id.resultFullContainer);
 
         searchText.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
@@ -291,11 +288,12 @@ public boolean onQueryTextSubmit(final String query) {
             @Override
             public boolean onQueryTextChange(final String newText) {
                 String searchInput = newText.trim();
-                textIllegalInput.setVisibility(View.GONE);
+                textResult.setText(R.string.search_prompt);
+                textResult.setTextColor(getColor(R.color.colorDefaultText));
                 if (!searchInput.equals("")) {
                     if (!validate(searchInput, translateOptionsParam())) {
-                        textResult.setVisibility(View.GONE);
-                        textIllegalInput.setVisibility(View.VISIBLE);
+                        textResult.setText(R.string.search_illegal);
+                        textResult.setTextColor(Color.RED);
                     }
                 } else {
                     // No input
@@ -304,10 +302,18 @@ public boolean onQueryTextChange(final String newText) {
                 return false;
             }
         });
+
+        // Set auto-sizing
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            textResult.setAutoSizeTextTypeWithDefaults(TextView.AUTO_SIZE_TEXT_TYPE_UNIFORM);
+        } else {
+            TextViewCompat.setAutoSizeTextTypeWithDefaults(textResult, TextViewCompat.AUTO_SIZE_TEXT_TYPE_UNIFORM);
+        }
     }
 
     private void clearResults() {
-        textResult.setVisibility(View.GONE);
+        textResult.setText(R.string.search_prompt);
+        textResult.setTextColor(getColor(R.color.colorDefaultText));
         loadedResults = null;
         currentLayout.removeAllViews();
     }
@@ -329,7 +335,8 @@ private boolean startSearch(final String s) {
         String searchInput = s.trim();
         Log.i("startSearch", "Current Input: " + searchInput + ", Current Manufacturer: "
                 + translateFiltersParam() + ", Current Option: " + translateOptionsParam());
-        textIllegalInput.setVisibility(View.GONE);
+        textResult.setText(R.string.search_prompt);
+        textResult.setTextColor(getColor(R.color.colorDefaultText));
         loadedResults = null;
         currentLayout.removeAllViews();
         if (!searchInput.equals("")) {
@@ -338,13 +345,14 @@ private boolean startSearch(final String s) {
                 return true;
             } else {
                 // Illegal input
-                textResult.setVisibility(View.GONE);
-                textIllegalInput.setVisibility(View.VISIBLE);
+                textResult.setText(R.string.search_illegal);
+                textResult.setTextColor(Color.RED);
                 return false;
             }
         } else {
             // No input
-            textResult.setVisibility(View.GONE);
+            textResult.setText(R.string.search_prompt);
+            textResult.setTextColor(getColor(R.color.colorDefaultText));
             return false;
         }
     }
@@ -427,8 +435,10 @@ public void run() {
                                 textResult.setVisibility(View.VISIBLE);
                                 if (positions.length == 0) {
                                     textResult.setText(R.string.search_noResult);
+                                    textResult.setTextColor(getColor(R.color.colorDefaultText));
                                 } else {
                                     textResult.setText(getString(R.string.search_found) + resultCount + getString(R.string.search_results));
+                                    textResult.setTextColor(getColor(R.color.colorDefaultText));
                                 }
                                 loadedResults = new TextView[1][positions.length];
                                 loadedResults[0] = SpecsIntentHelper.initCategory(currentLayout, positions,
diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml
@@ -28,24 +28,13 @@
 
         <Space
             android:layout_width="match_parent"
-            android:layout_height="10dp"
-            android:layout_weight="1" />
-
-        <TextView
-            android:id="@+id/textIllegalInput"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/search_illegal"
-            android:textColor="#D50000"
-            android:textStyle="bold" />
+            android:layout_height="10dp" />
 
         <TextView
             android:id="@+id/textResult"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center"
-            android:text="@string/search_noResult"
             android:textStyle="bold" />
 
         <Space
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
@@ -60,6 +60,7 @@
     <string name="search_noResult">无结果</string>
     <string name="search_found">共找到&#160;</string>
     <string name="search_results">&#160;个结果</string>
+    <string name="search_prompt">点按回车来开始搜索</string>
     <string name="search_illegal">无效输入（请参阅帮助内容）</string>
     <string name="search_disable_identification">Old world Macintosh 没有型号标识符和 EMC 编号。请以形态标识符代替。也请参阅帮助内容。</string>
     <string name="search_disable_gestalt">New world Macintosh 没有形态标识符。请以型号标识符代替。也请参阅帮助内容。</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -60,6 +60,7 @@
     <string name="search_noResult">No result</string>
     <string name="search_found">Found&#160;</string>
     <string name="search_results">&#160;result(s)</string>
+    <string name="search_prompt">Press return to start searching</string>
     <string name="search_illegal">Invalid Input</string>
     <string name="search_disable_identification">Old world Macintosh does not have Identification and EMC Number. Please use the Gestalt ID instead.</string>
     <string name="search_disable_gestalt">New world Macintosh does not have a Gestalt ID. Please use the Identification instead.</string>

Original file line number	Diff line number	Diff line change
`@@ -1058,7 +1058,7 @@ public int[] searchHelper(final String columnName, final String searchInput, fin`
`1058`	`1058`	`for (int machineToVerify : finalPositions) {`
`1059`	`1059`	`String[] rawUndefinedQuery = getUndefined(machineToVerify, columnName).split("~");`
`1060`	`1060`	`for (String resultToVerify : rawUndefinedQuery) {`
`1061`		`- if (resultToVerify.equals(searchInput)) {`
	`1061`	`+ if (resultToVerify.equalsIgnoreCase(searchInput)) {`
`1062`	`1062`	`verifiedPositions.add(machineToVerify);`
`1063`	`1063`	`break;`
`1064`	`1064`	`}`