review

Author: LongCatIsLooong

shell/platform/android/io/flutter/embedding/engine/systemchannels/TextInputChannel.java

@@ -1,9 +1,9 @@
 package io.flutter.embedding.engine.systemchannels;
 
 import android.view.inputmethod.EditorInfo;
+import android.view.View;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.autofill.HintConstants;
 import io.flutter.Log;
 import io.flutter.embedding.engine.dart.DartExecutor;
 import io.flutter.plugin.common.JSONMethodCodec;
@@ -134,7 +134,7 @@ public void requestExistingInputState() {
     channel.invokeMethod("TextInputClient.requestExistingInputState", null);
   }
 
-  private HashMap<Object, Object> createEditingStateJSON(
+  private static HashMap<Object, Object> createEditingStateJSON(
       String text, int selectionStart, int selectionEnd, int composingStart, int composingEnd) {
     HashMap<Object, Object> state = new HashMap<>();
     state.put("text", text);
@@ -316,10 +316,10 @@ public static Configuration fromJson(@NonNull JSONObject json)
       }
       Configuration[] fields = null;
       if (!json.isNull("fields")) {
-        final JSONArray fields = json.getJSONArray("fields");
-        fields = new Configuration[fields.length()];
+        final JSONArray jsonFields = json.getJSONArray("fields");
+        fields = new Configuration[jsonFields.length()];
         for (int i = 0; i < fields.length; i++) {
-          fields[i] = Configuration.fromJson(fields.getJSONObject(i));
+          fields[i] = Configuration.fromJson(jsonFields.getJSONObject(i));
         }
       }
       final Integer inputAction = inputActionFromTextInputAction(inputActionName);
@@ -384,77 +384,77 @@ public static Autofill fromJson(@NonNull JSONObject json)
       private static String translateAutofillHint(@NonNull String hint) {
         switch (hint) {
           case "addressCity":
-            return HintConstants.AUTOFILL_HINT_POSTAL_ADDRESS_LOCALITY;
+            return "addressLocality";
           case "addressState":
-            return HintConstants.AUTOFILL_HINT_POSTAL_ADDRESS_REGION;
+            return "addressRegion";
           case "birthday":
-            return HintConstants.AUTOFILL_HINT_BIRTH_DATE_FULL;
+            return "birthDateFull";
           case "birthdayDay":
-            return HintConstants.AUTOFILL_HINT_BIRTH_DATE_DAY;
+            return "birthDateDay";
           case "birthdayMonth":
-            return HintConstants.AUTOFILL_HINT_BIRTH_DATE_MONTH;
+            return "birthDateMonth";
           case "birthdayYear":
-            return HintConstants.AUTOFILL_HINT_BIRTH_DATE_YEAR;
+            return "birthDateYear";
           case "countryName":
-            return HintConstants.AUTOFILL_HINT_POSTAL_ADDRESS_COUNTRY;
+            return "addressCountry";
           case "creditCardExpirationDate":
-            return HintConstants.AUTOFILL_HINT_CREDIT_CARD_NUMBER;
+            return View.AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_DATE;
           case "creditCardExpirationDay":
-            return HintConstants.AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_DAY;
+            return View.AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_DAY;
           case "creditCardExpirationMonth":
-            return HintConstants.AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_MONTH;
+            return View.AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_MONTH;
           case "creditCardExpirationYear":
-            return HintConstants.AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_YEAR;
+            return View.AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_YEAR;
           case "creditCardNumber":
-            return HintConstants.AUTOFILL_HINT_CREDIT_CARD_NUMBER;
+            return View.AUTOFILL_HINT_CREDIT_CARD_NUMBER;
           case "creditCardSecurityCode":
-            return HintConstants.AUTOFILL_HINT_CREDIT_CARD_SECURITY_CODE;
+            return View.AUTOFILL_HINT_CREDIT_CARD_SECURITY_CODE;
           case "email":
-            return HintConstants.AUTOFILL_HINT_EMAIL_ADDRESS;
+            return View.AUTOFILL_HINT_EMAIL_ADDRESS;
           case "familyName":
-            return HintConstants.AUTOFILL_HINT_PERSON_NAME_FAMILY;
+            return "personFamilyName";
           case "fullStreetAddress":
-            return HintConstants.AUTOFILL_HINT_POSTAL_ADDRESS_STREET_ADDRESS;
+            return "streetAddress";
           case "gender":
-            return HintConstants.AUTOFILL_HINT_GENDER;
+            return "gender";
           case "givenName":
-            return HintConstants.AUTOFILL_HINT_PERSON_NAME_GIVEN;
+            return "personGivenName";
           case "middleInitial":
-            return HintConstants.AUTOFILL_HINT_PERSON_NAME_MIDDLE_INITIAL;
+            return "personMiddleInitial";
           case "middleName":
-            return HintConstants.AUTOFILL_HINT_PERSON_NAME_MIDDLE;
+            return "personMiddleName";
           case "name":
-            return HintConstants.AUTOFILL_HINT_PERSON_NAME;
+            return "personName";
           case "namePrefix":
-            return HintConstants.AUTOFILL_HINT_PERSON_NAME_PREFIX;
+            return "personNamePrefix";
           case "nameSuffix":
-            return HintConstants.AUTOFILL_HINT_PERSON_NAME_SUFFIX;
+            return "personNameSuffix";
           case "newPassword":
-            return HintConstants.AUTOFILL_HINT_NEW_PASSWORD;
+            return "newPassword";
           case "newUsername":
-            return HintConstants.AUTOFILL_HINT_NEW_USERNAME;
+            return "newUsername";
           case "oneTimeCode":
-            return HintConstants.AUTOFILL_HINT_SMS_OTP;
+            return "smsOTPCode";
           case "password":
-            return HintConstants.AUTOFILL_HINT_PASSWORD;
+            return View.AUTOFILL_HINT_PASSWORD;
           case "postalAddress":
-            return HintConstants.AUTOFILL_HINT_POSTAL_ADDRESS;
+            return View.AUTOFILL_HINT_POSTAL_ADDRESS;
           case "postalAddressExtended":
-            return HintConstants.AUTOFILL_HINT_POSTAL_ADDRESS_EXTENDED_ADDRESS;
+            return "extendedAddress";
           case "postalAddressExtendedPostalCode":
-            return HintConstants.AUTOFILL_HINT_POSTAL_ADDRESS_EXTENDED_POSTAL_CODE;
+            return "extendedPostalCode";
           case "postalCode":
-            return HintConstants.AUTOFILL_HINT_POSTAL_CODE;
+            return View.AUTOFILL_HINT_POSTAL_CODE;
           case "telephoneNumber":
-            return HintConstants.AUTOFILL_HINT_PHONE_NUMBER;
+            return "phoneNumber";
           case "telephoneNumberCountryCode":
-            return HintConstants.AUTOFILL_HINT_PHONE_COUNTRY_CODE;
+            return "phoneCountryCode";
           case "telephoneNumberDevice":
-            return HintConstants.AUTOFILL_HINT_PHONE_NUMBER_DEVICE;
+            return "phoneNumberDevice";
           case "telephoneNumberNational":
-            return HintConstants.AUTOFILL_HINT_PHONE_NATIONAL;
+            return "phoneNational";
           case "username":
-            return HintConstants.AUTOFILL_HINT_NEW_USERNAME;
+            return View.AUTOFILL_HINT_USERNAME;
           default:
             return hint;
         }