Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 13 additions & 13 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ android {
'proguard-square.pro',
'proguard-support.pro',
'proguard-rx.pro'
resConfigs 'en', 'zh-rCN', 'es'
resourceConfigurations += ['en', 'zh-rCN', 'es']
}

buildTypes {
Expand All @@ -31,24 +31,24 @@ android {
shrinkResources true
}
}
lintOptions {
htmlReport false
xmlReport false
textReport true
lintConfig file("${rootProject.getRootDir()}/lint.xml")
abortOnError true
explainIssues false
absolutePaths false
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
sourceCompatibility JavaVersion.VERSION_21
targetCompatibility JavaVersion.VERSION_21
}
kotlin {
jvmToolchain(11)
jvmToolchain(21)
}
namespace 'io.github.hidroh.materialistic'
lint {
abortOnError true
absolutePaths false
explainIssues false
htmlReport false
lintConfig file("${rootProject.getRootDir()}/lint.xml")
textReport true
xmlReport false
}

}

Expand Down
12 changes: 6 additions & 6 deletions app/src/main/java/io/github/hidroh/materialistic/AppUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -520,13 +520,13 @@ public static LayoutInflater createLayoutInflater(Context context) {
public static void share(Context context, String subject, String text) {
Intent intent = new Intent(Intent.ACTION_SEND)
.setType("text/plain")
.putExtra(Intent.EXTRA_SUBJECT, subject)
.putExtra(Intent.EXTRA_TEXT, !TextUtils.isEmpty(subject) ?
TextUtils.join(" - ", new String[]{subject, text}) : text);
if (intent.resolveActivity(context.getPackageManager()) != null) {
context.startActivity(intent);
}
.putExtra(Intent.EXTRA_TEXT, text)
.putExtra(Intent.EXTRA_TITLE, subject);

Intent shareIntent = Intent.createChooser(intent, null);
context.startActivity(shareIntent);
}

public static Uri createItemUri(@NonNull String itemId) {
return new Uri.Builder()
.scheme(BuildConfig.APPLICATION_ID)
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
buildscript {
ext.kotlin_version = '1.8.20'
ext.kotlin_version = '1.9.25'

repositories {
mavenCentral()
google()
}

dependencies {
classpath 'com.android.tools.build:gradle:7.4.2'
classpath 'com.android.tools.build:gradle:8.8.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
Expand Down
3 changes: 3 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,6 @@ org.gradle.daemon=true
android.useAndroidX=true
kapt.include.compile.classpath=false
kapt.incremental.apt=true
android.defaults.buildfeatures.buildconfig=true
android.nonTransitiveRClass=false
android.nonFinalResIds=false
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
41 changes: 28 additions & 13 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 9 additions & 6 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.