diff options
author | ByteHamster <ByteHamster@users.noreply.github.com> | 2024-04-07 23:28:14 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-07 23:28:14 +0200 |
commit | e578f4ca93f6292f62e4b4c7fa11d17fe0b27c71 (patch) | |
tree | 383ed908c22d51fd789b8db814a4dc17e7d5dfb7 /app | |
parent | fc40da28a7a9146cd1e3c11e5169477ba85399c1 (diff) | |
download | AntennaPod-e578f4ca93f6292f62e4b4c7fa11d17fe0b27c71.zip |
CI tweaks (#7069)
- Run Checkstyle with gradle to make it easier for users
- No longer needs different configuration for new code
- Exclude current violations
- Fix some violations that somehow couldn't be specified in the exclusion file
- Print SpotBugs/Lint/Checkstly violations in GitHub format
- Then the CI run gets annotated on the web UI
Diffstat (limited to 'app')
15 files changed, 187 insertions, 178 deletions
diff --git a/app/build.gradle b/app/build.gradle index 5b4fdf6b4..2abb66ccf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -47,13 +47,11 @@ android { } lint { - disable 'ObsoleteLintCustomCheck', 'CheckResult', 'UnusedAttribute', 'BatteryLife', 'InflateParams', - 'RestrictedApi', 'TrustAllX509TrustManager', 'ExportedReceiver', 'AllowBackup', 'VectorDrawableCompat', - 'StaticFieldLeak', 'UseCompoundDrawables', 'NestedWeights', 'Overdraw', 'UselessParent', 'TextFields', - 'AlwaysShowAction', 'Autofill', 'ClickableViewAccessibility', 'ContentDescription', + disable 'CheckResult', 'MissingMediaBrowserServiceIntentFilter', 'UnusedAttribute', 'InflateParams', + 'RestrictedApi', 'ExportedReceiver', 'NotifyDataSetChanged', 'UseCompoundDrawables', 'NestedWeights', + 'Overdraw', 'UselessParent', 'TextFields', 'AlwaysShowAction', 'Autofill', 'ClickableViewAccessibility', 'KeyboardInaccessibleWidget', 'LabelFor', 'SetTextI18n', 'HardcodedText', 'RelativeOverlap', - 'RtlCompat', 'RtlHardcoded', 'MissingMediaBrowserServiceIntentFilter', 'VectorPath', - 'InvalidPeriodicWorkRequestInterval', 'NotifyDataSetChanged', 'RtlEnabled' + 'RtlHardcoded', 'RtlEnabled', 'ContentDescription' } androidResources { diff --git a/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/GeneratorUtil.java b/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/GeneratorUtil.java index 9aedbb493..d37ef3b07 100644 --- a/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/GeneratorUtil.java +++ b/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/GeneratorUtil.java @@ -7,9 +7,7 @@ import java.io.IOException; /** * Utility methods for FeedGenerator */ -class GeneratorUtil { - private GeneratorUtil(){} - +abstract class GeneratorUtil { public static void addPaymentLink(XmlSerializer xml, String paymentLink, boolean withNamespace) throws IOException { String ns = (withNamespace) ? "http://www.w3.org/2005/Atom" : null; xml.startTag(ns, "link"); diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/preferences/ProxyDialog.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/preferences/ProxyDialog.java index ca4b4b5e5..6086f5cb1 100644 --- a/app/src/main/java/de/danoeh/antennapod/ui/screen/preferences/ProxyDialog.java +++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/preferences/ProxyDialog.java @@ -173,10 +173,12 @@ public class ProxyDialog { private final TextWatcher requireTestOnChange = new TextWatcher() { @Override - public void beforeTextChanged(CharSequence s, int start, int count, int after) {} + public void beforeTextChanged(CharSequence s, int start, int count, int after) { + } @Override - public void onTextChanged(CharSequence s, int start, int before, int count) {} + public void onTextChanged(CharSequence s, int start, int before, int count) { + } @Override public void afterTextChanged(Editable s) { diff --git a/app/src/main/java/de/danoeh/antennapod/ui/view/LockableBottomSheetBehavior.java b/app/src/main/java/de/danoeh/antennapod/ui/view/LockableBottomSheetBehavior.java index aa506aaea..13fcd2715 100644 --- a/app/src/main/java/de/danoeh/antennapod/ui/view/LockableBottomSheetBehavior.java +++ b/app/src/main/java/de/danoeh/antennapod/ui/view/LockableBottomSheetBehavior.java @@ -13,7 +13,8 @@ import com.google.android.material.bottomsheet.ViewPagerBottomSheetBehavior; public class LockableBottomSheetBehavior<V extends View> extends ViewPagerBottomSheetBehavior<V> { private boolean isLocked = false; - public LockableBottomSheetBehavior() {} + public LockableBottomSheetBehavior() { + } public LockableBottomSheetBehavior(Context context, AttributeSet attrs) { super(context, attrs); diff --git a/app/src/main/res/layout/alternate_urls_dropdown_item.xml b/app/src/main/res/layout/alternate_urls_dropdown_item.xml index 82de8a02f..3c4dcc7fc 100644 --- a/app/src/main/res/layout/alternate_urls_dropdown_item.xml +++ b/app/src/main/res/layout/alternate_urls_dropdown_item.xml @@ -2,7 +2,7 @@ <CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/text1" - style="?android:attr/spinnerDropDownItemStyle" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingVertical="8dp" /> + android:paddingVertical="8dp" + style="?android:attr/spinnerDropDownItemStyle" /> diff --git a/app/src/main/res/layout/alternate_urls_item.xml b/app/src/main/res/layout/alternate_urls_item.xml index 9fdb50e33..54e05b49d 100644 --- a/app/src/main/res/layout/alternate_urls_item.xml +++ b/app/src/main/res/layout/alternate_urls_item.xml @@ -2,8 +2,8 @@ <TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/text1" - style="?android:attr/spinnerItemStyle" android:layout_width="match_parent" android:layout_height="wrap_content" android:maxLines="3" - android:textAlignment="inherit" /> + android:textAlignment="inherit" + style="?android:attr/spinnerItemStyle" /> diff --git a/app/src/main/res/layout/bug_report.xml b/app/src/main/res/layout/bug_report.xml index e97e85265..447ce911f 100644 --- a/app/src/main/res/layout/bug_report.xml +++ b/app/src/main/res/layout/bug_report.xml @@ -1,28 +1,30 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:padding="16dp"> +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="16dp"> + <Button - android:id="@+id/btn_open_bug_tracker" - android:text="@string/open_bug_tracker" - android:layout_width="match_parent" - android:layout_height="wrap_content"/> + android:id="@+id/btn_open_bug_tracker" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/open_bug_tracker" /> <Button - android:id="@+id/btn_copy_log" - android:text="@string/copy_to_clipboard" - android:layout_width="match_parent" - android:layout_height="wrap_content"/> + android:id="@+id/btn_copy_log" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/copy_to_clipboard" /> <TextView - android:layout_marginTop="8dp" - android:id="@+id/crash_report_logs" - android:textIsSelectable="true" - android:textSize="12sp" - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="1"/> + android:id="@+id/crash_report_logs" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_marginTop="8dp" + android:textIsSelectable="true" + android:textSize="12sp" + android:layout_weight="1" /> </LinearLayout> diff --git a/app/src/main/res/layout/checkbox_do_not_show_again.xml b/app/src/main/res/layout/checkbox_do_not_show_again.xml index 15f26e8b4..9953f9afc 100644 --- a/app/src/main/res/layout/checkbox_do_not_show_again.xml +++ b/app/src/main/res/layout/checkbox_do_not_show_again.xml @@ -1,17 +1,18 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:paddingLeft="16dp" - android:paddingRight="16dp" - android:paddingTop="8dp" - android:paddingBottom="8dp"> +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:paddingTop="8dp" + android:paddingBottom="8dp"> <CheckBox - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:id="@+id/checkbox_do_not_show_again" - android:text="@string/checkbox_do_not_show_again"/> + android:id="@+id/checkbox_do_not_show_again" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/checkbox_do_not_show_again" /> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/app/src/main/res/layout/edit_text_dialog.xml b/app/src/main/res/layout/edit_text_dialog.xml index b442b92ce..49e2b8fbb 100644 --- a/app/src/main/res/layout/edit_text_dialog.xml +++ b/app/src/main/res/layout/edit_text_dialog.xml @@ -1,15 +1,16 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:padding="16dp"> +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="16dp"> <EditText - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:inputType="text" - android:ems="10" - android:id="@+id/urlEditText" /> + android:id="@+id/urlEditText" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:inputType="text" + android:ems="10" /> </LinearLayout> diff --git a/app/src/main/res/layout/ellipsize_start_listitem.xml b/app/src/main/res/layout/ellipsize_start_listitem.xml index 1b6c48152..fcdf85809 100644 --- a/app/src/main/res/layout/ellipsize_start_listitem.xml +++ b/app/src/main/res/layout/ellipsize_start_listitem.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> - -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" @@ -19,4 +19,4 @@ tools:background="@android:color/holo_green_dark" tools:text="List item title" /> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/app/src/main/res/layout/empty_view_layout.xml b/app/src/main/res/layout/empty_view_layout.xml index c6de8d2d0..e02c5debe 100644 --- a/app/src/main/res/layout/empty_view_layout.xml +++ b/app/src/main/res/layout/empty_view_layout.xml @@ -1,36 +1,37 @@ -<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical"
- android:gravity="center"
- android:layout_centerInParent="true"
- android:paddingLeft="40dp"
- android:paddingRight="40dp"
- xmlns:tools="http://schemas.android.com/tools">
-
- <ImageView
- android:id="@+id/emptyViewIcon"
- android:layout_width="32dp"
- android:layout_height="32dp"
- android:visibility="gone"
- tools:src="@drawable/ic_feed"
- tools:visibility="visible"/>
-
- <TextView
- android:id="@+id/emptyViewTitle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- tools:text="Title"
- android:textSize="16sp"
- android:textColor="?android:attr/textColorPrimary"/>
-
- <TextView
- android:id="@+id/emptyViewMessage"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textSize="14sp"
- tools:text="Message"
- android:textAlignment="center"/>
-
-</LinearLayout>
\ No newline at end of file +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:gravity="center" + android:layout_centerInParent="true" + android:paddingLeft="40dp" + android:paddingRight="40dp"> + + <ImageView + android:id="@+id/emptyViewIcon" + android:layout_width="32dp" + android:layout_height="32dp" + android:visibility="gone" + tools:src="@drawable/ic_feed" + tools:visibility="visible" /> + + <TextView + android:id="@+id/emptyViewTitle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textSize="16sp" + android:textColor="?android:attr/textColorPrimary" + tools:text="Title" /> + + <TextView + android:id="@+id/emptyViewMessage" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textSize="14sp" + android:textAlignment="center" + tools:text="Message" /> + +</LinearLayout> diff --git a/app/src/main/res/layout/feed_pref_skip_dialog.xml b/app/src/main/res/layout/feed_pref_skip_dialog.xml index db76a3426..98c1dabe8 100644 --- a/app/src/main/res/layout/feed_pref_skip_dialog.xml +++ b/app/src/main/res/layout/feed_pref_skip_dialog.xml @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical" > + android:orientation="vertical"> <TextView android:id="@+id/labelSkipIntro" @@ -15,7 +16,7 @@ <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="horizontal" > + android:orientation="horizontal"> <EditText android:id="@+id/etxtSkipIntro" @@ -51,7 +52,7 @@ <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="horizontal" > + android:orientation="horizontal"> <EditText android:id="@+id/etxtSkipEnd" @@ -73,6 +74,7 @@ android:layout_marginLeft="8dp" android:layout_marginRight="24dp" android:text="@string/time_seconds" /> + </LinearLayout> </LinearLayout> diff --git a/app/src/main/res/layout/secondary_action.xml b/app/src/main/res/layout/secondary_action.xml index e5bff480e..1c2bd203a 100644 --- a/app/src/main/res/layout/secondary_action.xml +++ b/app/src/main/res/layout/secondary_action.xml @@ -1,29 +1,31 @@ <?xml version="1.0" encoding="utf-8"?> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - xmlns:app="http://schemas.android.com/apk/res-auto" - android:layout_width="48dp" - android:layout_height="48dp" - android:layout_marginRight="12dp" - android:layout_marginEnd="12dp" - android:id="@+id/secondaryActionButton" - android:background="?selectableItemBackgroundBorderless" - android:clickable="true" - android:focusable="false" - android:focusableInTouchMode="false" > +<FrameLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:id="@+id/secondaryActionButton" + android:layout_width="48dp" + android:layout_height="48dp" + android:layout_marginRight="12dp" + android:layout_marginEnd="12dp" + android:background="?selectableItemBackgroundBorderless" + android:clickable="true" + android:focusable="false" + android:focusableInTouchMode="false"> <ImageView - android:id="@+id/secondaryActionIcon" - android:layout_width="24dp" - android:layout_height="24dp" - android:layout_gravity="center" - tools:ignore="ContentDescription" - tools:src="@sample/secondaryaction"/> + android:id="@+id/secondaryActionIcon" + android:layout_width="24dp" + android:layout_height="24dp" + android:layout_gravity="center" + tools:ignore="ContentDescription" + tools:src="@sample/secondaryaction" /> <de.danoeh.antennapod.ui.common.CircularProgressBar - android:id="@+id/secondaryActionProgress" - android:layout_width="40dp" - android:layout_gravity="center" - android:layout_height="40dp" - app:foregroundColor="?attr/action_icon_color"/> + android:id="@+id/secondaryActionProgress" + android:layout_width="40dp" + android:layout_height="40dp" + android:layout_gravity="center" + app:foregroundColor="?attr/action_icon_color" /> + </FrameLayout> diff --git a/app/src/main/res/layout/simple_list_item_multiple_choice_on_start.xml b/app/src/main/res/layout/simple_list_item_multiple_choice_on_start.xml index f10df5c96..7de6e2541 100644 --- a/app/src/main/res/layout/simple_list_item_multiple_choice_on_start.xml +++ b/app/src/main/res/layout/simple_list_item_multiple_choice_on_start.xml @@ -17,8 +17,8 @@ See the License for the specific language governing permissions and limitations under the License. --> - -<CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android" +<CheckedTextView + xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/text1" android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeightSmall" @@ -31,5 +31,4 @@ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" android:paddingRight="?android:attr/listPreferredItemPaddingRight" android:maxLines="2" - android:ellipsize="end" - /> + android:ellipsize="end" /> diff --git a/app/src/main/res/layout/simplechapter_item.xml b/app/src/main/res/layout/simplechapter_item.xml index 276ce48bc..c85db3c21 100644 --- a/app/src/main/res/layout/simplechapter_item.xml +++ b/app/src/main/res/layout/simplechapter_item.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - android:id="@+id/container" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:gravity="center_vertical" - android:baselineAligned="false" - android:descendantFocusability="blocksDescendants"> + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/container" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:gravity="center_vertical" + android:baselineAligned="false" + android:descendantFocusability="blocksDescendants"> <ImageView android:id="@+id/imgvCover" @@ -17,57 +17,59 @@ android:importantForAccessibility="no" android:layout_marginLeft="16dp" android:layout_marginStart="16dp" - tools:src="@tools:sample/avatars"/> + tools:src="@tools:sample/avatars" /> <LinearLayout - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginBottom="@dimen/listitem_threeline_verticalpadding" - android:layout_marginRight="@dimen/listitem_threeline_textrightpadding" - android:layout_marginEnd="@dimen/listitem_threeline_textrightpadding" - android:layout_marginTop="@dimen/listitem_threeline_verticalpadding" - android:layout_marginLeft="16dp" - android:layout_marginStart="16dp" - android:layout_weight="1" - android:orientation="vertical"> + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginBottom="@dimen/listitem_threeline_verticalpadding" + android:layout_marginRight="@dimen/listitem_threeline_textrightpadding" + android:layout_marginEnd="@dimen/listitem_threeline_textrightpadding" + android:layout_marginTop="@dimen/listitem_threeline_verticalpadding" + android:layout_marginLeft="16dp" + android:layout_marginStart="16dp" + android:layout_weight="1" + android:orientation="vertical"> <TextView - android:id="@+id/txtvStart" - style="@style/AntennaPod.TextView.ListItemSecondaryTitle" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - tools:text="00:00:00"/> + android:id="@+id/txtvStart" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + style="@style/AntennaPod.TextView.ListItemSecondaryTitle" + tools:text="00:00:00" /> <TextView - android:id="@+id/txtvTitle" - style="@style/AntennaPod.TextView.ListItemPrimaryTitle" - android:layout_width="match_parent" - android:layout_height="wrap_content" - tools:text="@sample/episodes.json/data/title" - android:ellipsize="end"/> + android:id="@+id/txtvTitle" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:ellipsize="end" + style="@style/AntennaPod.TextView.ListItemPrimaryTitle" + tools:text="@sample/episodes.json/data/title" /> <TextView - android:id="@+id/txtvLink" - android:layout_width="match_parent" - android:layout_height="wrap_content" - style="@style/AntennaPod.TextView.ListItemSecondaryTitle" - android:focusable="false" - android:focusableInTouchMode="false" - android:visibility="gone" - android:background="?attr/selectableItemBackground" - tools:visibility="visible" - tools:text="https://example.com"/> + android:id="@+id/txtvLink" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:focusable="false" + android:focusableInTouchMode="false" + android:visibility="gone" + android:background="?attr/selectableItemBackground" + style="@style/AntennaPod.TextView.ListItemSecondaryTitle" + tools:visibility="visible" + tools:text="https://example.com" /> <TextView - android:id="@+id/txtvDuration" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - style="@style/AntennaPod.TextView.ListItemSecondaryTitle" - android:focusable="false" - android:focusableInTouchMode="false" - tools:text="Duration: 00:00:00"/> + android:id="@+id/txtvDuration" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:focusable="false" + android:focusableInTouchMode="false" + style="@style/AntennaPod.TextView.ListItemSecondaryTitle" + tools:text="Duration: 00:00:00" /> + </LinearLayout> - <include layout="@layout/secondary_action"/> + <include + layout="@layout/secondary_action" /> </LinearLayout> |