diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml index d3ff0e3..f804d23 100644 --- a/.github/workflows/android-ci.yml +++ b/.github/workflows/android-ci.yml @@ -26,7 +26,7 @@ jobs: # Step 3: Cache Gradle dependencies - name: Cache Gradle dependencies - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | ~/.gradle/caches diff --git a/CSSampleApp/.gitignore b/app/.gitignore similarity index 100% rename from CSSampleApp/.gitignore rename to app/.gitignore diff --git a/CSSampleApp/build.gradle b/app/build.gradle similarity index 100% rename from CSSampleApp/build.gradle rename to app/build.gradle diff --git a/CSSampleApp/proguard-rules.pro b/app/proguard-rules.pro similarity index 100% rename from CSSampleApp/proguard-rules.pro rename to app/proguard-rules.pro diff --git a/CSSampleApp/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml similarity index 100% rename from CSSampleApp/src/main/AndroidManifest.xml rename to app/src/main/AndroidManifest.xml diff --git a/CSSampleApp/src/main/java/com/example/androidsampleapp/ComposeSimpleActivity.kt b/app/src/main/java/com/example/androidsampleapp/ComposeSimpleActivity.kt similarity index 100% rename from CSSampleApp/src/main/java/com/example/androidsampleapp/ComposeSimpleActivity.kt rename to app/src/main/java/com/example/androidsampleapp/ComposeSimpleActivity.kt diff --git a/CSSampleApp/src/main/java/com/example/androidsampleapp/CustomVariablesActivity.kt b/app/src/main/java/com/example/androidsampleapp/CustomVariablesActivity.kt similarity index 100% rename from CSSampleApp/src/main/java/com/example/androidsampleapp/CustomVariablesActivity.kt rename to app/src/main/java/com/example/androidsampleapp/CustomVariablesActivity.kt diff --git a/CSSampleApp/src/main/java/com/example/androidsampleapp/DynamicVariablesActivity.kt b/app/src/main/java/com/example/androidsampleapp/DynamicVariablesActivity.kt similarity index 100% rename from CSSampleApp/src/main/java/com/example/androidsampleapp/DynamicVariablesActivity.kt rename to app/src/main/java/com/example/androidsampleapp/DynamicVariablesActivity.kt diff --git a/CSSampleApp/src/main/java/com/example/androidsampleapp/GdprActivity.kt b/app/src/main/java/com/example/androidsampleapp/GdprActivity.kt similarity index 100% rename from CSSampleApp/src/main/java/com/example/androidsampleapp/GdprActivity.kt rename to app/src/main/java/com/example/androidsampleapp/GdprActivity.kt diff --git a/CSSampleApp/src/main/java/com/example/androidsampleapp/MainActivity.kt b/app/src/main/java/com/example/androidsampleapp/MainActivity.kt similarity index 100% rename from CSSampleApp/src/main/java/com/example/androidsampleapp/MainActivity.kt rename to app/src/main/java/com/example/androidsampleapp/MainActivity.kt diff --git a/CSSampleApp/src/main/java/com/example/androidsampleapp/MaskingScenariosActivity.kt b/app/src/main/java/com/example/androidsampleapp/MaskingScenariosActivity.kt similarity index 100% rename from CSSampleApp/src/main/java/com/example/androidsampleapp/MaskingScenariosActivity.kt rename to app/src/main/java/com/example/androidsampleapp/MaskingScenariosActivity.kt diff --git a/CSSampleApp/src/main/java/com/example/androidsampleapp/SampleApplication.kt b/app/src/main/java/com/example/androidsampleapp/SampleApplication.kt similarity index 100% rename from CSSampleApp/src/main/java/com/example/androidsampleapp/SampleApplication.kt rename to app/src/main/java/com/example/androidsampleapp/SampleApplication.kt diff --git a/CSSampleApp/src/main/java/com/example/androidsampleapp/SimpleActivity.kt b/app/src/main/java/com/example/androidsampleapp/SimpleActivity.kt similarity index 100% rename from CSSampleApp/src/main/java/com/example/androidsampleapp/SimpleActivity.kt rename to app/src/main/java/com/example/androidsampleapp/SimpleActivity.kt diff --git a/CSSampleApp/src/main/java/com/example/androidsampleapp/analytics/Analytics.kt b/app/src/main/java/com/example/androidsampleapp/analytics/Analytics.kt similarity index 100% rename from CSSampleApp/src/main/java/com/example/androidsampleapp/analytics/Analytics.kt rename to app/src/main/java/com/example/androidsampleapp/analytics/Analytics.kt diff --git a/CSSampleApp/src/main/java/com/example/androidsampleapp/crash/CrashHelper.kt b/app/src/main/java/com/example/androidsampleapp/crash/CrashHelper.kt similarity index 100% rename from CSSampleApp/src/main/java/com/example/androidsampleapp/crash/CrashHelper.kt rename to app/src/main/java/com/example/androidsampleapp/crash/CrashHelper.kt diff --git a/CSSampleApp/src/main/java/com/example/androidsampleapp/crash/CrashService.kt b/app/src/main/java/com/example/androidsampleapp/crash/CrashService.kt similarity index 100% rename from CSSampleApp/src/main/java/com/example/androidsampleapp/crash/CrashService.kt rename to app/src/main/java/com/example/androidsampleapp/crash/CrashService.kt diff --git a/CSSampleApp/src/main/java/com/example/androidsampleapp/crash/CrashType.kt b/app/src/main/java/com/example/androidsampleapp/crash/CrashType.kt similarity index 100% rename from CSSampleApp/src/main/java/com/example/androidsampleapp/crash/CrashType.kt rename to app/src/main/java/com/example/androidsampleapp/crash/CrashType.kt diff --git a/CSSampleApp/src/main/java/com/example/androidsampleapp/crash/CrashTypeAdapter.kt b/app/src/main/java/com/example/androidsampleapp/crash/CrashTypeAdapter.kt similarity index 100% rename from CSSampleApp/src/main/java/com/example/androidsampleapp/crash/CrashTypeAdapter.kt rename to app/src/main/java/com/example/androidsampleapp/crash/CrashTypeAdapter.kt diff --git a/CSSampleApp/src/main/java/com/example/androidsampleapp/crash/ErrorAnalysisCrashActivity.kt b/app/src/main/java/com/example/androidsampleapp/crash/ErrorAnalysisCrashActivity.kt similarity index 100% rename from CSSampleApp/src/main/java/com/example/androidsampleapp/crash/ErrorAnalysisCrashActivity.kt rename to app/src/main/java/com/example/androidsampleapp/crash/ErrorAnalysisCrashActivity.kt diff --git a/CSSampleApp/src/main/java/com/example/androidsampleapp/fragment/FragmentTab.kt b/app/src/main/java/com/example/androidsampleapp/fragment/FragmentTab.kt similarity index 100% rename from CSSampleApp/src/main/java/com/example/androidsampleapp/fragment/FragmentTab.kt rename to app/src/main/java/com/example/androidsampleapp/fragment/FragmentTab.kt diff --git a/CSSampleApp/src/main/java/com/example/androidsampleapp/fragment/MainFragmentActivity.kt b/app/src/main/java/com/example/androidsampleapp/fragment/MainFragmentActivity.kt similarity index 100% rename from CSSampleApp/src/main/java/com/example/androidsampleapp/fragment/MainFragmentActivity.kt rename to app/src/main/java/com/example/androidsampleapp/fragment/MainFragmentActivity.kt diff --git a/CSSampleApp/src/main/java/com/example/androidsampleapp/fragment/ViewPagerAdapter.kt b/app/src/main/java/com/example/androidsampleapp/fragment/ViewPagerAdapter.kt similarity index 100% rename from CSSampleApp/src/main/java/com/example/androidsampleapp/fragment/ViewPagerAdapter.kt rename to app/src/main/java/com/example/androidsampleapp/fragment/ViewPagerAdapter.kt diff --git a/CSSampleApp/src/main/java/com/example/androidsampleapp/network/NetworkAnalysisActivity.kt b/app/src/main/java/com/example/androidsampleapp/network/NetworkAnalysisActivity.kt similarity index 100% rename from CSSampleApp/src/main/java/com/example/androidsampleapp/network/NetworkAnalysisActivity.kt rename to app/src/main/java/com/example/androidsampleapp/network/NetworkAnalysisActivity.kt diff --git a/CSSampleApp/src/main/java/com/example/androidsampleapp/network/NetworkIntegration.kt b/app/src/main/java/com/example/androidsampleapp/network/NetworkIntegration.kt similarity index 100% rename from CSSampleApp/src/main/java/com/example/androidsampleapp/network/NetworkIntegration.kt rename to app/src/main/java/com/example/androidsampleapp/network/NetworkIntegration.kt diff --git a/CSSampleApp/src/main/java/com/example/androidsampleapp/network/OkHttpIntegration.kt b/app/src/main/java/com/example/androidsampleapp/network/OkHttpIntegration.kt similarity index 100% rename from CSSampleApp/src/main/java/com/example/androidsampleapp/network/OkHttpIntegration.kt rename to app/src/main/java/com/example/androidsampleapp/network/OkHttpIntegration.kt diff --git a/CSSampleApp/src/main/java/com/example/androidsampleapp/network/UrlIntegration.kt b/app/src/main/java/com/example/androidsampleapp/network/UrlIntegration.kt similarity index 100% rename from CSSampleApp/src/main/java/com/example/androidsampleapp/network/UrlIntegration.kt rename to app/src/main/java/com/example/androidsampleapp/network/UrlIntegration.kt diff --git a/CSSampleApp/src/main/java/com/example/androidsampleapp/useridentifier/UserIdentifierActivity.kt b/app/src/main/java/com/example/androidsampleapp/useridentifier/UserIdentifierActivity.kt similarity index 100% rename from CSSampleApp/src/main/java/com/example/androidsampleapp/useridentifier/UserIdentifierActivity.kt rename to app/src/main/java/com/example/androidsampleapp/useridentifier/UserIdentifierActivity.kt diff --git a/CSSampleApp/src/main/java/com/example/androidsampleapp/utils/PreferenceHelper.kt b/app/src/main/java/com/example/androidsampleapp/utils/PreferenceHelper.kt similarity index 100% rename from CSSampleApp/src/main/java/com/example/androidsampleapp/utils/PreferenceHelper.kt rename to app/src/main/java/com/example/androidsampleapp/utils/PreferenceHelper.kt diff --git a/CSSampleApp/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml similarity index 100% rename from CSSampleApp/src/main/res/drawable-v24/ic_launcher_foreground.xml rename to app/src/main/res/drawable-v24/ic_launcher_foreground.xml diff --git a/CSSampleApp/src/main/res/drawable/contentsquare_img_cs_logo.xml b/app/src/main/res/drawable/contentsquare_img_cs_logo.xml similarity index 100% rename from CSSampleApp/src/main/res/drawable/contentsquare_img_cs_logo.xml rename to app/src/main/res/drawable/contentsquare_img_cs_logo.xml diff --git a/CSSampleApp/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml similarity index 100% rename from CSSampleApp/src/main/res/drawable/ic_launcher_background.xml rename to app/src/main/res/drawable/ic_launcher_background.xml diff --git a/CSSampleApp/src/main/res/layout/activity_custom_variables.xml b/app/src/main/res/layout/activity_custom_variables.xml similarity index 100% rename from CSSampleApp/src/main/res/layout/activity_custom_variables.xml rename to app/src/main/res/layout/activity_custom_variables.xml diff --git a/CSSampleApp/src/main/res/layout/activity_dynamic_variables.xml b/app/src/main/res/layout/activity_dynamic_variables.xml similarity index 100% rename from CSSampleApp/src/main/res/layout/activity_dynamic_variables.xml rename to app/src/main/res/layout/activity_dynamic_variables.xml diff --git a/CSSampleApp/src/main/res/layout/activity_error_crash.xml b/app/src/main/res/layout/activity_error_crash.xml similarity index 100% rename from CSSampleApp/src/main/res/layout/activity_error_crash.xml rename to app/src/main/res/layout/activity_error_crash.xml diff --git a/CSSampleApp/src/main/res/layout/activity_gdpr.xml b/app/src/main/res/layout/activity_gdpr.xml similarity index 100% rename from CSSampleApp/src/main/res/layout/activity_gdpr.xml rename to app/src/main/res/layout/activity_gdpr.xml diff --git a/CSSampleApp/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml similarity index 100% rename from CSSampleApp/src/main/res/layout/activity_main.xml rename to app/src/main/res/layout/activity_main.xml diff --git a/CSSampleApp/src/main/res/layout/activity_masking_scenarios.xml b/app/src/main/res/layout/activity_masking_scenarios.xml similarity index 100% rename from CSSampleApp/src/main/res/layout/activity_masking_scenarios.xml rename to app/src/main/res/layout/activity_masking_scenarios.xml diff --git a/CSSampleApp/src/main/res/layout/activity_network_analysis.xml b/app/src/main/res/layout/activity_network_analysis.xml similarity index 100% rename from CSSampleApp/src/main/res/layout/activity_network_analysis.xml rename to app/src/main/res/layout/activity_network_analysis.xml diff --git a/CSSampleApp/src/main/res/layout/activity_simple.xml b/app/src/main/res/layout/activity_simple.xml similarity index 100% rename from CSSampleApp/src/main/res/layout/activity_simple.xml rename to app/src/main/res/layout/activity_simple.xml diff --git a/CSSampleApp/src/main/res/layout/activity_user_identifier.xml b/app/src/main/res/layout/activity_user_identifier.xml similarity index 100% rename from CSSampleApp/src/main/res/layout/activity_user_identifier.xml rename to app/src/main/res/layout/activity_user_identifier.xml diff --git a/CSSampleApp/src/main/res/layout/content_gdpr.xml b/app/src/main/res/layout/content_gdpr.xml similarity index 100% rename from CSSampleApp/src/main/res/layout/content_gdpr.xml rename to app/src/main/res/layout/content_gdpr.xml diff --git a/CSSampleApp/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml similarity index 100% rename from CSSampleApp/src/main/res/layout/content_main.xml rename to app/src/main/res/layout/content_main.xml diff --git a/CSSampleApp/src/main/res/layout/fragment_tab.xml b/app/src/main/res/layout/fragment_tab.xml similarity index 100% rename from CSSampleApp/src/main/res/layout/fragment_tab.xml rename to app/src/main/res/layout/fragment_tab.xml diff --git a/CSSampleApp/src/main/res/layout/main_fragment_activity.xml b/app/src/main/res/layout/main_fragment_activity.xml similarity index 100% rename from CSSampleApp/src/main/res/layout/main_fragment_activity.xml rename to app/src/main/res/layout/main_fragment_activity.xml diff --git a/CSSampleApp/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from CSSampleApp/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/CSSampleApp/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from CSSampleApp/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/CSSampleApp/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp similarity index 100% rename from CSSampleApp/src/main/res/mipmap-hdpi/ic_launcher.webp rename to app/src/main/res/mipmap-hdpi/ic_launcher.webp diff --git a/CSSampleApp/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp similarity index 100% rename from CSSampleApp/src/main/res/mipmap-hdpi/ic_launcher_round.webp rename to app/src/main/res/mipmap-hdpi/ic_launcher_round.webp diff --git a/CSSampleApp/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp similarity index 100% rename from CSSampleApp/src/main/res/mipmap-mdpi/ic_launcher.webp rename to app/src/main/res/mipmap-mdpi/ic_launcher.webp diff --git a/CSSampleApp/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp similarity index 100% rename from CSSampleApp/src/main/res/mipmap-mdpi/ic_launcher_round.webp rename to app/src/main/res/mipmap-mdpi/ic_launcher_round.webp diff --git a/CSSampleApp/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp similarity index 100% rename from CSSampleApp/src/main/res/mipmap-xhdpi/ic_launcher.webp rename to app/src/main/res/mipmap-xhdpi/ic_launcher.webp diff --git a/CSSampleApp/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp similarity index 100% rename from CSSampleApp/src/main/res/mipmap-xhdpi/ic_launcher_round.webp rename to app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp diff --git a/CSSampleApp/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp similarity index 100% rename from CSSampleApp/src/main/res/mipmap-xxhdpi/ic_launcher.webp rename to app/src/main/res/mipmap-xxhdpi/ic_launcher.webp diff --git a/CSSampleApp/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp similarity index 100% rename from CSSampleApp/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp rename to app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp diff --git a/CSSampleApp/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp similarity index 100% rename from CSSampleApp/src/main/res/mipmap-xxxhdpi/ic_launcher.webp rename to app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp diff --git a/CSSampleApp/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp similarity index 100% rename from CSSampleApp/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp rename to app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp diff --git a/CSSampleApp/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml similarity index 100% rename from CSSampleApp/src/main/res/values-night/themes.xml rename to app/src/main/res/values-night/themes.xml diff --git a/CSSampleApp/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml similarity index 100% rename from CSSampleApp/src/main/res/values/colors.xml rename to app/src/main/res/values/colors.xml diff --git a/CSSampleApp/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml similarity index 100% rename from CSSampleApp/src/main/res/values/strings.xml rename to app/src/main/res/values/strings.xml diff --git a/CSSampleApp/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml similarity index 100% rename from CSSampleApp/src/main/res/values/styles.xml rename to app/src/main/res/values/styles.xml diff --git a/CSSampleApp/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml similarity index 100% rename from CSSampleApp/src/main/res/values/themes.xml rename to app/src/main/res/values/themes.xml diff --git a/settings.gradle b/settings.gradle index 33242c4..8bd61a3 100644 --- a/settings.gradle +++ b/settings.gradle @@ -13,5 +13,5 @@ dependencyResolutionManagement { } } -rootProject.name='Sample' -include ':CSSampleApp' \ No newline at end of file +rootProject.name='Contentsquare Sample App (legacy)' +include ':app' \ No newline at end of file