diff --git a/app/src/main/res/layout/item_download.xml b/app/src/main/res/layout/item_download.xml index 15cf1c129..fcdacaa39 100644 --- a/app/src/main/res/layout/item_download.xml +++ b/app/src/main/res/layout/item_download.xml @@ -1,5 +1,5 @@ - - + diff --git a/app/src/main/res/layout/item_library.xml b/app/src/main/res/layout/item_library.xml index 707de8237..b57f6cd9b 100644 --- a/app/src/main/res/layout/item_library.xml +++ b/app/src/main/res/layout/item_library.xml @@ -1,10 +1,9 @@ - @@ -146,4 +145,4 @@ - + diff --git a/buildSrc/src/main/kotlin/Libs.kt b/buildSrc/src/main/kotlin/Libs.kt index 527e5e000..e7a09093c 100644 --- a/buildSrc/src/main/kotlin/Libs.kt +++ b/buildSrc/src/main/kotlin/Libs.kt @@ -336,11 +336,6 @@ object Libs { */ const val rxandroid: String = "io.reactivex.rxjava2:rxandroid:" + Versions.rxandroid - /** - * http://developer.android.com/tools/extras/support-library.html - */ - const val cardview: String = "androidx.cardview:cardview:" + Versions.cardview - /** * https://developer.android.com/jetpack/androidx */ diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 59a2f5605..5da2c239d 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -87,8 +87,6 @@ object Versions { const val rxandroid: String = "2.1.0" // available: "2.1.1" - const val cardview: String = "1.0.0" - const val core_ktx: String = "1.2.0" const val kiwixlib: String = "9.0.1-1" diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 2302eee5f..8a4538b1c 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -42,9 +42,6 @@ dependencies { api(fileTree(mapOf("include" to "*.aar", "dir" to "libs"))) } - // Android Support - implementation(Libs.cardview) - // SquiDB implementation(Libs.squidb) implementation(Libs.squidb_annotations) diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/main/TabsAdapter.java b/core/src/main/java/org/kiwix/kiwixmobile/core/main/TabsAdapter.java index 545fedcbc..345a43763 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/main/TabsAdapter.java +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/main/TabsAdapter.java @@ -25,7 +25,7 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.NonNull; -import androidx.cardview.widget.CardView; +import com.google.android.material.card.MaterialCardView; import androidx.constraintlayout.widget.ConstraintLayout; import androidx.constraintlayout.widget.ConstraintSet; import androidx.core.content.ContextCompat; @@ -72,11 +72,11 @@ public class TabsAdapter extends RecyclerView.Adapter { ImageViewExtensionsKt.tint(close, ContextExtensionsKt.getColorAttribute(context, R.attr.colorOnSurface)); - CardView cardView = new CardView(context); + MaterialCardView cardView = new MaterialCardView(context); cardView.setId(3); cardView.setUseCompatPadding(true); - cardView.addView(contentImage, new CardView.LayoutParams(CardView.LayoutParams.MATCH_PARENT, - CardView.LayoutParams.MATCH_PARENT)); + cardView.addView(contentImage, new MaterialCardView.LayoutParams(MaterialCardView.LayoutParams.MATCH_PARENT, + MaterialCardView.LayoutParams.MATCH_PARENT)); ConstraintLayout constraintLayout = new ConstraintLayout(context); constraintLayout.setFocusableInTouchMode(true); diff --git a/core/src/main/res/layout/content_main.xml b/core/src/main/res/layout/content_main.xml index 467659ff7..f2b20f0e5 100644 --- a/core/src/main/res/layout/content_main.xml +++ b/core/src/main/res/layout/content_main.xml @@ -11,7 +11,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - + - - + diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml index cccd9a8d0..be293b92f 100644 --- a/core/src/main/res/values/colors.xml +++ b/core/src/main/res/values/colors.xml @@ -16,7 +16,7 @@ #9E9E9E #616161 #303030 - #FFFFFF + @color/white @color/gray700 @color/gray500 diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml index cb27fa9d8..af09fb805 100644 --- a/core/src/main/res/values/styles.xml +++ b/core/src/main/res/values/styles.xml @@ -56,7 +56,7 @@ @style/ThemeOverlay.MaterialComponents.Dark - diff --git a/core/src/main/res/values/themes.xml b/core/src/main/res/values/themes.xml index f1eb0c1eb..9aa52cb15 100644 --- a/core/src/main/res/values/themes.xml +++ b/core/src/main/res/values/themes.xml @@ -62,7 +62,7 @@ @style/ThemeOverlay.MaterialComponents.Dialog.Alert @style/ThemeOverlay.KiwixTheme.BottomSheetDialog @style/Widget.KiwixTheme.NavigationView - @style/Widget.KiwixTheme.CardView + @style/Widget.KiwixTheme.CardView @style/Widget.KiwixTheme.Toolbar @style/Widget.KiwixTheme.TabLayout @style/Widget.KiwixTheme.AppBar