From 4d348dd26a14d4b42d0992722ba45cee5f012546 Mon Sep 17 00:00:00 2001 From: ekager Date: Fri, 2 Oct 2020 17:58:11 -0700 Subject: [PATCH] Fixes existing lint errors --- .../fenix/components/toolbar/TabCounter.kt | 5 ++- .../fenix/customtabs/CustomTabToolbarMenu.kt | 10 ++++- .../fenix/settings/DataChoicesFragment.kt | 8 ++-- .../settings/RadioButtonInfoPreference.kt | 25 ----------- .../account/AccountSettingsFragment.kt | 4 +- .../fenix/settings/account/SignOutFragment.kt | 6 ++- .../search/AddSearchEngineFragment.kt | 5 ++- .../search/EditCustomSearchEngineFragment.kt | 21 +++++---- .../org/mozilla/fenix/tabtray/TabTrayView.kt | 2 +- .../main/res/layout/account_preference.xml | 1 + .../layout/amo_collection_override_dialog.xml | 26 ++++++----- .../layout/browser_toolbar_popup_window.xml | 6 ++- app/src/main/res/layout/button_tip_item.xml | 2 +- .../main/res/layout/collections_list_item.xml | 2 +- .../layout/component_collection_creation.xml | 43 ++++++++++--------- ...nt_collection_creation_name_collection.xml | 20 +++++---- ..._collection_creation_select_collection.xml | 22 ++++++---- .../res/layout/download_dialog_layout.xml | 11 ++--- .../res/layout/fragment_crash_reporter.xml | 3 +- app/src/main/res/layout/list_element.xml | 2 +- .../res/layout/name_collection_dialog.xml | 2 + .../layout/onboarding_automatic_signin.xml | 2 +- ...reference_widget_radiobutton_with_info.xml | 7 +-- .../layout/search_widget_extra_small_v1.xml | 10 ++--- .../layout/search_widget_extra_small_v2.xml | 26 +++++------ .../main/res/layout/search_widget_large.xml | 14 +++--- .../main/res/layout/search_widget_medium.xml | 2 +- .../main/res/layout/search_widget_small.xml | 8 ++-- .../res/layout/search_widget_small_no_mic.xml | 22 +++++----- app/src/main/res/layout/tab_header.xml | 2 +- ...cking_protection_learn_more_preference.xml | 2 +- .../res/layout/view_synced_tabs_title.xml | 2 +- app/src/main/res/values/strings.xml | 7 +++ .../fenix/lintrules/ButtonStyleXmlDetector.kt | 5 +-- 34 files changed, 179 insertions(+), 156 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/TabCounter.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/TabCounter.kt index fe015efa0..1585fb7c3 100644 --- a/app/src/main/java/org/mozilla/fenix/components/toolbar/TabCounter.kt +++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/TabCounter.kt @@ -39,7 +39,7 @@ class TabCounter @JvmOverloads constructor( counter_root.contentDescription = if (count == 1) { context?.getString(R.string.open_tab_tray_single) } else { - context?.getString(R.string.open_tab_tray_plural, count.toString()) + String.format(context.getString(R.string.open_tab_tray_plural), count.toString()) } } @@ -191,7 +191,8 @@ class TabCounter @JvmOverloads constructor( ONE_DIGIT_SIZE_RATIO } - val counterBoxWidth = context.resources.getDimensionPixelSize(R.dimen.tab_counter_box_width_height) + val counterBoxWidth = + context.resources.getDimensionPixelSize(R.dimen.tab_counter_box_width_height) val textSize = newRatio * counterBoxWidth counter_text.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize) counter_text.setTypeface(null, Typeface.BOLD) diff --git a/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabToolbarMenu.kt b/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabToolbarMenu.kt index fa3e8a94e..dd9a3baea 100644 --- a/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabToolbarMenu.kt +++ b/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabToolbarMenu.kt @@ -25,6 +25,7 @@ import org.mozilla.fenix.ext.components import org.mozilla.fenix.ext.getStringWithArgSafe import org.mozilla.fenix.ext.settings import org.mozilla.fenix.theme.ThemeManager +import java.util.Locale /** * Builds the toolbar object used with the 3-dot menu in the custom tab browser fragment. @@ -121,7 +122,11 @@ class CustomTabToolbarMenu( BrowserMenuDivider(), menuToolbar ) - if (shouldReverseItems) { menuItems.reversed() } else { menuItems } + if (shouldReverseItems) { + menuItems.reversed() + } else { + menuItems + } } private val desktopMode = BrowserMenuImageSwitch( @@ -161,7 +166,8 @@ class CustomTabToolbarMenu( } private val poweredBy = BrowserMenuCategory( - label = context.getStringWithArgSafe(R.string.browser_menu_powered_by, appName).toUpperCase(), + label = context.getStringWithArgSafe(R.string.browser_menu_powered_by, appName) + .toUpperCase(Locale.getDefault()), textSize = CAPTION_TEXT_SIZE, textColorResource = primaryTextColor(), textStyle = Typeface.NORMAL diff --git a/app/src/main/java/org/mozilla/fenix/settings/DataChoicesFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/DataChoicesFragment.kt index 0579c9b5f..be6f1a274 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/DataChoicesFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/DataChoicesFragment.kt @@ -24,8 +24,7 @@ class DataChoicesFragment : PreferenceFragmentCompat() { super.onCreate(savedInstanceState) val context = requireContext() - preferenceManager.sharedPreferences.registerOnSharedPreferenceChangeListener(this) { - _, key -> + preferenceManager.sharedPreferences.registerOnSharedPreferenceChangeListener(this) { _, key -> if (key == getPreferenceKey(R.string.pref_key_telemetry)) { if (context.settings().isTelemetryEnabled) { context.components.analytics.metrics.start(MetricServiceType.Data) @@ -63,7 +62,10 @@ class DataChoicesFragment : PreferenceFragmentCompat() { isChecked = context.settings().isMarketingTelemetryEnabled val appName = context.getString(R.string.app_name) - summary = context.getString(R.string.preferences_marketing_data_description, appName) + summary = String.format( + context.getString(R.string.preferences_marketing_data_description), + appName + ) onPreferenceChangeListener = SharedPreferenceUpdater() } diff --git a/app/src/main/java/org/mozilla/fenix/settings/RadioButtonInfoPreference.kt b/app/src/main/java/org/mozilla/fenix/settings/RadioButtonInfoPreference.kt index b2389c174..4ee82e670 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/RadioButtonInfoPreference.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/RadioButtonInfoPreference.kt @@ -7,8 +7,6 @@ package org.mozilla.fenix.settings import android.content.Context import android.util.AttributeSet import android.widget.ImageView -import androidx.core.content.res.TypedArrayUtils -import androidx.core.content.withStyledAttributes import androidx.preference.PreferenceViewHolder import org.mozilla.fenix.R @@ -32,29 +30,6 @@ class RadioButtonInfoPreference @JvmOverloads constructor( init { layoutResource = R.layout.preference_widget_radiobutton_with_info - - context.withStyledAttributes( - attrs, - androidx.preference.R.styleable.Preference, - TypedArrayUtils.getAttr( - context, - androidx.preference.R.attr.preferenceStyle, - android.R.attr.preferenceStyle - ), - 0 - ) { - val defaultValue = when { - hasValue(androidx.preference.R.styleable.Preference_defaultValue) -> - getBoolean(androidx.preference.R.styleable.Preference_defaultValue, false) - hasValue(androidx.preference.R.styleable.Preference_android_defaultValue) -> - getBoolean( - androidx.preference.R.styleable.Preference_android_defaultValue, - false - ) - else -> false - } - setDefaultValue(defaultValue) - } } override fun onBindViewHolder(holder: PreferenceViewHolder) { diff --git a/app/src/main/java/org/mozilla/fenix/settings/account/AccountSettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/account/AccountSettingsFragment.kt index 45e73998d..570ec64b4 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/account/AccountSettingsFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/account/AccountSettingsFragment.kt @@ -403,8 +403,8 @@ class AccountSettingsFragment : PreferenceFragmentCompat() { ) } } - is LastSyncTime.Success -> getString( - R.string.sync_last_synced_summary, + is LastSyncTime.Success -> String.format( + getString(R.string.sync_last_synced_summary), DateUtils.getRelativeTimeSpanString(state.lastSyncedDate.lastSync) ) } diff --git a/app/src/main/java/org/mozilla/fenix/settings/account/SignOutFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/account/SignOutFragment.kt index c972737de..2544945f5 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/account/SignOutFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/account/SignOutFragment.kt @@ -50,8 +50,10 @@ class SignOutFragment : BottomSheetDialogFragment() { ): View? { accountManager = requireComponents.backgroundServices.accountManager val view = inflater.inflate(R.layout.fragment_sign_out, container, false) - view.sign_out_message.text = view.context.getString( - R.string.sign_out_confirmation_message_2, + view.sign_out_message.text = String.format( + view.context.getString( + R.string.sign_out_confirmation_message_2 + ), view.context.getString(R.string.app_name) ) return view diff --git a/app/src/main/java/org/mozilla/fenix/settings/search/AddSearchEngineFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/search/AddSearchEngineFragment.kt index d3e4aaa56..fdf1470a4 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/search/AddSearchEngineFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/search/AddSearchEngineFragment.kt @@ -155,8 +155,9 @@ class AddSearchEngineFragment : Fragment(R.layout.fragment_add_search_engine), .map { it.toLowerCase(Locale.ROOT) } if (existingIdentifiers.contains(name.toLowerCase(Locale.ROOT))) { - custom_search_engine_name_field.error = resources - .getString(R.string.search_add_custom_engine_error_existing_name, name) + custom_search_engine_name_field.error = String.format( + resources.getString(R.string.search_add_custom_engine_error_existing_name), name + ) hasError = true } diff --git a/app/src/main/java/org/mozilla/fenix/settings/search/EditCustomSearchEngineFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/search/EditCustomSearchEngineFragment.kt index 92ed2f145..2def180a1 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/search/EditCustomSearchEngineFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/search/EditCustomSearchEngineFragment.kt @@ -85,6 +85,7 @@ class EditCustomSearchEngineFragment : Fragment(R.layout.fragment_add_search_eng } } + @Suppress("LongMethod") private fun saveCustomEngine() { custom_search_engine_name_field.error = "" custom_search_engine_search_string_field.error = "" @@ -108,24 +109,30 @@ class EditCustomSearchEngineFragment : Fragment(R.layout.fragment_add_search_eng val nameHasChanged = name != args.searchEngineIdentifier if (existingIdentifiers.contains(name.toLowerCase(Locale.ROOT)) && nameHasChanged) { - custom_search_engine_name_field.error = resources - .getString(R.string.search_add_custom_engine_error_existing_name, name) + custom_search_engine_name_field.error = String.format( + resources + .getString(R.string.search_add_custom_engine_error_existing_name), name + ) hasError = true } if (searchString.isEmpty()) { custom_search_engine_search_string_field - .error = resources.getString(R.string.search_add_custom_engine_error_empty_search_string) + .error = + resources.getString(R.string.search_add_custom_engine_error_empty_search_string) hasError = true } if (!searchString.contains("%s")) { custom_search_engine_search_string_field - .error = resources.getString(R.string.search_add_custom_engine_error_missing_template) + .error = + resources.getString(R.string.search_add_custom_engine_error_missing_template) hasError = true } - if (hasError) { return } + if (hasError) { + return + } viewLifecycleOwner.lifecycleScope.launch(Main) { val result = withContext(IO) { @@ -166,8 +173,4 @@ class EditCustomSearchEngineFragment : Fragment(R.layout.fragment_add_search_eng } } } - - companion object { - private const val DPS_TO_INCREASE = 20 - } } diff --git a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt index 88d372d99..d3d037d0c 100644 --- a/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt +++ b/app/src/main/java/org/mozilla/fenix/tabtray/TabTrayView.kt @@ -581,7 +581,7 @@ class TabTrayView( view.tab_layout.getTabAt(0)?.contentDescription = if (count == 1) { view.context?.getString(R.string.open_tab_tray_single) } else { - view.context?.getString(R.string.open_tab_tray_plural, count.toString()) + String.format(view.context.getString(R.string.open_tab_tray_plural), count.toString()) } view.tabsTray.accessibilityDelegate = object : View.AccessibilityDelegate() { diff --git a/app/src/main/res/layout/account_preference.xml b/app/src/main/res/layout/account_preference.xml index e2998bee9..23a2bfbac 100644 --- a/app/src/main/res/layout/account_preference.xml +++ b/app/src/main/res/layout/account_preference.xml @@ -13,6 +13,7 @@ + android:id="@+id/linear_layout" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> + android:layout_marginEnd="16dp" + android:autofillHints="false" + android:hint="@string/customize_addon_collection_user_hint" + android:inputType="number" + android:singleLine="true" + android:textColor="?primaryText" /> + android:autofillHints="false" + android:hint="@string/customize_addon_collection_hint" + android:inputType="text" + android:singleLine="true" + android:textColor="?primaryText" /> diff --git a/app/src/main/res/layout/browser_toolbar_popup_window.xml b/app/src/main/res/layout/browser_toolbar_popup_window.xml index c068b404c..a92608402 100644 --- a/app/src/main/res/layout/browser_toolbar_popup_window.xml +++ b/app/src/main/res/layout/browser_toolbar_popup_window.xml @@ -1,4 +1,5 @@ - diff --git a/app/src/main/res/layout/collections_list_item.xml b/app/src/main/res/layout/collections_list_item.xml index 99fb2b038..a42e135ad 100644 --- a/app/src/main/res/layout/collections_list_item.xml +++ b/app/src/main/res/layout/collections_list_item.xml @@ -29,7 +29,7 @@ android:layout_height="wrap_content" android:importantForAccessibility="no" app:srcCompat="@drawable/ic_tab_collection" - android:tint="@null" + app:tint="@null" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/component_collection_creation.xml b/app/src/main/res/layout/component_collection_creation.xml index 88e156ef4..e8fe8a816 100644 --- a/app/src/main/res/layout/component_collection_creation.xml +++ b/app/src/main/res/layout/component_collection_creation.xml @@ -14,53 +14,55 @@ android:id="@+id/back_button" android:layout_width="0dp" android:layout_height="wrap_content" + android:background="?android:attr/selectableItemBackgroundBorderless" + android:drawablePadding="8dp" + android:gravity="start|center_vertical" android:paddingStart="16dp" android:paddingTop="16dp" android:paddingEnd="8dp" android:paddingBottom="16dp" - android:background="?android:attr/selectableItemBackgroundBorderless" - app:drawableStartCompat="@drawable/mozac_ic_back" - android:drawablePadding="8dp" - app:drawableTint="@color/neutral_text" - android:gravity="start|center_vertical" android:text="@string/create_collection_select_tabs" android:textAppearance="@style/HeaderTextStyle" android:textColor="@color/neutral_text" android:textSize="20sp" + app:drawableStartCompat="@drawable/mozac_ic_back" + app:drawableTint="@color/neutral_text" app:layout_constraintEnd_toStartOf="@+id/guideline" app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:layout_constraintWidth_default="wrap"/> + app:layout_constraintWidth_default="wrap" + tools:ignore="ButtonStyleXmlDetector" />