Skip to content

Commit

Permalink
Merge pull request #706 from Automattic/fix/wpandroid-lint-errors
Browse files Browse the repository at this point in the history
Address WPAndroid ClickableViewAccessibility lint errors
  • Loading branch information
malinajirka authored Jun 25, 2021
2 parents 4a51527 + 7012566 commit f110ad8
Show file tree
Hide file tree
Showing 3 changed files with 83 additions and 0 deletions.
75 changes: 75 additions & 0 deletions lint.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,81 @@
<?xml version="1.0" encoding="UTF-8"?>
<lint>
<!-- INFO -->
<issue id="IconMissingDensityFolder" severity="info" />

<!-- WARNING -->
<issue id="RtlSymmetry" severity="warning" />
<issue id="UseSparseArrays" severity="warning" />

<!-- ERROR -->
<issue id="SimpleDateFormat" severity="error" />
<issue id="RtlCompat" severity="error" />
<issue id="DefaultLocale" severity="error" />
<issue id="RtlHardcoded" severity="error" />
<issue id="InconsistentArrays" severity="error" />
<issue id="HardcodedText" severity="error" />
<issue id="IconDuplicates" severity="error" />
<issue id="IconDipSize" severity="error" />
<issue id="InconsistentArrays" severity="error" />
<issue id="StringFormatCount" severity="error" />
<issue id="ScrollViewSize" severity="error" />
<issue id="ApplySharedPref" severity="error" />
<issue id="CustomViewStyleable" severity="error" />
<issue id="DuplicateIncludedIds" severity="error" />
<issue id="InconsistentLayout" severity="error" />
<issue id="InlinedApi" severity="error" />
<issue id="InconsistentLayout" severity="error" />
<issue id="InlinedApi" severity="error" />
<issue id="UnknownIdInLayout" severity="error" />
<issue id="GradleOverrides" severity="error" />
<issue id="ExtraText" severity="error" />
<issue id="SpUsage" severity="error" />
<issue id="SwitchIntDef" severity="error" />
<issue id="Typos" severity="error" />
<issue id="AddJavascriptInterface" severity="error" />
<issue id="DrawAllocation" severity="error" />
<issue id="Recycle" severity="error" />
<issue id="ObsoleteLayoutParam" severity="error" />
<issue id="ObsoleteSdkInt" severity="error" />
<issue id="ViewHolder" severity="error" />
<issue id="DuplicateDivider" severity="error" />
<issue id="InefficientWeight" severity="error" />
<issue id="UnusedResources" severity="error" />
<issue id="UselessParent" severity="error" />
<issue id="UnusedNamespace" severity="error" />
<issue id="TypographyDashes" severity="error" />
<issue id="TypographyEllipsis" severity="error" />
<issue id="IconLocation" severity="error" />
<issue id="TextFields" severity="error" />
<issue id="SmallSp" severity="error" />
<issue id="StaticFieldLeak" severity="error" />
<issue id="SetTextI18n" severity="error" />
<issue id="RelativeOverlap" severity="error" />
<issue id="PrivateResource" severity="error" />
<issue id="StaticFieldLeak" severity="error" />
<issue id="ContentDescription" severity="error" />
<issue id="ClickableViewAccessibility" severity="error" />
<issue id="KeyboardInaccessibleWidget" severity="error" />
<issue id="UnusedAttribute" severity="error" />
<issue id="UnusedAttribute" severity="error" />
<issue id="IconXmlAndPng" severity="error" />
<issue id="RtlSymmetry" severity="error" />
<issue id="ExportedReceiver" severity="error" />
<issue id="ExportedService" severity="error" />

<!-- IGNORE -->
<issue id="MissingTranslation" severity="ignore" />
<issue id="ExtraTranslation" severity="ignore" />
<issue id="PluralsCandidate" severity="ignore" /> <!-- GlotPress doesn't support plurals -->
<issue id="LabelFor" severity="ignore" /> <!-- Severity should be increased to error when minSdk >= 17 -->
<issue id="OldTargetApi" severity="ignore" /> <!-- We are aware of down sides of having an old targetApi -->
<issue id="UseAppTint" severity="ignore" /> <!-- android:tint attribute had a problem on API<=21, but our minSdk is 21, ignore -->
<issue id="InvalidPackage">
<ignore path="**/sentry*.jar"/>
</issue>

<issue id="UnusedResources" severity="error">
<ignore path="**/.gradle/caches/**" />
<ignore path="**/generated/**" />
</issue>
</lint>
4 changes: 4 additions & 0 deletions stories/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}

lintOptions{
lintConfig file("${project.rootDir}/lint.xml")
}
}

dependencies {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -951,6 +951,7 @@ abstract class ComposeLoopFrameActivity : AppCompatActivity(), OnStoryFrameSelec
onStoryFrameSelected(-1, storyFrameIndex)
}

@SuppressLint("ClickableViewAccessibility")
private fun addClickListeners() {
contentComposerBinding.run {
cameraCaptureButton
Expand Down Expand Up @@ -1281,6 +1282,7 @@ abstract class ComposeLoopFrameActivity : AppCompatActivity(), OnStoryFrameSelec
storyViewModel.setSelectedFrameByUser(storyViewModel.getSelectedFrameIndex())
}

@SuppressLint("ClickableViewAccessibility")
private fun addCurrentViewsToFrameAtIndex(index: Int) {
// first, remember the currently added views
val currentStoryFrameItem = storyViewModel.getCurrentStoryFrameAt(index)
Expand Down Expand Up @@ -1916,6 +1918,7 @@ abstract class ComposeLoopFrameActivity : AppCompatActivity(), OnStoryFrameSelec
)
}

@SuppressLint("ClickableViewAccessibility")
private fun blockTouchOnPhotoEditor(touchBlockMode: ScreenTouchBlockMode, message: String? = null) {
contentComposerBinding.run {
when (touchBlockMode) {
Expand Down Expand Up @@ -1974,6 +1977,7 @@ abstract class ComposeLoopFrameActivity : AppCompatActivity(), OnStoryFrameSelec
}
}

@SuppressLint("ClickableViewAccessibility")
private fun releaseTouchOnPhotoEditor(touchBlockMode: ScreenTouchBlockMode) {
contentComposerBinding.run {
when (touchBlockMode) {
Expand Down

0 comments on commit f110ad8

Please sign in to comment.