diff --git a/CHANGELOG.md b/CHANGELOG.md index f2688c5..0286c66 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ - Reverted to the old icon. +- Better icon for the intro activity. + +- Updated gradle version. + **1.5.2.03** - Added the ability to accept self signed certificates. (Needs more testing) diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/IntroActivity.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/IntroActivity.kt index 412deb8..3b58609 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/IntroActivity.kt +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/IntroActivity.kt @@ -20,7 +20,7 @@ class IntroActivity : MaterialIntroActivity() { addSlide(SlideFragmentBuilder() .backgroundColor(R.color.colorPrimary) .buttonsColor(R.color.colorAccent) - .image(R.mipmap.ic_launcher) + .image(R.drawable.web_hi_res_512) .title(getString(R.string.intro_hello_title)) .description(getString(R.string.intro_hello_message)) .build()) @@ -28,7 +28,7 @@ class IntroActivity : MaterialIntroActivity() { addSlide(SlideFragmentBuilder() .backgroundColor(R.color.colorAccent) .buttonsColor(R.color.colorPrimary) - .image(R.drawable.ic_info_outline_white_48dp) + .image(R.drawable.ic_info_outline_white_48px) .title(getString(R.string.intro_needs_selfoss_title)) .description(getString(R.string.intro_needs_selfoss_message)) .build(), @@ -40,7 +40,7 @@ class IntroActivity : MaterialIntroActivity() { addSlide(SlideFragmentBuilder() .backgroundColor(R.color.colorPrimaryDark) .buttonsColor(R.color.colorAccentDark) - .image(R.drawable.ic_thumb_up_white_48dp) + .image(R.drawable.ic_thumb_up_white_48px) .title(getString(R.string.intro_all_set_title)) .description(getString(R.string.intro_all_set_message)) .build()) diff --git a/app/src/main/res/drawable-hdpi/ic_info_outline_white_48dp.png b/app/src/main/res/drawable-hdpi/ic_info_outline_white_48dp.png deleted file mode 100644 index c41a5fc..0000000 Binary files a/app/src/main/res/drawable-hdpi/ic_info_outline_white_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_info_outline_white_48dp.png b/app/src/main/res/drawable-mdpi/ic_info_outline_white_48dp.png deleted file mode 100644 index c571b2e..0000000 Binary files a/app/src/main/res/drawable-mdpi/ic_info_outline_white_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_info_outline_white_48dp.png b/app/src/main/res/drawable-xhdpi/ic_info_outline_white_48dp.png deleted file mode 100644 index 3a82cab..0000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_info_outline_white_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_info_outline_white_48dp.png b/app/src/main/res/drawable-xxhdpi/ic_info_outline_white_48dp.png deleted file mode 100644 index bc0eda9..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_info_outline_white_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_info_outline_white_48dp.png b/app/src/main/res/drawable-xxxhdpi/ic_info_outline_white_48dp.png deleted file mode 100644 index 939ee3a..0000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_info_outline_white_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable/background_splash.xml b/app/src/main/res/drawable/background_splash.xml index c0724a9..32241ec 100644 --- a/app/src/main/res/drawable/background_splash.xml +++ b/app/src/main/res/drawable/background_splash.xml @@ -7,7 +7,7 @@ + android:src="@mipmap/ic_launcher_foreground"/> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_info_outline_white_48px.xml b/app/src/main/res/drawable/ic_info_outline_white_48px.xml new file mode 100644 index 0000000..ad66e9a --- /dev/null +++ b/app/src/main/res/drawable/ic_info_outline_white_48px.xml @@ -0,0 +1,4 @@ + + + diff --git a/app/src/main/res/drawable/ic_thumb_up_white_48px.xml b/app/src/main/res/drawable/ic_thumb_up_white_48px.xml new file mode 100644 index 0000000..b8984d1 --- /dev/null +++ b/app/src/main/res/drawable/ic_thumb_up_white_48px.xml @@ -0,0 +1,4 @@ + + + diff --git a/app/src/main/res/drawable/web_hi_res_512.png b/app/src/main/res/drawable/web_hi_res_512.png new file mode 100644 index 0000000..a149479 Binary files /dev/null and b/app/src/main/res/drawable/web_hi_res_512.png differ diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_background.png b/app/src/main/res/mipmap-hdpi/ic_launcher_background.png new file mode 100644 index 0000000..6ebce6a Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_background.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..d612d4f Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_background.png b/app/src/main/res/mipmap-mdpi/ic_launcher_background.png new file mode 100644 index 0000000..78e3920 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_background.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..ac706cc Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png new file mode 100644 index 0000000..8a578a5 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..34d35e7 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png new file mode 100644 index 0000000..da46328 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..e164571 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png new file mode 100644 index 0000000..df3db4d Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..687cb6a Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml index 737e7d6..16cdd5a 100644 --- a/app/src/main/res/values/ic_launcher_background.xml +++ b/app/src/main/res/values/ic_launcher_background.xml @@ -1,4 +1,4 @@ - #26B29F + #FFFFFF \ No newline at end of file diff --git a/build.gradle b/build.gradle index cbda3d1..336a788 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.0-alpha8' + classpath 'com.android.tools.build:gradle:3.0.0-beta2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 02830f0..cfa7b20 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Jul 02 08:13:37 CEST 2017 +#Wed Aug 16 19:45:22 CEST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-milestone-1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-rc-1-all.zip