Merge pull request #1056 from Catrobat/release-v2.8.1

wslany · web-flow · commit 356677411cf3 · 2022-03-20T18:23:57.000+01:00
Release v2.8.1
diff --git a/Jenkinsfile.screenshots b/Jenkinsfile.screenshots
@@ -64,7 +64,7 @@ pipeline {
             }
         }
 
-        stage('Take sreenshots') {
+        stage('Take screenshots') {
             steps {
                 sh "fastlane screengrab"
             }
@@ -90,7 +90,7 @@ pipeline {
             }
         }
 
-        stage('Upload sreenshots to googlePlay') {
+        stage('Upload screenshots to Google Play') {
             when {
                 allOf {
                     environment name: 'UPLOAD_SCREENSHOTS', value: 'true'
diff --git a/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/espresso/tools/WatercolorToolIntegrationTest.kt b/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/espresso/tools/WatercolorToolIntegrationTest.kt
@@ -1,6 +1,6 @@
 /*
  * Paintroid: An image manipulation application for Android.
- * Copyright (C) 2010-2021 The Catrobat Team
+ * Copyright (C) 2010-2022 The Catrobat Team
  * (<http://developer.catrobat.org/credits>)
  *
  * This program is free software: you can redistribute it and/or modify
@@ -20,6 +20,7 @@ package org.catrobat.paintroid.test.espresso.tools
 
 import android.graphics.Color
 import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.Espresso.pressBack
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.action.ViewActions.scrollTo
 import androidx.test.espresso.assertion.ViewAssertions.matches
@@ -58,12 +59,39 @@ class WatercolorToolIntegrationTest {
         ToolBarViewInteraction.onToolBarView().performSelectTool(ToolType.WATERCOLOR)
     }
 
+    @Test
+    fun testSwitchingBackToBrushOnBackPressed() {
+        DrawingSurfaceInteraction.onDrawingSurfaceView()
+            .perform(UiInteractions.touchAt(DrawingSurfaceLocationProvider.MIDDLE))
+
+        assertTrue(
+            "Paint has maskFilter",
+            launchActivityRule.activity.toolPaint.paint.maskFilter != null
+        )
+
+        pressBack()
+
+        BottomNavigationViewInteraction.onBottomNavigationView()
+            .checkShowsCurrentTool(ToolType.BRUSH)
+
+        DrawingSurfaceInteraction.onDrawingSurfaceView()
+            .perform(UiInteractions.touchAt(DrawingSurfaceLocationProvider.MIDDLE))
+
+        assertTrue(
+            "Paint maskFilter has been reset",
+            launchActivityRule.activity.toolPaint.paint.maskFilter == null
+        )
+    }
+
     @Test
     fun testSwitchingBetweenBrushAndWatercolorAndEraserAndLookForMaskFilter() {
         DrawingSurfaceInteraction.onDrawingSurfaceView()
             .perform(UiInteractions.touchAt(DrawingSurfaceLocationProvider.MIDDLE))
 
-        assertTrue("Paint has no maskfilter", launchActivityRule.activity.toolPaint.paint.maskFilter != null)
+        assertTrue(
+            "Paint has no maskFilter",
+            launchActivityRule.activity.toolPaint.paint.maskFilter != null
+        )
 
         ToolBarViewInteraction.onToolBarView()
             .performSelectTool(ToolType.ERASER)
@@ -89,7 +117,10 @@ class WatercolorToolIntegrationTest {
         DrawingSurfaceInteraction.onDrawingSurfaceView()
             .perform(UiInteractions.touchAt(DrawingSurfaceLocationProvider.MIDDLE))
 
-        assertTrue("Paint still has maskfilter", launchActivityRule.activity.toolPaint.paint.maskFilter == null)
+        assertTrue(
+            "Paint still has maskFilter",
+            launchActivityRule.activity.toolPaint.paint.maskFilter == null
+        )
     }
 
     @Test
diff --git a/Paintroid/src/main/java/org/catrobat/paintroid/presenter/MainActivityPresenter.kt b/Paintroid/src/main/java/org/catrobat/paintroid/presenter/MainActivityPresenter.kt
@@ -1,6 +1,6 @@
 /*
  * Paintroid: An image manipulation application for Android.
- * Copyright (C) 2010-2021 The Catrobat Team
+ * Copyright (C) 2010-2022 The Catrobat Team
  * (<http://developer.catrobat.org/credits>)
  *
  * This program is free software: you can redistribute it and/or modify
@@ -509,8 +509,7 @@ open class MainActivityPresenter(
         } else if (model.isFullscreen) {
             exitFullscreenClicked()
         } else if (!toolController.isDefaultTool) {
-            setTool(ToolType.BRUSH)
-            toolController.switchTool(ToolType.BRUSH, true)
+            switchTool(ToolType.BRUSH, true)
         } else {
             showSecurityQuestionBeforeExit()
         }
@@ -691,9 +690,10 @@ open class MainActivityPresenter(
         }
     }
 
-    private fun switchTool(type: ToolType) {
+    private fun switchTool(type: ToolType, backPressed: Boolean = false) {
+        navigator.setMaskFilterToNull()
         setTool(type)
-        toolController.switchTool(type, false)
+        toolController.switchTool(type, backPressed)
         if (type === ToolType.IMPORTPNG) {
             showImportDialog()
         }
diff --git a/build.gradle b/build.gradle
@@ -48,8 +48,8 @@ ext {
 
     androidSupportLibraryVersion = '28.0.0'
 
-    androidVersionCode = 43
-    androidVersionName = '2.8.0'
+    androidVersionCode = 44
+    androidVersionName = '2.8.1'
 }
 
 if(project.hasProperty("snapshot")) {
diff --git a/colorpicker/src/main/res/values-pl-rPL/strings.xml b/colorpicker/src/main/res/values-pl-rPL/strings.xml
@@ -20,10 +20,10 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <string name="color_picker_title">Wybór kolorów</string>
     <string name="color_picker_tab_icon">Ikona zakładki Wyboru kolorów</string>
-    <string name="color_red">Czerwony (Red)</string>
-    <string name="color_green">Zielony (Green)</string>
-    <string name="color_blue">Niebieski (Blue)</string>
-    <string name="color_alpha">Przezroczyste</string>
+    <string name="color_red">Czerwony</string>
+    <string name="color_green">Zielony</string>
+    <string name="color_blue">Niebieski</string>
+    <string name="color_alpha">Przezroczystość</string>
     <string name="color_hex">HEX</string>
     <string name="color_picker_apply">Zastosuj</string>
     <string name="color_picker_cancel">Anuluj</string>
diff --git a/fastlane/Screengrabfile b/fastlane/Screengrabfile
@@ -11,6 +11,6 @@ test_instrumentation_runner 'androidx.test.runner.AndroidJUnitRunner'
 
 ending_locale 'de-rDE'
 # supported languages: https://www.ibabbleon.com/Google-Play-Store-Language-Codes.html
-locales(['ar','en-US','es-US','es-ES','fr-FR','de-DE','zh-CN','zh-TW','hi-IN','hu-HU','it-IT','ja-JP','ko-KR','nl-NL','pl-PL','pt-BR','ru-RU','sr-SP','tr-TR','da-DK'])
+locales(['ar','zh-CN','zh-TW','en-US','en-GB','en-CA','en-AU','es-ES','fr-FR','de-DE','hi-IN','hu-HU','it-IT','ja-JP','ko-KR','nl-NL','pl-PL','pt-BR','ru-RU','tr-TR','id'])
 
 clear_previous_screenshots(true)

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ pipeline {`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`
`67`		`- stage('Take sreenshots') {`
	`67`	`+ stage('Take screenshots') {`
`68`	`68`	`steps {`
`69`	`69`	`sh "fastlane screengrab"`
`70`	`70`	`}`
`@@ -90,7 +90,7 @@ pipeline {`
`90`	`90`	`}`
`91`	`91`	`}`
`92`	`92`
`93`		`- stage('Upload sreenshots to googlePlay') {`
	`93`	`+ stage('Upload screenshots to Google Play') {`
`94`	`94`	`when {`
`95`	`95`	`allOf {`
`96`	`96`	`environment name: 'UPLOAD_SCREENSHOTS', value: 'true'`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`/*`
`2`	`2`	`* Paintroid: An image manipulation application for Android.`
`3`		`- * Copyright (C) 2010-2021 The Catrobat Team`
	`3`	`+ * Copyright (C) 2010-2022 The Catrobat Team`
`4`	`4`	`* (<http://developer.catrobat.org/credits>)`
`5`	`5`	`*`
`6`	`6`	`* This program is free software: you can redistribute it and/or modify`
`@@ -509,8 +509,7 @@ open class MainActivityPresenter(`
`509`	`509`	`} else if (model.isFullscreen) {`
`510`	`510`	`exitFullscreenClicked()`
`511`	`511`	`} else if (!toolController.isDefaultTool) {`
`512`		`- setTool(ToolType.BRUSH)`
`513`		`- toolController.switchTool(ToolType.BRUSH, true)`
	`512`	`+ switchTool(ToolType.BRUSH, true)`
`514`	`513`	`} else {`
`515`	`514`	`showSecurityQuestionBeforeExit()`
`516`	`515`	`}`
`@@ -691,9 +690,10 @@ open class MainActivityPresenter(`
`691`	`690`	`}`
`692`	`691`	`}`
`693`	`692`
`694`		`- private fun switchTool(type: ToolType) {`
	`693`	`+ private fun switchTool(type: ToolType, backPressed: Boolean = false) {`
	`694`	`+ navigator.setMaskFilterToNull()`
`695`	`695`	`setTool(type)`
`696`		`- toolController.switchTool(type, false)`
	`696`	`+ toolController.switchTool(type, backPressed)`
`697`	`697`	`if (type === ToolType.IMPORTPNG) {`
`698`	`698`	`showImportDialog()`
`699`	`699`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,8 +48,8 @@ ext {`
`48`	`48`
`49`	`49`	`androidSupportLibraryVersion = '28.0.0'`
`50`	`50`
`51`		`- androidVersionCode = 43`
`52`		`- androidVersionName = '2.8.0'`
	`51`	`+ androidVersionCode = 44`
	`52`	`+ androidVersionName = '2.8.1'`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`if(project.hasProperty("snapshot")) {`