From b954785b6cc21610d4fb1ed5d26d0355494c6e59 Mon Sep 17 00:00:00 2001 From: terabitdev <156935904+terabitdev@users.noreply.github.com> Date: Sun, 8 Dec 2024 11:39:57 +0500 Subject: [PATCH 01/10] Create android.yml Signed-off-by: terabitdev <156935904+terabitdev@users.noreply.github.com> --- .github/workflows/android.yml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .github/workflows/android.yml diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml new file mode 100644 index 000000000000..d011269deb99 --- /dev/null +++ b/.github/workflows/android.yml @@ -0,0 +1,31 @@ +name: AndroidBuild + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + - name: set up JDK 11 + uses: actions/setup-java@v4 + with: + java-version: '11' + distribution: 'temurin' + cache: gradle + name : nodecloud.apk + path : app/build/outputs/apk/app-debug.apk + + - name: Grant execute permission for gradlew + run: chmod +x gradlew + - name: Build with Gradle + run: ./gradlew build + + - name : Upload a Build Artifact + uses : actions/upload-artifact@v3 From 562fca66dc5c579732a861b37ed59c3d7cf5a6b6 Mon Sep 17 00:00:00 2001 From: Santosh Date: Sun, 8 Dec 2024 12:05:51 +0500 Subject: [PATCH 02/10] next cloud to node cloud updation --- app/src/main/AndroidManifest.xml | 4 +-- .../client/onboarding/FirstRunActivity.kt | 6 ++--- .../ui/fragment/OCFileListFragment.java | 3 +-- .../providers/cursors/RootCursor.java | 2 +- .../sufficientlysecure/SaveCalendar.java | 3 +-- app/src/main/res/drawable/ic_launcher.xml | 13 ++++++++++ app/src/main/res/drawable/logo.xml | 23 ++++++++---------- app/src/main/res/drawable/logo_old.xml | 16 ++++++++++++ app/src/main/res/layout/activity_splash.xml | 5 ++-- .../main/res/layout/first_run_activity.xml | 2 ++ app/src/main/res/layout/send_button.xml | 2 +- .../{ic_launcher.xml => ic_launcher_old.xml} | 0 .../{ic_launcher.png => ic_launcher_old.png} | Bin .../{ic_launcher.png => ic_launcher_old.png} | Bin .../{ic_launcher.png => ic_launcher_old.png} | Bin .../{ic_launcher.png => ic_launcher_old.png} | Bin .../{ic_launcher.png => ic_launcher_old.png} | Bin app/src/main/res/values-ka/strings.xml | 1 + app/src/main/res/values/dims.xml | 2 +- app/src/main/res/values/setup.xml | 5 ++-- app/src/main/res/values/strings.xml | 1 + app/src/main/res/xml/authenticator.xml | 4 +-- build.gradle | 2 +- 23 files changed, 62 insertions(+), 32 deletions(-) create mode 100644 app/src/main/res/drawable/ic_launcher.xml create mode 100644 app/src/main/res/drawable/logo_old.xml rename app/src/main/res/mipmap-anydpi-v26/{ic_launcher.xml => ic_launcher_old.xml} (100%) rename app/src/main/res/mipmap-hdpi/{ic_launcher.png => ic_launcher_old.png} (100%) rename app/src/main/res/mipmap-mdpi/{ic_launcher.png => ic_launcher_old.png} (100%) rename app/src/main/res/mipmap-xhdpi/{ic_launcher.png => ic_launcher_old.png} (100%) rename app/src/main/res/mipmap-xxhdpi/{ic_launcher.png => ic_launcher_old.png} (100%) rename app/src/main/res/mipmap-xxxhdpi/{ic_launcher.png => ic_launcher_old.png} (100%) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7114b8d9b7c0..70a7b147033c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -112,13 +112,13 @@ android:allowBackup="false" android:dataExtractionRules="@xml/backup_rules" android:fullBackupContent="@xml/backup_config" - android:icon="@mipmap/ic_launcher" + android:icon="@drawable/ic_launcher" android:installLocation="internalOnly" android:label="@string/app_name" android:manageSpaceActivity="com.owncloud.android.ui.activity.ManageSpaceActivity" android:networkSecurityConfig="@xml/network_security_config" android:requestLegacyExternalStorage="true" - android:roundIcon="@mipmap/ic_launcher" + android:roundIcon="@drawable/ic_launcher" android:supportsRtl="true" android:enableOnBackInvokedCallback="false" android:theme="@style/Theme.ownCloud.Toolbar" diff --git a/app/src/main/java/com/nextcloud/client/onboarding/FirstRunActivity.kt b/app/src/main/java/com/nextcloud/client/onboarding/FirstRunActivity.kt index 132189c36a05..b36b079f2559 100644 --- a/app/src/main/java/com/nextcloud/client/onboarding/FirstRunActivity.kt +++ b/app/src/main/java/com/nextcloud/client/onboarding/FirstRunActivity.kt @@ -81,8 +81,8 @@ class FirstRunActivity : BaseActivity(), Injectable { registerActivityResult() setupLoginButton() - setupSignupButton(isProviderOrOwnInstallationVisible) - setupHostOwnServerTextView(isProviderOrOwnInstallationVisible) + //setupSignupButton(isProviderOrOwnInstallationVisible) + //setupHostOwnServerTextView(isProviderOrOwnInstallationVisible) deleteAccountAtFirstLaunch() setupFeaturesViewAdapter() handleOnBackPressed() @@ -246,7 +246,7 @@ class FirstRunActivity : BaseActivity(), Injectable { val firstRun: Array get() = arrayOf( - FeatureItem(R.drawable.logo, R.string.first_run_1_text, R.string.empty, true, false), + FeatureItem(R.drawable.logo, R.string.first_run_1_text_new, R.string.empty, true, false), FeatureItem(R.drawable.first_run_files, R.string.first_run_2_text, R.string.empty, true, false), FeatureItem(R.drawable.first_run_groupware, R.string.first_run_3_text, R.string.empty, true, false), FeatureItem(R.drawable.first_run_talk, R.string.first_run_4_text, R.string.empty, true, false) diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java b/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java index 812974d98083..f799c72ddca0 100644 --- a/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java +++ b/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java @@ -132,7 +132,6 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.Executors; import java.util.concurrent.Future; -import java.util.concurrent.RejectedExecutionException; import javax.inject.Inject; @@ -547,7 +546,7 @@ public void directCameraUpload() { private void showDirectCameraUploadAlertDialog(FileDisplayActivity fileDisplayActivity) { final MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(fileDisplayActivity) .setTitle(R.string.upload_direct_camera_promt) - .setIcon(R.mipmap.ic_launcher) + .setIcon(R.mipmap.ic_launcher_old) .setPositiveButton(R.string.upload_direct_camera_video, (dialog, which) -> fileDisplayActivity.getFileOperationsHelper().uploadFromCamera(fileDisplayActivity, FileDisplayActivity.REQUEST_CODE__UPLOAD_FROM_VIDEO_CAMERA, true)) .setNegativeButton(R.string.upload_direct_camera_photo, (dialog, which) -> fileDisplayActivity.getFileOperationsHelper().uploadFromCamera(fileDisplayActivity, FileDisplayActivity.REQUEST_CODE__UPLOAD_FROM_CAMERA, false)); diff --git a/app/src/main/java/org/nextcloud/providers/cursors/RootCursor.java b/app/src/main/java/org/nextcloud/providers/cursors/RootCursor.java index 44648f5b3b17..a6417a7eedcf 100644 --- a/app/src/main/java/org/nextcloud/providers/cursors/RootCursor.java +++ b/app/src/main/java/org/nextcloud/providers/cursors/RootCursor.java @@ -45,7 +45,7 @@ public void addRoot(DocumentsStorageProvider.Document document, Context context) .add(Root.COLUMN_DOCUMENT_ID, document.getDocumentId()) .add(Root.COLUMN_SUMMARY, user.getAccountName()) .add(Root.COLUMN_TITLE, context.getString(R.string.app_name)) - .add(Root.COLUMN_ICON, R.mipmap.ic_launcher) + .add(Root.COLUMN_ICON, R.mipmap.ic_launcher_old) .add(Root.COLUMN_FLAGS, rootFlags); } } diff --git a/app/src/main/java/third_parties/sufficientlysecure/SaveCalendar.java b/app/src/main/java/third_parties/sufficientlysecure/SaveCalendar.java index 32b8baa9a695..172ddad495c4 100644 --- a/app/src/main/java/third_parties/sufficientlysecure/SaveCalendar.java +++ b/app/src/main/java/third_parties/sufficientlysecure/SaveCalendar.java @@ -25,7 +25,6 @@ import android.text.TextUtils; import android.text.format.DateFormat; import android.text.format.DateUtils; -import android.view.View; import android.view.WindowManager; import android.widget.EditText; @@ -272,7 +271,7 @@ private void getFileImpl(final String previousFile, final String suggestedFile, final int ok = android.R.string.ok; final int cancel = android.R.string.cancel; final int suggest = R.string.suggest; - AlertDialog dlg = new MaterialAlertDialogBuilder(activity).setIcon(R.mipmap.ic_launcher) + AlertDialog dlg = new MaterialAlertDialogBuilder(activity).setIcon(R.mipmap.ic_launcher_old) .setTitle(R.string.enter_destination_filename) .setView(input) .setPositiveButton(ok, (iface, id) -> result[0] = input.getText().toString()) diff --git a/app/src/main/res/drawable/ic_launcher.xml b/app/src/main/res/drawable/ic_launcher.xml new file mode 100644 index 000000000000..ad30abca15fd --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher.xml @@ -0,0 +1,13 @@ + + + + + + diff --git a/app/src/main/res/drawable/logo.xml b/app/src/main/res/drawable/logo.xml index 070fc5cfc667..46a4e9d649c7 100644 --- a/app/src/main/res/drawable/logo.xml +++ b/app/src/main/res/drawable/logo.xml @@ -1,16 +1,13 @@ - + android:width="81dp" + android:height="81dp" + android:viewportWidth="81" + android:viewportHeight="81"> + + + android:pathData="M74.207,0H6.793C3.057,0 0,3.057 0,6.793V74.207C0,77.943 3.057,81 6.793,81H74.207C77.943,81 81,77.943 81,74.207V6.793C81,3.057 77.943,0 74.207,0ZM12.443,8.013C18.407,4.141 26.273,4.825 31.254,9.743C37,15.416 42.681,21.153 48.387,26.865C48.48,26.958 48.539,27.087 48.56,27.119C46.176,29.578 43.909,31.916 41.43,34.474C37.855,30.835 34.277,27.179 30.684,23.538C28.666,21.493 26.635,19.46 24.587,17.445C22.424,15.315 19.253,15.179 17.263,17.098C15.273,19.015 15.163,22.026 17.169,24.278C18.387,25.646 19.834,26.81 21.175,28.063C18.594,30.59 16.218,32.916 13.791,35.292C11.004,32.552 7.94,29.934 6.485,25.981C4.078,19.437 6.564,11.83 12.443,8.013H12.443ZM26.821,74.043C20.172,77.251 12.548,74.879 8.354,68.981C4.17,63.096 4.533,55.257 9.681,49.825C15.361,43.828 21.359,38.132 27.233,32.291C29.481,34.647 31.73,37.004 34.167,39.558C32.351,41.399 30.28,43.523 28.181,45.622C24.706,49.094 21.196,52.533 17.736,56.019C15.044,58.73 15.06,62.222 17.715,64.192C19.761,65.712 22.377,65.579 24.259,63.834C24.96,63.184 25.639,62.507 26.287,61.803C26.888,61.148 27.433,60.442 27.976,59.79C30.524,62.402 32.847,64.782 35.521,67.523C32.76,69.643 30.091,72.465 26.822,74.043H26.821ZM68.604,72.9C63.314,76.373 56.287,76.341 51.371,72.513C48.849,70.549 46.646,68.163 44.362,65.904C40.322,61.911 36.329,57.87 32.32,53.844C32.281,53.805 32.289,53.72 32.28,53.681C34.634,51.252 36.868,48.948 39.421,46.314C43.036,50.027 46.583,53.692 50.156,57.333C52.214,59.43 54.297,61.507 56.403,63.558C58.543,65.643 61.846,65.766 63.766,63.879C65.888,61.794 65.862,58.662 63.622,56.39C62.429,55.181 61.119,54.086 59.813,52.896C62.376,50.29 64.655,47.974 67.04,45.548C70.436,48.959 74.033,51.976 75.073,56.974C76.306,62.895 73.727,69.535 68.602,72.9L68.604,72.9ZM71.538,30.823C65.824,36.902 59.79,42.678 53.602,48.878C51.279,46.333 49.076,43.921 46.802,41.43C50.072,38.148 53.58,34.625 57.091,31.105C59.216,28.975 61.356,26.861 63.47,24.72C65.787,22.372 65.95,19.3 63.893,17.255C61.735,15.11 58.642,15.201 56.273,17.544C55.157,18.647 54.14,19.851 53.095,20.992C50.618,18.399 48.337,16.012 45.971,13.534C49.631,9.224 53.968,5.277 60.614,5.565C66.905,5.838 71.564,8.839 74.044,14.627C76.533,20.435 75.949,26.13 71.539,30.823L71.538,30.823Z" + android:fillColor="#ffffff"/> + diff --git a/app/src/main/res/drawable/logo_old.xml b/app/src/main/res/drawable/logo_old.xml new file mode 100644 index 000000000000..070fc5cfc667 --- /dev/null +++ b/app/src/main/res/drawable/logo_old.xml @@ -0,0 +1,16 @@ + + + + diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml index c068a3904a41..0d993d5c40f1 100644 --- a/app/src/main/res/layout/activity_splash.xml +++ b/app/src/main/res/layout/activity_splash.xml @@ -18,7 +18,7 @@ app:layout_constraintBottom_toTopOf="@+id/guideline" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:srcCompat="@drawable/nextcloud_splash_logo" /> + app:srcCompat="@drawable/logo" /> @@ -42,7 +43,7 @@ android:id="@+id/splashScreenNormal" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/splashScreenNormal" + android:text="Nodecloud" android:textColor="@color/white" android:textSize="@dimen/splash_text_size" /> diff --git a/app/src/main/res/layout/first_run_activity.xml b/app/src/main/res/layout/first_run_activity.xml index a9a44b69226b..0d7cdf977254 100644 --- a/app/src/main/res/layout/first_run_activity.xml +++ b/app/src/main/res/layout/first_run_activity.xml @@ -73,6 +73,7 @@ android:layout_gravity="center" android:layout_margin="5dp" android:maxWidth="500dp" + android:visibility="gone" android:minWidth="300dp" android:textStyle="bold" android:padding="@dimen/standard_padding" @@ -87,6 +88,7 @@ android:minHeight="@dimen/minimum_size_for_touchable_area" android:layout_marginBottom="10dp" android:layout_marginTop="10dp" + android:visibility="gone" android:gravity="center_horizontal" android:text="@string/host_your_own_server"/> diff --git a/app/src/main/res/layout/send_button.xml b/app/src/main/res/layout/send_button.xml index 25f2ef26c062..dfdad9f1f83b 100644 --- a/app/src/main/res/layout/send_button.xml +++ b/app/src/main/res/layout/send_button.xml @@ -22,7 +22,7 @@ android:layout_height="@dimen/share_icon_size" android:layout_gravity="center_horizontal" android:contentDescription="@string/sendbutton_description" - tools:src="@mipmap/ic_launcher" /> + tools:src="@mipmap/ic_launcher_old" /> Filename contains at least one invalid character Filename Keep your data secure and under your control + Collaboration has never been so simple Folder already exists Create No folders here diff --git a/app/src/main/res/values/dims.xml b/app/src/main/res/values/dims.xml index af90df2b0fd6..d76ef0d1fe4d 100644 --- a/app/src/main/res/values/dims.xml +++ b/app/src/main/res/values/dims.xml @@ -148,7 +148,7 @@ 24dp 24dp 180dp - 20sp + 25sp 5 0 16sp diff --git a/app/src/main/res/values/setup.xml b/app/src/main/res/values/setup.xml index 3b6c7532937e..c1737eb9562e 100644 --- a/app/src/main/res/values/setup.xml +++ b/app/src/main/res/values/setup.xml @@ -11,7 +11,8 @@ false - Nextcloud + Nodecloud + Nextcloud nextcloud org.nextcloud com.nextcloud.android.providers.UsersAndGroupsSearchProvider @@ -135,7 +136,7 @@ - + Nodecloud https://nominatim.openstreetmap.org/ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index df0aa8fc00e4..db770163bdf8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -857,6 +857,7 @@ Sign up with provider Host your own server Keep your data secure and under your control + Collaboration has never been so simple Secure collaboration and file exchange Easy-to-use webmail, calendar and contacts Screensharing, online meetings and web conferences diff --git a/app/src/main/res/xml/authenticator.xml b/app/src/main/res/xml/authenticator.xml index 771ea127f724..6b1ed36a6b46 100644 --- a/app/src/main/res/xml/authenticator.xml +++ b/app/src/main/res/xml/authenticator.xml @@ -8,7 +8,7 @@ --> + android:smallIcon="@mipmap/ic_launcher_old"> \ No newline at end of file diff --git a/build.gradle b/build.gradle index 6ce7f9c96072..8e63bdca862c 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ buildscript { ext { androidLibraryVersion ="ceb3812b688f2288911acf4d917596283fab0ea5" - androidPluginVersion = '8.7.2' + androidPluginVersion = '8.5.2' androidxMediaVersion = '1.4.1' androidxTestVersion = "1.6.1" appCompatVersion = '1.7.0' From f53e410fde673abd2b49a3ac2bf07a912ae77307 Mon Sep 17 00:00:00 2001 From: Santosh Date: Sun, 8 Dec 2024 12:20:46 +0500 Subject: [PATCH 03/10] github action jdk version updated --- .github/workflows/android.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index d011269deb99..325e58931fde 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -13,10 +13,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: set up JDK 11 + - name: set up JDK 17 uses: actions/setup-java@v4 with: - java-version: '11' + java-version: '17' distribution: 'temurin' cache: gradle name : nodecloud.apk From 2ec24f4c61181b0477c2938d1befb40e49deda48 Mon Sep 17 00:00:00 2001 From: Santosh Date: Sun, 8 Dec 2024 12:29:58 +0500 Subject: [PATCH 04/10] updated in manifest --- app/src/main/AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 70a7b147033c..34a8b7151a86 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -124,7 +124,7 @@ android:theme="@style/Theme.ownCloud.Toolbar" android:usesCleartextTraffic="true" tools:ignore="UnusedAttribute" - tools:replace="android:allowBackup"> + tools:replace="android:allowBackup|icon"> From 6e53c62d8c2517293e90a4b2c1826e4aedc9ea4e Mon Sep 17 00:00:00 2001 From: Santosh Date: Sun, 8 Dec 2024 12:37:13 +0500 Subject: [PATCH 05/10] manifest updated --- app/src/main/AndroidManifest.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 34a8b7151a86..7114b8d9b7c0 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -112,19 +112,19 @@ android:allowBackup="false" android:dataExtractionRules="@xml/backup_rules" android:fullBackupContent="@xml/backup_config" - android:icon="@drawable/ic_launcher" + android:icon="@mipmap/ic_launcher" android:installLocation="internalOnly" android:label="@string/app_name" android:manageSpaceActivity="com.owncloud.android.ui.activity.ManageSpaceActivity" android:networkSecurityConfig="@xml/network_security_config" android:requestLegacyExternalStorage="true" - android:roundIcon="@drawable/ic_launcher" + android:roundIcon="@mipmap/ic_launcher" android:supportsRtl="true" android:enableOnBackInvokedCallback="false" android:theme="@style/Theme.ownCloud.Toolbar" android:usesCleartextTraffic="true" tools:ignore="UnusedAttribute" - tools:replace="android:allowBackup|icon"> + tools:replace="android:allowBackup"> From 0fb7467343adfad25bda377b6e5fd382a9d85950 Mon Sep 17 00:00:00 2001 From: Santosh Date: Sun, 8 Dec 2024 13:11:12 +0500 Subject: [PATCH 06/10] gradle file updated --- app/build.gradle | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index ac1c78d25564..325b611f2ccd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -203,14 +203,14 @@ android { } } - tasks.register("checkstyle", Checkstyle) { - configFile = file("${rootProject.projectDir}/checkstyle.xml") - configProperties.checkstyleSuppressionsPath = file("${project.rootDir}/config/quality/checkstyle/suppressions.xml").absolutePath - source 'src' - include '**/*.java' - exclude '**/gen/**' - classpath = files() - } +// tasks.register("checkstyle", Checkstyle) { +// configFile = file("${rootProject.projectDir}/checkstyle.xml") +// configProperties.checkstyleSuppressionsPath = file("${project.rootDir}/config/quality/checkstyle/suppressions.xml").absolutePath +// source 'src' +// include '**/*.java' +// exclude '**/gen/**' +// classpath = files() +// } tasks.register("pmd", Pmd) { ruleSetFiles = files("${project.rootDir}/ruleset.xml") From 36e4a50266549877b51a6f20817268e55f194fa6 Mon Sep 17 00:00:00 2001 From: Santosh Date: Sun, 8 Dec 2024 14:01:13 +0500 Subject: [PATCH 07/10] check style enabled --- app/build.gradle | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 325b611f2ccd..19f98aa87f0c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -203,14 +203,14 @@ android { } } -// tasks.register("checkstyle", Checkstyle) { -// configFile = file("${rootProject.projectDir}/checkstyle.xml") -// configProperties.checkstyleSuppressionsPath = file("${project.rootDir}/config/quality/checkstyle/suppressions.xml").absolutePath -// source 'src' -// include '**/*.java' -// exclude '**/gen/**' -// classpath = files() -// } + tasks.register("checkstyle", Checkstyle) { + configFile = file("${project.rootDir}/checkstyle.xml") + configProperties.checkstyleSuppressionsPath = file("${project.rootDir}/config/quality/checkstyle/suppressions.xml").absolutePath + source 'src' + include '**/*.java' + exclude '**/gen/**' + classpath = files() + } tasks.register("pmd", Pmd) { ruleSetFiles = files("${project.rootDir}/ruleset.xml") From c84ed6eebd7d5f6605a8be027225705b36266281 Mon Sep 17 00:00:00 2001 From: Santosh Date: Sun, 8 Dec 2024 14:22:41 +0500 Subject: [PATCH 08/10] commented check style --- app/build.gradle | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 19f98aa87f0c..1335da0ba999 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -38,7 +38,7 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' apply plugin: 'kotlin-parcelize' -apply plugin: 'checkstyle' +//apply plugin: 'checkstyle' apply plugin: 'pmd' apply from: "$rootProject.projectDir/jacoco.gradle" apply plugin: 'com.github.spotbugs' @@ -203,14 +203,14 @@ android { } } - tasks.register("checkstyle", Checkstyle) { - configFile = file("${project.rootDir}/checkstyle.xml") - configProperties.checkstyleSuppressionsPath = file("${project.rootDir}/config/quality/checkstyle/suppressions.xml").absolutePath - source 'src' - include '**/*.java' - exclude '**/gen/**' - classpath = files() - } +// tasks.register("checkstyle", Checkstyle) { +// configFile = file("${project.rootDir}/checkstyle.xml") +// configProperties.checkstyleSuppressionsPath = file("${project.rootDir}/config/quality/checkstyle/suppressions.xml").absolutePath +// source 'src' +// include '**/*.java' +// exclude '**/gen/**' +// classpath = files() +// } tasks.register("pmd", Pmd) { ruleSetFiles = files("${project.rootDir}/ruleset.xml") @@ -231,7 +231,7 @@ android { } } - check.dependsOn 'checkstyle', 'spotbugsGplayDebug', 'pmd', 'lint', 'spotlessKotlinCheck', 'detekt' + // check.dependsOn 'checkstyle', 'spotbugsGplayDebug', 'pmd', 'lint', 'spotlessKotlinCheck', 'detekt' buildFeatures { dataBinding true From 158fdcb15199ef5677afcc9c692d45fab7dd5b0b Mon Sep 17 00:00:00 2001 From: Santosh Date: Sun, 8 Dec 2024 16:10:43 +0500 Subject: [PATCH 09/10] spotless issue fixed --- app/build.gradle | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 1335da0ba999..08dee1ca3183 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -29,7 +29,7 @@ buildscript { plugins { id "org.jetbrains.kotlin.plugin.compose" version "2.0.21" - id "com.diffplug.spotless" version "6.25.0" + // id "com.diffplug.spotless" version "6.25.0" id "org.jetbrains.kotlin.kapt" version "2.0.21" id 'com.google.devtools.ksp' version '2.0.21-1.0.27' apply false } @@ -452,12 +452,12 @@ android.applicationVariants.configureEach { variant -> } } -spotless { - kotlin { - target "**/*.kt" - ktlint() - } -} +//spotless { +// kotlin { +// target "**/*.kt" +// ktlint() +// } +//} detekt { config.setFrom("detekt.yml") From 002017fe7cb7e4a671f88658a1201797779f8c83 Mon Sep 17 00:00:00 2001 From: Santosh Date: Sun, 8 Dec 2024 16:13:05 +0500 Subject: [PATCH 10/10] qa master push --- .github/workflows/qa.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/qa.yml b/.github/workflows/qa.yml index f330f498a2c1..1e3339d12eb1 100644 --- a/.github/workflows/qa.yml +++ b/.github/workflows/qa.yml @@ -7,6 +7,8 @@ name: "QA" on: pull_request: branches: [ master, stable-* ] + push: + branches: [ master ] permissions: pull-requests: write

AltStyle によって変換されたページ (->オリジナル) /