diff --git a/.gitea/workflows/apk.yml b/.gitea/workflows/apk.yml index 0e118ea..59736e7 100644 --- a/.gitea/workflows/apk.yml +++ b/.gitea/workflows/apk.yml @@ -7,15 +7,15 @@ jobs: container: mingc/android-build-box steps: - uses: actions/checkout@v4 - - run: curl -sSL -u "$USERNAME:$PASSWORD" -o ShareWithTitle/$STORE_FILE https://cloud.crystalyx.net/remote.php/dav/files/$USERNAME/Bordel/$STORE_FILE - - run: sh gradlew lint build bundle assemble --no-daemon + - run: curl -sSL -u "$USERNAME:$PASSWORD" -o app/$STORE_FILE https://cloud.crystalyx.net/remote.php/dav/files/$USERNAME/Bordel/$STORE_FILE + - run: sh gradlew lint build bundle assemble --no-daemon --warning-mode all - uses: akkuman/gitea-release-action@v1 if: gitea.ref_type == 'tag' with: files: | - ShareWithTitle/build/outputs/apk/debug/ShareWithTitle-debug.apk - ShareWithTitle/build/outputs/apk/release/ShareWithTitle-release.apk - ShareWithTitle/build/outputs/bundle/release/ShareWithTitle-release.aab + app/build/outputs/apk/debug/app-debug.apk + app/build/outputs/apk/release/app-release.apk + app/build/outputs/bundle/release/app-release.aab env: USERNAME: ${{ secrets.USERNAME }} PASSWORD: ${{ secrets.PASSWORD }} diff --git a/.gitignore b/.gitignore index eefd851..ea8f981 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,4 @@ .DS_Store build/ local.properties -.idea +.idea/ diff --git a/ShareWithTitleProject.iml b/ShareWithTitleProject.iml deleted file mode 100644 index f6835cb..0000000 --- a/ShareWithTitleProject.iml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/ShareWithTitle/build.gradle b/app/build.gradle similarity index 58% rename from ShareWithTitle/build.gradle rename to app/build.gradle index 0dc8871..6ef57b9 100644 --- a/ShareWithTitle/build.gradle +++ b/app/build.gradle @@ -4,19 +4,19 @@ android { namespace 'net.crystalyx.sharewithtitle' compileSdk 34 defaultConfig { - applicationId "net.crystalyx.sharewithtitle" - minSdkVersion 11 - targetSdkVersion 34 - versionCode 9 - versionName "1.7" + applicationId = "net.crystalyx.sharewithtitle" + minSdkVersion = 11 + targetSdkVersion = 34 + versionCode = 9 + versionName = "1.7" } signingConfigs { release { if (System.env.STORE_FILE) { - storeFile file(System.env.STORE_FILE) - storePassword System.env.STORE_PASSWORD - keyAlias System.env.KEY_ALIAS - keyPassword System.env.KEY_PASSWORD + storeFile = file(System.env.STORE_FILE) + storePassword = System.env.STORE_PASSWORD + keyAlias = System.env.KEY_ALIAS + keyPassword = System.env.KEY_PASSWORD } } } @@ -26,10 +26,10 @@ android { } buildTypes { release { - minifyEnabled false + minifyEnabled = true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' if (System.env.STORE_FILE) { - signingConfig signingConfigs.release + signingConfig = signingConfigs.release } } } diff --git a/ShareWithTitle/proguard-rules.pro b/app/proguard-rules.pro similarity index 100% rename from ShareWithTitle/proguard-rules.pro rename to app/proguard-rules.pro diff --git a/ShareWithTitle/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml similarity index 100% rename from ShareWithTitle/src/main/AndroidManifest.xml rename to app/src/main/AndroidManifest.xml diff --git a/ShareWithTitle/src/main/ic_launcher-web.png b/app/src/main/ic_launcher-web.png similarity index 100% rename from ShareWithTitle/src/main/ic_launcher-web.png rename to app/src/main/ic_launcher-web.png diff --git a/ShareWithTitle/src/main/java/net/crystalyx/sharewithtitle/HttpThreadHandler.java b/app/src/main/java/net/crystalyx/sharewithtitle/HttpThreadHandler.java similarity index 100% rename from ShareWithTitle/src/main/java/net/crystalyx/sharewithtitle/HttpThreadHandler.java rename to app/src/main/java/net/crystalyx/sharewithtitle/HttpThreadHandler.java diff --git a/ShareWithTitle/src/main/java/net/crystalyx/sharewithtitle/MainActivity.java b/app/src/main/java/net/crystalyx/sharewithtitle/MainActivity.java similarity index 100% rename from ShareWithTitle/src/main/java/net/crystalyx/sharewithtitle/MainActivity.java rename to app/src/main/java/net/crystalyx/sharewithtitle/MainActivity.java diff --git a/ShareWithTitle/src/main/res/drawable-hdpi/ic_launcher.png b/app/src/main/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from ShareWithTitle/src/main/res/drawable-hdpi/ic_launcher.png rename to app/src/main/res/drawable-hdpi/ic_launcher.png diff --git a/ShareWithTitle/src/main/res/drawable-mdpi/ic_launcher.png b/app/src/main/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from ShareWithTitle/src/main/res/drawable-mdpi/ic_launcher.png rename to app/src/main/res/drawable-mdpi/ic_launcher.png diff --git a/ShareWithTitle/src/main/res/drawable-xhdpi/ic_launcher.png b/app/src/main/res/drawable-xhdpi/ic_launcher.png similarity index 100% rename from ShareWithTitle/src/main/res/drawable-xhdpi/ic_launcher.png rename to app/src/main/res/drawable-xhdpi/ic_launcher.png diff --git a/ShareWithTitle/src/main/res/drawable-xxhdpi/ic_launcher.png b/app/src/main/res/drawable-xxhdpi/ic_launcher.png similarity index 100% rename from ShareWithTitle/src/main/res/drawable-xxhdpi/ic_launcher.png rename to app/src/main/res/drawable-xxhdpi/ic_launcher.png diff --git a/ShareWithTitle/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from ShareWithTitle/src/main/res/mipmap-hdpi/ic_launcher.png rename to app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/ShareWithTitle/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from ShareWithTitle/src/main/res/mipmap-mdpi/ic_launcher.png rename to app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/ShareWithTitle/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from ShareWithTitle/src/main/res/mipmap-xhdpi/ic_launcher.png rename to app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/ShareWithTitle/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from ShareWithTitle/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/ShareWithTitle/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from ShareWithTitle/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/build.gradle b/build.gradle index e6ed636..1a79182 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { mavenCentral() } dependencies { - classpath("com.android.tools.build:gradle:8.8.0") + classpath('com.android.tools.build:gradle:8.8.0') } } diff --git a/settings.gradle b/settings.gradle index 52d3beb..9b59db7 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,3 @@ // Boilerplate from https://transang.me/create-a-minimal-android-boilerplate-from-scratch/ -rootProject.name = 'ShareWithTitle' -include ':ShareWithTitle' +rootProject.name = "ShareWithTitle" +include ':app'