From 6eeb78a3af37aa483b13df6f9e0d10972d18eb56 Mon Sep 17 00:00:00 2001 From: foxrayalpha <33701127+tanoDxyz@users.noreply.github.com> Date: Sat, 3 Feb 2024 14:04:34 +0500 Subject: [PATCH 1/3] Update the information in the AboutFragment related to the dependencies used in the app. --- .../com/fsck/k9/ui/settings/AboutFragment.kt | 46 ++++++++++++++----- 1 file changed, 35 insertions(+), 11 deletions(-) diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/AboutFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/AboutFragment.kt index aaa11782d..b9f2831cb 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/AboutFragment.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/AboutFragment.kt @@ -95,10 +95,26 @@ class AboutFragment : Fragment() { "Apache License, Version 2.0", ), Library( - "AndroidX Preference eXtended", + "AndroidX Preference extended", "https://github.com/takisoft/preferencex-android", "Apache License, Version 2.0", ), + Library( + "KotlinX Coroutines", + "https://github.com/Kotlin/kotlinx.coroutines", + "Apache License, Version 2.0", + ), + Library( + "Kotlin Standard Library", + "https://kotlinlang.org/api/latest/jvm/stdlib/", + "Apache License, Version 2.0", + ), + Library("KotlinX Immutable Collections", + "https://github.com/Kotlin/kotlinx.collections.immutable", + "Apache License, Version 2.0" + ), + Library("KotlinX DateTime","https://github.com/Kotlin/kotlinx-datetime","Apache License, Version 2.0"), + Library("Kotlin Android Extensions Runtime","https://kotlinlang.org/","Apache License, Version 2.0"), Library("AppAuth for Android", "https://github.com/openid/AppAuth-Android", "Apache License, Version 2.0"), Library("CircleImageView", "https://github.com/hdodenhof/CircleImageView", "Apache License, Version 2.0"), Library("ckChangeLog", "https://github.com/cketti/ckChangeLog", "Apache License, Version 2.0"), @@ -109,16 +125,6 @@ class AboutFragment : Fragment() { Library("jutf7", "http://jutf7.sourceforge.net/", "MIT License"), Library("JZlib", "http://www.jcraft.com/jzlib/", "BSD-style License"), Library("Koin", "https://insert-koin.io/", "Apache License, Version 2.0"), - Library( - "Kotlin Standard Library", - "https://kotlinlang.org/api/latest/jvm/stdlib/", - "Apache License, Version 2.0", - ), - Library( - "KotlinX coroutines", - "https://github.com/Kotlin/kotlinx.coroutines", - "Apache License, Version 2.0", - ), Library( "Material Components for Android", "https://github.com/material-components/material-components-android", @@ -142,6 +148,24 @@ class AboutFragment : Fragment() { "https://github.com/splitwise/TokenAutoComplete/", "Apache License, Version 2.0", ), + Library("accompanist","https://github.com/google/accompanist","Apache License, Version 2.0"), + Library("FlexboxLayout","https://github.com/google/flexbox-layout","Apache License, Version 2.0"), + Library("Error Prone","https://github.com/google/error-prone","Apache License, Version 2.0"), + Library("ListenableFuture", + "https://mvnrepository.com/artifact/com.google.guava/listenablefuture/1.0", + "Apache License, Version 2.0" + ), + Library("ColorPicker","https://github.com/gregkorossy/ColorPicker","Apache License, Version 2.0"), + Library("DateTimePicker","https://github.com/gregkorossy/DateTimePicker","Apache License, Version 2.0"), + Library("jcip-annotations","https://jcip.net/","Public License"), + Library("Http Components","https://hc.apache.org/","Apache License, Version 2.0"), + Library("Compose Runtime", + "https://mvnrepository.com/artifact/org.jetbrains.compose.runtime/runtime", + "Apache License, Version 2.0" + ), + Library("SLF4J","https://www.slf4j.org/","MIT License"), + Library("java-annotations","https://github.com/JetBrains/java-annotations","Apache License, Version 2.0"), + Library("Parcelize Runtime","https://kotlinlang.org/","Apache License, Version 2.0") ) } } From b1ae29ab342dcf51c62e0fadb2c493a180863b66 Mon Sep 17 00:00:00 2001 From: foxrayalpha <33701127+tanoDxyz@users.noreply.github.com> Date: Tue, 6 Feb 2024 20:23:38 +0500 Subject: [PATCH 2/3] applied spotless plugin. --- .../com/fsck/k9/ui/settings/AboutFragment.kt | 39 ++++++++++--------- 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/AboutFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/AboutFragment.kt index b9f2831cb..7d5444d61 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/AboutFragment.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/AboutFragment.kt @@ -109,12 +109,13 @@ class AboutFragment : Fragment() { "https://kotlinlang.org/api/latest/jvm/stdlib/", "Apache License, Version 2.0", ), - Library("KotlinX Immutable Collections", + Library( + "KotlinX Immutable Collections", "https://github.com/Kotlin/kotlinx.collections.immutable", - "Apache License, Version 2.0" + "Apache License, Version 2.0", ), - Library("KotlinX DateTime","https://github.com/Kotlin/kotlinx-datetime","Apache License, Version 2.0"), - Library("Kotlin Android Extensions Runtime","https://kotlinlang.org/","Apache License, Version 2.0"), + Library("KotlinX DateTime", "https://github.com/Kotlin/kotlinx-datetime", "Apache License, Version 2.0"), + Library("Kotlin Android Extensions Runtime", "https://kotlinlang.org/", "Apache License, Version 2.0"), Library("AppAuth for Android", "https://github.com/openid/AppAuth-Android", "Apache License, Version 2.0"), Library("CircleImageView", "https://github.com/hdodenhof/CircleImageView", "Apache License, Version 2.0"), Library("ckChangeLog", "https://github.com/cketti/ckChangeLog", "Apache License, Version 2.0"), @@ -148,24 +149,26 @@ class AboutFragment : Fragment() { "https://github.com/splitwise/TokenAutoComplete/", "Apache License, Version 2.0", ), - Library("accompanist","https://github.com/google/accompanist","Apache License, Version 2.0"), - Library("FlexboxLayout","https://github.com/google/flexbox-layout","Apache License, Version 2.0"), - Library("Error Prone","https://github.com/google/error-prone","Apache License, Version 2.0"), - Library("ListenableFuture", + Library("accompanist", "https://github.com/google/accompanist", "Apache License, Version 2.0"), + Library("FlexboxLayout", "https://github.com/google/flexbox-layout", "Apache License, Version 2.0"), + Library("Error Prone", "https://github.com/google/error-prone", "Apache License, Version 2.0"), + Library( + "ListenableFuture", "https://mvnrepository.com/artifact/com.google.guava/listenablefuture/1.0", - "Apache License, Version 2.0" + "Apache License, Version 2.0", ), - Library("ColorPicker","https://github.com/gregkorossy/ColorPicker","Apache License, Version 2.0"), - Library("DateTimePicker","https://github.com/gregkorossy/DateTimePicker","Apache License, Version 2.0"), - Library("jcip-annotations","https://jcip.net/","Public License"), - Library("Http Components","https://hc.apache.org/","Apache License, Version 2.0"), - Library("Compose Runtime", + Library("ColorPicker", "https://github.com/gregkorossy/ColorPicker", "Apache License, Version 2.0"), + Library("DateTimePicker", "https://github.com/gregkorossy/DateTimePicker", "Apache License, Version 2.0"), + Library("jcip-annotations", "https://jcip.net/", "Public License"), + Library("Http Components", "https://hc.apache.org/", "Apache License, Version 2.0"), + Library( + "Compose Runtime", "https://mvnrepository.com/artifact/org.jetbrains.compose.runtime/runtime", - "Apache License, Version 2.0" + "Apache License, Version 2.0", ), - Library("SLF4J","https://www.slf4j.org/","MIT License"), - Library("java-annotations","https://github.com/JetBrains/java-annotations","Apache License, Version 2.0"), - Library("Parcelize Runtime","https://kotlinlang.org/","Apache License, Version 2.0") + Library("SLF4J", "https://www.slf4j.org/", "MIT License"), + Library("java-annotations", "https://github.com/JetBrains/java-annotations", "Apache License, Version 2.0"), + Library("Parcelize Runtime", "https://kotlinlang.org/", "Apache License, Version 2.0"), ) } } From 0dfa2889e7ab6dd76a43ffb8598ce04d723c07f5 Mon Sep 17 00:00:00 2001 From: foxrayalpha <33701127+tanoDxyz@users.noreply.github.com> Date: Tue, 6 Feb 2024 23:46:30 +0500 Subject: [PATCH 3/3] Updated per Reviewer Comments. --- .../com/fsck/k9/ui/settings/AboutFragment.kt | 70 +++++++++++-------- 1 file changed, 39 insertions(+), 31 deletions(-) diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/AboutFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/AboutFragment.kt index 7d5444d61..cbc7c8af2 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/AboutFragment.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/AboutFragment.kt @@ -99,6 +99,34 @@ class AboutFragment : Fragment() { "https://github.com/takisoft/preferencex-android", "Apache License, Version 2.0", ), + Library("AppAuth for Android", "https://github.com/openid/AppAuth-Android", "Apache License, Version 2.0"), + Library("Accompanist", "https://github.com/google/accompanist", "Apache License, Version 2.0"), + Library("Apache HttpComponents", "https://hc.apache.org/", "Apache License, Version 2.0"), + Library("CircleImageView", "https://github.com/hdodenhof/CircleImageView", "Apache License, Version 2.0"), + Library("ckChangeLog", "https://github.com/cketti/ckChangeLog", "Apache License, Version 2.0"), + Library("Commons IO", "https://commons.apache.org/io/", "Apache License, Version 2.0"), + Library("ColorPicker", "https://github.com/gregkorossy/ColorPicker", "Apache License, Version 2.0"), + Library("DateTimePicker", "https://github.com/gregkorossy/DateTimePicker", "Apache License, Version 2.0"), + Library("Error Prone annotations", "https://github.com/google/error-prone", "Apache License, Version 2.0"), + Library("FlexboxLayout", "https://github.com/google/flexbox-layout", "Apache License, Version 2.0"), + Library("FastAdapter", "https://github.com/mikepenz/FastAdapter", "Apache License, Version 2.0"), + Library("Glide", "https://github.com/bumptech/glide", "BSD, part MIT and Apache 2.0"), + Library("jsoup", "https://jsoup.org/", "MIT License"), + Library("jutf7", "http://jutf7.sourceforge.net/", "MIT License"), + Library("JZlib", "http://www.jcraft.com/jzlib/", "BSD-style License"), + Library("jcip-annotations", "https://jcip.net/", "Public License"), + Library( + "Jetbrains Annotations for JVM-based languages", + "https://github.com/JetBrains/java-annotations", + "Apache License, Version 2.0", + ), + Library( + "Jetbrains Compose Runtime", + "https://github.com/JetBrains/compose-multiplatform-core", + "Apache License, Version 2.0", + ), + Library("Koin", "https://insert-koin.io/", "Apache License, Version 2.0"), + Library("Kotlin Parcelize Runtime", "https://github.com/JetBrains/kotlin", "Apache License, Version 2.0"), Library( "KotlinX Coroutines", "https://github.com/Kotlin/kotlinx.coroutines", @@ -115,17 +143,16 @@ class AboutFragment : Fragment() { "Apache License, Version 2.0", ), Library("KotlinX DateTime", "https://github.com/Kotlin/kotlinx-datetime", "Apache License, Version 2.0"), - Library("Kotlin Android Extensions Runtime", "https://kotlinlang.org/", "Apache License, Version 2.0"), - Library("AppAuth for Android", "https://github.com/openid/AppAuth-Android", "Apache License, Version 2.0"), - Library("CircleImageView", "https://github.com/hdodenhof/CircleImageView", "Apache License, Version 2.0"), - Library("ckChangeLog", "https://github.com/cketti/ckChangeLog", "Apache License, Version 2.0"), - Library("Commons IO", "https://commons.apache.org/io/", "Apache License, Version 2.0"), - Library("FastAdapter", "https://github.com/mikepenz/FastAdapter", "Apache License, Version 2.0"), - Library("Glide", "https://github.com/bumptech/glide", "BSD, part MIT and Apache 2.0"), - Library("jsoup", "https://jsoup.org/", "MIT License"), - Library("jutf7", "http://jutf7.sourceforge.net/", "MIT License"), - Library("JZlib", "http://www.jcraft.com/jzlib/", "BSD-style License"), - Library("Koin", "https://insert-koin.io/", "Apache License, Version 2.0"), + Library( + "Kotlin Android Extensions Runtime", + "https://github.com/JetBrains/kotlin/tree/master/plugins/android-extensions/android-extensions-runtime", + "Apache License, Version 2.0", + ), + Library( + "ListenableFuture", + "https://github.com/google/guava", + "Apache License, Version 2.0", + ), Library( "Material Components for Android", "https://github.com/material-components/material-components-android", @@ -143,32 +170,13 @@ class AboutFragment : Fragment() { "Apache License, Version 2.0", ), Library("SearchPreference", "https://github.com/ByteHamster/SearchPreference", "MIT License"), + Library("SLF4J", "https://www.slf4j.org/", "MIT License"), Library("Timber", "https://github.com/JakeWharton/timber", "Apache License, Version 2.0"), Library( "TokenAutoComplete", "https://github.com/splitwise/TokenAutoComplete/", "Apache License, Version 2.0", ), - Library("accompanist", "https://github.com/google/accompanist", "Apache License, Version 2.0"), - Library("FlexboxLayout", "https://github.com/google/flexbox-layout", "Apache License, Version 2.0"), - Library("Error Prone", "https://github.com/google/error-prone", "Apache License, Version 2.0"), - Library( - "ListenableFuture", - "https://mvnrepository.com/artifact/com.google.guava/listenablefuture/1.0", - "Apache License, Version 2.0", - ), - Library("ColorPicker", "https://github.com/gregkorossy/ColorPicker", "Apache License, Version 2.0"), - Library("DateTimePicker", "https://github.com/gregkorossy/DateTimePicker", "Apache License, Version 2.0"), - Library("jcip-annotations", "https://jcip.net/", "Public License"), - Library("Http Components", "https://hc.apache.org/", "Apache License, Version 2.0"), - Library( - "Compose Runtime", - "https://mvnrepository.com/artifact/org.jetbrains.compose.runtime/runtime", - "Apache License, Version 2.0", - ), - Library("SLF4J", "https://www.slf4j.org/", "MIT License"), - Library("java-annotations", "https://github.com/JetBrains/java-annotations", "Apache License, Version 2.0"), - Library("Parcelize Runtime", "https://kotlinlang.org/", "Apache License, Version 2.0"), ) } }