Merge pull request #321 from ghostbyte-dev/dev

Dev

Author: daniebeler

.github/workflows/crowdin.yml

@@ -4,7 +4,11 @@ on:
   push:
     branches: [ dev ]
   workflow_dispatch:
-
+  
+permissions:
+  contents: write
+  pull-requests: write
+  
 jobs:
   synchronize-with-crowdin:
     runs-on: ubuntu-latest

README.md

@@ -3,9 +3,12 @@
 Pixelix is an Android client for [Pixelfed](https://pixelfed.org/), the federated image-sharing social network.
 It's designed to provide a seamless and high-performance user experience. With Pixelix, you can easily browse, post, and interact with your Pixelfed network on the go.
 
+
+<a href="https://apps.apple.com/app/pixelix-a-pixelfed-client/id6743839819"><img alt="Get it on Google Play" src="https://github.com/ghostbyte-dev/pixelix/blob/db447657e1abd8ec90bbd1e1ca9edac4bb930878/appstorebadgewhite.svg" height="42" align="middle"></a>
+<a href="https://play.google.com/store/apps/details?id=com.daniebeler.pfpixelix"><img alt="Get it on Google Play" src="https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png" height="60" align="middle"></a>
+
 <a href="https://f-droid.org/packages/com.daniebeler.pfpixelix"><img alt="Get it on F-Droid" src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" height="60" align="middle"></a>
 <a href="https://github.com/ImranR98/Obtainium/releases"><img alt="Get it on Obtainium banner" src="https://github.com/user-attachments/assets/58fd5f7e-8136-4e92-a462-c7977e119602" height="40" align="middle"/></a>
-<a href="https://play.google.com/store/apps/details?id=com.daniebeler.pfpixelix"><img alt="Get it on Google Play" src="https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png" height="60" align="middle"></a>
 <a href="https://apt.izzysoft.de/fdroid/index/apk/com.daniebeler.pfpixelix"><img src="https://gitlab.com/IzzyOnDroid/repo/-/raw/master/assets/IzzyOnDroid.png" alt="Get it from IzzyOnDroid" height="60" align="middle"></a>
 
 ## Please donate

app/build.gradle.kts

@@ -1,3 +1,4 @@
+import com.google.devtools.ksp.gradle.KspAATask
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat.*
 
 plugins {
@@ -93,6 +94,9 @@ kotlin {
 
             //image crop
             implementation(libs.krop)
+
+            //video player
+            implementation(libs.composemediaplayer)
         }
 
         androidMain.dependencies {
@@ -111,12 +115,8 @@ kotlin {
             implementation(libs.material)
 
             //media
-            implementation(libs.androidx.media3.exoplayer)
-            implementation(libs.androidx.media3.exoplayer.dash)
-            implementation(libs.androidx.media3.ui)
-            implementation(libs.android.image.cropper)
-            implementation(libs.coil.video)
             implementation(libs.coil.gif)
+            implementation(libs.coil.video)
 
             // widget
             implementation(libs.androidx.glance.appwidget)
@@ -133,11 +133,7 @@ kotlin {
             implementation(compose.desktop.currentOs)
             implementation(libs.kotlinx.coroutines.swing)
             implementation(libs.ktor.client.okhttp)
-            implementation(libs.appdirs)
             implementation(libs.slf4j.simple)
-            implementation(libs.vlcj)
-            implementation(libs.jna)
-            implementation(libs.jna.platform)
         }
     }
 
@@ -154,8 +150,8 @@ android {
         applicationId = "com.daniebeler.pfpixelix"
         minSdk = 26
         targetSdk = 35
-        versionCode = 31
-        versionName = "4.1.0"
+        versionCode = 32
+        versionName = "4.1.1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -183,6 +179,9 @@ android {
             isDebuggable = false
             isProfileable = false
             isShrinkResources = true
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
+            )
         }
     }
     packaging.resources {
@@ -243,3 +242,8 @@ compose.desktop {
         }
     }
 }
+
+tasks.configureEach {
+    if (this is KspAATask && name != "kspCommonMainKotlinMetadata")
+        dependsOn("kspCommonMainKotlinMetadata")
+}

app/proguard-rules.pro

@@ -18,4 +18,5 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+-dontobfuscate

app/src/androidMain/AndroidManifest.xml

@@ -41,6 +41,11 @@
             <intent-filter>
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            <intent-filter>
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="image/*" />
+            </intent-filter>
+
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -64,20 +69,10 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:mimeType="video/*" />
             </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.BROWSABLE" />
-                <category android:name="android.intent.category.DEFAULT" />
-
-                <data
-                    android:host="callback"
-                    android:scheme="pixelix-android-auth" />
-            </intent-filter>
         </activity>
 
         <activity-alias
-            android:name=".AppActivity"
+            android:name=".Icon02"
             android:exported="true"
             android:enabled="true"
             android:icon="@mipmap/ic_launcher_02"
@@ -315,6 +310,16 @@
             android:authorities="${applicationId}.androidx-startup"
             tools:node="remove">
         </provider>
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.provider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths" />
+        </provider>
+
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="com.example.android.appwidget.fileprovider"

