Merge pull request #50 from ChochaNaresh/Dev

- #48 add Dark Theme support for default popup layout

build.gradle.kts

@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id("com.android.application").version("8.1.2").apply(false)
-    id("com.android.library").version("8.1.2").apply(false)
+    id("com.android.application").version("8.3.0").apply(false)
+    id("com.android.library").version("8.3.0").apply(false)
     kotlin("android").version("1.9.10").apply(false)
     id("io.gitlab.arturbosch.detekt").version("1.23.1").apply(false)
     id("com.vanniktech.maven.publish").version("0.25.3")

filepickerlibrary/build.gradle.kts

@@ -119,7 +119,7 @@ detekt {
 }
 
 mavenPublishing {
-    coordinates("io.github.chochanaresh", "filepicker", "0.2.3")
+    coordinates("io.github.chochanaresh", "filepicker", "0.2.4")
 
     pom {
         name.set("filepicker")

filepickerlibrary/src/main/java/com/nareshchocha/filepickerlibrary/ui/adapter/PopUpAdapter.kt

@@ -6,10 +6,12 @@ import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.annotation.LayoutRes
+import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import coil.load
 import com.nareshchocha.filepickerlibrary.R
 import com.nareshchocha.filepickerlibrary.models.BaseConfig
+import com.nareshchocha.filepickerlibrary.utilities.extentions.isDarkMode
 
 internal class PopUpAdapter(
     @LayoutRes private val layoutID: Int,
@@ -36,7 +38,16 @@ internal class PopUpAdapter(
 
     private fun bind(holder: ItemViewHolder, position: Int) {
         val item = items[position]
+        val isDarkMode = holder.binding.context.isDarkMode()
         holder.mImageView?.load(item.popUpIcon)
+        if (isDarkMode) {
+            holder.mImageView?.setColorFilter(
+                ContextCompat.getColor(holder.binding.context, R.color.white),
+                android.graphics.PorterDuff.Mode.SRC_IN
+            )
+            holder.mTextView?.setTextColor(ContextCompat.getColor(holder.binding.context, R.color.white))
+        }
+
         holder.mTextView?.text = item.popUpText
     }
 

filepickerlibrary/src/main/java/com/nareshchocha/filepickerlibrary/utilities/extentions/Extentions.kt

@@ -4,6 +4,7 @@ import android.app.Activity
 import android.content.ClipData
 import android.content.Context
 import android.content.Intent
+import android.content.res.Configuration
 import android.net.Uri
 import android.os.Build
 import android.provider.MediaStore
@@ -15,6 +16,8 @@ import com.nareshchocha.filepickerlibrary.R
 import com.nareshchocha.filepickerlibrary.models.DocumentFilePickerConfig
 import com.nareshchocha.filepickerlibrary.models.PickMediaConfig
 import com.nareshchocha.filepickerlibrary.utilities.appConst.Const
+import java.security.AccessController.getContext
+
 
 internal fun Context.showMyDialog(
     title: String,
@@ -204,3 +207,14 @@ internal fun Activity.setCanceledResult(error: String? = null) {
     )
     finish()
 }
+
+
+fun Context.isDarkMode(): Boolean {
+    return when (resources.configuration.uiMode and
+            Configuration.UI_MODE_NIGHT_MASK) {
+        Configuration.UI_MODE_NIGHT_YES -> true
+        Configuration.UI_MODE_NIGHT_NO -> false
+        Configuration.UI_MODE_NIGHT_UNDEFINED -> false
+        else -> false
+    }
+}

filepickerlibrary/src/main/res/layout/activity_pop_up.xml

@@ -4,7 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    app:cardBackgroundColor="@color/white"
     app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"
     app:shapeAppearanceOverlay="@style/Theme.FilePicker.MediumComponent"
     tools:context=".ui.activitys.PopUpActivity">
@@ -27,7 +26,7 @@
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintVertical_bias="0"
             app:title="@string/app_name"
-            app:titleTextColor="?colorPrimary" />
+             />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rvItems"

filepickerlibrary/src/main/res/layout/item_pop_up.xml

@@ -25,7 +25,7 @@
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintWidth_max="30dp"
             app:layout_constraintWidth_min="30dp"
-            tools:srcCompat="@mipmap/ic_launcher" />
+            tools:srcCompat="@drawable/ic_camera" />
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@id/mtvText"

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Mon May 01 11:06:20 IST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

sample/build.gradle.kts

@@ -92,8 +92,8 @@ dependencies {
     implementation("androidx.core:core-ktx:1.12.0")
 
     // File Picker
-    // implementation(project(":filepickerlibrary"))
-    implementation("io.github.chochanaresh:filepicker:0.2.0")
+     implementation(project(":filepickerlibrary"))
+    //implementation("io.github.chochanaresh:filepicker:0.2.0")
 
     // timber
     implementation("com.jakewharton.timber:timber:5.0.1")