From d8c8480a25d1c6b134ef08f651099ece2e17f921 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20=27Morty=27=20Str=C3=BCbe?= Date: Sun, 1 Nov 2015 19:16:05 +0100 Subject: [PATCH 001/292] Add fullscreen mode This keeps the kids from accidentally leave the app. --- .../ui/activity/AbstractColoringActivity.java | 11 +++++++++++ .../coloring/ui/activity/CreditsActivity.java | 11 +++++++++++ .../coloring/ui/activity/StartNewActivity.java | 12 +++++++++++- .../androidsoft/coloring/util/ScreenUtils.java | 17 +++++++++++++++++ 4 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 src/main/java/org/androidsoft/coloring/util/ScreenUtils.java diff --git a/src/main/java/org/androidsoft/coloring/ui/activity/AbstractColoringActivity.java b/src/main/java/org/androidsoft/coloring/ui/activity/AbstractColoringActivity.java index 21412d1..e159ed7 100644 --- a/src/main/java/org/androidsoft/coloring/ui/activity/AbstractColoringActivity.java +++ b/src/main/java/org/androidsoft/coloring/ui/activity/AbstractColoringActivity.java @@ -24,6 +24,8 @@ import android.view.View; import android.view.ViewGroup; import android.view.WindowManager; + +import org.androidsoft.coloring.util.ScreenUtils; import org.androidsoft.utils.ui.NoTitleActivity; public abstract class AbstractColoringActivity extends NoTitleActivity @@ -37,6 +39,7 @@ public abstract class AbstractColoringActivity extends NoTitleActivity public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + ScreenUtils.setFullscreen(this); WindowManager w = getWindowManager(); Display d = w.getDefaultDisplay(); @@ -45,6 +48,14 @@ public void onCreate(Bundle savedInstanceState) } + @Override + public void onWindowFocusChanged(boolean hasFocus) { + super.onWindowFocusChanged(hasFocus); + if (hasFocus) { + ScreenUtils.setFullscreen(this); + } + } + public static int getDisplayWitdh() { return _displayWidth; diff --git a/src/main/java/org/androidsoft/coloring/ui/activity/CreditsActivity.java b/src/main/java/org/androidsoft/coloring/ui/activity/CreditsActivity.java index 8c8aed6..e3c295a 100644 --- a/src/main/java/org/androidsoft/coloring/ui/activity/CreditsActivity.java +++ b/src/main/java/org/androidsoft/coloring/ui/activity/CreditsActivity.java @@ -18,6 +18,7 @@ import android.os.Bundle; import android.view.View; import org.androidsoft.coloring.R; +import org.androidsoft.coloring.util.ScreenUtils; import org.androidsoft.utils.credits.CreditsParams; import org.androidsoft.utils.credits.CreditsView; import org.androidsoft.utils.ui.BasicActivity; @@ -33,12 +34,22 @@ public class CreditsActivity extends BasicActivity public void onCreate(Bundle icicle) { super.onCreate(icicle); + ScreenUtils.setFullscreen(this); View view = new CreditsView(this, getCreditsParams()); setContentView(view); } + @Override + public void onWindowFocusChanged(boolean hasFocus) + { + super.onWindowFocusChanged(hasFocus); + if (hasFocus) { + ScreenUtils.setFullscreen(this); + } + } + /** * {@inheritDoc } */ diff --git a/src/main/java/org/androidsoft/coloring/ui/activity/StartNewActivity.java b/src/main/java/org/androidsoft/coloring/ui/activity/StartNewActivity.java index 29cac4d..f0b7bb8 100644 --- a/src/main/java/org/androidsoft/coloring/ui/activity/StartNewActivity.java +++ b/src/main/java/org/androidsoft/coloring/ui/activity/StartNewActivity.java @@ -31,6 +31,7 @@ import android.widget.GridView; import android.widget.ImageView; import org.androidsoft.coloring.R; +import org.androidsoft.coloring.util.ScreenUtils; import org.androidsoft.utils.ui.NoTitleActivity; public class StartNewActivity extends NoTitleActivity implements View.OnClickListener @@ -46,7 +47,7 @@ public static int randomOutlineId() public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - + ScreenUtils.setFullscreen(this); // Apparently this cannot be set from the style. getWindow().setFlags(WindowManager.LayoutParams.FLAG_BLUR_BEHIND, WindowManager.LayoutParams.FLAG_BLUR_BEHIND); @@ -57,6 +58,15 @@ public void onCreate(Bundle savedInstanceState) gridview.setAdapter(new ImageAdapter(this)); } + @Override + public void onWindowFocusChanged(boolean hasFocus) + { + super.onWindowFocusChanged(hasFocus); + if (hasFocus) { + ScreenUtils.setFullscreen(this); + } + } + public void onClick(View view) { setResult(view.getId()); diff --git a/src/main/java/org/androidsoft/coloring/util/ScreenUtils.java b/src/main/java/org/androidsoft/coloring/util/ScreenUtils.java new file mode 100644 index 0000000..ed671e8 --- /dev/null +++ b/src/main/java/org/androidsoft/coloring/util/ScreenUtils.java @@ -0,0 +1,17 @@ +package org.androidsoft.coloring.util; + +import android.app.Activity; +import android.view.View; + +// Based on http://stackoverflow.com/questions/22265945/full-screen-action-bar-immersive#22560946 +public class ScreenUtils { + static public void setFullscreen(Activity act) { + if (android.os.Build.VERSION.SDK_INT >= 19) { + act.getWindow().getDecorView().setSystemUiVisibility( + View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN + | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION + | View.SYSTEM_UI_FLAG_FULLSCREEN + | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY); + } + } +} From 01740dabf8b9f12e87a4dfed7fa3a90ae97851ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20=27Morty=27=20Str=C3=BCbe?= Date: Tue, 3 Nov 2015 20:30:19 +0100 Subject: [PATCH 002/292] Do not crop images While cropping images was origninally intended, it can cut quite a bit off, depending on the screen resolution. --- .../java/org/androidsoft/coloring/util/DrawUtils.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/main/java/org/androidsoft/coloring/util/DrawUtils.java b/src/main/java/org/androidsoft/coloring/util/DrawUtils.java index a53e1c8..c39ae91 100644 --- a/src/main/java/org/androidsoft/coloring/util/DrawUtils.java +++ b/src/main/java/org/androidsoft/coloring/util/DrawUtils.java @@ -30,14 +30,8 @@ public static void convertSizeClip(Bitmap src, Bitmap dest) { RectF srcRect = new RectF(0, 0, src.getWidth(), src.getHeight()); RectF destRect = new RectF(0, 0, dest.getWidth(), dest.getHeight()); - // Because the current SDK does not directly support the "dest fits - // inside src" mode, we calculate the reverse matrix and invert to - // get what we want. - Matrix mDestSrc = new Matrix(); - mDestSrc.setRectToRect(destRect, srcRect, Matrix.ScaleToFit.CENTER); Matrix mSrcDest = new Matrix(); - mDestSrc.invert(mSrcDest); - + mSrcDest.setRectToRect(srcRect, destRect, Matrix.ScaleToFit.CENTER); canvas.drawBitmap(src, mSrcDest, new Paint(Paint.DITHER_FLAG)); } From 789a9f0642ebbf6aaf7df3435ab9ab042dac532e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20=27Morty=27=20Str=C3=BCbe?= Date: Sun, 1 Nov 2015 19:16:05 +0100 Subject: [PATCH 003/292] Add fullscreen mode This keeps the kids from accidentally leave the app. --- .../ui/activity/AbstractColoringActivity.java | 11 +++++++++++ .../coloring/ui/activity/CreditsActivity.java | 11 +++++++++++ .../coloring/ui/activity/StartNewActivity.java | 12 +++++++++++- .../androidsoft/coloring/util/ScreenUtils.java | 17 +++++++++++++++++ 4 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 src/main/java/org/androidsoft/coloring/util/ScreenUtils.java diff --git a/src/main/java/org/androidsoft/coloring/ui/activity/AbstractColoringActivity.java b/src/main/java/org/androidsoft/coloring/ui/activity/AbstractColoringActivity.java index 21412d1..e159ed7 100644 --- a/src/main/java/org/androidsoft/coloring/ui/activity/AbstractColoringActivity.java +++ b/src/main/java/org/androidsoft/coloring/ui/activity/AbstractColoringActivity.java @@ -24,6 +24,8 @@ import android.view.View; import android.view.ViewGroup; import android.view.WindowManager; + +import org.androidsoft.coloring.util.ScreenUtils; import org.androidsoft.utils.ui.NoTitleActivity; public abstract class AbstractColoringActivity extends NoTitleActivity @@ -37,6 +39,7 @@ public abstract class AbstractColoringActivity extends NoTitleActivity public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + ScreenUtils.setFullscreen(this); WindowManager w = getWindowManager(); Display d = w.getDefaultDisplay(); @@ -45,6 +48,14 @@ public void onCreate(Bundle savedInstanceState) } + @Override + public void onWindowFocusChanged(boolean hasFocus) { + super.onWindowFocusChanged(hasFocus); + if (hasFocus) { + ScreenUtils.setFullscreen(this); + } + } + public static int getDisplayWitdh() { return _displayWidth; diff --git a/src/main/java/org/androidsoft/coloring/ui/activity/CreditsActivity.java b/src/main/java/org/androidsoft/coloring/ui/activity/CreditsActivity.java index 8c8aed6..e3c295a 100644 --- a/src/main/java/org/androidsoft/coloring/ui/activity/CreditsActivity.java +++ b/src/main/java/org/androidsoft/coloring/ui/activity/CreditsActivity.java @@ -18,6 +18,7 @@ import android.os.Bundle; import android.view.View; import org.androidsoft.coloring.R; +import org.androidsoft.coloring.util.ScreenUtils; import org.androidsoft.utils.credits.CreditsParams; import org.androidsoft.utils.credits.CreditsView; import org.androidsoft.utils.ui.BasicActivity; @@ -33,12 +34,22 @@ public class CreditsActivity extends BasicActivity public void onCreate(Bundle icicle) { super.onCreate(icicle); + ScreenUtils.setFullscreen(this); View view = new CreditsView(this, getCreditsParams()); setContentView(view); } + @Override + public void onWindowFocusChanged(boolean hasFocus) + { + super.onWindowFocusChanged(hasFocus); + if (hasFocus) { + ScreenUtils.setFullscreen(this); + } + } + /** * {@inheritDoc } */ diff --git a/src/main/java/org/androidsoft/coloring/ui/activity/StartNewActivity.java b/src/main/java/org/androidsoft/coloring/ui/activity/StartNewActivity.java index 29cac4d..f0b7bb8 100644 --- a/src/main/java/org/androidsoft/coloring/ui/activity/StartNewActivity.java +++ b/src/main/java/org/androidsoft/coloring/ui/activity/StartNewActivity.java @@ -31,6 +31,7 @@ import android.widget.GridView; import android.widget.ImageView; import org.androidsoft.coloring.R; +import org.androidsoft.coloring.util.ScreenUtils; import org.androidsoft.utils.ui.NoTitleActivity; public class StartNewActivity extends NoTitleActivity implements View.OnClickListener @@ -46,7 +47,7 @@ public static int randomOutlineId() public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - + ScreenUtils.setFullscreen(this); // Apparently this cannot be set from the style. getWindow().setFlags(WindowManager.LayoutParams.FLAG_BLUR_BEHIND, WindowManager.LayoutParams.FLAG_BLUR_BEHIND); @@ -57,6 +58,15 @@ public void onCreate(Bundle savedInstanceState) gridview.setAdapter(new ImageAdapter(this)); } + @Override + public void onWindowFocusChanged(boolean hasFocus) + { + super.onWindowFocusChanged(hasFocus); + if (hasFocus) { + ScreenUtils.setFullscreen(this); + } + } + public void onClick(View view) { setResult(view.getId()); diff --git a/src/main/java/org/androidsoft/coloring/util/ScreenUtils.java b/src/main/java/org/androidsoft/coloring/util/ScreenUtils.java new file mode 100644 index 0000000..ed671e8 --- /dev/null +++ b/src/main/java/org/androidsoft/coloring/util/ScreenUtils.java @@ -0,0 +1,17 @@ +package org.androidsoft.coloring.util; + +import android.app.Activity; +import android.view.View; + +// Based on http://stackoverflow.com/questions/22265945/full-screen-action-bar-immersive#22560946 +public class ScreenUtils { + static public void setFullscreen(Activity act) { + if (android.os.Build.VERSION.SDK_INT >= 19) { + act.getWindow().getDecorView().setSystemUiVisibility( + View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN + | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION + | View.SYSTEM_UI_FLAG_FULLSCREEN + | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY); + } + } +} From f46ea5a6031091af04adc5b391d00c6fa8226061 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20=27Morty=27=20Str=C3=BCbe?= Date: Tue, 3 Nov 2015 20:30:19 +0100 Subject: [PATCH 004/292] Do not crop images While cropping images was origninally intended, it can cut quite a bit off, depending on the screen resolution. --- .../java/org/androidsoft/coloring/util/DrawUtils.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/main/java/org/androidsoft/coloring/util/DrawUtils.java b/src/main/java/org/androidsoft/coloring/util/DrawUtils.java index a53e1c8..c39ae91 100644 --- a/src/main/java/org/androidsoft/coloring/util/DrawUtils.java +++ b/src/main/java/org/androidsoft/coloring/util/DrawUtils.java @@ -30,14 +30,8 @@ public static void convertSizeClip(Bitmap src, Bitmap dest) { RectF srcRect = new RectF(0, 0, src.getWidth(), src.getHeight()); RectF destRect = new RectF(0, 0, dest.getWidth(), dest.getHeight()); - // Because the current SDK does not directly support the "dest fits - // inside src" mode, we calculate the reverse matrix and invert to - // get what we want. - Matrix mDestSrc = new Matrix(); - mDestSrc.setRectToRect(destRect, srcRect, Matrix.ScaleToFit.CENTER); Matrix mSrcDest = new Matrix(); - mDestSrc.invert(mSrcDest); - + mSrcDest.setRectToRect(srcRect, destRect, Matrix.ScaleToFit.CENTER); canvas.drawBitmap(src, mSrcDest, new Paint(Paint.DITHER_FLAG)); } From 35629af3e10b3539c64579a4076e907aaeefb4dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Marcelo=20Alvarenga?= Date: Tue, 22 Dec 2015 00:01:21 -0200 Subject: [PATCH 005/292] Create strings.xml --- src/main/res/values-pt-rBR/strings.xml | 52 ++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 src/main/res/values-pt-rBR/strings.xml diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml new file mode 100644 index 0000000..2111745 --- /dev/null +++ b/src/main/res/values-pt-rBR/strings.xml @@ -0,0 +1,52 @@ + + + + Pintura para Crianças + + New + Salvar + Compartilhar + Sobre + + Salvando em Imagens… + OK! + Erro! + Compartilhar imagem usando + + /dcim/Pintura para Crianças/ + + + Versão 1.0.1 + Pintura para Crianças + + Ir + + + Bem-vindo ao Pintura para Crianças! + Obrigado por baixar o aplicativo Pintura para Crianças\n\n + Instruções rápidas :\n + \t• Selecione a cor e pinte com seu dedo.\n + \n\n Divirta-se!\n + + Novidades do Pintura para Crianças + Obrigado por atualizar o Pintura para Crianças\n\n + Novidades da versão 1.0.1:\n + \t• Pequenas correções de erros (sincronização da desinstalação).\n + \n\nDivirta-se e não esqueça de avaliar o aplicativo para contribuir com seu desenvolvimento. + + + From 02f2495e54e0f2769708d47e91cd7f9af2fb9e92 Mon Sep 17 00:00:00 2001 From: Nicco Kunzmann Date: Tue, 25 Feb 2020 10:56:54 +0100 Subject: [PATCH 006/292] ignore Android Studio files --- .gitignore | 3 ++- local.properties | 11 ----------- 2 files changed, 2 insertions(+), 12 deletions(-) delete mode 100644 local.properties diff --git a/.gitignore b/.gitignore index 83f7c0a..cbc2041 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,5 @@ /gen/ /build/ /private/ -/.idea/ \ No newline at end of file +/.idea/ +/androidsoft-coloring.iml diff --git a/local.properties b/local.properties deleted file mode 100644 index d92d457..0000000 --- a/local.properties +++ /dev/null @@ -1,11 +0,0 @@ -## This file is automatically generated by Android Studio. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must *NOT* be checked into Version Control Systems, -# as it contains information specific to your local configuration. -# -# Location of the SDK. This is only used by Gradle. -# For customization when using a Version Control System, please read the -# header note. -#Tue May 05 20:39:57 CST 2015 -sdk.dir=/opt/android-sdk From b969aa26e0c426fddf2b9ebcae3d91fb6d31743d Mon Sep 17 00:00:00 2001 From: Nicco Kunzmann Date: Tue, 25 Feb 2020 11:27:03 +0100 Subject: [PATCH 007/292] run add under Android Studio 3.5 --- .gitignore | 1 + build.gradle | 17 ++++++++--------- gradle/wrapper/gradle-wrapper.properties | 4 ++-- src/main/AndroidManifest.xml | 3 +-- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index cbc2041..bd9c49b 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /private/ /.idea/ /androidsoft-coloring.iml +local.properties diff --git a/build.gradle b/build.gradle index 1edd836..1e0f064 100644 --- a/build.gradle +++ b/build.gradle @@ -1,16 +1,12 @@ -task wrapper(type: Wrapper) { - gradleVersion = '2.3' -} - - buildscript { repositories { //mavenCentral() + google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.1.0' + classpath 'com.android.tools.build:gradle:3.4.2' } } @@ -23,19 +19,22 @@ repositories { apply plugin: 'com.android.application' dependencies { - compile fileTree( dir: 'libs', include:'*.jar' ) + implementation fileTree( dir: 'libs', include:'*.jar' ) } android { - compileSdkVersion 19 + compileSdkVersion 29 - buildToolsVersion "19.1.0" lintOptions { enable 'UnusedIds', 'EasterEgg' //, 'NewerVersionAvailable' } apply from: 'sign.gradle' + defaultConfig { + minSdkVersion 14 + targetSdkVersion 29 + } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 78e3e68..1f81168 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue May 05 23:10:10 CST 2015 +#Tue Feb 25 11:09:43 CET 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index bb09760..977e0b7 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -18,8 +18,7 @@ package="org.androidsoft.coloring" android:versionName="1.0.1" android:versionCode="2"> - - + Date: Tue, 25 Feb 2020 11:28:13 +0100 Subject: [PATCH 008/292] create android build workflow --- .github/workflows/android.yml | 17 +++++++++++++++++ 1 file changed, 17 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 0000000..2884129 --- /dev/null +++ b/.github/workflows/android.yml @@ -0,0 +1,17 @@ +name: Android CI + +on: [push] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: set up JDK 1.8 + uses: actions/setup-java@v1 + with: + java-version: 1.8 + - name: Build with Gradle + run: ./gradlew build From 2fc6f452879a45e658bc631a9069bb77955d04b6 Mon Sep 17 00:00:00 2001 From: Nicco Kunzmann Date: Tue, 25 Feb 2020 11:29:52 +0100 Subject: [PATCH 009/292] Create README.md --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..d4f4e85 --- /dev/null +++ b/README.md @@ -0,0 +1,7 @@ +# Coloring for Kids +[![Android CI](https://github.com/niccokunzmann/androidsoft-coloring/workflows/Android%20CI/badge.svg)](https://github.com/niccokunzmann/androidsoft-coloring/actions?query=workflow%3A%22Android+CI%22) + +## Development + +This app is developed using Android Studio. + From a5827b8034cc6c31af30970cba38ccd7f6302de1 Mon Sep 17 00:00:00 2001 From: Nicco Kunzmann Date: Tue, 25 Feb 2020 11:33:40 +0100 Subject: [PATCH 010/292] add google source for build see https://github.com/niccokunzmann/androidsoft-coloring/runs/466905930 --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index 1e0f064..a4ca093 100644 --- a/build.gradle +++ b/build.gradle @@ -13,6 +13,7 @@ buildscript { repositories { //mavenCentral() jcenter() + google() } From c40899016f62310739895e0169538fb3f65e94de Mon Sep 17 00:00:00 2001 From: Nicco Kunzmann Date: Tue, 25 Feb 2020 12:00:15 +0100 Subject: [PATCH 011/292] add German translation --- src/main/res/values-de-rDE/strings.xml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 src/main/res/values-de-rDE/strings.xml diff --git a/src/main/res/values-de-rDE/strings.xml b/src/main/res/values-de-rDE/strings.xml new file mode 100644 index 0000000..d89e9df --- /dev/null +++ b/src/main/res/values-de-rDE/strings.xml @@ -0,0 +1,26 @@ + + + Coloring for Kids + Los + Malen für Kinder + Version 1.0.1 + Speichere in Bilder… + Fehler! + OK! + Teile das Bild mit + "Schön, dass Du Malen für Kinder runtergeladen hast!\n\n + Kurze Einführung:\n + \t• Wähle eine Farbe und bemale das Bild mit dem Finger.\n + Viel Spaß!\n" + Willkommen zu Malen für Kinder! + Über + Neu + Speichern + Teilen + /dcim/Malen für Kinder/ + "Danke, dass Du Malen für Kinder erneuert hast.\n\n + Neu in Version 1.0.1:\n + \t• Kleinere Fehler wurden behoben (Synchronisation bei der Deinstallation).\n + \n\nViel Spaß und vergiß nicht, die Entwickler zu unterstützen. " + Was ist neu bei Malen für Kinder + \ No newline at end of file From a9549be72138f9f3681f8b6c3d41f5c48919ea6e Mon Sep 17 00:00:00 2001 From: Nicco Kunzmann Date: Tue, 25 Feb 2020 12:03:28 +0100 Subject: [PATCH 012/292] remove duplicate title --- .../org/androidsoft/coloring/ui/activity/CreditsActivity.java | 2 +- src/main/res/values-de-rDE/strings.xml | 3 +-- src/main/res/values-pt-rBR/strings.xml | 1 - src/main/res/values/strings.xml | 1 - 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/androidsoft/coloring/ui/activity/CreditsActivity.java b/src/main/java/org/androidsoft/coloring/ui/activity/CreditsActivity.java index e3c295a..9c59a99 100644 --- a/src/main/java/org/androidsoft/coloring/ui/activity/CreditsActivity.java +++ b/src/main/java/org/androidsoft/coloring/ui/activity/CreditsActivity.java @@ -71,7 +71,7 @@ public int getMenuCloseId() private CreditsParams getCreditsParams() { CreditsParams p = new CreditsParams(); - p.setAppNameRes(R.string.credits_app_name); + p.setAppNameRes(R.string.app_name); p.setAppVersionRes(R.string.credits_current_version); p.setBitmapBackgroundRes(R.drawable.background); p.setBitmapBackgroundLandscapeRes(R.drawable.background_land); diff --git a/src/main/res/values-de-rDE/strings.xml b/src/main/res/values-de-rDE/strings.xml index d89e9df..3484dc7 100644 --- a/src/main/res/values-de-rDE/strings.xml +++ b/src/main/res/values-de-rDE/strings.xml @@ -1,8 +1,7 @@ - Coloring for Kids + Malen für Kinder Los - Malen für Kinder Version 1.0.1 Speichere in Bilder… Fehler! diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml index 2111745..067d24f 100644 --- a/src/main/res/values-pt-rBR/strings.xml +++ b/src/main/res/values-pt-rBR/strings.xml @@ -31,7 +31,6 @@ Versão 1.0.1 - Pintura para Crianças Ir diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 768617a..18470ab 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -31,7 +31,6 @@ Version 1.0.1 - Coloring for Kids Go From d87b140b9e6b92aaa7ae9e4ac1f664ce86dfaaeb Mon Sep 17 00:00:00 2001 From: Nicco Kunzmann Date: Tue, 25 Feb 2020 16:59:09 +0100 Subject: [PATCH 013/292] remove thunbnail images contirnutes to https://github.com/niccokunzmann/androidsoft-coloring/issues/7 --- .../ui/activity/StartNewActivity.java | 23 ++---------------- .../res/drawable-mdpi/thumb001_balloons.png | Bin 924 -> 0 bytes .../res/drawable-mdpi/thumb002_spaceship.png | Bin 906 -> 0 bytes .../res/drawable-mdpi/thumb003_horses.png | Bin 1062 -> 0 bytes .../res/drawable-mdpi/thumb004_castle.png | Bin 934 -> 0 bytes src/main/res/drawable-mdpi/thumb005_house.png | Bin 958 -> 0 bytes src/main/res/drawable-mdpi/thumb006_dino.png | Bin 855 -> 0 bytes .../res/drawable-mdpi/thumb007_flowers.png | Bin 997 -> 0 bytes .../res/drawable-mdpi/thumb008_sealife.png | Bin 888 -> 0 bytes src/main/res/drawable-mdpi/thumb009_zoo.png | Bin 1235 -> 0 bytes .../res/drawable-mdpi/thumb010_roadrunner.png | Bin 864 -> 0 bytes src/main/res/drawable-mdpi/thumb011_plane.png | Bin 831 -> 0 bytes .../res/drawable-mdpi/thumb012_birthday.png | Bin 891 -> 0 bytes .../res/drawable-mdpi/thumb013_18wheeler.png | Bin 935 -> 0 bytes .../res/drawable-mdpi/thumb014_motorbike.png | Bin 967 -> 0 bytes .../res/drawable-mdpi/thumb015_f15eagle.png | Bin 924 -> 0 bytes .../res/drawable-mdpi/thumb016_beagle.png | Bin 940 -> 0 bytes .../res/drawable-mdpi/thumb017_butterfly.png | Bin 1050 -> 0 bytes src/main/res/drawable-mdpi/thumb018_snail.png | Bin 981 -> 0 bytes .../res/drawable-mdpi/thumb019_helicopter.png | Bin 994 -> 0 bytes src/main/res/drawable-mdpi/thumb020_bee.png | Bin 857 -> 0 bytes .../res/drawable-mdpi/thumb021_spider.png | Bin 996 -> 0 bytes .../drawable-mdpi/thumb022_medeival_city.png | Bin 1151 -> 0 bytes .../drawable-mdpi/thumb023_outer_space.png | Bin 857 -> 0 bytes .../res/drawable-mdpi/thumb024_world_map.png | Bin 963 -> 0 bytes 25 files changed, 2 insertions(+), 21 deletions(-) delete mode 100644 src/main/res/drawable-mdpi/thumb001_balloons.png delete mode 100644 src/main/res/drawable-mdpi/thumb002_spaceship.png delete mode 100644 src/main/res/drawable-mdpi/thumb003_horses.png delete mode 100644 src/main/res/drawable-mdpi/thumb004_castle.png delete mode 100644 src/main/res/drawable-mdpi/thumb005_house.png delete mode 100644 src/main/res/drawable-mdpi/thumb006_dino.png delete mode 100644 src/main/res/drawable-mdpi/thumb007_flowers.png delete mode 100644 src/main/res/drawable-mdpi/thumb008_sealife.png delete mode 100644 src/main/res/drawable-mdpi/thumb009_zoo.png delete mode 100644 src/main/res/drawable-mdpi/thumb010_roadrunner.png delete mode 100644 src/main/res/drawable-mdpi/thumb011_plane.png delete mode 100644 src/main/res/drawable-mdpi/thumb012_birthday.png delete mode 100644 src/main/res/drawable-mdpi/thumb013_18wheeler.png delete mode 100644 src/main/res/drawable-mdpi/thumb014_motorbike.png delete mode 100644 src/main/res/drawable-mdpi/thumb015_f15eagle.png delete mode 100644 src/main/res/drawable-mdpi/thumb016_beagle.png delete mode 100644 src/main/res/drawable-mdpi/thumb017_butterfly.png delete mode 100644 src/main/res/drawable-mdpi/thumb018_snail.png delete mode 100644 src/main/res/drawable-mdpi/thumb019_helicopter.png delete mode 100644 src/main/res/drawable-mdpi/thumb020_bee.png delete mode 100644 src/main/res/drawable-mdpi/thumb021_spider.png delete mode 100644 src/main/res/drawable-mdpi/thumb022_medeival_city.png delete mode 100644 src/main/res/drawable-mdpi/thumb023_outer_space.png delete mode 100644 src/main/res/drawable-mdpi/thumb024_world_map.png diff --git a/src/main/java/org/androidsoft/coloring/ui/activity/StartNewActivity.java b/src/main/java/org/androidsoft/coloring/ui/activity/StartNewActivity.java index f0b7bb8..b3d37ae 100644 --- a/src/main/java/org/androidsoft/coloring/ui/activity/StartNewActivity.java +++ b/src/main/java/org/androidsoft/coloring/ui/activity/StartNewActivity.java @@ -78,11 +78,7 @@ private static class ResourceLoader ResourceLoader() { - // Use reflection to list resource ids of thumbnails and outline - // images.First, we list all the drawables starting with the proper - // prefixes into 2 maps. Map outlineMap = new TreeMap(); - Map thumbMap = new TreeMap(); Field[] drawables = R.drawable.class.getDeclaredFields(); for (int i = 0; i < drawables.length; i++) { @@ -94,36 +90,23 @@ private static class ResourceLoader outlineMap.put(name.substring(PREFIX_OUTLINE.length()), drawables[i].getInt(null)); } - if (name.startsWith(PREFIX_THUMB)) - { - thumbMap.put(name.substring(PREFIX_THUMB.length()), - drawables[i].getInt(null)); - } } catch (IllegalAccessException e) { } } Set keys = outlineMap.keySet(); - keys.retainAll(thumbMap.keySet()); _outlineIds = new Integer[keys.size()]; - _thumbIds = new Integer[keys.size()]; int j = 0; Iterator i = keys.iterator(); while (i.hasNext()) { String key = i.next(); _outlineIds[j] = outlineMap.get(key); - _thumbIds[j] = thumbMap.get(key); j++; } } - public Integer[] getThumbIds() - { - return _thumbIds; - } - public Integer[] getOutlineIds() { return _outlineIds; @@ -134,8 +117,6 @@ public int randomOutlineId() return _outlineIds[new Random().nextInt(_outlineIds.length)]; } private static final String PREFIX_OUTLINE = "outline"; - private static final String PREFIX_THUMB = "thumb"; - private Integer[] _thumbIds; private Integer[] _outlineIds; } @@ -150,7 +131,7 @@ private class ImageAdapter extends BaseAdapter public int getCount() { - return _resourceLoader.getThumbIds().length; + return _resourceLoader.getOutlineIds().length; } public Object getItem(int i) @@ -180,7 +161,7 @@ public View getView(int position, View convertView, ViewGroup parent) imageView = (ImageView) convertView; } - imageView.setImageResource(_resourceLoader.getThumbIds()[position]); + imageView.setImageResource(_resourceLoader.getOutlineIds()[position]); imageView.setId(_resourceLoader.getOutlineIds()[position]); return imageView; } diff --git a/src/main/res/drawable-mdpi/thumb001_balloons.png b/src/main/res/drawable-mdpi/thumb001_balloons.png deleted file mode 100644 index 76609d1e1ba75b39c4d628edeae925eaacf49b6d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 924 zcmeAS@N?(olHy`uVBq!ia0vp^Hb88^0VEhQLfx(cDVB6cUq=Rpjs4tz5?O(K#^NA% zCx&(BWL^R}3dtTpz6=aiY77hwEes65fIGVIjx(P3a<>hpAQ4DmRAH|%zyvLVmq?XLqh zbz0_b5G`x!DtqSeYU3rlBFX#rb8Y;RxJ5h~rkwi7@BfqkV8dhY4V@j`EB;II7?-S& z%d2rbqL(dqaNVkN<}v}o`#z_(f1GL2zIsOd0iJX&mk|DK?*8TziDh9sN)k$P-UOO{c4a#DFsWRc-&mT!`qWj+7f+bwtJ9Vp65>`iMhynajJ1Bcz}>*2~v zq(o<1-*VRW)nwbB5cBNOBU-sq9fc_bQ_r86yYrElG+ia5K(>c$~i9esY zWu1HW&f2O)i%YYcUiheauPohsVdjLX`_k84d!tqMFT>{9jSb#n#y#1R%1f6XJ?P3Tifu8Tv~+ znLgqI6lT6=Zh?h6hL zS@Cg8552L;sNdtgw<-45$u-}k9@suNGGVIjx(P3a;xN`q|_c2l3qVRIu{Qp~gb(C8UEUk;L*sEeE{r$M>?)F0*8~!j|Q~SAbaVvj9 z9*@J$m%Lhw7WF4QK6_`@gSOrp3HbvC8hI@fU%pVj@zMO0m_cH=!JHSh{}(O#A{ZHV z%k8q9gZu;LAM@TBg ze{r5}(|Wl6`W$UumlF@x>@hMHtiG_WVO34SW7X!{DwEkv_A?!7cU-~DsMt8J4H zyWgAe%F9wz_M1uI1UCJM=}J#FyphRMVTr4B=5m)aDcy7|;p|J}$;P+S4$7SDIQKzu z;=jnKqA1IAZR&3h2%L~jwt3rH@U8OM_HV|E!s>Rs_dmGlQ5n;tKOcUc$lsE}X86u% zSNrEV7Tt&Am#>;}PN7sdV}{#YzoyM8Wl@{Vr|mwc@O*)4s*AGNV$Xl~&T?*lo_e8@ z)Bki;xK#2p{q}wQCbo~Btq|PD|LE_RoSGgMSt-UHi&vi0xgL1e{tK zO_IE9Che@R$X0$UhWoSa>6cH1jyyFUOSs z{*>mla+X|Uw#R>SSGtRBnL6w1$3^qzE!ZcyyZ?sJoOeYJnZG^p*nZ0X$?fZ$fd^yc z>SG-DHtkJ!{XN}#T9B*vxA)UIzTThykNwVn29xi+3!aq5RRa^HYKdz^NpewYVo9oQ z3XothGBB{zH89aNGz~E{w=yxbGBnUOFtRc*c*uD`52hhEKP5A*l7NPNJGMyyH86O( L`njxgN@xNAaae#r diff --git a/src/main/res/drawable-mdpi/thumb003_horses.png b/src/main/res/drawable-mdpi/thumb003_horses.png deleted file mode 100644 index 004469635918f6076bc3e56c0d1012ca57ae747e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1062 zcmeAS@N?(olHy`uVBq!ia0vp^Hb88^0VEhQLfx(cDVB6cUq=Rpjs4tz5?O(K#^NA% zCx&(BWL^R}3dtTpz6=aiY77hwEes65fIg;Fu1i!PYYD)bY__U|^Q;ba4#vIDR(lAg{C`&u&(mUiFI_ zQ7x-8M0`^gEO~SKre~v)Zr3+C$0GH}DISL9z4klS?Vmj-a{m19%Jp-3t}ox4zP$av zj%CvS#J-6yD!M=ZkbG03z&1hjQC{MnDw(-H7T44BdQ!HQv^NG8$Ugq~imBmje0W0X z^m44mDdKZfq^!2a1)pM7<{%S+hgPKi6U($L? zogOW>`p~4RvH90mrOEb*GsU9Ut&C9BuA2HpBgsvcxq0W$uv;hcGD_zBE503Avqv@i z!sI7Y>WucX2KK+PW17uXZD zTby40Uc}|adFs6D-Gv67Z{tOHj+`4O_b9~_cP0#=B|uXv~mAcpSks@W!1xzw@bCdf6E=%wO3?Sq!>?Pvd>x_4vvo@aUD+t`kn^6 z_P8kU^zaro-BNmY@bYG_>Yv^T?@lWR{+cyMMpZVlc{1ORykC*CmoYCd++UFFu~#Lt zEckWeq3yF9|FL}8E+Tv(C+JjAlTX2|T@`OTHg6IU-D|v6-&NlKGTau8hM}Z$mVyw(mnrVkxBL8XOC2; z$4%QFws1}DiSz#7=X{gc-MjhWHH%Fh&;H%D?qm`5QESfNy{|esQail&<(m6@c}rIx zoZ#BMK7Q$*vj+uA{{OSh@zq=#`R|`}!oSJakN-FN$u4#z<=hf|{o}w4qgvt`QIcGg znpl#mn*t;lj0_Acbq!2(4NXG~&8l%}>cpt0bU7;{4uq PKn)C@u6{1-oD!M>0=`9#gYSGjPhS$A6An{WAZ}9^rCt&h$m!IQ0xzzr1Aom|XYn zRL^Awn`T?b6>&3-f3#ou{N47(DP{}fZ9e%8Q)k!A`Z!bc#P)+SmtqbE#pvGS4h+91 zpY}+z>(!L*mKd(x9AQ$9FYq7)2IMSAD z-Nxn>EM6)~U3_kPDsOyznXtTf)92k!coo^?mwU2jYaHgExn<+R_>lKYKGZz<_wa-T z`?D0Q8N6|}K4-jlPQH0qBcnQH+Oan?pSl`tdilvshNrs0wsH#JHnzT~>7sAMCM^D_ zdZW4ZfpPk5&7$KgIj^baT&{`wy>#2Gz5|9=_zvl;^_f~We|g~rhj$sNAG3o)Cs(|! zEq(av<*V?pMWx17;XKvH3O`>v5qc|PbJb?{iHpv*Mjf- z84ERqw?<_?=ic<^Z1#$~5zpm#RM#3rqmameOgX| z^3D1`r*`bVEBoVOaqeHHjX|$Z&RzBK05B~|mbgZgIOpf)rskC}I2WZRmZYXAlxLP? zD7bt2281{Ai31g>f)pi#C3RDPDj19m3@mjGOmq!RLk!KWObo3I4Ydu7tPBj?>rT&t dX~@k_$xN#xph4pN-gQ6?44$rjF6*2UngBE2eFp#l diff --git a/src/main/res/drawable-mdpi/thumb005_house.png b/src/main/res/drawable-mdpi/thumb005_house.png deleted file mode 100644 index e73d7d589eea36d6f2b7ea0f4cd7043f904f7f76..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 958 zcmeAS@N?(olHy`uVBq!ia0vp^Hb88^0VEhQLfx(cDVB6cUq=Rpjs4tz5?O(K#^NA% zCx&(BWL^R}3dtTpz6=aiY77hwEes65fIH06}<2Px`J6ZFy!bkL5^dH>F_fk>)f9YUB!`DOmbKQiW z*g1V)wZpgMccc8Pl{SrsS0vn{%c&@!$t!KaQ&tKUatzu@=zDaNGPOH|_PFt7pWY5&a zq5D`DpU4&|Ex$8;*5!jUL%I4l6x#gs`n=)rmO1D6pS=n9m{o&h-Ec&g5Yk3rQA6={c_u)>J!}=;l-LfyfE|0TO+q>z;^@;iuyHnkx zMd#e~H}z=>db#jgc14cGt5vo$d7EPUh>STYodJ=6RcN{Ds~A zTc<;Ar_C1aySY{8t8}@+?*$*?y^5#gwyIv4lKT4Hne!5f8zp9?>v(PUK9er^`~uJF zgTlKRIxnAAE}ykM<+DbG&YWFWeK^lFKl7_*&c4c!aJ})r)r%yF+uzO~-2PHV=K0C! z#N6eaK5_q=IJA~!cHQ=rnD+6GmyT_)-5S$VPc7{JExal1y|=9B?LJ1yeU|U<8P&a8 zHvOYukM7F;+w0VRaV+DqTUED&_u3Mpgy}Wz#OQ!!+dPr(~v8640QjzT6n7fx*+&&t;uc GLK6TsDVh2J diff --git a/src/main/res/drawable-mdpi/thumb006_dino.png b/src/main/res/drawable-mdpi/thumb006_dino.png deleted file mode 100644 index 65d50f60c39fbc01949481b90353d862cfe0ff56..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 855 zcmeAS@N?(olHy`uVBq!ia0vp^Hb88^0VEhQLfx(cDVB6cUq=Rpjs4tz5?O(K#^NA% zCx&(BWL^R}3dtTpz6=aiY77hwEes65fI?!4*EkT?x*rz>DSaqw%oY|ndfU#FSVbz2~6$Psz@8vkYo7334Z%vZv+9RJg zur5kZeEsbGuH{iLHw&Ln-rzYi|McrQiVD*btO~cC-RHYIw((b*n{Q=^s6JoI#m95} z<@Q8~?dlSqZgHT?`FYDXo@Wg`65o=ZELs%BbYSv@SsCxnaD|%gS$uir{3mx`u56n) z|IzK$s?nNNyeouU9E<|*e^_3`p=lNnGHdIlUJmw`94{75Nj7g1cXBwW&?8wkB|Y@? z!J3(e8LhX)?lr8uP+4am-{<8zxuARbw(tL~r@F`9)QU1yH~CeNk=?s|xnu3+Nm0pV zbKdB=y>XHEKE8NKrRH7rMZu3BPfW7@v+7fxP)Wf$0j6lCnvyG0NpBt~-KakJe8=j; zZIL?nGuAH&>$S@fG1{|qX*v1HE_y|W))PJ2@KX-ciE@WLa?e7`N#E@vO#`S;wOb$6Fv z`Ki;O^-g5Z=fq4pgKHQj`pq)J*}ZU@$T;u+%j$ z(KR#;F*LU_F|;x?);2J*GBCLC@YZIShTQy=%(O}Z8u|m)v;#FTc)I$ztaD0e0syRV BVIcqj diff --git a/src/main/res/drawable-mdpi/thumb007_flowers.png b/src/main/res/drawable-mdpi/thumb007_flowers.png deleted file mode 100644 index d73e6e1a97fde4ec82820ed006036130cbf50176..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 997 zcmeAS@N?(olHy`uVBq!ia0vp^Hb88^0VEhQLfx(cDVB6cUq=Rpjs4tz5?O(K#^NA% zCx&(BWL^R}3dtTpz6=aiY77hwEes65fIGVIjx(P3aOdd7~QQ`}jiz zr`wFjdw(WxP`t$d@%RIdJ)3p@MM$iExbS@L>Q$*1pC_c)-O+ipX7ARw@ss4&A3XR+ zJtzBip4P>Qoz<5QZQFlE{f(5tF3lsF-8{h`?g=XrhC<4p26mp z*A<+7QR!zt{9bnT<`r*);}h2Ve3_`a^Zxb+jFaP)l4YmvEw+AavaQDKS=x!UAA1cv z?(6P6HfQ$LZE>nEmoI55en0cqokx6+LeFp9aAx~%&4y5qVP zSzSJ&3a@3i<<;NVo5`eh=9=H)h@O&$z77xBK-gi_|rfq#GaCS+U+q zn&%$Vw=$8>aL3$9^ERyg5;AdhXTs#`$^19E9pt}sZ0nq<_2uo8;A)F4m&Cp$C@7Xr znD{a$w0}3VjA`jzm6^e>PBgrbnd-ZEov-_>s3Pl^J73gqJpQQ3*naAlp8?71R$g3i za)N;_qvxyTQMLB95%^U zAJ66fa@}`cG*s^Xg3!627pPD1zc6{)5B~cHq}N*R-eC6j7)N_#)6^|29UUAMtmkj| z{gHW|GGlpr3A2l$u-5HgciG=wD~uNxD_h+CmG4t(@f4--U8{QxpQk2H@csI6LHFy@ zgmq7HQ-1xve}_Tb_;35`GVIjx(P3a<%JOt^4DmSrHtgWUCk7lPDdO!+ ziu^%}Q~5kXuQyCsIx#){)w|vIR&7kZ+%Svn?bZK}chw#I&*%1jSy$CNgBrHOYuL|S zVQ`=Qp;Mc+&HCP9;bZ!2H+t7N|9rAg;Iy25?BTiVD~zp{u6NPkT^~_u%GrN*+3nwp zI&Xj3lX=f(vG#Y-lYKJ3`dptz$s0uO+{W=?Z|3boRYvg}bT@c7P1}(5O?1Xe_Vod4 zc53WfU0lrdwJ*o<0ypD(5jNpS4(E!Ay$pX8&ac!|TmNNB=swN~`de}p`PN(Py#DZ_ z<;DI7njdcUuuXl`TElYxn@8-T{SS_s{%2|1a_P{AA`$abKRBKpOW9){xhtLfpWY^o zP2Fy{F8EHFS86utuC(@s&l#UZn@_LZ#FA!a^ow&D_l#9}tG02R6yy_*J?44BF10=N zeB1@`z8iiOx;Zz3EEh)~o2NTFVYx^DB-R;+vR{_CTr+y-UN4^@7F^xfsPitSgjGgx;fBJ=AGsDMa5Y%EP)#>O6t}InT7WpGjxn{uThWtzO$z3uLb|i zOK!6(e#rb{m1BM-sKZjow`q-z`2Rf$og3}=f14-p1<1?AHBYh*J2anV|GUUnSM1c( zKm3+|u;U-o)m?l(TFa+60h6F=iEBhja#3nxNvduNkYF$}FtF4$Fwr$M4KXygGBLC= pG|@INvNA9bb$en9(~z5=l9^UXK!ex!Nt{3p44$rjF6*2UngDrKX666@ diff --git a/src/main/res/drawable-mdpi/thumb009_zoo.png b/src/main/res/drawable-mdpi/thumb009_zoo.png deleted file mode 100644 index 638f87ced178703da764c76f55416b9fb53806fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1235 zcmeAS@N?(olHy`uVBq!ia0vp^Hb88^0VEhQLfx(cDVB6cUq=Rpjs4tz5?O(K#^NA% zCx&(BWL^R}3dtTpz6=aiY77hwEes65fIRvS#HxABw_x6b@E=hlVbYW0bGz(44Ns{sZc};r$_G(9CNAH<7 zVM>pfW8MVU2(nmpL}tmQed}LdZX45}^=#_x=L36gw=Pru(pv3U(vz$+)3&Lh`<#!o(gbgpbKkVLE>ki1vvV2uZoTO| zTfe+`_rP2tgZKJGEBVSt1u2PZ*WTi|op5sUy2o=Lm)YqpP4KW{Ua(j9eofQOPRqu1 zYm27mU!HitV(zu+-E*}&-UQ`{*B||%mg)E1bpCeB^^CWr6izd;=f0W5koM}mP`@XS zvFW}C*Bdt179V($on2Jv|7$(lj)RiS-){A)zh7k>oAvj@2F7ZWmfboVZp6x6E6e}4 zt8ZDDu2J|VtGUuKx4s+Mln9k>f4pAZ zEq1@;`3=1hGwT~Fzntav52%$hc+PD6r%Gggl&sZ@k{q?;A^Q%qo~|zWQea^jX2bg9 zftMpon_cj^C5Npmtf%)cW}K4t;^fPR8ODw?xengydMR+`htZC!B7NVOUiLkUPnbVf zTBSF$|Hl8fW;3py+P_0<=bX&{%z5*e#Ol7xxC6|%k|nMYCC>S|xv6<249-QVi6yBi z3gww484B*6z5(HleBwYwsvt$lU`gE+pb7>f0|QH40~1|C(-1>*D-%O2LsM-7BP#=g i&4%wgVH$GtQ!>*k321oJFmo?Z1B0ilpUXO@geCx!r4lay diff --git a/src/main/res/drawable-mdpi/thumb010_roadrunner.png b/src/main/res/drawable-mdpi/thumb010_roadrunner.png deleted file mode 100644 index 4949344e44658ea2f66949a5260fba54e9ed67e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 864 zcmeAS@N?(olHy`uVBq!ia0vp^Hb88^0VEhQLfx(cDVB6cUq=Rpjs4tz5?O(K#^NA% zCx&(BWL^R}3dtTpz6=aiY77hwEes65fIg;Fu1i!PYYD)bY__U|zr89P_5oc%ENLy3vivX7Je z3yx0J`XHcF(o(&vSyQ5Vhv9nrB8DBT`tF6>ZDP}uxgenkGf6;BtrpIm%?62o)Fpdax!>>ZXdxx|ZJ`)SYLojli)f8o@(FaH*B zKfBuZOZ{Mcn%sto)sN5gOn>ku;rirTH&cW<_GP3^yCV3Xb;^YTzeMRG*QHmoo15%T z+NY_XR%3a;=R;ZsgXUR>^;>;KZTXrz4y=&;x=nHR-uWuA^H=FEzW7A#{IdRoYf=^% zvP;xtB`0o_J3TFG{4SC2YR_AR}ao zg3zi(K_?!n36(}3y%B5els&ai&qeD>vPhmtz+p9^`N@nKsnht=?NsM8A27|DyZ6LC z?K59R569&gsGBaie8XOEvT(rWLs``Z>{_ciCy4#+hHPJw%@vs z>wSz$)!FwobwX*v!Xt4%#SeODKJwr1+3^2m@GJ8ly|qjaPOt5Kzv25&U{X^pag8WR zE=o--N!3jO5)4KL29~-8Cc1{EA%^BwCWcmqrrHKZRt5%}4c~XdH00)|WTsUT(D0^V R=3bx%22WQ%mvv4FO#qUSYF_{V diff --git a/src/main/res/drawable-mdpi/thumb011_plane.png b/src/main/res/drawable-mdpi/thumb011_plane.png deleted file mode 100644 index c151580a33c2119876eedac3a6654ac58d60b75f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 831 zcmeAS@N?(olHy`uVBq!ia0vp^Hb88^0VEhQLfx(cDVB6cUq=Rpjs4tz5?O(K#^NA% zCx&(BWL^R}3dtTpz6=aiY77hwEes65fIYE*Y&XD<7-tYI-1fB=_0Sz4qO*i>Yrmyho{=zUh z`sw-%b7sEnf*Jo(%v&ZJHve({vHGrJk*ZFDll@bv4Ce`ZzA8E@CkaNeVY1vg)5(&i8b3G zb?m{pe;R74kLs7~+2N$~l2gn+M{i|%0lTP=R_u}0>Q0wA3L8#(nKr9^<*ycB(3ZDl z+QZ&0ch2>!ymdk{EivR*l5Ox>5ADDi5?@nnBevB3dCevC+47?H?X2UE=G;vTo%<`` zfPvPTcaBS!mz?|Mu{G_W%WCBak*jgBQ@;x`9p44t>J-bYP}k!FKzao#e#-@0M|VSn%_}htJ0X44y2ynrV{tvXDvo@*Jj;w`@5-*@WkpPfhb! zy0v3++B7CrZ`~87E94SZ+eaT>$uyU5duKG;4Q3fW-}aTexTUJ?K=8Ame1^+n~lJ}Z6U`o8nzEoJWPyr+la8tpG+htK6Wv0cBs zq^UnUDfZdF-3#-hKLvh{o?HH9+J?7xEM9JAk-mB?Y}MO4&)fAD{=WMDAO8pYhI)p- zehR$xEiM(nl%!hX8c~v5l$uzQs+$5N7>o=IEOiY`bPY{I49%@f46O{!v<-}`3=EoX geieaf$jwj5OsgcI;ciB=0#E~kr>mdKI;Vst0DHzu_5c6? diff --git a/src/main/res/drawable-mdpi/thumb012_birthday.png b/src/main/res/drawable-mdpi/thumb012_birthday.png deleted file mode 100644 index c3375226dce0b622094eadbb0ed2258d8e777ac7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 891 zcmeAS@N?(olHy`uVBq!ia0vp^Hb88^0VEhQLfx(cDVB6cUq=Rpjs4tz5?O(K#^NA% zCx&(BWL^R}3dtTpz6=aiY77hwEes65fI~$_{iq{X;YtsJDEa%S5RgQl+e|bj_yFs&Sj?z;7&xe{%&G~8l?%+M{f=d(6 z8z1FrX8QhKtS9EE!JX0xi>xOpdOi`qvVY0ki7#EP1e0_m`op)#?|E9wc6eH3B$wO1 zAe*Hw-rJ8p^3*Civb?z`HSjH4L*|!%@0F`NkFr?mrfu17Sm-I%xx;_9qNHKR1ASNh z`?oC_bDwg`o0L>~ zteNzY>y8WW?A*A#Zj&DYsrd<&hhOiz)IYb)%SE(&U7x3ql=|P9J{=p+q&<~6d4)Hk zPf$j9{mQ)TTQBcivX|$2W5_0MvHb1E-Kt5AVo;m&Ri&7J@{DVX8q_Y&wJkI240*ixT9kY2qP2;4XX$*F z(#aO!-F|J#<_meyiLC; z#Wb)wnyDwq?s7|$4lCIxKlfhk<-opY9&h+sjPA+IYx=p;q%UEn#p)HlJGquMt1Z${ zVeMFbBA4w+2G51ty}RY!`PDzHwz}%-yKkoUF25O7dkcIj=U1Kd4t=Vz_)%s~bwRjx z#hov2GXj6aUHkk>;LlNms$bq`ecsC}efh|-EARi-S-*qt-&4IN6}>yK;DNNf$*nA2 zh9B?a8|p>=FrM0Zsp@!pw*W8|s+PD$lq46WCYGe?rT_^BBLf3VT>}$cL(>pLb1M@= rD?>AF10yQ~gQlBbMPM3o^HVa@DhX(~o6)QQ)WG2B>gTe~DWM4f^_OiF diff --git a/src/main/res/drawable-mdpi/thumb013_18wheeler.png b/src/main/res/drawable-mdpi/thumb013_18wheeler.png deleted file mode 100644 index dab1eb1b938aa411db82c4972b6d74a42dc13354..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 935 zcmeAS@N?(olHy`uVBq!ia0vp^Hb88^0VEhQLfx(cDVB6cUq=Rpjs4tz5?O(K#^NA% zCx&(BWL^R}3dtTpz6=aiY77hwEes65fIzKdY zGn`fTDV+II!+-od_Z-P2-2$0|is?LAw`R@wo1nlTeE3uHWhn!bur{MV7nr#ZJZ)xP zr*3&Wcv{zY2FBE$)zeM24f~ZiKkiIR(HGnEn!B~M;r36zU^lTvGRBjpUaDYVX1UlP zkhfGkob$xr$+v4N87?mpe9pwJJW1kT)^3fDTzz5tCKh}>w@;+eGPYBSb5GOp9F9Bh zv!B$IEi-QHPvE%X`eDnTjF*WU=Whu8YkBdY*R+7yf41_>Sa&``*qqg(_Rgu(+u~a? zwum~bD7U^o_l~)z)%#QOk$Z1b_o_VY-W9~bnkJCBPJ8d#2aWSsLP`bRg?yfv8v^o8! z*o^qaKO7HT(wX{(_o_n2=~*j0F3(J_DLkn1P2}wU7e_e`%_u(U_wY@DPWwxRT%nxZ zZo>bbpIozfav#%$bth&u#GhF0GSkQ4nXCF)rZr-Mo|SLPe)yeqk(hL7)z(Ofmq#Xq z1vSp%kPQ($BP(fG>$LT2Pi{`D`dS9#-3rH5_=P6sRY*C9OTONIVry=`#P2>|o$_r7 zmd69cSM4|KHMLT~26Qg8_Yeb22er|4RUI~M9QEFmIYKlU6 zW=V#EyQgnJcq5-UP?0J~Q8HLkHwCDI!N|bCQrEyl*U&V?(A>(z(8|zU+rY@mz(8f) gzXdQ2x%nxXX_W*tRLgfv0cv3IboFyt=akR{00eM@K>z>% diff --git a/src/main/res/drawable-mdpi/thumb014_motorbike.png b/src/main/res/drawable-mdpi/thumb014_motorbike.png deleted file mode 100644 index 010f5268aa50f02dbe9dc44b67796b83e6e2bd1f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 967 zcmeAS@N?(olHy`uVBq!ia0vp^Hb88^0VEhQLfx(cDVB6cUq=Rpjs4tz5?O(K#^NA% zCx&(BWL^R}3dtTpz6=aiY77hwEes65fIajM?0&}?>_nFR+C4Q!jr{+kCy(aE@-LV!{W|vk?`zld?P1Q z`Gx80r1TF2ww53H_W%3?m#MsoAJsNlfAh*+Z*`}l^8Y`#h_#Jntj8lbDn1+!=$^ku zX0^-aTX$|OxpOm-_0is}r_%x?wx6B-_QR}#kQ>Kmg{O&L-7_WN#);fnH?Ij_X4d0b zCR;OOX_DH(N4$Tw9+cpTj#>MN?a$&>X{)_NimTV_+AV2IEVf@=8r(F$H?z&4{n@M_&~tO`0X~)OCthEX-t9EkLx)dYR(< zxwj4^?>?QO@y=}V-PmdO#Aa~rRC-``^t7;*)?GEu4awS;-FJ`NSXcGxt(&J?PovoF z;ulJ%?(T8Zvt3tPD0IZ~#|P;u4X*_4Le}G>vCpXe{V_?dl&`E}Ese?A%A)n}c)Gve8y zJiCLj3Na~Ny309Bj|5#yocY0|huvcJCBB@}D2d}KmorvYifI(u_{wk2%e?M=BX7Fa z?VXEx-WKg|wr+j#Z28MoHzrQlx10C+H`zP;FMYl>p{b$PY`^@R<0r3kgow!`nW5xdcVP76=J$v%EB}VDsq{zMVPTR}8lel%h zbH!WP9o4;2yZC0`k6-HN&U54UbPM@Q?pwYmOzjE3@c+r(&;J?zGhXD}-M0JH+-_is zRxNRjC`m3#O)N>(O#u=NMg|6!x&|h?hNdBg=2j+#R)!YZ21Zr}2A7`odBQa0=BH$) XRT9w98~&pfsDZ)L)z4*}Q$iB}cwD67 diff --git a/src/main/res/drawable-mdpi/thumb015_f15eagle.png b/src/main/res/drawable-mdpi/thumb015_f15eagle.png deleted file mode 100644 index ec33c54670d4e6981ed270c00e1445a621160972..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 924 zcmeAS@N?(olHy`uVBq!ia0vp^Hb88^0VEhQLfx(cDVB6cUq=Rpjs4tz5?O(K#^NA% zCx&(BWL^R}3dtTpz6=aiY77hwEes65fIH}by#ih5sVm(3@#$0S`!~MN%#0$09xR=&AF)5~wCIkX?-NQd#~)M(lCERkUAA5C z2P;pga_WWX4Kv>=&nSO8@uzNtL(!F*+l)>!MeVmwD0<~hh+gnd*u9S7-6vC)gq`jm zd4E2bw_)y*qr#m98`*Q5|NZd1etCvHqw$S1I~F~fY+`e1=B2uL9gmKu|1PLV?@D4&zscoZf5TNMH_VLHg})+VAj@hP4UhQi-WUn&yt;e#P(^^>w;}A?#c2C z*M;3ZA~jV*O3k2ro|Jk#>)X307#1}yyn3U9$$93{nuc7P{LP2fM4p<$5_;#ui&LIk zZdOFS*>SK^)}ZgTYhhX7%+Ig8^*_=+KAN|B|Q0^6dJMblLQ~$K}Nbo;;kA zvLtNhdL_pX?(1Iv?2(cA(`V=_dv*R@o+^=y9H+_;vfj4~b}&tTrJ)hDCfYdiY+3!n zi!$dkwEjnb=DV}_?(u`O&$xaT;PKy}dX|0rKyk ze5(87_D!E(c^B?CKUYlI-~78SV=wdjYxc^|Bz*p^OZg2ZSk*1|tIlOI-sKT|?6lLvt$=Ln}iIZ381K1A|M?`aEG8a`RI% X(<%vQ=nel-3$nt~)z4*}Q$iB}?`MYz diff --git a/src/main/res/drawable-mdpi/thumb016_beagle.png b/src/main/res/drawable-mdpi/thumb016_beagle.png deleted file mode 100644 index 0271d412ae1a1dbeedce91df2be13d1dba31b6bd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 940 zcmeAS@N?(olHy`uVBq!ia0vp^Hb88^0VEhQLfx(cDVB6cUq=Rpjs4tz5?O(K#^NA% zCx&(BWL^R}3dtTpz6=aiY77hwEes65fIg;Fu1i!PYYD)bY__U|^c(>EamTaeQf5XYOGGo-0g|Zkr1P z^@?^E2kr|HZ~iTykwcim$a?l56~@9TA& zd`~d8t=xDhU~_T9)bA5YRg0QhSE=6mpzkBFp0T~VcWvTRhRw6G#m&T1`WG=ezY~aC zHvi6fzcWeOceb+a%S%u!iC2sN5cK_{TBzK?(j^V+t#4cwYcxA)KHs+GK%ldBtjYkPQopKILs@v%y4lB?;t=FsEn zC3zaQQ)_y*yWI*;7ZhLjNF~?j{-*Gx?k5K|^vz#yRbgE3p!~+}$feFlf7Dh!nv$@p zvf@Z|dAg~1?%Wi~&;Ol``x!n2Ez{ibb4~4`murr$m~?IO#X`@+XLqgHRwQk@C&1~o z=l9jTFE}Fk({3I+c#2^`An!fS%PCj)&VSkXso(PG{riV6?EO|_!fLp4x5d->dWDaI zXDv21k-z;Q&*9%+wiOT8=!i>oOFpsvuy@Vg`dF#g)(Llix&Jw4euS* uD-%O2LrZM~BP#=gl8LQ*k324w(_Klg-N7X;bisPkCfVz`&0pMq3p`-$)R^@BY0p>j`p5hA%dY;|7NP63UuWLsLdTj= zoqa4v<4es>pIYCwGe;smUW9wuwwkBDQvWJ9YA@K7u}8)8vVV7AO5$Fl`!~EF9Zq^) zxaCvS%-`L&syEL5y8~)n)>mE#T@PL7yfL|e4V5?JF%QGInJyv zb`5X6yfpigbNMb;@2S{sJ{xz_l=HH5s9ufkBIc;@;+4lLH+;Ay-CDKdZe`z^bKSn- zdxYc{&z!US6>BT=tjVhccCB+Pot2pRy`cWXg3R z**q5Ii`}^zv@6Qx_48{6w-ww=d}Geszsg>G_2;sfK=p)1ZwYb7?HlD8v<_+IU!JO< zWO_Nwm_zqsTT-E6j8;fwiudKsr7t6=HLxwMR9Tk0%EWs{$i)Yl%l)=qdz;;pu%rIj zhR`$b=iYd*Pww=I;<@Xpp2U^*dp+viw(^YFB>xC4+qqgB&shISG}^@fb6QDd!!_x` zhm!MuX+Ky$PpHfA)SUS@GWllpv@~hm>`rRgCjM*NwvwW2d8x7@^Vn5HmudNO$a7oH zO4+P3H~O{KI|*@%HLH)yvSwx57hlL!{&mV*cA51@kBUtKqGgNOSwnQ|C;j$H6LdPG z7_`}lGuCLa)t7Cm2PeGl39`Sr?!uWxnj8leoKlR>o!Omsqi&JRqAssXTV|@v3eWy{ zWQSeL71y|M(zk2TNtj z&k0t-x4-1fJtnzv{+<}C#2GdsVM%@S>k{Ui-%u7>XK1)2y-H5BkY8T&@lThabv(=~ zxKyWoZ@c-v{!W9jme7mf+dF%IF1MF#^qNboNn*vn9U}RumscT@OYiJr` wXl`X~!H91D?xgd3Oq3 zJ!Ex*%PP@*9;d_K&2`hCOgj8oW%ss}56n$hrac!A|2g@=57r&G&L3p>b3Ebne&s3V z8}=Vn-`-by^u2k(718*f=>E40*H-LleS5m~`i#K&h1Q-GtnG=LT6CGLEja3#g%zrt z=9CotzQrWUK3mtvz_+NsRCUSh`~;UPz0ItB(Z5+2>m+=rQRdxg&i9aQ_CnjR)H#|) zzHg_m5&qx#B#rBIv-qV;vi%qC1YAi7ojK>vlj4~tKd=hqOctGWxoJniRb}B*NmoQB zG+JKXGVSZ4HEaeMSxg*an$8Z|Szq@oz8oSkDRkwbrrQydP78TOoeArV7k{+tN!-23 zxwB6-Je3u*ikfQF%g$ndeQA2zCF#Yh#g-^*ePe20`>gHZx~uupt#-RkU4H*;jcsS* zNi&b`+(1s5)7}2HI_FXYD>t?*E4sdNmxk7|Q$T0B&ze1B%A7Zw+4LT*Uj1#M1vld> z?&XmtrZl-aYDJc-`wYTiUu9583vgzQ>*W_uRtR`}LA*j9=cC zv}fx5`0;st`(O6`G4U@y-)w4KwImLhbR|n%BTAg}b8}PkN*J7rQWHy3QxwWGOEMJP zJ$(bh8~Mb6ic~?0lEIR?DL@qrMg|6!x&|h?hNdBg=2j+#Rz`-}21Zr}1}8tBsf20B c%}>cpt0bUdn!_$&7Gz-XboFyt=akR{0Ao>`;Q#;t diff --git a/src/main/res/drawable-mdpi/thumb019_helicopter.png b/src/main/res/drawable-mdpi/thumb019_helicopter.png deleted file mode 100644 index c6fdadaf6a7d6307e5c60a1b8fe409bd465e4138..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 994 zcmeAS@N?(olHy`uVBq!ia0vp^Hb88^0VEhQLfx(cDVB6cUq=Rpjs4tz5?O(K#^NA% zCx&(BWL^R}3dtTpz6=aiY77hwEes65fI|*b01D?|ov4<~b z@cJ$a-NGf#^}*w`-<+7subJg zW_IIo?i4}YC9@VE|I+%-Yxeu<8BTqR&q~gGpB7)^5ci(P{6O<}g_&(Dt>h*!IrkiV zAuwr8bcEv$559N&9*xQ|`5*3GufHSpLnkShpbF@G0T*KYKcvL zof!je?J5qMHFI~O;VcPFY zUo>(%7~G<~cb#fq`DI<`)%70A=bM_cnsQEs%-mdg+N48%?vX?BZ_-|^v)r_XZK?N> zi$VgqyZ+y*l63Q%@U4a|vF%yo(W)Kt?++|?smh6ts{3+IZMXQ2g`W!Ze-$end41_? zfO4DAgt?o()g@`HnX%cVDtYm2_iL5BVvb+pgyoO%7KI4dyIhHw&|tU8Y|H&`>*wA3 z{xce_y69 zH9K-lAwIbJwfMW>TRI}%rOpp)XWwNDo4KZC)5T|V3Ma(x$~>iP>r{TZOx@bIMqaSu z^UL)tzYShgrT+PoHFLnW!3AQS5`A0FyCTtyQm@V zo%`Ne-fO9wuA2(|k9+%{?GL+R<(74)>L>dH6T51OYeY$MQEFmIs%{F9U@$T;u+%j$ z(KR#;F*LU_F|;x=)HX1(GB7y#@k}L5LvDUbW?Cfy4bvQU0rMjRgQu&X%Q~loCIDYI BwG#jU diff --git a/src/main/res/drawable-mdpi/thumb020_bee.png b/src/main/res/drawable-mdpi/thumb020_bee.png deleted file mode 100644 index 6f0e4298b9ef9f36f52c30e8acaf2a9ec1e7d33f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 857 zcmeAS@N?(olHy`uVBq!ia0vp^Hb88^0VEhQLfx(cDVB6cUq=Rpjs4tz5?O(K#^NA% zCx&(BWL^R}3dtTpz6=aiY77hwEes65fIWufr4n9n9wo4*kuQbLvRbd+`L-Yd@6# zh~%76j^C7?pg33k567OiS}wC`Z>Pvz$x-2c=o9kf+Is#6a@Vbo9+>&vr=I=UiyqFZ z9B(sitBrY1v)(?vma_Zfh9=)zxy4O0jw@L^G;OZ+Dikl`ROB ztYlc$Ebj8I)h9-4&v(k`5YwOH`|?Ir^iAKdQp$0cl~xN_6`hJ? z=Ugz;^^(G(-=aJkQxB<6zj5!KqL6ms!h3CEUrnE0s#)^5j`(iQ*GszB zEzWMpU37VooC;@YTCUK$uJ!x3rv0~PKQu>0VRggX1f9IgX@_R9=Q1ZX?e({`UgKx? z^lZ!2qHmkt7#vp6E*Jk3VtmJYnbbW$rI%rj(cNo5FH;q;f6(>y@0S+Ol`mf1*|w{% zW7GL9zhAVzF%-@*xW&Yt?e(ef_zF?a-h1sCEM^w}>=ep2oLUn%yZ6x+1?3#cHR%RC zr#IO|)n1swRQ=QJYMEwn@P4f`@>x}@PyUHbsg~~iad_IxyZ3%)zE-_^Y=RwQwP!Jd zli8;aqB=|FO{=r9WSTsU&6fM_fu#El6TkCI9{F3=lcxbnnW`nO5hck*sfi`2x+y?{ z!N|bCQrEyl*U&V?(A>(z(8|b2+rY@mz~G1EwI?tQx%nxXX_W*tEMKwU0#E~kr>mdK II;Vst0A(v-z5oCK diff --git a/src/main/res/drawable-mdpi/thumb021_spider.png b/src/main/res/drawable-mdpi/thumb021_spider.png deleted file mode 100644 index 7404648be8f0b774ff2be3c5da0897ca1b179683..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 996 zcmeAS@N?(olHy`uVBq!ia0vp^Hb88^0VEhQLfx(cDVB6cUq=Rpjs4tz5?O(K#^NA% zCx&(BWL^R}3dtTpz6=aiY77hwEes65fI{>-k|fJ3 zj+$GX)I+As^mo-q}AamMAwR1lhAw20%x9tHJeYMsm z5A(8a{Ra!hP6>zEcyDSj+tw7g>Pe@#Qi$M@D$iqL1{cK&V-KyVsCdDCgZEw53-j}@ z!o}tua1?E*>XM&m)IVe20U;knw$RqqJ0DLr_>g;w`&U-M))$8~=l)=0zqaSlb%$IkuP^CD^MnVnq9w-Yz(Tes!E+O9K^ee2p+yi*l?_9{EE zUy^yP`twiTgDHRC^0)yAiyZ-#I9)%IbOvyNlJX_gXG4 z|5x1q#eGXLflW)t*<5-{Sev3C%lCi__k0YdEA+2DTiiD3@2V-!ix+%kTXFazSI>%V zM-9tn@vSgBo!@pt>&J&cyR6vL^A!3Iu?xE;NZNW{VC}sAXxjEkDvP8qRocz^d0<)C zmNTIoj`2q?Z4|v?bg*KReNu)~Z(CL4W`0fiM-wxrwx`bisB*aKcJ{W(=?l|!FRoj) zw3zc??EkhciyCIRB_~hb{z7J5k;+RQ&Uh)uGFn6 z`-X-DRm(%k@vq*CZ_NE3q^|uj>6ygyBdXt3y^ORnZ*Ex9x6%_0P`c`Ie`yhsdv*u6$eVQ`Nn#hpt!1^XkcT zeoSzE9Xj=}!u2`HFKW&dcr~A!IKZWZq5Oao&bge-8_xU3yM&GxifAmC+R5pkFlp8fIW_r|DbiOtt<8 diff --git a/src/main/res/drawable-mdpi/thumb022_medeival_city.png b/src/main/res/drawable-mdpi/thumb022_medeival_city.png deleted file mode 100644 index baf3f57b02f2697ba8d6fc0f3aeef192a873e280..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1151 zcmeAS@N?(olHy`uVBq!ia0vp^Hb88^0VEhQLfx(cDVB6cUq=Rpjs4tz5?O(K#^NA% zCx&(BWL^R}3dtTpz6=aiY77hwEes65fIEamTaeQgm+rp;?93{N#T&G^( zoO*$4?u7|;ck~o)7wNq>68C?0bK}+;9qvnp`*-U++rRGdZT+nM4Bh_(*6fH2ob~(k z)|dAW9OQ8Rp3gM-_a%$aC(hyM&+p2^aHEIw5}zLHOhcajJjpHW!WTELwY!oxDK}-$EkWkzl9?^94ceA& zkc+;t$xA^{Yx5yC`=16T&b&>L4)*!!$Jffby1iTDQN3*oll6&%Jr0i!)vD`AEEb!) zEcA+{dlRS86rT0A!F;tFdCN?71(>ULE!v^2o6a}ud-}n?v{gb6-8r} z{5sr{$!Of%LzG5kDzqU-Pd2O?|K<@j`5v$S+X*Yq-8p7?g|%`fkH zw@nl8)p}guU~Kb%ak=W#+d8}7Bzk|3DO0+p?WK2R%5s+pXRch1z0qeFzO;JMhxiLK zuc{_`&eQ94UnWx|#Hpzps=ML2MWEK*93FvZSN~Rs?o7I5dwX&9J3Y~m-tAGA?kkN~ zDk`*gFAq5}5c$chnH%D60ca~tEz^EWDf&T~hd9yKnTP54{ zbhTbZli@NW^Dn<0Zl{K}sbX_#ly6&BpE1=6kznEPm3nDE*WD!0^> zL~mD9&KZ0bj<-~pwaW^o-<_axy-3cqr}gCYipML>O%8>v(#jKMF8q4qX zHcrb)W(8|34WCZQj{33HexaTE)vmoq!qRmLzB%PrJec}5sg6VP&9j6Pw;pxA75m*M zc)KpEB{=z*EQ?S=`(mfbHa{wTh0F>|a8szk62vE=X*Qr_SVebd-adKb_o`Cl8>Idzsxf_IrMhYN0aJhzgNopJJ(i3bSL>r zHGO=!>EGGFQ`NI;-~YbP0l+XkK Dy`1I5 diff --git a/src/main/res/drawable-mdpi/thumb023_outer_space.png b/src/main/res/drawable-mdpi/thumb023_outer_space.png deleted file mode 100644 index 08067884d523e416c594cc695edd60133ca29419..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 857 zcmeAS@N?(olHy`uVBq!ia0vp^Hb88^0VEhQLfx(cDVB6cUq=Rpjs4tz5?O(K#^NA% zCx&(BWL^R}3dtTpz6=aiY77hwEes65fIele2Jht(x?vyucixiaEKnJKs8ZF1pdolHNCQad1-R^~;x&TZHu^&%ZnC z`<`XW{nmr=Tz|NHPS$8^?R7Dn7hreEIBzoVf=A2-E@gh2?|;7Fl<|rl?pI^P*(E~UjTW!z%b_}XpP-k!xzGa5{Hd_ViaPwDrvoT=Sg7Ktrg zc2-aDP~)=~#V<~;^Eo@`N%@zzJ=YReN3Z&~h&$@?(`DP5Uv6I;)gKu5-&k}<^KGA8 zY3Y5Y9$CkJxd;`Dl@`BH3(=O}&t)vvlDK@9aoWek4BeZS*L^mnO?kiVq1lxV$r!P- z-yAxwEh;vNdZ=Z1IOyEsOWnUd9!(Ru#<|j5XWo$suD@*9JB7ssP5E|s+4%jQd)FxS z(c!agO_!!#Kf3YW=VxJsO=tKbwS7;|*~Oq5<(&OcV0qrN{O(Lek95b^+4BBRHlMz` z$$#^g_4g$Cm2>BA+9fS?`HA3Vz(`gQ1!f7%J=YJjIWbFKRNU===1EWjI0&R z`}gjTJh%M!%gxtKS4>-fQ1!9=0r@@E|NKAjcU^N}z1i)=2~1b7sQ!>*k31~P{G4&Nt1B0il KpUXO@geCwk&}cUR diff --git a/src/main/res/drawable-mdpi/thumb024_world_map.png b/src/main/res/drawable-mdpi/thumb024_world_map.png deleted file mode 100644 index fa23f6a25d94cb8f88147386a83ccfe4201ca245..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 963 zcmeAS@N?(olHy`uVBq!ia0vp^Hb88^0VEhQLfx(cDVB6cUq=Rpjs4tz5?O(K#^NA% zCx&(BWL^R}3dtTpz6=aiY77hwEes65fIlFz@i^Wac5~ws1CEjaKbM0O z*fvh^bbqocw?skZv~_;nn~hgw&Q{tkmk)8d!eG4bL*<^YG41)wvh)u61kV4{zrQh* zqwuQB3ckvsruPZ=Rtc>-=RWc5LH>gMiBYL7kK9^b{68RIva2JsJ}o{bZKJ<|Z&_B4 z(v^dA^-if=@w`xUnmxk1^-|a+*WY(DX05t(l1bUk(tX3Lf{7fC#(`(!4q7xwMrF_cqn7*tP3`YvE>YlV~4_TNlpo&srBRX%e&T z!-Ru+Cky{wEct(`>u#Ky#~m?yrEII%cRTahH>7i2HeOd&?6XVDMap-B{7r$iW^*=t zTzi%Ea#)-5+f!`Iva(*b+IxtGNxO;}TQ{V>j9c0)XfiD-QZJ$4<`R>$-dy*VURGNC zvGVAIw2x7D4@OwGh`Va1u3uLudbLTg-G75T&oSw>&Dr0Wo;b)HSi8y1-RnqY`i8Ld z`3aFtbE;QN)W70qa`1fGHnj~ZXYY0TXwSB;NGmX1qx{FVG{NoDF)=Nj1eNHkcl%S; z_lAaV$h~{#dGC?cnOBNyFPa{nC%Z>v<*^AZ>lR(F;yWwIa5-h#)kN)s&$do+Xjm+- za9(@bvVwPg8%1n+v?I=4-qXwDVOe%QgY*3N_5Bw(<3j&3uybE84v@`Nzqwoezt!qb zJI_1SWX@Y!aMp0j`H#7#%VuS-ZZ|Pmu98xyX;8T%JBF=2Cw^JYx$g6MD~0X7W3O|) z6+J)k-KU*CTmP;tb-A)HC7zpC@xpE?hXwDv8~e*@)(1`4eO%&Ol!nE#Z5;ci?U=sL zW%J)C`H$x&q#pa5T6kBfwrSqM(u-gB9&eB9oiu0ePxg;|ubwA9Un>nv&8j7?5hck* zsfi`2x+y?{!N|bCQrEyl*U&V?(A>(z(8|bE+rY@mz`%Cji!7Li-29Zxv`PXRlKAJv Q0W~mqy85}Sb4q9e0Dv}?p#T5? From 825cc5a92312772aee8ec876f4124fc583768b48 Mon Sep 17 00:00:00 2001 From: Nicco Kunzmann Date: Tue, 25 Feb 2020 17:03:51 +0100 Subject: [PATCH 014/292] remove unused code --- .../androidsoft/coloring/ui/activity/PaintActivity.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/main/java/org/androidsoft/coloring/ui/activity/PaintActivity.java b/src/main/java/org/androidsoft/coloring/ui/activity/PaintActivity.java index d19e06c..47a124e 100644 --- a/src/main/java/org/androidsoft/coloring/ui/activity/PaintActivity.java +++ b/src/main/java/org/androidsoft/coloring/ui/activity/PaintActivity.java @@ -51,9 +51,6 @@ public class PaintActivity extends AbstractColoringActivity implements PaintView.LifecycleListener { - - public static final String FILE_BACKUP = "backup"; - public PaintActivity() { _state = new State(); @@ -402,12 +399,6 @@ public void onScanCompleted(String path, final Uri uri) private String _mimeType; } - public static interface OnSavedListener - { - - void onSaved(String filename); - } - private class BitmapSaver implements Runnable { From 394a46db27059c6ae657f1c34197cb5a43bfd8d8 Mon Sep 17 00:00:00 2001 From: Nicco Kunzmann Date: Tue, 25 Feb 2020 17:24:39 +0100 Subject: [PATCH 015/292] add double back press to exit contributes to https://github.com/androidsoft-org/androidsoft-coloring/issues/6 fixes https://github.com/androidsoft-org/androidsoft-coloring/issues/6 --- .../coloring/ui/activity/PaintActivity.java | 25 +++++++++++++++++++ src/main/res/values-de-rDE/strings.xml | 1 + src/main/res/values/strings.xml | 3 ++- 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/androidsoft/coloring/ui/activity/PaintActivity.java b/src/main/java/org/androidsoft/coloring/ui/activity/PaintActivity.java index 47a124e..0fc857f 100644 --- a/src/main/java/org/androidsoft/coloring/ui/activity/PaintActivity.java +++ b/src/main/java/org/androidsoft/coloring/ui/activity/PaintActivity.java @@ -44,6 +44,8 @@ import android.view.MenuItem; import android.view.View; import android.widget.ProgressBar; +import android.widget.Toast; + import java.util.List; import java.util.ArrayList; import org.androidsoft.coloring.R; @@ -96,6 +98,29 @@ public void onCreate(Bundle savedInstanceState) } } + boolean doubleBackToExitPressedOnce = false; + + @Override + public void onBackPressed() { + // code for double-clicking the back button to exit the activity + // see https://stackoverflow.com/a/13578600/1320237 + if (doubleBackToExitPressedOnce) { + super.onBackPressed(); + return; + } + + this.doubleBackToExitPressedOnce = true; + Toast.makeText(this, R.string.toast_double_click_back_button, Toast.LENGTH_SHORT).show(); + + new Handler().postDelayed(new Runnable() { + + @Override + public void run() { + doubleBackToExitPressedOnce=false; + } + }, 2000); + } + @Override public boolean onCreateOptionsMenu(Menu menu) { diff --git a/src/main/res/values-de-rDE/strings.xml b/src/main/res/values-de-rDE/strings.xml index 3484dc7..a53da56 100644 --- a/src/main/res/values-de-rDE/strings.xml +++ b/src/main/res/values-de-rDE/strings.xml @@ -22,4 +22,5 @@ \t• Kleinere Fehler wurden behoben (Synchronisation bei der Deinstallation).\n \n\nViel Spaß und vergiß nicht, die Entwickler zu unterstützen. " Was ist neu bei Malen für Kinder + Drücke Zurück nochmal zum Beenden \ No newline at end of file diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 18470ab..8fe4c57 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - + Coloring for Kids New @@ -47,5 +47,6 @@ \t• Minor bugs fixes (uninstall synchronization).\n \n\nEnjoy it and don\'t forget to rate it to support the development. + Please click BACK again to exit \ No newline at end of file From b171fd8a3d1d91cda27d636283593f64754e3f74 Mon Sep 17 00:00:00 2001 From: Nicco Kunzmann Date: Tue, 25 Feb 2020 17:30:46 +0100 Subject: [PATCH 016/292] add changelogs to metadata --- metadata/de-DE | 1 + metadata/de/changelogs/2.txt | 1 + metadata/en-US | 1 + metadata/en/changelogs/2.txt | 1 + metadata/en/changelogs/3.txt | 4 ++++ metadata/pt-BR | 1 + metadata/pt/changelogs/2.txt | 1 + 7 files changed, 10 insertions(+) create mode 120000 metadata/de-DE create mode 100644 metadata/de/changelogs/2.txt create mode 120000 metadata/en-US create mode 100644 metadata/en/changelogs/2.txt create mode 100644 metadata/en/changelogs/3.txt create mode 120000 metadata/pt-BR create mode 100644 metadata/pt/changelogs/2.txt diff --git a/metadata/de-DE b/metadata/de-DE new file mode 120000 index 0000000..c42e816 --- /dev/null +++ b/metadata/de-DE @@ -0,0 +1 @@ +de \ No newline at end of file diff --git a/metadata/de/changelogs/2.txt b/metadata/de/changelogs/2.txt new file mode 100644 index 0000000..5296e30 --- /dev/null +++ b/metadata/de/changelogs/2.txt @@ -0,0 +1 @@ +Kleinere Fehler wurden behoben (Synchronisation bei der Deinstallation). diff --git a/metadata/en-US b/metadata/en-US new file mode 120000 index 0000000..2c4c454 --- /dev/null +++ b/metadata/en-US @@ -0,0 +1 @@ +en \ No newline at end of file diff --git a/metadata/en/changelogs/2.txt b/metadata/en/changelogs/2.txt new file mode 100644 index 0000000..31f0c2b --- /dev/null +++ b/metadata/en/changelogs/2.txt @@ -0,0 +1 @@ +Minor bugs fixes (uninstall synchronization). diff --git a/metadata/en/changelogs/3.txt b/metadata/en/changelogs/3.txt new file mode 100644 index 0000000..cc6cf03 --- /dev/null +++ b/metadata/en/changelogs/3.txt @@ -0,0 +1,4 @@ +- add double click to exit painting activity +- remove preview images to make the apk smaller +- add German and Brazilian Portuguese translations +- add fullscreen mode diff --git a/metadata/pt-BR b/metadata/pt-BR new file mode 120000 index 0000000..9e3340e --- /dev/null +++ b/metadata/pt-BR @@ -0,0 +1 @@ +pt \ No newline at end of file diff --git a/metadata/pt/changelogs/2.txt b/metadata/pt/changelogs/2.txt new file mode 100644 index 0000000..7d276af --- /dev/null +++ b/metadata/pt/changelogs/2.txt @@ -0,0 +1 @@ +Pequenas correções de erros (sincronização da desinstalação). From 6c62adb01e330b3e3d1c25fb353c5d4acbb66525 Mon Sep 17 00:00:00 2001 From: Nicco Kunzmann Date: Tue, 25 Feb 2020 17:38:50 +0100 Subject: [PATCH 017/292] add onclick listener to close splash screen more easily --- .../coloring/ui/activity/SplashActivity.java | 31 ++++++------ src/main/res/layout/splash.xml | 50 +++++++++++-------- 2 files changed, 44 insertions(+), 37 deletions(-) diff --git a/src/main/java/org/androidsoft/coloring/ui/activity/SplashActivity.java b/src/main/java/org/androidsoft/coloring/ui/activity/SplashActivity.java index 9d4c2c2..b474792 100644 --- a/src/main/java/org/androidsoft/coloring/ui/activity/SplashActivity.java +++ b/src/main/java/org/androidsoft/coloring/ui/activity/SplashActivity.java @@ -16,10 +16,13 @@ import android.content.Intent; import android.os.Bundle; +import android.telephony.SubscriptionPlan; import android.view.View; import android.view.View.OnClickListener; import android.widget.Button; import android.widget.ImageView; +import android.widget.LinearLayout; + import org.androidsoft.coloring.R; import org.androidsoft.utils.ui.WhatsNewActivity; @@ -27,7 +30,7 @@ * Splash activity * @author Pierre Levy */ -public class SplashActivity extends WhatsNewActivity implements OnClickListener +public class SplashActivity extends WhatsNewActivity { private Button mButtonPlay; @@ -39,24 +42,22 @@ public void onCreate(Bundle icicle) setContentView(R.layout.splash); - mButtonPlay = (Button) findViewById(R.id.button_go); - mButtonPlay.setOnClickListener(this); + OnClickListener closeThis = new OnClickListener() { + @Override + public void onClick(View view) { + Intent intent = new Intent(SplashActivity.this, PaintActivity.class); + startActivity(intent); + } + }; + + mButtonPlay = findViewById(R.id.button_go); + mButtonPlay.setOnClickListener(closeThis); ImageView image = (ImageView) findViewById(R.id.image_splash); image.setImageResource(R.drawable.splash); - } - - /** - * {@inheritDoc } - */ - public void onClick(View v) - { - if (v == mButtonPlay) - { - Intent intent = new Intent(this, PaintActivity.class); - startActivity(intent); - } + LinearLayout splashScreen = findViewById(R.id.splash_screen); + splashScreen.setOnClickListener(closeThis); } @Override diff --git a/src/main/res/layout/splash.xml b/src/main/res/layout/splash.xml index 5c3e1a6..e8602d9 100644 --- a/src/main/res/layout/splash.xml +++ b/src/main/res/layout/splash.xml @@ -18,35 +18,41 @@ - - + android:gravity="center_horizontal|center_vertical" + android:orientation="vertical"> - - + - + -