From 77e46d7e2d7d8e03231775a82b43dddb57201130 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Thu, 24 Mar 2022 15:47:23 +0530 Subject: [PATCH 1/4] Add .gitignore --- .gitignore | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5a81439 --- /dev/null +++ b/.gitignore @@ -0,0 +1,54 @@ +## Java +*.class +*.war +*.ear +hs_err_pid* + +## Intellij +out/ +/lib/ +.idea/* +!.idea/runConfigurations* +!.idea/inspectionProfiles* +!.idea/codeStyles* +!.idea/dictionaries* +*.ipr +*.iws +*.iml + +## Eclipse +.classpath +.project +.metadata +**/bin/ +tmp/ +*.tmp +*.bak +*.swp +*~.nib +local.properties +.settings/ +.loadpath +.externalToolBuilders/ +*.launch + +## NetBeans +**/nbproject/private/ +/build/ +/app/build/ +nbbuild/ +dist/ +nbdist/ +nbactions.xml +nb-configuration.xml + +## Gradle +.gradle +keystore.properties +gradle-app.setting + +## OS Specific +.DS_Store + +## Android +gen/ From 8bdd2d4d6e1ef45a0bedbd42f870b68737d3f1d2 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Thu, 24 Mar 2022 15:47:43 +0530 Subject: [PATCH 2/4] Drop Android.bp * In case this ever gets synced to AOSP, let's avoid conflits * AOSP syncs this to external/ --- Android.bp | 64 -------------------------------- lottie_loading_layout/Android.bp | 31 ---------------- 2 files changed, 95 deletions(-) delete mode 100644 Android.bp delete mode 100644 lottie_loading_layout/Android.bp diff --git a/Android.bp b/Android.bp deleted file mode 100644 index 4d416d3..0000000 --- a/Android.bp +++ /dev/null @@ -1,64 +0,0 @@ -// -// Build the setup design library. -// - -package { - default_applicable_licenses: ["external_setupdesign_license"], -} - -// Added automatically by a large-scale-change -// -// large-scale-change included anything that looked like it might be a license -// text as a license_text. e.g. LICENSE, NOTICE, COPYING etc. -// -// Please consider removing redundant or irrelevant files from 'license_text:'. -// See: http://go/android-license-faq -license { - name: "external_setupdesign_license", - visibility: [":__subpackages__"], - license_kinds: [ - "SPDX-license-identifier-Apache-2.0", - ], - license_text: [ - "LICENSE", - "NOTICE", - ], -} - -android_library { - name: "setupdesign", - static_libs: [ - "androidx.annotation_annotation", - "androidx.core_core", - "androidx.legacy_legacy-support-core-ui", - "androidx.appcompat_appcompat", - "androidx.recyclerview_recyclerview", - "com.google.android.material_material", - "setupcompat", - "setupdesign-strings", - ], - manifest: "main/AndroidManifest.xml", - resource_dirs: [ - "main/res", - ], - sdk_version: "current", - srcs: [ - "main/src/**/*.java", - ], - min_sdk_version: "14", -} - -// -// Strings that will not exposing. -// If app requires these strings, please copy the string definitions directly. -// - -android_library { - name: "setupdesign-strings", - manifest: "main/AndroidManifest.xml", - resource_dirs: [ - "strings/res", - ], - min_sdk_version: "14", - sdk_version: "current" -} diff --git a/lottie_loading_layout/Android.bp b/lottie_loading_layout/Android.bp deleted file mode 100644 index 6d41812..0000000 --- a/lottie_loading_layout/Android.bp +++ /dev/null @@ -1,31 +0,0 @@ -// -// Build the setup design - lottie_loading_layout. -// - -package { - // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "external_setupdesign_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["external_setupdesign_license"], -} - -android_library { - name: "setupdesign-lottie-loading-layout", - manifest: "AndroidManifest.xml", - static_libs: [ - "androidx.annotation_annotation", - "lottie", - "setupcompat", - "setupdesign", - ], - srcs: [ - "src/**/*.java", - ], - resource_dirs: [ - "res", - ], - min_sdk_version: "16", - sdk_version: "current" -} From 99f37d7500444df0e4e8ecf14534256899d8ca57 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Thu, 24 Mar 2022 15:49:16 +0530 Subject: [PATCH 3/4] gradle: Match SDK versions to Seedvault --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 7339ec4..2fe62ff 100644 --- a/build.gradle +++ b/build.gradle @@ -19,11 +19,11 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 28 + compileSdkVersion 31 defaultConfig { - minSdkVersion 14 - targetSdkVersion 28 + minSdkVersion 29 + targetSdkVersion 31 } buildTypes { From eb73ba76e20bf64ff7ba628d8633760d713a4029 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Thu, 24 Mar 2022 15:49:25 +0530 Subject: [PATCH 4/4] Make it build --- build.gradle | 1 + lint.xml | 4 ++++ main/res/drawable-anydpi-v21/sud_navbar_ic_back.xml | 4 ++-- main/res/drawable-anydpi-v21/sud_navbar_ic_more.xml | 4 ++-- main/res/drawable-anydpi-v21/sud_navbar_ic_next.xml | 4 ++-- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 2fe62ff..73765dd 100644 --- a/build.gradle +++ b/build.gradle @@ -47,4 +47,5 @@ dependencies { implementation "androidx.annotation:annotation:1.0.0" implementation "androidx.recyclerview:recyclerview:1.0.0" implementation 'androidx.appcompat:appcompat:1.0.2' + implementation 'com.google.android.material:material:1.4.0' } diff --git a/lint.xml b/lint.xml index 7e2d5d3..0e93615 100644 --- a/lint.xml +++ b/lint.xml @@ -8,4 +8,8 @@ + + + + diff --git a/main/res/drawable-anydpi-v21/sud_navbar_ic_back.xml b/main/res/drawable-anydpi-v21/sud_navbar_ic_back.xml index 6cf4229..e4e4942 100644 --- a/main/res/drawable-anydpi-v21/sud_navbar_ic_back.xml +++ b/main/res/drawable-anydpi-v21/sud_navbar_ic_back.xml @@ -17,8 +17,8 @@ diff --git a/main/res/drawable-anydpi-v21/sud_navbar_ic_next.xml b/main/res/drawable-anydpi-v21/sud_navbar_ic_next.xml index 8daa32b..ccc8485 100644 --- a/main/res/drawable-anydpi-v21/sud_navbar_ic_next.xml +++ b/main/res/drawable-anydpi-v21/sud_navbar_ic_next.xml @@ -17,8 +17,8 @@