소스 검색

Us activity dialog fixed.

Iñigo Valentin 9 년 전
부모
커밋
d810740d20

+ 2 - 2
app/build.gradle

@@ -2,11 +2,11 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    buildToolsVersion '25.0.0'
 
     defaultConfig {
         applicationId "com.ivalentin.margolariak"
-        minSdkVersion 12
+        minSdkVersion 14
         targetSdkVersion 23
         multiDexEnabled true
     }

+ 1 - 1
app/src/main/java/com/ivalentin/margolariak/UsActivity.java

@@ -105,7 +105,7 @@ public class UsActivity extends Activity {
 		tvText.setText(text);
 
 		//Set image
-		//TODO
+		ivImage.setImageDrawable(img);
 
 		//Set close button
 		btClose.setOnClickListener(new View.OnClickListener() {

+ 4 - 3
app/src/main/res/layout/dialog_us.xml

@@ -33,12 +33,13 @@
         >
 
         <ImageView
+            android:id="@+id/iv_dialog_us_image"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:srcCompat="@drawable/photo_placeholder_thumb"
-            android:id="@+id/iv_dialog_us_image"
+            android:adjustViewBounds="true"
             android:maxHeight="140dp"
-            android:adjustViewBounds="true"/>
+            android:minHeight="100dp"
+            app:srcCompat="@drawable/photo_placeholder_thumb"/>
 
         <TextView
             android:id="@+id/tv_dialog_us_text"

+ 1 - 1
build.gradle

@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:2.3.0'
     }
 }
 

+ 2 - 2
gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sun Oct 09 00:49:43 CEST 2016
+#Sat Apr 01 22:26:43 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip