Fixed image layout bug, updated dependencies, bumped version

janheinrichmerker · Sep 1, 2016 · 4388072 · 4388072
1 parent 4d5af6d
commit 4388072
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -55,7 +55,7 @@ allprojects {
 ```
 ```gradle
 dependencies {
-    compile 'com.heinrichreimersoftware:material-intro:1.5.7'
+    compile 'com.heinrichreimersoftware:material-intro:1.5.8'
 }
 ```
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -12,12 +12,12 @@ apply plugin: 'com.neenbedankt.android-apt'
 
 def versionMajor = 1
 def versionMinor = 5
-def versionPatch = 7
+def versionPatch = 8
 def versionBuild = 0 // bump for dogfood builds, public betas, etc.
 
 android {
     compileSdkVersion 24
-    buildToolsVersion '24.0.0'
+    buildToolsVersion '24.0.1'
 
     defaultConfig {
         applicationId "com.heinrichreimersoftware.materialintro.demo"
@@ -40,9 +40,9 @@ android {
 dependencies {
     compile project(':library')
     //Support
-    compile 'com.android.support:appcompat-v7:24.0.0'
-    compile 'com.android.support:support-v4:24.0.0'
-    compile 'com.android.support:design:24.0.0'
+    compile 'com.android.support:appcompat-v7:24.2.0'
+    compile 'com.android.support:support-v4:24.2.0'
+    compile 'com.android.support:design:24.2.0'
     //Firebase
     compile 'com.google.firebase:firebase-core:9.0.0'
     compile 'com.google.firebase:firebase-crash:9.0.0'

diff --git a/library/build.gradle b/library/build.gradle
@@ -2,12 +2,12 @@ apply plugin: 'com.android.library'
 
 def versionMajor = 1
 def versionMinor = 5
-def versionPatch = 7
+def versionPatch = 8
 def versionBuild = 0 // bump for dogfood builds, public betas, etc.
 
 android {
     compileSdkVersion 24
-    buildToolsVersion '24.0.0'
+    buildToolsVersion '24.0.1'
 
     defaultConfig {
         minSdkVersion 15
@@ -27,5 +27,5 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:24.0.0'
+    compile 'com.android.support:appcompat-v7:24.2.0'
 }
diff --git a/library/src/main/res/layout-land/fragment_simple_slide.xml b/library/src/main/res/layout-land/fragment_simple_slide.xml
@@ -8,16 +8,22 @@
     android:fitsSystemWindows="false"
     android:padding="@dimen/mi_baseline">
 
-    <ImageView
-        android:id="@id/mi_image"
+    <FrameLayout
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:adjustViewBounds="true"
-        tools:ignore="ContentDescription"
-        tools:src="@android:drawable/sym_action_call"/>
+        android:layout_height="match_parent"
+        android:layout_weight="1">
+
+        <ImageView
+            android:id="@id/mi_image"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:adjustViewBounds="true"
+            tools:ignore="ContentDescription"
+            tools:src="@android:drawable/sym_action_call"/>
+
+    </FrameLayout>
 
     <android.support.v4.widget.Space
         android:layout_width="@dimen/mi_baseline"

diff --git a/library/src/main/res/layout-land/fragment_simple_slide_scrollable.xml b/library/src/main/res/layout-land/fragment_simple_slide_scrollable.xml
@@ -8,16 +8,22 @@
     android:clipToPadding="false"
     android:fitsSystemWindows="false">
 
-    <ImageView
-        android:id="@id/mi_image"
+    <FrameLayout
         android:layout_width="0dp"
-        android:layout_weight="1"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:gravity="center"
-        android:adjustViewBounds="true"
-        tools:ignore="ContentDescription"
-        tools:src="@android:drawable/sym_action_call"/>
+        android:layout_height="match_parent"
+        android:layout_weight="1">
+
+        <ImageView
+            android:id="@id/mi_image"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:adjustViewBounds="true"
+            tools:ignore="ContentDescription"
+            tools:src="@android:drawable/sym_action_call"/>
+
+    </FrameLayout>
 
     <android.support.v4.widget.Space
         android:layout_width="@dimen/mi_baseline"

diff --git a/library/src/main/res/layout/fragment_simple_slide.xml b/library/src/main/res/layout/fragment_simple_slide.xml
@@ -11,7 +11,7 @@
 
     <ImageView
         android:id="@id/mi_image"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/mi_baseline"
         android:gravity="center"

diff --git a/library/src/main/res/layout/fragment_simple_slide_scrollable.xml b/library/src/main/res/layout/fragment_simple_slide_scrollable.xml
@@ -16,7 +16,7 @@
 
         <ImageView
             android:id="@id/mi_image"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/mi_baseline"
             android:gravity="center"