CATROID-1202 implement add brick functionality in Catblocks

Catrobat · Sep 15, 2022 · 7600e90 · 7600e90
1 parent 2e9dd66
commit 7600e90
Show file tree

Hide file tree

Showing 84 changed files with 424 additions and 213 deletions.
diff --git a/catroid/src/main/assets/catblocks/CatBlocks.js b/catroid/src/main/assets/catblocks/CatBlocks.js
diff --git a/catroid/src/main/assets/catblocks/i18n/af.json b/catroid/src/main/assets/catblocks/i18n/af.json
diff --git a/catroid/src/main/assets/catblocks/i18n/ar.json b/catroid/src/main/assets/catblocks/i18n/ar.json
diff --git a/catroid/src/main/assets/catblocks/i18n/az.json b/catroid/src/main/assets/catblocks/i18n/az.json
diff --git a/catroid/src/main/assets/catblocks/i18n/bg.json b/catroid/src/main/assets/catblocks/i18n/bg.json
diff --git a/catroid/src/main/assets/catblocks/i18n/bn.json b/catroid/src/main/assets/catblocks/i18n/bn.json
diff --git a/catroid/src/main/assets/catblocks/i18n/bs.json b/catroid/src/main/assets/catblocks/i18n/bs.json
diff --git a/catroid/src/main/assets/catblocks/i18n/ca.json b/catroid/src/main/assets/catblocks/i18n/ca.json
diff --git a/catroid/src/main/assets/catblocks/i18n/chr.json b/catroid/src/main/assets/catblocks/i18n/chr.json
diff --git a/catroid/src/main/assets/catblocks/i18n/cs.json b/catroid/src/main/assets/catblocks/i18n/cs.json
diff --git a/catroid/src/main/assets/catblocks/i18n/da.json b/catroid/src/main/assets/catblocks/i18n/da.json
diff --git a/catroid/src/main/assets/catblocks/i18n/de.json b/catroid/src/main/assets/catblocks/i18n/de.json
diff --git a/catroid/src/main/assets/catblocks/i18n/el.json b/catroid/src/main/assets/catblocks/i18n/el.json
diff --git a/catroid/src/main/assets/catblocks/i18n/en.json b/catroid/src/main/assets/catblocks/i18n/en.json
diff --git a/catroid/src/main/assets/catblocks/i18n/en_AU.json b/catroid/src/main/assets/catblocks/i18n/en_AU.json
diff --git a/catroid/src/main/assets/catblocks/i18n/en_CA.json b/catroid/src/main/assets/catblocks/i18n/en_CA.json
diff --git a/catroid/src/main/assets/catblocks/i18n/en_GB.json b/catroid/src/main/assets/catblocks/i18n/en_GB.json
diff --git a/catroid/src/main/assets/catblocks/i18n/es.json b/catroid/src/main/assets/catblocks/i18n/es.json
diff --git a/catroid/src/main/assets/catblocks/i18n/eu_ES.json b/catroid/src/main/assets/catblocks/i18n/eu_ES.json
diff --git a/catroid/src/main/assets/catblocks/i18n/fa.json b/catroid/src/main/assets/catblocks/i18n/fa.json
diff --git a/catroid/src/main/assets/catblocks/i18n/fa_IR.json b/catroid/src/main/assets/catblocks/i18n/fa_IR.json
diff --git a/catroid/src/main/assets/catblocks/i18n/fi.json b/catroid/src/main/assets/catblocks/i18n/fi.json
diff --git a/catroid/src/main/assets/catblocks/i18n/fr.json b/catroid/src/main/assets/catblocks/i18n/fr.json
diff --git a/catroid/src/main/assets/catblocks/i18n/gl.json b/catroid/src/main/assets/catblocks/i18n/gl.json
diff --git a/catroid/src/main/assets/catblocks/i18n/gu.json b/catroid/src/main/assets/catblocks/i18n/gu.json
diff --git a/catroid/src/main/assets/catblocks/i18n/ha.json b/catroid/src/main/assets/catblocks/i18n/ha.json
diff --git a/catroid/src/main/assets/catblocks/i18n/hi.json b/catroid/src/main/assets/catblocks/i18n/hi.json
diff --git a/catroid/src/main/assets/catblocks/i18n/hr.json b/catroid/src/main/assets/catblocks/i18n/hr.json
diff --git a/catroid/src/main/assets/catblocks/i18n/hu.json b/catroid/src/main/assets/catblocks/i18n/hu.json
diff --git a/catroid/src/main/assets/catblocks/i18n/ig.json b/catroid/src/main/assets/catblocks/i18n/ig.json
diff --git a/catroid/src/main/assets/catblocks/i18n/in.json b/catroid/src/main/assets/catblocks/i18n/in.json
diff --git a/catroid/src/main/assets/catblocks/i18n/it.json b/catroid/src/main/assets/catblocks/i18n/it.json
diff --git a/catroid/src/main/assets/catblocks/i18n/iw.json b/catroid/src/main/assets/catblocks/i18n/iw.json
diff --git a/catroid/src/main/assets/catblocks/i18n/ja.json b/catroid/src/main/assets/catblocks/i18n/ja.json
diff --git a/catroid/src/main/assets/catblocks/i18n/ka.json b/catroid/src/main/assets/catblocks/i18n/ka.json
diff --git a/catroid/src/main/assets/catblocks/i18n/kab.json b/catroid/src/main/assets/catblocks/i18n/kab.json
diff --git a/catroid/src/main/assets/catblocks/i18n/kk.json b/catroid/src/main/assets/catblocks/i18n/kk.json
diff --git a/catroid/src/main/assets/catblocks/i18n/kn.json b/catroid/src/main/assets/catblocks/i18n/kn.json
diff --git a/catroid/src/main/assets/catblocks/i18n/ko.json b/catroid/src/main/assets/catblocks/i18n/ko.json
diff --git a/catroid/src/main/assets/catblocks/i18n/lt.json b/catroid/src/main/assets/catblocks/i18n/lt.json
diff --git a/catroid/src/main/assets/catblocks/i18n/mk.json b/catroid/src/main/assets/catblocks/i18n/mk.json
diff --git a/catroid/src/main/assets/catblocks/i18n/ml.json b/catroid/src/main/assets/catblocks/i18n/ml.json
diff --git a/catroid/src/main/assets/catblocks/i18n/ml_IN.json b/catroid/src/main/assets/catblocks/i18n/ml_IN.json
diff --git a/catroid/src/main/assets/catblocks/i18n/ms.json b/catroid/src/main/assets/catblocks/i18n/ms.json
diff --git a/catroid/src/main/assets/catblocks/i18n/nl.json b/catroid/src/main/assets/catblocks/i18n/nl.json
diff --git a/catroid/src/main/assets/catblocks/i18n/no.json b/catroid/src/main/assets/catblocks/i18n/no.json
diff --git a/catroid/src/main/assets/catblocks/i18n/pa_IN.json b/catroid/src/main/assets/catblocks/i18n/pa_IN.json
diff --git a/catroid/src/main/assets/catblocks/i18n/pl.json b/catroid/src/main/assets/catblocks/i18n/pl.json
diff --git a/catroid/src/main/assets/catblocks/i18n/ps.json b/catroid/src/main/assets/catblocks/i18n/ps.json
diff --git a/catroid/src/main/assets/catblocks/i18n/pt.json b/catroid/src/main/assets/catblocks/i18n/pt.json
diff --git a/catroid/src/main/assets/catblocks/i18n/pt_BR.json b/catroid/src/main/assets/catblocks/i18n/pt_BR.json
diff --git a/catroid/src/main/assets/catblocks/i18n/ro.json b/catroid/src/main/assets/catblocks/i18n/ro.json
diff --git a/catroid/src/main/assets/catblocks/i18n/ru.json b/catroid/src/main/assets/catblocks/i18n/ru.json
diff --git a/catroid/src/main/assets/catblocks/i18n/sd.json b/catroid/src/main/assets/catblocks/i18n/sd.json
diff --git a/catroid/src/main/assets/catblocks/i18n/si.json b/catroid/src/main/assets/catblocks/i18n/si.json
diff --git a/catroid/src/main/assets/catblocks/i18n/sk.json b/catroid/src/main/assets/catblocks/i18n/sk.json
diff --git a/catroid/src/main/assets/catblocks/i18n/sl.json b/catroid/src/main/assets/catblocks/i18n/sl.json
diff --git a/catroid/src/main/assets/catblocks/i18n/sq.json b/catroid/src/main/assets/catblocks/i18n/sq.json
diff --git a/catroid/src/main/assets/catblocks/i18n/sr.json b/catroid/src/main/assets/catblocks/i18n/sr.json
diff --git a/catroid/src/main/assets/catblocks/i18n/sr_CS.json b/catroid/src/main/assets/catblocks/i18n/sr_CS.json
diff --git a/catroid/src/main/assets/catblocks/i18n/sr_SP.json b/catroid/src/main/assets/catblocks/i18n/sr_SP.json
diff --git a/catroid/src/main/assets/catblocks/i18n/sv.json b/catroid/src/main/assets/catblocks/i18n/sv.json
diff --git a/catroid/src/main/assets/catblocks/i18n/sw.json b/catroid/src/main/assets/catblocks/i18n/sw.json
diff --git a/catroid/src/main/assets/catblocks/i18n/ta.json b/catroid/src/main/assets/catblocks/i18n/ta.json
diff --git a/catroid/src/main/assets/catblocks/i18n/te.json b/catroid/src/main/assets/catblocks/i18n/te.json
diff --git a/catroid/src/main/assets/catblocks/i18n/th.json b/catroid/src/main/assets/catblocks/i18n/th.json
diff --git a/catroid/src/main/assets/catblocks/i18n/tl.json b/catroid/src/main/assets/catblocks/i18n/tl.json
diff --git a/catroid/src/main/assets/catblocks/i18n/tr.json b/catroid/src/main/assets/catblocks/i18n/tr.json
diff --git a/catroid/src/main/assets/catblocks/i18n/tw.json b/catroid/src/main/assets/catblocks/i18n/tw.json
diff --git a/catroid/src/main/assets/catblocks/i18n/uk.json b/catroid/src/main/assets/catblocks/i18n/uk.json
diff --git a/catroid/src/main/assets/catblocks/i18n/ur.json b/catroid/src/main/assets/catblocks/i18n/ur.json
diff --git a/catroid/src/main/assets/catblocks/i18n/uz.json b/catroid/src/main/assets/catblocks/i18n/uz.json
diff --git a/catroid/src/main/assets/catblocks/i18n/vi.json b/catroid/src/main/assets/catblocks/i18n/vi.json
diff --git a/catroid/src/main/assets/catblocks/i18n/yo_NG.json b/catroid/src/main/assets/catblocks/i18n/yo_NG.json
diff --git a/catroid/src/main/assets/catblocks/i18n/zh_CN.json b/catroid/src/main/assets/catblocks/i18n/zh_CN.json
diff --git a/catroid/src/main/assets/catblocks/i18n/zh_TW.json b/catroid/src/main/assets/catblocks/i18n/zh_TW.json
diff --git a/catroid/src/main/assets/catblocks/index.html b/catroid/src/main/assets/catblocks/index.html
@@ -1,18 +1,49 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>Catblocks 2D view</title>
-  <link href="main.css" rel="stylesheet">
-</head>
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Android Release</title>
 
