From 865b9e03860b4948b4249759d31758a11f878367 Mon Sep 17 00:00:00 2001 From: 07prakash <135522803+07prakash@users.noreply.github.com> Date: Mon, 23 Oct 2023 16:49:38 +0530 Subject: [PATCH 1/5] Create maven-publish.yml --- .github/workflows/maven-publish.yml | 34 +++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 .github/workflows/maven-publish.yml diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml new file mode 100644 index 0000000000..dab69fef79 --- /dev/null +++ b/.github/workflows/maven-publish.yml @@ -0,0 +1,34 @@ +# This workflow will build a package using Maven and then publish it to GitHub packages when a release is created +# For more information see: https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#apache-maven-with-a-settings-path + +name: Maven Package + +on: + release: + types: [created] + +jobs: + build: + + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + + steps: + - uses: actions/checkout@v3 + - name: Set up JDK 11 + uses: actions/setup-java@v3 + with: + java-version: '11' + distribution: 'temurin' + server-id: github # Value of the distributionManagement/repository/id field of the pom.xml + settings-path: ${{ github.workspace }} # location for the settings.xml file + + - name: Build with Maven + run: mvn -B package --file pom.xml + + - name: Publish to GitHub Packages Apache Maven + run: mvn deploy -s $GITHUB_WORKSPACE/settings.xml + env: + GITHUB_TOKEN: ${{ github.token }} From f66afb4b2ccd5ae24c63f5d2a2c66ccc689963fd Mon Sep 17 00:00:00 2001 From: Prakash Bhagat Date: Thu, 14 Dec 2023 15:08:16 +0530 Subject: [PATCH 2/5] splash screen added --- mastodon/build.gradle | 1 + mastodon/src/main/AndroidManifest.xml | 2 +- mastodon/src/main/res/values/styles.xml | 12 ++++++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/mastodon/build.gradle b/mastodon/build.gradle index 9c94c26e2a..b89e282eae 100644 --- a/mastodon/build.gradle +++ b/mastodon/build.gradle @@ -95,4 +95,5 @@ dependencies { androidTestImplementation 'androidx.test.ext:junit:1.1.5' androidTestImplementation 'androidx.test:runner:1.5.2' androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' + implementation "androidx.core:core-splashscreen:1.0.0" } diff --git a/mastodon/src/main/AndroidManifest.xml b/mastodon/src/main/AndroidManifest.xml index 8343a374b8..15c55d1e68 100644 --- a/mastodon/src/main/AndroidManifest.xml +++ b/mastodon/src/main/AndroidManifest.xml @@ -31,7 +31,7 @@ android:theme="@style/Theme.Mastodon.AutoLightDark" android:largeHeap="true"> - + diff --git a/mastodon/src/main/res/values/styles.xml b/mastodon/src/main/res/values/styles.xml index e0d0ee78f4..a4bd54e05e 100644 --- a/mastodon/src/main/res/values/styles.xml +++ b/mastodon/src/main/res/values/styles.xml @@ -434,4 +434,16 @@ + // adding splash screen + \ No newline at end of file From 470160a0a867c2d9a696504dc6bd339caf3e9c5a Mon Sep 17 00:00:00 2001 From: Prakash Bhagat Date: Thu, 14 Dec 2023 15:19:15 +0530 Subject: [PATCH 3/5] splash screen added --- mastodon/src/main/res/values/styles.xml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/mastodon/src/main/res/values/styles.xml b/mastodon/src/main/res/values/styles.xml index a4bd54e05e..cc72f6b64b 100644 --- a/mastodon/src/main/res/values/styles.xml +++ b/mastodon/src/main/res/values/styles.xml @@ -434,16 +434,14 @@ - // adding splash screen + + \ No newline at end of file From a699c2259b61359ff1762c1515b29dffef168996 Mon Sep 17 00:00:00 2001 From: Prakash Bhagat Date: Thu, 14 Dec 2023 15:29:48 +0530 Subject: [PATCH 4/5] splash screen added --- .github/workflows/maven-publish.yml | 34 ----------------------------- 1 file changed, 34 deletions(-) delete mode 100644 .github/workflows/maven-publish.yml diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml deleted file mode 100644 index dab69fef79..0000000000 --- a/.github/workflows/maven-publish.yml +++ /dev/null @@ -1,34 +0,0 @@ -# This workflow will build a package using Maven and then publish it to GitHub packages when a release is created -# For more information see: https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#apache-maven-with-a-settings-path - -name: Maven Package - -on: - release: - types: [created] - -jobs: - build: - - runs-on: ubuntu-latest - permissions: - contents: read - packages: write - - steps: - - uses: actions/checkout@v3 - - name: Set up JDK 11 - uses: actions/setup-java@v3 - with: - java-version: '11' - distribution: 'temurin' - server-id: github # Value of the distributionManagement/repository/id field of the pom.xml - settings-path: ${{ github.workspace }} # location for the settings.xml file - - - name: Build with Maven - run: mvn -B package --file pom.xml - - - name: Publish to GitHub Packages Apache Maven - run: mvn deploy -s $GITHUB_WORKSPACE/settings.xml - env: - GITHUB_TOKEN: ${{ github.token }} From e56968228480376d3e7ed80f9beb871111b33dc8 Mon Sep 17 00:00:00 2001 From: Prakash Bhagat Date: Fri, 15 Dec 2023 16:11:00 +0530 Subject: [PATCH 5/5] splash screen added --- mastodon/build.gradle | 1 - mastodon/src/main/res/drawable/splash_screen.xml | 12 ++++++++++++ mastodon/src/main/res/values/styles.xml | 9 ++------- 3 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 mastodon/src/main/res/drawable/splash_screen.xml diff --git a/mastodon/build.gradle b/mastodon/build.gradle index b89e282eae..9c94c26e2a 100644 --- a/mastodon/build.gradle +++ b/mastodon/build.gradle @@ -95,5 +95,4 @@ dependencies { androidTestImplementation 'androidx.test.ext:junit:1.1.5' androidTestImplementation 'androidx.test:runner:1.5.2' androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' - implementation "androidx.core:core-splashscreen:1.0.0" } diff --git a/mastodon/src/main/res/drawable/splash_screen.xml b/mastodon/src/main/res/drawable/splash_screen.xml new file mode 100644 index 0000000000..554231893e --- /dev/null +++ b/mastodon/src/main/res/drawable/splash_screen.xml @@ -0,0 +1,12 @@ + + + + diff --git a/mastodon/src/main/res/values/styles.xml b/mastodon/src/main/res/values/styles.xml index cc72f6b64b..b01b1227c0 100644 --- a/mastodon/src/main/res/values/styles.xml +++ b/mastodon/src/main/res/values/styles.xml @@ -436,12 +436,7 @@ - \ No newline at end of file