Resolve conflicts.

Author: e16din

codeview/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 
 android {
     compileSdkVersion 24
-    buildToolsVersion "24.0.1"
+    buildToolsVersion "24.0.2"
 
     defaultConfig {
         minSdkVersion 15

codeview/src/main/java/io/github/kbiakov/codeview/CodeView.kt

@@ -10,8 +10,8 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewPropertyAnimator
 import android.widget.RelativeLayout
-import io.github.kbiakov.codeview.adapters.AbstractCodeAdapter
 import io.github.kbiakov.codeview.Thread.delayed
+import io.github.kbiakov.codeview.adapters.AbstractCodeAdapter
 import io.github.kbiakov.codeview.adapters.CodeWithNotesAdapter
 import io.github.kbiakov.codeview.highlight.ColorTheme
 import io.github.kbiakov.codeview.highlight.ColorThemeData
@@ -294,14 +294,9 @@ class CodeView : RelativeLayout {
 
         val height = linesCount * lineHeight + padding
 
-<<<<<<< HEAD
-        vPlaceholder.layoutParams = RelativeLayout.LayoutParams(
-                RelativeLayout.LayoutParams.MATCH_PARENT, height)
-
-=======
         vPlaceholder.layoutParams = LayoutParams(
                 LayoutParams.MATCH_PARENT, height)
->>>>>>> Softwee/master
+
         vPlaceholder.alpha = 1f
     }
 
@@ -310,13 +305,7 @@ class CodeView : RelativeLayout {
     private fun hidePlaceholder() = vPlaceholder.animate()
             .setDuration(350)
             .alpha(0f)
-<<<<<<< HEAD
             .didAnimated { vPlaceholder.alpha = 0f }
-=======
-            .didAnimated {
-                vPlaceholder.alpha = 0f
-            }
->>>>>>> Softwee/master
 
     private fun refreshAnimated() = animate()
             .setDuration(150)

codeview/src/main/java/io/github/kbiakov/codeview/adapters/AbstractCodeAdapter.kt

@@ -7,21 +7,12 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.LinearLayout
 import android.widget.TextView
-<<<<<<< HEAD:codeview/src/main/java/io/github/kbiakov/codeview/CodeContentAdapter.kt
+import io.github.kbiakov.codeview.*
 import io.github.kbiakov.codeview.Thread.async
 import io.github.kbiakov.codeview.Thread.ui
 import io.github.kbiakov.codeview.classifier.CodeClassifier
 import io.github.kbiakov.codeview.classifier.CodeProcessor
 import io.github.kbiakov.codeview.highlight.*
-=======
-import io.github.kbiakov.codeview.*
-import io.github.kbiakov.codeview.classifier.CodeProcessor
-import io.github.kbiakov.codeview.highlight.*
-import io.github.kbiakov.codeview.Thread.async
-import io.github.kbiakov.codeview.Thread.ui
-import io.github.kbiakov.codeview.classifier.CodeClassifier
-import io.github.kbiakov.codeview.OnCodeLineClickListener
->>>>>>> Softwee/master:codeview/src/main/java/io/github/kbiakov/codeview/adapters/AbstractCodeAdapter.kt
 import java.util.*
 
 /**
@@ -228,11 +219,7 @@ abstract class AbstractCodeAdapter<T> : RecyclerView.Adapter<AbstractCodeAdapter
         holder.mItem = codeLine
 
         holder.itemView.setOnClickListener {
-<<<<<<< HEAD:codeview/src/main/java/io/github/kbiakov/codeview/CodeContentAdapter.kt
-            codeListener?.onCodeLineClicked(position + 1)
-=======
             codeListener?.onCodeLineClicked(position, codeLine)
->>>>>>> Softwee/master:codeview/src/main/java/io/github/kbiakov/codeview/adapters/AbstractCodeAdapter.kt
         }
 
         setupLine(position, codeLine, holder)

example/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 
 android {
     compileSdkVersion 24
-    buildToolsVersion "24.0.1"
+    buildToolsVersion "24.0.2"
 
     defaultConfig {
         applicationId "io.github.kbiakov.codeviewexample"

example/src/main/java/io/github/kbiakov/codeviewexample/ListingsActivity.java

@@ -2,21 +2,16 @@
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 
-<<<<<<< HEAD
-import io.github.kbiakov.codeview.CodeView;
-import io.github.kbiakov.codeview.OnCodeLineClickListener;
-=======
 import org.jetbrains.annotations.NotNull;
 
-import io.github.kbiakov.codeview.adapters.CodeWithDiffsAdapter;
-import io.github.kbiakov.codeview.adapters.CodeWithNotesAdapter;
->>>>>>> Softwee/master
-import io.github.kbiakov.codeview.highlight.ColorTheme;
 import io.github.kbiakov.codeview.CodeView;
 import io.github.kbiakov.codeview.OnCodeLineClickListener;
+import io.github.kbiakov.codeview.adapters.CodeWithDiffsAdapter;
+import io.github.kbiakov.codeview.highlight.ColorTheme;
 import io.github.kbiakov.codeview.views.DiffModel;
 
 public class ListingsActivity extends AppCompatActivity {
@@ -48,15 +43,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         codeView.setCodeContent(getString(R.string.listing_java));
         codeView.setColorTheme(ColorTheme.SOLARIZED_LIGHT);
         codeView.highlightCode("java");
-<<<<<<< HEAD
 
-        codeView.setCodeListener(new OnCodeLineClickListener() {
-            @Override
-            public void onCodeLineClicked(int n) {
-                Log.i("example", "Line: " + n);
-            }
-        });
-=======
         codeView.setCodeListener(new OnCodeLineClickListener() {
             @Override
             public void onCodeLineClicked(int n, @NotNull String line) {
@@ -91,6 +78,5 @@ public void onCodeLineClicked(int n, @NotNull String line) {
 
         diffsAdapter.addFooterEntity(16, new DiffModel(getString(R.string.py_addition_16), true));
         diffsAdapter.addFooterEntity(11, new DiffModel(getString(R.string.py_deletion_11), false));
->>>>>>> Softwee/master
     }
 }