From bde1615e2fb27756fcac200a08dc42e8ec0bcb4d Mon Sep 17 00:00:00 2001 From: harsha Date: Wed, 8 Jan 2025 22:54:03 +0530 Subject: [PATCH] https://catrobat.atlassian.net/browse/CATROID-1617 Catroid-1617 Main menu Scratch-converter beta removed. --- catroid/build.gradle | 2 +- catroid/gradle/code_quality_tasks.gradle | 1 - catroid/src/main/AndroidManifest.xml | 3 ++- .../scratchconverter/ScratchConversionManager.java | 2 ++ .../catroid/scratchconverter/WebSocketClient.java | 3 +++ .../java/org/catrobat/catroid/ui/MainMenuActivity.kt | 11 +++++++++-- .../catrobat/catroid/ui/ScratchConverterActivity.java | 4 ++++ .../catroid/ui/ScratchProgramDetailsActivity.java | 3 +++ .../main/res/layout/activity_scratch_converter.xml | 3 ++- catroid/src/main/res/menu/menu_main_menu.xml | 4 +++- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 11 files changed, 31 insertions(+), 9 deletions(-) diff --git a/catroid/build.gradle b/catroid/build.gradle index 2a48bc34023..388d9761690 100644 --- a/catroid/build.gradle +++ b/catroid/build.gradle @@ -158,7 +158,7 @@ android { buildConfigField "boolean", "FEATURE_NFC_ENABLED", "true" buildConfigField "boolean", "FEATURE_POCKETMUSIC_ENABLED", "true" buildConfigField "boolean", "FEATURE_RASPI_ENABLED", "true" - buildConfigField "boolean", "FEATURE_SCRATCH_CONVERTER_ENABLED", "true" + //buildConfigField "boolean", "FEATURE_SCRATCH_CONVERTER_ENABLED", "true" buildConfigField "boolean", "FEATURE_USER_REPORTERS_ENABLED", "true" buildConfigField "boolean", "FEATURE_MULTIPLAYER_VARIABLES_ENABLED", "true" buildConfigField "boolean", "FEATURE_TESTBRICK_ENABLED", "true" diff --git a/catroid/gradle/code_quality_tasks.gradle b/catroid/gradle/code_quality_tasks.gradle index 80a318e80d8..0b8988a181c 100644 --- a/catroid/gradle/code_quality_tasks.gradle +++ b/catroid/gradle/code_quality_tasks.gradle @@ -68,7 +68,6 @@ task pmd(type: Pmd) { reports { xml.required = true - html.enabled = false xml.destination file("build/reports/pmd.xml") } } diff --git a/catroid/src/main/AndroidManifest.xml b/catroid/src/main/AndroidManifest.xml index 6720466bbd6..90d002e315f 100644 --- a/catroid/src/main/AndroidManifest.xml +++ b/catroid/src/main/AndroidManifest.xml @@ -213,11 +213,12 @@ android:screenOrientation="portrait" android:windowSoftInputMode="adjustNothing" /> + implements Client, BaseMessageHandler, CompletedCallback { @@ -289,3 +290,5 @@ private void sendCommand(final Command command) { webSocket.send(dataToSend); } } + + */ diff --git a/catroid/src/main/java/org/catrobat/catroid/ui/MainMenuActivity.kt b/catroid/src/main/java/org/catrobat/catroid/ui/MainMenuActivity.kt index d9bb88b6e86..7c7b5199418 100644 --- a/catroid/src/main/java/org/catrobat/catroid/ui/MainMenuActivity.kt +++ b/catroid/src/main/java/org/catrobat/catroid/ui/MainMenuActivity.kt @@ -246,6 +246,7 @@ class MainMenuActivity : BaseCastActivity(), ProjectLoadListener { } } + /* override fun onCreateOptionsMenu(menu: Menu): Boolean { menuInflater.inflate(R.menu.menu_main_menu, menu) val scratchConverter = getString(R.string.main_menu_scratch_converter) @@ -261,15 +262,17 @@ class MainMenuActivity : BaseCastActivity(), ProjectLoadListener { menu.findItem(R.id.menu_scratch_converter).title = scratchConverterBeta return super.onCreateOptionsMenu(menu) } - + */ override fun onPrepareOptionsMenu(menu: Menu): Boolean { menu.findItem(R.id.menu_login).isVisible = !Utils.isUserLoggedIn(this) menu.findItem(R.id.menu_logout).isVisible = Utils.isUserLoggedIn(this) + /* if (!BuildConfig.FEATURE_SCRATCH_CONVERTER_ENABLED) { menu.removeItem(R.id.menu_scratch_converter) } + */ return true } @@ -303,9 +306,13 @@ class MainMenuActivity : BaseCastActivity(), ProjectLoadListener { supportFragmentManager, AboutDialogFragment.TAG ) - R.id.menu_scratch_converter -> if (Utils.checkIsNetworkAvailableAndShowErrorMessage(this)) { + /* Scratch Converter removed + R.id.menu_scratch_converter -> if (Utils.checkIsNetworkAvailableAndShowErrorMessage + (this)) { startActivity(Intent(this, ScratchConverterActivity::class.java)) } + + */ R.id.settings -> startActivity(Intent(this, SettingsActivity::class.java)) R.id.menu_login -> startActivity(Intent(this, SignInActivity::class.java)) R.id.menu_logout -> { diff --git a/catroid/src/main/java/org/catrobat/catroid/ui/ScratchConverterActivity.java b/catroid/src/main/java/org/catrobat/catroid/ui/ScratchConverterActivity.java index dfad3d793c1..9b6be0d6749 100644 --- a/catroid/src/main/java/org/catrobat/catroid/ui/ScratchConverterActivity.java +++ b/catroid/src/main/java/org/catrobat/catroid/ui/ScratchConverterActivity.java @@ -57,6 +57,8 @@ import static org.catrobat.catroid.common.SharedPreferenceKeys.SCRATCH_CONVERTER_CLIENT_ID_PREFERENCE_KEY; +//Scratch Converter activity removal +/* public class ScratchConverterActivity extends BaseActivity implements BaseInfoViewListener, JobViewListener, @@ -362,3 +364,5 @@ public interface OnJobListListener { void onJobListChanged(); } } + + */ diff --git a/catroid/src/main/java/org/catrobat/catroid/ui/ScratchProgramDetailsActivity.java b/catroid/src/main/java/org/catrobat/catroid/ui/ScratchProgramDetailsActivity.java index 82494f600f6..663ecd888a1 100644 --- a/catroid/src/main/java/org/catrobat/catroid/ui/ScratchProgramDetailsActivity.java +++ b/catroid/src/main/java/org/catrobat/catroid/ui/ScratchProgramDetailsActivity.java @@ -68,6 +68,7 @@ import static org.catrobat.catroid.utils.NumberFormats.toMetricUnitRepresentation; +/* public class ScratchProgramDetailsActivity extends BaseActivity implements FetchScratchProgramDetailsTask.ScratchProgramListTaskDelegate, JobViewListener, Client.ProjectDownloadCallback, @@ -398,3 +399,5 @@ public void onUserCanceledDownload(final String url) { } } } + + */ diff --git a/catroid/src/main/res/layout/activity_scratch_converter.xml b/catroid/src/main/res/layout/activity_scratch_converter.xml index adc34855406..3a5b4dd8aa5 100644 --- a/catroid/src/main/res/layout/activity_scratch_converter.xml +++ b/catroid/src/main/res/layout/activity_scratch_converter.xml @@ -21,6 +21,7 @@ ~ You should have received a copy of the GNU Affero General Public License ~ along with this program. If not, see . --> + - + \ No newline at end of file diff --git a/catroid/src/main/res/menu/menu_main_menu.xml b/catroid/src/main/res/menu/menu_main_menu.xml index 3e358606b8c..e3c18f4874e 100644 --- a/catroid/src/main/res/menu/menu_main_menu.xml +++ b/catroid/src/main/res/menu/menu_main_menu.xml @@ -55,11 +55,13 @@ android:title="@string/main_menu_about" app:showAsAction="never" android:icon="@drawable/ic_info"/> + +