Merge pull request chyrta#11 from ViFork/master

Fix image with a Vector
dharmakshetri · Mar 27, 2017 · 9385ebc · 9385ebc
2 parents 3a44bdb + e2fa9f4
commit 9385ebc
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 15 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -17,4 +17,4 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-support_library_version = 23.3.0
+support_library_version = 25.1.1
diff --git a/onboarder/build.gradle b/onboarder/build.gradle
@@ -6,12 +6,12 @@ repositories {
 }
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 25
+    buildToolsVersion "25.0.2"
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 23
+        targetSdkVersion 25
         versionCode 1
         versionName "1.0"
     }
@@ -52,8 +52,8 @@ ext {
     GIT_URL = 'https://github.com/chyrta/AndroidOnboarder'
     GROUP_NAME = 'com.github.chyrta'
     MODULE_NAME = 'onboarder'
-    COMPILE_SDK = 23
-    BUILD_TOOLS = '23.0.3'
+    COMPILE_SDK = 25
+    BUILD_TOOLS = '25.0.2'
     LICENSE = 'MIT'
     IS_UPLOADING = project.getGradle().startParameter.taskNames.any{it.contains('bintrayUpload')}
 }

diff --git a/onboarder/src/main/java/com/chyrta/onboarder/OnboarderFragment.java b/onboarder/src/main/java/com/chyrta/onboarder/OnboarderFragment.java
@@ -7,6 +7,7 @@
 import android.support.annotation.StringRes;
 import android.support.v4.app.Fragment;
 import android.support.v4.content.ContextCompat;
+import android.support.v7.content.res.AppCompatResources;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -114,7 +115,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
 		}
 
 		if (onboarderImageResId != 0) {
-			ivOnboarderImage.setImageDrawable(ContextCompat.getDrawable(getActivity(), onboarderImageResId));
+			ivOnboarderImage.setImageDrawable(AppCompatResources.getDrawable(getActivity(), onboarderImageResId));
 		}
 
 		if (onboarderTitleTextSize != 0f) {

diff --git a/...c/main/res/drawable-xhdpi/DieForMusic.png → ...main/res/drawable-xhdpi/die_for_music.png b/...c/main/res/drawable-xhdpi/DieForMusic.png → ...main/res/drawable-xhdpi/die_for_music.png
diff --git a/onboarder/src/main/res/layout-land/fragment_onboarder.xml b/onboarder/src/main/res/layout-land/fragment_onboarder.xml
@@ -22,7 +22,7 @@
          android:adjustViewBounds="true"
          android:scaleType="fitCenter"
          android:contentDescription="@null"
-         tools:background="@drawable/DieForMusic"
+         tools:background="@drawable/die_for_music"
       />
    </FrameLayout>
 

diff --git a/onboarder/src/main/res/layout/fragment_onboarder.xml b/onboarder/src/main/res/layout/fragment_onboarder.xml
@@ -24,7 +24,7 @@
          android:layout_gravity="bottom|center_horizontal"
          android:scaleType="fitCenter"
          android:contentDescription="@null"
-         tools:background="@drawable/DieForMusic"
+         tools:background="@drawable/die_for_music"
       />
    </FrameLayout>
 

diff --git a/onboarder/src/main/res/values-h720dp/dimen.xml b/onboarder/src/main/res/values-h720dp/dimen.xml
@@ -1,12 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+
 <!-- Used for       -->
 <!--    Nexus 7     -->
 <!--    Nexus 5x    -->
 <!--    Nexus 6p    -->
 <!--    Nexus 6      -->
 
-
-
-<?xml version="1.0" encoding="utf-8"?>
 <resources>
    <dimen name="text_section_min_height">250dp</dimen>
 </resources>
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -1,8 +1,8 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 25
+    buildToolsVersion "25.0.2"
 
     defaultConfig {
         applicationId "com.chyrta.androidonboarder"
@@ -22,6 +22,6 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:23.2.1'
+    compile 'com.android.support:appcompat-v7:25.1.1'
     compile project(path: ':onboarder')
 }