diff --git a/p2-SimpleCalculator/app/build.gradle b/p2-SimpleCalculator/app/build.gradle index e53eafe..3035944 100644 --- a/p2-SimpleCalculator/app/build.gradle +++ b/p2-SimpleCalculator/app/build.gradle @@ -9,7 +9,7 @@ android { minSdkVersion 16 targetSdkVersion 30 versionCode 1 - versionName "1.0" + versionName "1.1.0" // Required when setting minSdkVersion to 20 or lower multiDexEnabled true testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/p2-SimpleCalculator/app/src/main/AndroidManifest.xml b/p2-SimpleCalculator/app/src/main/AndroidManifest.xml index 40f96f9..36b4500 100644 --- a/p2-SimpleCalculator/app/src/main/AndroidManifest.xml +++ b/p2-SimpleCalculator/app/src/main/AndroidManifest.xml @@ -9,7 +9,7 @@ android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" - android:roundIcon="@mipmap/ic_launcher_round" + android:roundIcon="@mipmap/ic_launcher" android:supportsRtl="true" android:theme="@style/AppTheme"> - - + + \ No newline at end of file diff --git a/p2-SimpleCalculator/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/p2-SimpleCalculator/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index eca70cf..0000000 --- a/p2-SimpleCalculator/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/p2-SimpleCalculator/app/src/main/res/mipmap-hdpi/ic_launcher.png b/p2-SimpleCalculator/app/src/main/res/mipmap-hdpi/ic_launcher.png index a571e60..64a217a 100644 Binary files a/p2-SimpleCalculator/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/p2-SimpleCalculator/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/p2-SimpleCalculator/app/src/main/res/mipmap-hdpi/ic_launcher_background.png b/p2-SimpleCalculator/app/src/main/res/mipmap-hdpi/ic_launcher_background.png new file mode 100644 index 0000000..b0f574f Binary files /dev/null and b/p2-SimpleCalculator/app/src/main/res/mipmap-hdpi/ic_launcher_background.png differ diff --git a/p2-SimpleCalculator/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/p2-SimpleCalculator/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..301e5e2 Binary files /dev/null and b/p2-SimpleCalculator/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/p2-SimpleCalculator/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/p2-SimpleCalculator/app/src/main/res/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index 61da551..0000000 Binary files a/p2-SimpleCalculator/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ diff --git a/p2-SimpleCalculator/app/src/main/res/mipmap-mdpi/ic_launcher.png b/p2-SimpleCalculator/app/src/main/res/mipmap-mdpi/ic_launcher.png index c41dd28..12476e6 100644 Binary files a/p2-SimpleCalculator/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/p2-SimpleCalculator/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/p2-SimpleCalculator/app/src/main/res/mipmap-mdpi/ic_launcher_background.png b/p2-SimpleCalculator/app/src/main/res/mipmap-mdpi/ic_launcher_background.png new file mode 100644 index 0000000..13f94bd Binary files /dev/null and b/p2-SimpleCalculator/app/src/main/res/mipmap-mdpi/ic_launcher_background.png differ diff --git a/p2-SimpleCalculator/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/p2-SimpleCalculator/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..187007d Binary files /dev/null and b/p2-SimpleCalculator/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/p2-SimpleCalculator/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/p2-SimpleCalculator/app/src/main/res/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index db5080a..0000000 Binary files a/p2-SimpleCalculator/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ diff --git a/p2-SimpleCalculator/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/p2-SimpleCalculator/app/src/main/res/mipmap-xhdpi/ic_launcher.png index 6dba46d..81e8f34 100644 Binary files a/p2-SimpleCalculator/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/p2-SimpleCalculator/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/p2-SimpleCalculator/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png b/p2-SimpleCalculator/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png new file mode 100644 index 0000000..e6c7bf9 Binary files /dev/null and b/p2-SimpleCalculator/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png differ diff --git a/p2-SimpleCalculator/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/p2-SimpleCalculator/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..73942e6 Binary files /dev/null and b/p2-SimpleCalculator/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/p2-SimpleCalculator/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/p2-SimpleCalculator/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index da31a87..0000000 Binary files a/p2-SimpleCalculator/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ diff --git a/p2-SimpleCalculator/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/p2-SimpleCalculator/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 15ac681..8753e4d 100644 Binary files a/p2-SimpleCalculator/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/p2-SimpleCalculator/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/p2-SimpleCalculator/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png b/p2-SimpleCalculator/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png new file mode 100644 index 0000000..355d564 Binary files /dev/null and b/p2-SimpleCalculator/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png differ diff --git a/p2-SimpleCalculator/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/p2-SimpleCalculator/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..d121dcd Binary files /dev/null and b/p2-SimpleCalculator/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/p2-SimpleCalculator/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/p2-SimpleCalculator/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index b216f2d..0000000 Binary files a/p2-SimpleCalculator/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/p2-SimpleCalculator/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/p2-SimpleCalculator/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index f25a419..ac7e292 100644 Binary files a/p2-SimpleCalculator/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/p2-SimpleCalculator/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/p2-SimpleCalculator/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png b/p2-SimpleCalculator/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png new file mode 100644 index 0000000..04ce89f Binary files /dev/null and b/p2-SimpleCalculator/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png differ diff --git a/p2-SimpleCalculator/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/p2-SimpleCalculator/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..60036d4 Binary files /dev/null and b/p2-SimpleCalculator/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/p2-SimpleCalculator/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/p2-SimpleCalculator/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png deleted file mode 100644 index e96783c..0000000 Binary files a/p2-SimpleCalculator/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