From c30de5623a07d532f4b7a962eabf3623143a3940 Mon Sep 17 00:00:00 2001 From: Aran Zaiger Date: Fri, 8 Jul 2016 14:49:05 +0300 Subject: [PATCH] Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android # Conflicts: # app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/PersonalFragment.java --- app/build.gradle | 2 +- .../ara/sagi/thesocialnotework/SettingsFragment.java | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 6750108..eba0b91 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,7 +20,7 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) + compile fileTree(include: ['*.jar'], dir: 'libs') testCompile 'junit:junit:4.12' compile 'com.android.support:appcompat-v7:23.4.0' compile 'com.android.support:design:23.4.0' diff --git a/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/SettingsFragment.java b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/SettingsFragment.java index 8e0ce42..0d968d6 100644 --- a/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/SettingsFragment.java +++ b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/SettingsFragment.java @@ -15,13 +15,6 @@ import android.view.ViewGroup; import android.widget.Button; import android.widget.ImageView; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.util.HashMap; -import java.util.Map; - - public class SettingsFragment extends Fragment { private static final String ARG_PARAM1 = "param1"; private static final String ARG_PARAM2 = "param2"; @@ -137,6 +130,7 @@ public class SettingsFragment extends Fragment { // Bitmap imageBitmap = (Bitmap) extras.get("data"); avatarImage.setImageBitmap(imageBitmap); + } }