update

0xMartin · Jan 21, 2023 · ce7d423 · ce7d423
1 parent 640444e
commit ce7d423
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 10 deletions.
diff --git a/app/src/main/java/cz/utb/photostudio/EditorFragment.kt b/app/src/main/java/cz/utb/photostudio/EditorFragment.kt
@@ -99,7 +99,7 @@ class EditorFragment : Fragment() {
 
         // ulozi obrazek do galerie i s filtrama
         binding.buttonExport.setOnClickListener {
-            this.image?.let { it1 -> ImageIO.exportImageToGallery(requireContext(), it1, true) }
+            this.image?.let { it1 -> ImageIO.exportImageToGallery(requireContext(), it1, this.filterListAdapter?.getFilterList()) }
         }
 
         // ulozi filtry obrazku do databaze

diff --git a/app/src/main/java/cz/utb/photostudio/ImageFragment.kt b/app/src/main/java/cz/utb/photostudio/ImageFragment.kt
@@ -67,7 +67,7 @@ class ImageFragment : Fragment() {
 
         // exportuje obrazek do galerie
         binding.buttonExport.setOnClickListener {
-            this.image?.let { it1 -> ImageIO.exportImageToGallery(requireContext(), it1, false) }
+            this.image?.let { it1 -> ImageIO.exportImageToGallery(requireContext(), it1, null) }
         }
 
         // odstraneni tohoto obrazku

diff --git a/app/src/main/java/cz/utb/photostudio/util/ImageIO.kt b/app/src/main/java/cz/utb/photostudio/util/ImageIO.kt
@@ -78,21 +78,17 @@ class ImageIO {
             }
         }
 
-        fun exportImageToGallery(context: Context, image: ImageFile, applyFilters: Boolean) {
+        fun exportImageToGallery(context: Context, image: ImageFile, filters: List<Filter>?) {
             Executors.newSingleThreadExecutor().execute {
                 try {
                     // load img from local file system
                     val bitmap: Bitmap? = loadImage(context, image.imagePath)
 
                     // load filters from db and apply tham on img
-                    if(applyFilters) {
-                        val db: AppDatabase = AppDatabase.getDatabase(context)
-                        val filters: FilterPersistentDao = db.filterPersistentDao()
-
+                    if(filters != null) {
                         val matrix = ColorMatrix()
-                        for(fp in filters.getAllWithImageUID(image!!.uid)) {
-                            val f: Filter? = fp.createFilter()
-                            f?.applyFilter(matrix)
+                        for(f in filters) {
+                            f.applyFilter(matrix)
                         }
 
                         // apply color matrix

diff --git a/doc/img1.jpg b/doc/img1.jpg
diff --git a/doc/img2.jpg b/doc/img2.jpg