aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authorlookshe <github@lookshe.org>2015-04-15 21:29:31 +0200
committerlookshe <github@lookshe.org>2015-04-15 21:43:53 +0200
commitb3b4a2902e37fb072e800f5dff0392755f5d4501 (patch)
tree0b0666dfbf20ef04e1d92531ce59d8697bb5c4eb /src/main/java
parent549810783ce651f27bdd386488b6690195522372 (diff)
moved color picker to libs
Diffstat (limited to '')
-rw-r--r--libs/colorpicker/src/main/java/yuku/ambilwarna/AmbilWarnaDialog.java (renamed from src/main/java/yuku/ambilwarna/AmbilWarnaDialog.java)4
-rw-r--r--libs/colorpicker/src/main/java/yuku/ambilwarna/AmbilWarnaSquare.java (renamed from src/main/java/yuku/ambilwarna/AmbilWarnaSquare.java)2
-rw-r--r--libs/colorpicker/src/main/java/yuku/ambilwarna/widget/AmbilWarnaPrefWidgetView.java (renamed from src/main/java/yuku/ambilwarna/widget/AmbilWarnaPrefWidgetView.java)2
-rw-r--r--libs/colorpicker/src/main/java/yuku/ambilwarna/widget/AmbilWarnaPreference.java (renamed from src/main/java/yuku/ambilwarna/widget/AmbilWarnaPreference.java)4
4 files changed, 5 insertions, 7 deletions
diff --git a/src/main/java/yuku/ambilwarna/AmbilWarnaDialog.java b/libs/colorpicker/src/main/java/yuku/ambilwarna/AmbilWarnaDialog.java
index e553ed10..5c05e4ec 100644
--- a/src/main/java/yuku/ambilwarna/AmbilWarnaDialog.java
+++ b/libs/colorpicker/src/main/java/yuku/ambilwarna/AmbilWarnaDialog.java
@@ -14,8 +14,6 @@ import android.view.ViewTreeObserver;
import android.widget.ImageView;
import android.widget.RelativeLayout;
-import eu.siacs.conversations.R;
-
public class AmbilWarnaDialog {
public interface OnAmbilWarnaListener {
void onCancel(AmbilWarnaDialog dialog);
@@ -297,4 +295,4 @@ public class AmbilWarnaDialog {
});
viewAlphaOverlay.setBackgroundDrawable(gd);
}
-} \ No newline at end of file
+}
diff --git a/src/main/java/yuku/ambilwarna/AmbilWarnaSquare.java b/libs/colorpicker/src/main/java/yuku/ambilwarna/AmbilWarnaSquare.java
index 9fb854df..1f0c86e4 100644
--- a/src/main/java/yuku/ambilwarna/AmbilWarnaSquare.java
+++ b/libs/colorpicker/src/main/java/yuku/ambilwarna/AmbilWarnaSquare.java
@@ -43,4 +43,4 @@ public class AmbilWarnaSquare extends View {
color[0] = hue;
invalidate();
}
-} \ No newline at end of file
+}
diff --git a/src/main/java/yuku/ambilwarna/widget/AmbilWarnaPrefWidgetView.java b/libs/colorpicker/src/main/java/yuku/ambilwarna/widget/AmbilWarnaPrefWidgetView.java
index 6da10bb0..7ed4c4e3 100644
--- a/src/main/java/yuku/ambilwarna/widget/AmbilWarnaPrefWidgetView.java
+++ b/libs/colorpicker/src/main/java/yuku/ambilwarna/widget/AmbilWarnaPrefWidgetView.java
@@ -31,4 +31,4 @@ public class AmbilWarnaPrefWidgetView extends View {
canvas.drawRect(strokeWidth, strokeWidth, rectSize - strokeWidth, rectSize - strokeWidth, paint);
}
-} \ No newline at end of file
+}
diff --git a/src/main/java/yuku/ambilwarna/widget/AmbilWarnaPreference.java b/libs/colorpicker/src/main/java/yuku/ambilwarna/widget/AmbilWarnaPreference.java
index f18ed00c..2c634eb9 100644
--- a/src/main/java/yuku/ambilwarna/widget/AmbilWarnaPreference.java
+++ b/libs/colorpicker/src/main/java/yuku/ambilwarna/widget/AmbilWarnaPreference.java
@@ -8,8 +8,8 @@ import android.preference.Preference;
import android.util.AttributeSet;
import android.view.View;
-import eu.siacs.conversations.R;
import yuku.ambilwarna.AmbilWarnaDialog;
+import yuku.ambilwarna.R;
public class AmbilWarnaPreference extends Preference {
private final boolean supportsAlpha;
@@ -131,4 +131,4 @@ public class AmbilWarnaPreference extends Preference {
}
};
}
-} \ No newline at end of file
+}