diff --git a/.github/workflows/Android-CI.yml b/.github/workflows/Android-CI.yml index 514fc3d..4ab433b 100644 --- a/.github/workflows/Android-CI.yml +++ b/.github/workflows/Android-CI.yml @@ -5,8 +5,6 @@ on: branches: - master pull_request: - branches: - - master jobs: build: @@ -30,4 +28,4 @@ jobs: uses: actions/upload-artifact@v4 with: name: Lint-report - path: sample/build/reports/lint-results.html \ No newline at end of file + path: app/build/reports/lint-results.html \ No newline at end of file diff --git a/README.md b/README.md index e37098e..a47d95d 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ language-specific versions of `res/xml/`, e.g. `res/xml-de/changelog.xml`. ## Usage git changelog To generate a git changelog, grouped by tag you can run -`./generateTagGroupedGitlog.sh > sample/src/main/res/raw/gitlog.json` +`./generateTagGroupedGitlog.sh > app/src/main/res/raw/gitlog.json` This will show it similar to the XML diff --git a/sample/build.gradle b/app/build.gradle similarity index 100% rename from sample/build.gradle rename to app/build.gradle diff --git a/sample/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml similarity index 100% rename from sample/src/main/AndroidManifest.xml rename to app/src/main/AndroidManifest.xml diff --git a/sample/src/main/java/info/hannes/changelog/sample/MainActivity.kt b/app/src/main/java/info/hannes/changelog/sample/MainActivity.kt similarity index 100% rename from sample/src/main/java/info/hannes/changelog/sample/MainActivity.kt rename to app/src/main/java/info/hannes/changelog/sample/MainActivity.kt diff --git a/sample/src/main/res/drawable-hdpi/ic_launcher.png b/app/src/main/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from sample/src/main/res/drawable-hdpi/ic_launcher.png rename to app/src/main/res/drawable-hdpi/ic_launcher.png diff --git a/sample/src/main/res/drawable-mdpi/ic_launcher.png b/app/src/main/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from sample/src/main/res/drawable-mdpi/ic_launcher.png rename to app/src/main/res/drawable-mdpi/ic_launcher.png diff --git a/sample/src/main/res/drawable-nodpi/cover.png b/app/src/main/res/drawable-nodpi/cover.png similarity index 100% rename from sample/src/main/res/drawable-nodpi/cover.png rename to app/src/main/res/drawable-nodpi/cover.png diff --git a/sample/src/main/res/drawable-xhdpi/ic_launcher.png b/app/src/main/res/drawable-xhdpi/ic_launcher.png similarity index 100% rename from sample/src/main/res/drawable-xhdpi/ic_launcher.png rename to app/src/main/res/drawable-xhdpi/ic_launcher.png diff --git a/sample/src/main/res/drawable-xhdpi/ic_menu.png b/app/src/main/res/drawable-xhdpi/ic_menu.png similarity index 100% rename from sample/src/main/res/drawable-xhdpi/ic_menu.png rename to app/src/main/res/drawable-xhdpi/ic_menu.png diff --git a/sample/src/main/res/drawable-xxhdpi/ic_github.png b/app/src/main/res/drawable-xxhdpi/ic_github.png similarity index 100% rename from sample/src/main/res/drawable-xxhdpi/ic_github.png rename to app/src/main/res/drawable-xxhdpi/ic_github.png diff --git a/sample/src/main/res/drawable-xxhdpi/ic_launcher.png b/app/src/main/res/drawable-xxhdpi/ic_launcher.png similarity index 100% rename from sample/src/main/res/drawable-xxhdpi/ic_launcher.png rename to app/src/main/res/drawable-xxhdpi/ic_launcher.png diff --git a/sample/src/main/res/drawable-xxhdpi/ic_menu.png b/app/src/main/res/drawable-xxhdpi/ic_menu.png similarity index 100% rename from sample/src/main/res/drawable-xxhdpi/ic_menu.png rename to app/src/main/res/drawable-xxhdpi/ic_menu.png diff --git a/sample/src/main/res/drawable-xxhdpi/ic_money.png b/app/src/main/res/drawable-xxhdpi/ic_money.png similarity index 100% rename from sample/src/main/res/drawable-xxhdpi/ic_money.png rename to app/src/main/res/drawable-xxhdpi/ic_money.png diff --git a/sample/src/main/res/drawable-xxxhdpi/ic_launcher.png b/app/src/main/res/drawable-xxxhdpi/ic_launcher.png similarity index 100% rename from sample/src/main/res/drawable-xxxhdpi/ic_launcher.png rename to app/src/main/res/drawable-xxxhdpi/ic_launcher.png diff --git a/sample/src/main/res/drawable-xxxhdpi/ic_menu.png b/app/src/main/res/drawable-xxxhdpi/ic_menu.png similarity index 100% rename from sample/src/main/res/drawable-xxxhdpi/ic_menu.png rename to app/src/main/res/drawable-xxxhdpi/ic_menu.png diff --git a/sample/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml similarity index 100% rename from sample/src/main/res/layout/activity_main.xml rename to app/src/main/res/layout/activity_main.xml diff --git a/sample/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml similarity index 100% rename from sample/src/main/res/layout/content_main.xml rename to app/src/main/res/layout/content_main.xml diff --git a/sample/src/main/res/layout/nav_header.xml b/app/src/main/res/layout/nav_header.xml similarity index 100% rename from sample/src/main/res/layout/nav_header.xml rename to app/src/main/res/layout/nav_header.xml diff --git a/sample/src/main/res/menu/drawer_main.xml b/app/src/main/res/menu/drawer_main.xml similarity index 100% rename from sample/src/main/res/menu/drawer_main.xml rename to app/src/main/res/menu/drawer_main.xml diff --git a/sample/src/main/res/menu/drawer_view.xml b/app/src/main/res/menu/drawer_view.xml similarity index 100% rename from sample/src/main/res/menu/drawer_view.xml rename to app/src/main/res/menu/drawer_view.xml diff --git a/sample/src/main/res/raw/gitlog.json b/app/src/main/res/raw/gitlog.json similarity index 100% rename from sample/src/main/res/raw/gitlog.json rename to app/src/main/res/raw/gitlog.json diff --git a/sample/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml similarity index 53% rename from sample/src/main/res/values-de/strings.xml rename to app/src/main/res/values-de/strings.xml index 1505637..b03c079 100644 --- a/sample/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -2,8 +2,6 @@ ckChangeLog Beispiel - Dies ist die Beispiel-App für die Bibliothek ckChangeLog. - Öffne das Menü, um herauszufinden was für Dialoge zur Anzeige der letzten Änderungen zur Verfügung stehen. Das ist neu Alle Änderungen diff --git a/sample/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml similarity index 63% rename from sample/src/main/res/values-es/strings.xml rename to app/src/main/res/values-es/strings.xml index 6e17386..6c883fe 100644 --- a/sample/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -2,7 +2,6 @@ ckChangeLog Muestra - Esta es la app de muestra para la librería ckChangeLog. Busca en el menú los diferentes tipos de diálogos. Qué hay de nuevo Registro completo de cambios diff --git a/sample/src/main/res/values-v14/styles.xml b/app/src/main/res/values-v14/styles.xml similarity index 100% rename from sample/src/main/res/values-v14/styles.xml rename to app/src/main/res/values-v14/styles.xml diff --git a/sample/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml similarity index 100% rename from sample/src/main/res/values/colors.xml rename to app/src/main/res/values/colors.xml diff --git a/sample/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml similarity index 62% rename from sample/src/main/res/values/strings.xml rename to app/src/main/res/values/strings.xml index 770465a..de3ec9e 100644 --- a/sample/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2,7 +2,6 @@ ChangeLog Sample - This is the sample app for the ChangeLog library. Check out the menu for the different dialog types. What\'s New Full ChangeLog diff --git a/sample/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml similarity index 100% rename from sample/src/main/res/values/styles.xml rename to app/src/main/res/values/styles.xml diff --git a/sample/src/main/res/xml-de/changelog.xml b/app/src/main/res/xml-de/changelog.xml similarity index 100% rename from sample/src/main/res/xml-de/changelog.xml rename to app/src/main/res/xml-de/changelog.xml diff --git a/sample/src/main/res/xml/changelog.xml b/app/src/main/res/xml/changelog.xml similarity index 100% rename from sample/src/main/res/xml/changelog.xml rename to app/src/main/res/xml/changelog.xml diff --git a/settings.gradle b/settings.gradle index a005dcc..e16bd24 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,2 @@ include ':ChangeLogLib' -include ':sample' \ No newline at end of file +include ':app' \ No newline at end of file