Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix some IDE reported issues #17405

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
+15 −10
Open

Fix some IDE reported issues #17405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
11a5b1c
Cleaned the Warning in the code:
MritunjayTiwari14 Nov 9, 2024
f3d32c1
Merge branch 'main' of https://github.com/ankidroid/Anki-Android
MritunjayTiwari14 Nov 9, 2024
e1ef4f3
Resolved the Issues
MritunjayTiwari14 Nov 20, 2024
0bfbf11
Updated The Issues
MritunjayTiwari14 Nov 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<p align="center">
<img alt="" src="docs/graphics/logos/banner_readme.png"/>
<p style="text-align: center;">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove the obsolete align attribute. Also revert the spacing change on the inner img tag.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Request above still active.

<img src="docs/graphics/logos/banner_readme.png" alt="">
</p>

<a href="https://github.com/ankidroid/Anki-Android/releases"><img src="https://img.shields.io/github/v/release/ankidroid/Anki-Android" alt="release"/></a>
Expand Down Expand Up @@ -41,15 +41,18 @@ Install
<div style="display:flex;">

<a href="https://play.google.com/store/apps/details?id=com.ichi2.anki&utm_source=global_co&utm_medium=prtnr&utm_content=Mar2515&utm_campaign=PartBadge&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1">
<img alt="Get it on Google Play" height="80"
<!--suppress CheckImageSize -->
<img alt="Get it on Google Play" height="80"
src="docs/graphics/logos/google-badge.png" /></a>

<a href="https://f-droid.org/repository/browse/?fdid=com.ichi2.anki">
<img alt="Get it on F-Droid" height="80"
<!--suppress CheckImageSize -->
<img alt="Get it on F-Droid" height=80
src="docs/graphics/logos/f-droid-badge.png"></a>

<a href="http://www.amazon.com/gp/product/B004L1G7T2/ref=mas_pm_ankidroid_flashcards">
<img alt="Get it on Amazon app store" height="80"
<!--suppress CheckImageSize -->
<img alt="Get it on Amazon app store" height="80"
src="docs/graphics/logos/amazon-badge.png"/></a>

</div>
Expand Down
12 changes: 7 additions & 5 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat
import org.gradle.internal.jvm.Jvm
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import java.io.ByteArrayOutputStream
import java.util.Properties
import kotlin.math.max
import kotlin.system.exitProcess

// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
Expand All @@ -20,11 +22,11 @@ plugins {
alias(libs.plugins.keeper) apply false
}

val localProperties = java.util.Properties()
val localProperties = Properties()
if (project.rootProject.file("local.properties").exists()) {
localProperties.load(project.rootProject.file("local.properties").inputStream())
}
val fatalWarnings = !(localProperties["fatal_warnings"] == "false")
val fatalWarnings = localProperties["fatal_warnings"] != "false"

// Here we extract per-module "best practices" settings to a single top-level evaluation
subprojects {
Expand Down Expand Up @@ -99,19 +101,19 @@ if (jvmVersion != "17" && jvmVersion != "21") {
println("**************************************************************************************************************")
println("\n\n\n")
println("ERROR: AnkiDroid builds with JVM version 17 or 21.")
println(" Incompatible major version detected: '" + jvmVersion + "'")
println(" Incompatible major version detected: '$jvmVersion'")
println("\n\n\n")
println(" If you receive this error because you want to use a newer JDK, we may accept PRs to support new versions.")
println(" Edit the main build.gradle file, find this message in the file, and add support for the new version.")
println(" Please make sure the `jacocoTestReport` target works on an emulator with our minSdkVersion (currently 23).")
println("\n\n\n")
println("**************************************************************************************************************")
println("\n\n\n")
System.exit(1)
exitProcess(1)
}

val ciBuild by extra(System.getenv("CI") == "true") // works for Travis CI or Github Actions
// allows for -Dpre-dex=false to be set
// allows for -Dare-dex=false to be set
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Revert this, it changes the meaning of the comment.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay Sir

val preDexEnabled by extra("true" == System.getProperty("pre-dex", "true"))
// allows for universal APKs to be generated
val universalApkEnabled by extra("true" == System.getProperty("universal-apk", "false"))
Expand Down