app/src/androidMain/kotlin/com/daniebeler/pfpixelix/AppActivity.kt

@@ -5,48 +5,44 @@ import android.content.Intent
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
-import android.view.View
-import android.view.ViewGroup
-import android.view.WindowManager
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.ExperimentalComposeUiApi
-import androidx.compose.ui.platform.LocalView
-import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
-import androidx.compose.ui.window.DialogWindowProvider
+import androidx.core.content.FileProvider
+import io.github.vinceglb.filekit.FileKit
+import io.github.vinceglb.filekit.dialogs.init
 import java.io.File
 import java.io.FileOutputStream
 import java.io.InputStream
 import java.lang.ref.WeakReference
 
 class AppActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
+        FileKit.init(this)
         MyApplication.currentActivity = WeakReference(this)
         super.onCreate(savedInstanceState)
         enableEdgeToEdge()
         setContent {
             App(MyApplication.appComponent) { finish() }
         }
         if (savedInstanceState == null) {
-            handleNewIntent(intent)
+            handleNewIntent(intent, this)
         }
     }
 
     override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
-        handleNewIntent(intent)
+        handleNewIntent(intent, this)
     }
 
-    private fun handleNewIntent(intent: Intent) {
+    private fun handleNewIntent(intent: Intent, appActivity: AppActivity) {
         when (intent.action) {
             Intent.ACTION_VIEW -> {
                 intent.dataString?.let { onExternalUrl(it) }
             }
             Intent.ACTION_SEND, Intent.ACTION_SEND_MULTIPLE -> {
-                val imageUris = handleSharePhotoIntent(intent, contentResolver, cacheDir)
+                val imageUris = handleSharePhotoIntent(intent, contentResolver, cacheDir, appActivity)
                 if (imageUris.isNotEmpty()) {
                     imageUris.forEach { uri ->
                         try {
@@ -85,15 +81,19 @@ actual fun EdgeToEdgeDialogProperties(
     decorFitsSystemWindows = false
 )
 
-private fun saveUriToCache(uri: Uri, contentResolver: ContentResolver, cacheDir: File): Uri? {
+private fun saveUriToCache(uri: Uri, contentResolver: ContentResolver, cacheDir: File, appActivity: AppActivity): Uri? {
     try {
         val inputStream: InputStream? = contentResolver.openInputStream(uri)
         inputStream?.use { input ->
             val file = File(cacheDir, "shared_image_${System.currentTimeMillis()}.jpg")
             FileOutputStream(file).use { output ->
                 input.copyTo(output)
             }
-            return Uri.fromFile(file) // Return the new cached URI
+            return FileProvider.getUriForFile(
+                appActivity,
+                "${appActivity.packageName}.provider",
+                file
+            )
         }
     } catch (e: Exception) {
         e.printStackTrace()
@@ -102,7 +102,7 @@ private fun saveUriToCache(uri: Uri, contentResolver: ContentResolver, cacheDir:
 }
 
 private fun handleSharePhotoIntent(
-    intent: Intent, contentResolver: ContentResolver, cacheDir: File
+    intent: Intent, contentResolver: ContentResolver, cacheDir: File, appActivity: AppActivity
 ): List<Uri> {
     val action = intent.action
     val type = intent.type
@@ -122,7 +122,7 @@ private fun handleSharePhotoIntent(
                     ) as? Uri
                 }
                 singleUri?.let { uri ->
-                    val cachedUri = saveUriToCache(uri, contentResolver, cacheDir)
+                    val cachedUri = saveUriToCache(uri, contentResolver, cacheDir, appActivity)
                     imageUris =
                         cachedUri?.let { listOf(it) } ?: emptyList() // Wrap single image in a list
                 }
@@ -141,7 +141,7 @@ private fun handleSharePhotoIntent(
             }
             imageUris = receivedUris?.mapNotNull {
                 saveUriToCache(
-                    it, contentResolver, cacheDir
+                    it, contentResolver, cacheDir, appActivity
                 )
             } ?: emptyList()
         }

app/src/androidMain/kotlin/com/daniebeler/pfpixelix/MyApplication.kt

@@ -1,6 +1,5 @@
 package com.daniebeler.pfpixelix
 
-import android.app.Activity
 import android.app.Application
 import android.content.Context
 import androidx.activity.ComponentActivity
@@ -11,7 +10,6 @@ import androidx.work.WorkerParameters
 import coil3.SingletonImageLoader
 import com.daniebeler.pfpixelix.di.AppComponent
 import com.daniebeler.pfpixelix.di.create
-import com.daniebeler.pfpixelix.domain.service.file.AndroidFileService
 import com.daniebeler.pfpixelix.domain.service.icon.AndroidAppIconManager
 import com.daniebeler.pfpixelix.utils.configureLogger
 import com.daniebeler.pfpixelix.widget.notifications.work_manager.LatestImageTask
@@ -28,7 +26,6 @@ class MyApplication : Application(), Configuration.Provider {
     override fun onCreate() {
         appComponent = AppComponent.create(
             this,
-            AndroidFileService(this),
             AndroidAppIconManager(this)
         )
         SingletonImageLoader.setSafe {