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.

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

Updated code and added ImageView for icons #66

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
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
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:7.0.0'
classpath 'org.jetbrains.dokka:dokka-gradle-plugin:1.5.0'
classpath 'com.vanniktech:gradle-maven-publish-plugin:0.17.0'
classpath 'com.android.tools.build:gradle:8.3.1'
classpath 'org.jetbrains.dokka:dokka-gradle-plugin:1.9.20'
classpath 'com.vanniktech:gradle-maven-publish-plugin:0.28.0'
}
}

Expand Down
47 changes: 24 additions & 23 deletions demo/build.gradle
Original file line number Diff line number Diff line change
@@ -1,33 +1,34 @@
plugins {
id 'com.android.application'
id 'com.android.application'
}

android {
compileSdk 30
compileSdk 34

defaultConfig {
applicationId "io.github.muddz.styleabletoast.demo"
minSdk 16
targetSdk 30
versionCode 1
versionName "1.0"
}
namespace "io.github.muddz.styleabletoast.demo"
defaultConfig {
applicationId "io.github.muddz.styleabletoast.demo"
minSdk 16
targetSdk 34
versionCode 1
versionName "1.0"
}

buildFeatures {
dataBinding true
}
buildFeatures {
dataBinding true
}

buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
}

dependencies {
implementation 'androidx.appcompat:appcompat:1.3.1'
implementation 'com.google.android.material:material:1.4.0'
implementation 'io.github.muddz:styleabletoast:2.4.0'
// implementation project(':styleabletoast')
}
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'com.google.android.material:material:1.11.0'
// implementation 'io.github.muddz:styleabletoast:2.4.0'
implementation project(':styleabletoast')
}
37 changes: 19 additions & 18 deletions demo/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,22 +1,23 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="io.github.muddz.styleabletoast.demo">
xmlns:tools="http://schemas.android.com/tools"
package="io.github.muddz.styleabletoast.demo">

<application
android:allowBackup="true"
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@style/AppTheme"
tools:ignore="AllowBackup,GoogleAppIndexingWarning,MissingApplicationIcon">
<application
android:allowBackup="true"
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@style/AppTheme"
tools:ignore="AllowBackup,GoogleAppIndexingWarning,MissingApplicationIcon">

<activity
android:name="io.github.muddz.styleabletoast.demo.MainActivity"
android:screenOrientation="portrait">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name="io.github.muddz.styleabletoast.demo.MainActivity"
android:exported="true"
android:screenOrientation="portrait">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>

</application>
</manifest>
</application>
</manifest>
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStoreBase=GRADLE_USER_HOME
12 changes: 7 additions & 5 deletions styleabletoast/build.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
plugins {
id 'com.android.library'
id 'com.vanniktech.maven.publish'
id 'maven-publish'
}

android {
compileSdk 30
compileSdk 34

namespace "io.github.muddz.styleabletoast"
defaultConfig {
minSdk 16
targetSdk 30
targetSdk 34
}

buildTypes {
release {
minifyEnabled false
Expand All @@ -19,5 +21,5 @@ android {
}

dependencies {
implementation 'androidx.appcompat:appcompat:1.3.1'
}
implementation 'androidx.appcompat:appcompat:1.6.1'
}
Loading