-<body>
-<div id="catroid-catblocks-container"></div>
-<script type="text/javascript"
-        src="https://appassets.androidplatform.net/assets/catblocks/CatBlocks.js"></script>
+    <link
+      rel="stylesheet"
+      href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css"
+      integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh"
+      crossorigin="anonymous"
+    />
+    <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" />
 
-<script>
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/mdbootstrap/4.15.0/css/mdb.min.css" rel="stylesheet" />
+  <link href="main.css?a54aa1ae5714dedd3117" rel="stylesheet"></head>
+
+  <body>
+    <div id="catroid-catblocks-container"></div>
+
+    <div id="catroid-catblocks-hidden-container" style="display:none;"></div>
+
+    <div id="catroid-catblocks-add-brick-dialog" style="display:none;">
+      <div id="catroid-catblocks-add-brick-dialog-header">
+        <div id="catroid-catblocks-add-brick-dialog-header-content-container">
+          <div id="catroid-catblocks-add-brick-back-container">
+            <img
+                src="https://appassets.androidplatform.net/assets/catblocks/media/arrow_back_ios_black_36dp.svg" />
+          </div>
+          <div id="catroid-catblocks-add-brick-text-container">
+            <h3 id="catroid-catblocks-add-brick-dialog-header-text"></h3>
+          </div>
+        </div>
+        <div id="catroid-catblocks-add-brick-dialog-close-container">
+          <img
+              src="https://appassets.androidplatform.net/assets/catblocks/media/close_black_36dp.svg" />
+        </div>
+      </div>
+      <div id="catroid-catblocks-add-brick-dialog-content">
+        <div id="catroid-catblocks-brick-category-container" class="list-group" style="display:none;"></div>
+        <div id="catroid-catblocks-bricks-container" style="display:none;"></div>
+      </div>
+    </div>
+
+    <script>
       window.onload = function () {
         CatBlocks.init({
           container: 'catroid-catblocks-container',
@@ -28,13 +59,27 @@
           readOnly: false
         }).then(() => {
           const programXML = Android.getCurrentProject();
-
           const scene = Android.getSceneNameToDisplay();
           const object = Android.getSpriteNameToDisplay();
-          const brickIDToFocus = Android.getBrickIDToFocus();
-          CatBlocks.render(programXML, scene, object, brickIDToFocus);
+          CatBlocks.render(programXML, scene, object);
         });
       };
     </script>
