Merge pull request #1180 from mikepenz/feature/combined_sample_app

Restructure Sample app

Author: mikepenz

.github/workflows/ci.yml

@@ -135,10 +135,6 @@ jobs:
         if: github.event_name  == 'pull_request'
         run: ./gradlew lintDebug
 
-      - name: Verify Screenshot Tests
-        if: false && github.event_name  == 'pull_request'
-        run: ./gradlew validateScreenshotTest
-
       - name: Setup Ruby
         if: github.event_name  == 'pull_request'
         uses: ruby/setup-ruby@v1

.github/workflows/static.yml

@@ -45,13 +45,13 @@ jobs:
         uses: gradle/actions/setup-gradle@v4
       - name: Build Page
         run: |
-          ./gradlew :app-wasm:exportLibraryDefinitions -PaboutLibraries.exportPath=src/commonMain/composeResources/files/
-          ./gradlew :app-wasm:wasmJsBrowserDistribution --no-configuration-cache
+          ./gradlew :app:exportLibraryDefinitionsWasmJs
+          ./gradlew :app:wasmJsBrowserDistribution --no-configuration-cache
 
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v3
         with:
-          path: 'app-wasm/build/dist/wasmJs/productionExecutable'
+          path: 'app/build/dist/wasmJs/productionExecutable'
 
       - name: Deploy to GitHub Pages
         id: deployment

aboutlibraries-compose-m2/src/commonMain/kotlin/com/mikepenz/aboutlibraries/ui/compose/component/LibraryDefaultComponents.kt

@@ -87,6 +87,7 @@ internal val DefaultLibraryLicense: @Composable FlowRowScope.(license: License,
                 style = textStyles.licensesTextStyle ?: LocalTextStyle.current,
                 textAlign = TextAlign.Center,
                 overflow = textStyles.defaultOverflow,
+                maxLines = 1,
             )
         }
     }
@@ -118,6 +119,7 @@ internal val DefaultLibraryFunding: @Composable FlowRowScope.(funding: Funding,
                 style = textStyles.fundingTextStyle ?: LocalTextStyle.current,
                 textAlign = TextAlign.Center,
                 overflow = textStyles.defaultOverflow,
+                maxLines = 1,
             )
         }
     }