Merge pull request #11 from usefulness/updates

usefulness · Nov 20, 2022 · 8117989 · 8117989
2 parents 41894c9 + 1cd8c2c
commit 8117989
Show file tree

Hide file tree

Showing 22 changed files with 679 additions and 312 deletions.
diff --git a/README.md b/README.md
@@ -53,10 +53,6 @@ a) xml
     app:shimmer_base_alpha="0.3f"
     app:shimmer_highlight_alpha="1f"
     app:shimmer_shape="linear"
-    app:shimmer_fixed_width="0dp"
-    app:shimmer_fixed_height="0dp"
-    app:shimmer_width_ratio="1f"
-    app:shimmer_height_ratio="1f"
     app:shimmer_intensity="0f"
     app:shimmer_dropoff="0.5f"
     app:shimmer_tilt="20f"
@@ -85,10 +81,6 @@ val shimmer = Shimmer(
     baseAlpha = 0.3f,
     highlightAlpha = 1f,
     shape = Shimmer.Shape.Linear,
-    fixedWidth = 0f,
-    fixedHeight = 0f,
-    widthRatio = 1f,
-    heightRatio = 1f,
     intensity = 0f,
     dropoff = 0.5f,
     tilt = 20f,

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -15,6 +15,11 @@ google-androidtestext = "1.1.4"
 google-espresso = "3.5.0"
 google-appcompat = "1.5.1"
 google-constraintLayout = "2.1.4"
+google-material = "1.7.0"
+google-lifecycle = "2.5.1"
+google-activity = "1.6.1"
+google-fragment = "1.5.4"
+maven-leakcanary = "2.10"
 
 [libraries]
 agp-gradle = { module = "com.android.tools.build:gradle", version.ref = "google-agp" }
@@ -24,15 +29,20 @@ junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "mav
 junit-vintage = { module = "org.junit.vintage:junit-vintage-engine", version.ref = "maven-junit" }
 
 assertj-core = { module = "org.assertj:assertj-core", version.ref = "maven-assertj" }
-androidx-core = { module = "androidx.core:core", version.ref = "google-androidx-core" }
+androidx-core = { module = "androidx.core:core-ktx", version.ref = "google-androidx-core" }
 androidx-annotation = { module = "androidx.annotation:annotation", version.ref = "google-androidx-annotation" }
+androidx-lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "google-lifecycle" }
+androidx-activity-core = { module = "androidx.activity:activity-ktx", version.ref = "google-activity" }
+androidx-fragment-core = { module = "androidx.fragment:fragment-ktx", version.ref = "google-fragment" }
 androidtest-core = { module = "androidx.test:core-ktx", version.ref = "google-androidtest" }
 androidtest-runner = { module = "androidx.test:runner", version.ref = "google-androidtestRunner" }
 androidtest-rules = { module = "androidx.test:rules", version.ref = "google-androidtest" }
 androidtest-junitext = { module = "androidx.test.ext:junit-ktx", version.ref = "google-androidtestext" }
 espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "google-espresso" }
 appcompat-core = { module = "androidx.appcompat:appcompat", version.ref = "google-appcompat" }
 constraintlayout-core = { module = "androidx.constraintlayout:constraintlayout", version.ref = "google-constraintLayout" }
+material-core = { module = "com.google.android.material:material", version.ref = "google-material" }
+leakcanary-android = { module = "com.squareup.leakcanary:leakcanary-android", version.ref = "maven-leakcanary" }
 
 [plugins]
 jmailen-kotlinter = { id = "org.jmailen.kotlinter", version.ref = "gradle-kotlinter" }

diff --git a/sample/app/build.gradle b/sample/app/build.gradle
@@ -13,6 +13,27 @@ android {
   buildFeatures {
     viewBinding = true
   }
+  signingConfigs {
+    named("debug") {
+      storeFile rootProject.file("keys/debug.keystore")
+      storePassword 'android'
+      keyAlias 'androiddebugkey'
+      keyPassword 'android'
+    }
+  }
+  buildTypes {
+    named("debug") {
+      signingConfig signingConfigs.getByName("debug")
+    }
+    named("release") {
+      signingConfig signingConfigs.getByName("debug")
+    }
+  }
+
+  lint {
+    disable("SetTextI18n")
+    disable("HardcodedText")
+  }
 }
 
 screenshots {
@@ -23,6 +44,13 @@ dependencies {
   implementation("io.github.usefulness:shimmer-android-core")
   implementation(libs.appcompat.core)
   implementation(libs.constraintlayout.core)
+  implementation(libs.material.core)
+  implementation(libs.androidx.core)
+  implementation(libs.androidx.lifecycle.viewmodel)
+  implementation(libs.androidx.activity.core)
+  implementation(libs.androidx.fragment.core)
+  debugImplementation(libs.leakcanary.android)
+
 
   testImplementation(libs.junit.jupiter)