-</body>
-</html>
+    <script
+      src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.5.1/jquery.min.js"
+      integrity="sha256-9/aliU8dGd2tb6OSsuzixeV4y/faTqgFtohetphbbj0="
+      crossorigin="anonymous"
+    ></script>
+    <script
+      src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js"
+      integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1"
+      crossorigin="anonymous"
+    ></script>
+    <script
+      src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"
+      integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM"
+      crossorigin="anonymous"
+    ></script>
+  <script type="text/javascript"
+          src="https://appassets.androidplatform.net/assets/catblocks/CatBlocks.js?a54aa1ae5714dedd3117"></script></body>
+</html>
diff --git a/catroid/src/main/assets/catblocks/main.css b/catroid/src/main/assets/catblocks/main.css
@@ -66,6 +66,94 @@ body {
   width: 100%;
 }
 
+#catroid-catblocks-add-brick-dialog {
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  z-index: 9999;
+  background-color: white;
+}
+
+#catroid-catblocks-add-brick-dialog-header {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  height: 50px;
+}
+
+#catroid-catblocks-add-brick-dialog-content {
+  position: absolute;
+  top: 50px;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  overflow-x: auto;
+}
+
+#catroid-catblocks-bricks-container {
+  width: 90%;
+  margin-left: 5%;
+  margin-right: 5%;
+}
+
+.catblocks-svg-brick-container {
+  width: 100%;
+  background-color: white;
+  overflow-y: hidden;
+  overflow-x: auto;
+}
+
+.catblocks-svg-brick-container > svg {
+  width: 100%;
+}
+
+#catroid-catblocks-add-brick-dialog-header-content-container {
+  position: absolute;
+  top: 0;
+  left: 10px;
+  right: 50px;
+  height: 50px;
+
+  display: flex;
+  /*justify-content: center;*/
+  align-items: center;
+}
+
+#catroid-catblocks-add-brick-dialog-close-container {
+  position: absolute;
+  top: 0;
+  right: 0;
+  width: 50px;
+  height: 50px;
+
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+#catroid-catblocks-add-brick-dialog-header-text {
+  margin-bottom: 0;
+}
+
+#catroid-catblocks-add-brick-text-container {
+  vertical-align: middle;
+}
+
+#catroid-catblocks-add-brick-back-container {
+  vertical-align: middle;
+}
+
+.catblocks-brick {
+  margin-bottom: 5px;
+}
+
+.catblocks-brick:first-of-type {
+  margin-top: 5px;
+}
+
 /*!
  * Bootstrap v4.6.1 (https://getbootstrap.com/)
  * Copyright 2011-2021 The Bootstrap Authors

diff --git a/catroid/src/main/assets/catblocks/media/arrow_back_ios_black_24dp.svg b/catroid/src/main/assets/catblocks/media/arrow_back_ios_black_24dp.svg
diff --git a/catroid/src/main/assets/catblocks/media/arrow_back_ios_black_36dp.svg b/catroid/src/main/assets/catblocks/media/arrow_back_ios_black_36dp.svg
diff --git a/catroid/src/main/assets/catblocks/media/close_black_36dp.svg b/catroid/src/main/assets/catblocks/media/close_black_36dp.svg
diff --git a/catroid/src/main/java/org/catrobat/catroid/ui/fragment/BrickCategoryFragment.kt b/catroid/src/main/java/org/catrobat/catroid/ui/fragment/BrickCategoryFragment.kt
@@ -24,7 +24,6 @@ package org.catrobat.catroid.ui.fragment
 
 import android.content.Context
 import android.os.Bundle
-import android.preference.PreferenceManager
 import android.view.LayoutInflater
 import android.view.Menu
 import android.view.MenuItem
@@ -34,7 +33,6 @@ import android.widget.AdapterView
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.ListFragment
-import org.catrobat.catroid.ProjectManager
 import org.catrobat.catroid.R
 import org.catrobat.catroid.ui.BottomBar.hideBottomBar
 import org.catrobat.catroid.ui.BottomBar.showBottomBar
@@ -44,11 +42,7 @@ import org.catrobat.catroid.ui.ViewSwitchLock
 import org.catrobat.catroid.ui.adapter.BrickCategoryAdapter
 import org.catrobat.catroid.ui.addTabLayout
 import org.catrobat.catroid.ui.removeTabLayout
-import org.catrobat.catroid.ui.settingsfragments.AccessibilityProfile
-import org.catrobat.catroid.ui.settingsfragments.RaspberryPiSettingsFragment
-import org.catrobat.catroid.ui.settingsfragments.SettingsFragment
 import org.catrobat.catroid.utils.SnackbarUtil
-import java.util.ArrayList
 import java.util.concurrent.locks.Lock
 
 class BrickCategoryFragment : ListFragment() {
@@ -65,8 +59,6 @@ class BrickCategoryFragment : ListFragment() {
         scriptFragment = listener
     }
 
-    private fun onlyBeginnerBricks(): Boolean = PreferenceManager.getDefaultSharedPreferences(activity).getBoolean(AccessibilityProfile.BEGINNER_BRICKS, false)
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         val isRestoringPreviouslyDestroyedActivity = savedInstanceState != null
@@ -141,55 +133,9 @@ class BrickCategoryFragment : ListFragment() {
 
     @SuppressWarnings("ComplexMethod")
     private fun setupBrickCategories() {
-        val inflater = requireActivity().layoutInflater
-        val categories: MutableList<View> = ArrayList()
-
-        categories.add(inflater.inflate(R.layout.brick_category_recently_used, null))
+        val brickCategoryFactory = BrickCategoryListBuilder(requireActivity())
+        val categories = brickCategoryFactory.getBrickCategoryViews()
 
-        if (SettingsFragment.isEmroiderySharedPreferenceEnabled(activity)) {
-            categories.add(inflater.inflate(R.layout.brick_category_embroidery, null))
-        }
-        if (SettingsFragment.isMindstormsNXTSharedPreferenceEnabled(activity)) {
-            categories.add(inflater.inflate(R.layout.brick_category_lego_nxt, null))
-        }
-        if (SettingsFragment.isMindstormsEV3SharedPreferenceEnabled(activity)) {
-            categories.add(inflater.inflate(R.layout.brick_category_lego_ev3, null))
-        }
-        if (SettingsFragment.isDroneSharedPreferenceEnabled(activity)) {
-            categories.add(inflater.inflate(R.layout.brick_category_drone, null))
-        }
-        if (SettingsFragment.isJSSharedPreferenceEnabled(activity)) {
-            categories.add(inflater.inflate(R.layout.brick_category_drone_js, null))
-        }
-        if (SettingsFragment.isArduinoSharedPreferenceEnabled(activity)) {
-            categories.add(inflater.inflate(R.layout.brick_category_arduino, null))
-        }
-        if (RaspberryPiSettingsFragment.isRaspiSharedPreferenceEnabled(activity)) {
-            categories.add(inflater.inflate(R.layout.brick_category_raspi, null))
-        }
-        if (SettingsFragment.isPhiroSharedPreferenceEnabled(activity)) {
-            categories.add(inflater.inflate(R.layout.brick_category_phiro, null))
-        }
-        if (ProjectManager.getInstance().currentProject.isCastProject) {
-            categories.add(inflater.inflate(R.layout.brick_category_chromecast, null))
-        }
-
-        categories.add(inflater.inflate(R.layout.brick_category_event, null))
-        categories.add(inflater.inflate(R.layout.brick_category_control, null))
-        categories.add(inflater.inflate(R.layout.brick_category_motion, null))
-        categories.add(inflater.inflate(R.layout.brick_category_sound, null))
-        categories.add(inflater.inflate(R.layout.brick_category_looks, null))
-        if (!onlyBeginnerBricks()) {
-            categories.add(inflater.inflate(R.layout.brick_category_pen, null))
-        }
-        categories.add(inflater.inflate(R.layout.brick_category_data, null))
-        categories.add(inflater.inflate(R.layout.brick_category_device, null))
-        if (!onlyBeginnerBricks()) {
-            categories.add(inflater.inflate(R.layout.brick_category_userbrick, null))
-        }
-        if (SettingsFragment.isTestSharedPreferenceEnabled(activity)) {
-            categories.add(inflater.inflate(R.layout.brick_category_assert, null))
-        }
         adapter = BrickCategoryAdapter(categories)
         listAdapter = adapter
     }