Skip to content

Commit d44d734

Browse files
ratschillerpFrajhamsterreichli
authored and
Tine Podlunšek
committed
Release 1.3.0 (Catrobat#5045)
* Migrate targetSDKVersion 34 and minSDKVersion 31 (Catrobat#5027) * Increase Version Code and Version Number (Catrobat#5028) * Migrate targetSDKVersion 34 and minSDKVersion 31 * Increase version code to 89 and version name to 1.3.0 * Increase Version Number to 95 (Catrobat#5029) * Increase defaultVersionCode to 95 * Decrease minSDKVersion to 28 * Teamday fixes (Catrobat#5032) * Fix German strings, add new german string * Remove 'Add from local' option from the actors and objects popup menu * Fix crash when trying to paste empty clipboard * Fix checkstyle * IDE-264 Migrate targetSDKVersion 34 (Catrobat#5026) * IDE-264 Migrate targetSDKVersion 34 * IDE-264 Set ForegroundServiceType for project upload and download * Increase defaultVersionCode to 97 (Catrobat#5037) --------- Co-authored-by: Frajhamster <[email protected]> Co-authored-by: Thomas Reichel <[email protected]>
1 parent 5177804 commit d44d734

File tree

7 files changed

+28
-16
lines changed

7 files changed

+28
-16
lines changed

‎catroid/build.gradle

+5-7
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,11 @@ ext.copyGoogleServicesFile = { flavorName, flavorId ->
102102
}
103103
}
104104

105-
def defaultVersionCode = 88
106-
def defaultVersionName = "1.1.2"
105+
def defaultVersionCode = 97
106+
def defaultVersionName = "1.3.0"
107107

108108
android {
109-
compileSdk 33
109+
compileSdk 34
110110
buildToolsVersion = "33.0.2"
111111

112112
namespace 'org.catrobat.catroid'
@@ -117,9 +117,8 @@ android {
117117
}
118118

119119
defaultConfig {
120-
121-
minSdkVersion 23
122-
targetSdkVersion 33
120+
minSdkVersion 28
121+
targetSdkVersion 34
123122
applicationId appId
124123
testInstrumentationRunner 'org.catrobat.catroid.runner.UiTestApplicationRunner'
125124
versionCode defaultVersionCode
@@ -197,7 +196,6 @@ android {
197196
}
198197
}
199198

200-
dexOptions.javaMaxHeapSize "4g"
201199
packagingOptions {
202200
jniLibs {
203201
excludes += ['lib/mips/*', 'lib/armeabi/*']

‎catroid/src/main/AndroidManifest.xml

+10-3
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
4444
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
4545
<uses-permission android:name="android.permission.RECORD_AUDIO" />
46-
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
4746

4847
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" tools:node="remove" />
4948

@@ -83,6 +82,10 @@
8382
android:name="android.hardware.camera"
8483
android:required="false" />
8584

85+
<!-- foreground services -->
86+
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
87+
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
88+
8689
<application
8790
android:name=".CatroidApplication"
8891
android:allowBackup="false"
@@ -249,8 +252,12 @@
249252
<activity
250253
android:name=".ui.filepicker.FilePickerActivity" />
251254

252-
<service android:name=".transfers.project.ProjectUploadService" />
253-
<service android:name=".transfers.project.ProjectDownloadService" />
255+
<service
256+
android:name=".transfers.project.ProjectUploadService"
257+
android:foregroundServiceType="dataSync" />
258+
<service
259+
android:name=".transfers.project.ProjectDownloadService"
260+
android:foregroundServiceType="dataSync" />
254261
<service android:name=".transfers.MediaDownloadService" />
255262
<service android:name=".utils.notifications.StatusBarNotificationManager$NotificationActionService" />
256263
<service android:name=".cast.CastService"/>

‎catroid/src/main/java/org/catrobat/catroid/common/Constants.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242

4343
public final class Constants {
4444

45-
public static final double CURRENT_CATROBAT_LANGUAGE_VERSION = 1.12;
45+
public static final double CURRENT_CATROBAT_LANGUAGE_VERSION = 1.13;
4646
public static final String REMOTE_DISPLAY_APP_ID = "CEBB9229";
4747
public static final int CAST_CONNECTION_TIMEOUT = 5000; //in milliseconds
4848
public static final int CAST_NOT_SEEING_DEVICE_TIMEOUT = 3000; //in

‎catroid/src/main/java/org/catrobat/catroid/formulaeditor/InternFormula.java

+4
Original file line numberDiff line numberDiff line change
@@ -730,6 +730,10 @@ private CursorTokenPropertiesAfterModification insertRightToCurrentToken(List<In
730730
}
731731

732732
private CursorTokenPropertiesAfterModification setCursorPositionAndSelectionAfterInput(int insertedInternTokenIndex) {
733+
if (internTokenFormulaList.isEmpty()) {
734+
return CursorTokenPropertiesAfterModification.RIGHT;
735+
}
736+
733737
InternToken insertedInternToken = internTokenFormulaList.get(insertedInternTokenIndex);
734738

735739
if (insertedInternToken.getInternTokenType() == InternTokenType.FUNCTION_NAME) {

‎catroid/src/main/java/org/catrobat/catroid/transfers/project/ProjectDownloadService.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@ class ProjectDownloadService : IntentService("ProjectDownloadService") {
8686
val zipFileString = File(File(CACHE_DIRECTORY, TMP_DIRECTORY_NAME), DOWNLOAD_FILE_NAME).absolutePath
8787
val destinationFile = File(zipFileString)
8888

89-
if ((destinationFile.parentFile.isDirectory or destinationFile.parentFile.mkdirs()).not()) {
89+
if (((destinationFile.parentFile?.isDirectory ?: false) or
90+
(destinationFile.parentFile?.mkdirs() ?: false)).not()) {
9091
ToastUtil.showError(this, R.string.error_project_download)
9192
return
9293
}

‎catroid/src/main/java/org/catrobat/catroid/ui/recyclerview/fragment/SpriteListFragment.kt

+1
Original file line numberDiff line numberDiff line change
@@ -390,6 +390,7 @@ class SpriteListFragment : RecyclerViewFragment<Sprite?>() {
390390
}
391391
if (item !is GroupSprite) {
392392
popupMenu.menu.findItem(R.id.backpack).setTitle(R.string.pack)
393+
popupMenu.menu.removeItem(R.id.from_local)
393394
}
394395
popupMenu.show()
395396
}

‎catroid/src/main/res/values-de/strings.xml

+5-4
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@
325325
<string formatted="false" name="am_merge_error">Es wird keine Zusammenlegung durchgeführt. Es müssen genau 2 Projekte ausgewählt werden, welche zusammengeführt werden sollen.</string>
326326
<string formatted="false" name="am_backpack">Einpacken</string>
327327
<string formatted="false" name="am_unpack">Auspacken</string>
328-
<string formatted="false" name="am_copy">Kopiert</string>
328+
<string formatted="false" name="am_copy">Kopieren</string>
329329
<string formatted="false" name="am_delete">Löschen</string>
330330
<string formatted="false" name="am_rename">Umbenennen</string>
331331
<string formatted="false" name="am_convert">Konvertieren</string>
@@ -334,7 +334,7 @@
334334
<string formatted="false" name="list_headline_sprites">Figuren und Objekte</string>
335335
<!-- Options Menu Options -->
336336
<string formatted="false" name="backpack">Rucksack</string>
337-
<string formatted="false" name="copy">Kopiert</string>
337+
<string formatted="false" name="copy">Kopieren</string>
338338
<string formatted="false" name="delete">Löschen</string>
339339
<string formatted="false" name="rename">Umbenennen</string>
340340
<string formatted="false" name="merge">Zusammenführen</string>
@@ -614,6 +614,7 @@
614614
<string formatted="false" name="add_look_choose_image">Bild auswählen</string>
615615
<string formatted="false" name="add_look_media_library">Medienbibliothek</string>
616616
<string formatted="false" name="add_look_from_local_project">Lokale Projekte</string>
617+
<string formatted="false" name="add_look_actors_and_object">Lokale Figuren und Objekte</string>
617618
<!-- -->
618619
<!-- NewSoundDialog -->
619620
<string formatted="false" name="new_sound_dialog_title">Klang hinzufügen</string>
@@ -683,8 +684,8 @@
683684
<string formatted="false" name="brick_context_dialog_move_script">Skript bewegen</string>
684685
<string formatted="false" name="brick_context_dialog_move_definition">Verschiebe diese Definition</string>
685686
<string formatted="false" name="brick_context_dialog_delete_brick">Baustein löschen</string>
686-
<string formatted="false" name="brick_context_dialog_copy_brick">Baustein kopiert</string>
687-
<string formatted="false" name="brick_context_dialog_copy_script">Skript kopiert</string>
687+
<string formatted="false" name="brick_context_dialog_copy_brick">Baustein kopieren</string>
688+
<string formatted="false" name="brick_context_dialog_copy_script">Skript kopieren</string>
688689
<string formatted="false" name="brick_context_dialog_formula_edit_brick">Formel bearbeiten</string>
689690
<string formatted="false" name="brick_context_dialog_delete_script">Skript löschen</string>
690691
<string formatted="false" name="brick_context_dialog_delete_definition">Lösche diese Definition</string>

0 commit comments

Comments
 (0)