Merge branch 'develop'

.editorconfig

@@ -1,7 +1,10 @@
+root = true
+
 [*.{kt,kts}]
 indent_size = 4
 insert_final_newline = false
 
 # noinspection EditorConfigKeyCorrectness
-disabled_rules = no-wildcard-imports, indent
-# FIXME https://github.com/pinterest/ktlint/issues/764
+ktlint_standard_no-wildcard-imports = disabled
+# noinspection EditorConfigKeyCorrectness
+ktlint_standard_trailing-comma-on-declaration-site = disabled

.github/ISSUE_TEMPLATE/bug_report.md

@@ -10,7 +10,7 @@ assignees: 'massivemadness'
 *Please consider making a Pull Request if you are capable of doing so.*
 
 **Library Version:**
-2.5
+2.6
 
 **Affected Device(s):**
 Google Pixel 3 XL with Android 9.0

.github/workflows/android.yml

@@ -2,27 +2,34 @@ name: Android CI
 
 on:
   push:
-    branches: [ master, develop ]
+    branches: [ "master", "develop" ]
   pull_request:
-    branches: [ master, develop ]
+    branches: [ "master", "develop" ]
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           java-version: '11'
-          distribution: 'adopt'
+          distribution: 'temurin'
           cache: gradle
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build with Gradle
         run: ./gradlew :app:assembleDebug
       - name: Upload Debug APK
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: Sample App (Debug)
-          path: ./app/build/outputs/apk/debug/app-debug.apk
+          path: ./app/build/outputs/apk/debug/app-debug.apk
+  lint:
+    needs: [ build ]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Check Kotlin code style
+        run: ./gradlew ktlint

README.md

@@ -50,7 +50,7 @@ Add this to your module’s `build.gradle` file:
 ```gradle
 dependencies {
   ...
-  implementation 'com.fragula2:fragula-core:2.5'
+  implementation 'com.fragula2:fragula-core:2.6'
 }
 ```
 
@@ -298,7 +298,7 @@ Add this to your module’s `build.gradle` file:
 ```gradle
 dependencies {
   ...
-  implementation 'com.fragula2:fragula-compose:2.5'
+  implementation 'com.fragula2:fragula-compose:2.6'
 }
 ```
 
@@ -319,8 +319,7 @@ setContent {
            modifier = Modifier.fillMaxSize(), 
            color = MaterialTheme.colors.background,
         ) {
-            val swipeBackNavigator = rememberSwipeBackNavigator()
-            val navController = rememberNavController(swipeBackNavigator)
+            val navController = rememberFragulaNavController()
             FragulaNavHost(navController, startDestination = "list") {
                 // ...
             }
@@ -332,8 +331,7 @@ setContent {
 **Second,** you need to replace your `composable(...)` destinations with `swipeable(...)` as shown below:
 
 ```kotlin
-val swipeBackNavigator = rememberSwipeBackNavigator()
-val navController = rememberNavController(swipeBackNavigator)
+val navController = rememberFragulaNavController()
 FragulaNavHost(navController, startDestination = "list") {
     swipeable("list") {
         ListScreen(navController)
@@ -401,6 +399,7 @@ fun FragulaNavHost(
     startDestination: String,
     modifier: Modifier = Modifier,
     route: String? = null,
+    onPageScrolled: (Int, Float, Int) -> Unit, // Scroll listener (position, offset, offsetPixels)
     scrimColor: Color = ScrimColor, // Color used for the dimming
     scrimAmount: Float = 0.15f, // Percentage of dimming (depends on drag offset)
     parallaxFactor: Float = 1.3f, // Parallax multiplier (depends on drag offset)

app/benchmark-rules.pro

@@ -0,0 +1 @@
+-dontobfuscate

app/build.gradle

@@ -22,6 +22,14 @@ android {
 
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
+    buildTypes {
+        benchmark {
+            signingConfig signingConfigs.debug
+            matchingFallbacks = ['release']
+            proguardFiles 'benchmark-rules.pro'
+            debuggable false
+        }
+    }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
@@ -50,6 +58,7 @@ dependencies {
     implementation library.core
     implementation library.activity
     implementation library.fragment
+    implementation library.profileinstaller
 
     // UI
     implementation library.appcompat
@@ -64,6 +73,7 @@ dependencies {
     implementation library.compose_preview
     debugImplementation library.compose_tooling
     debugImplementation library.compose_manifest
+    implementation library.drawablepainter
 
     // AAC
     implementation library.viewmodel
@@ -75,8 +85,7 @@ dependencies {
     implementation project(':fragula-core')
 
     // Tests
-    testImplementation testLibrary.junit
-
-    androidTestImplementation androidTestLibrary.junit_ext
-    androidTestImplementation androidTestLibrary.test_runner
+    testImplementation library.junit
+    androidTestImplementation library.junit_ext
+    androidTestImplementation library.test_runner
 }

app/src/main/AndroidManifest.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <application
         android:allowBackup="true"
@@ -34,6 +35,10 @@
             </intent-filter>
         </activity>
 
+        <profileable
+            android:shell="true"
+            tools:targetApi="29" />
+
     </application>
 
 </manifest>