diff --git a/app/src/main/kotlin/jackall/overlaymulticounter/viewmodel/OverlayCounterViewModel.kt b/app/src/main/kotlin/jackall/overlaymulticounter/viewmodel/OverlayCounterViewModel.kt
index b17683b..e226cbc 100644
--- a/app/src/main/kotlin/jackall/overlaymulticounter/viewmodel/OverlayCounterViewModel.kt
+++ b/app/src/main/kotlin/jackall/overlaymulticounter/viewmodel/OverlayCounterViewModel.kt
@@ -2,6 +2,7 @@
import android.databinding.BaseObservable
import android.databinding.BindingAdapter
+import android.support.v7.widget.DividerItemDecoration
import android.support.v7.widget.LinearLayoutManager
import android.support.v7.widget.RecyclerView
import android.view.View
@@ -9,6 +10,7 @@
import io.realm.RealmResults
import jackall.overlaymulticounter.App
import jackall.overlaymulticounter.CounterAdapter
+import jackall.overlaymulticounter.R
import jackall.overlaymulticounter.contract.CounterContract
import jackall.overlaymulticounter.db.CounterRealmHelper
import jackall.overlaymulticounter.vo.Counter
@@ -88,6 +90,9 @@
return
recyclerView.layoutManager = LinearLayoutManager(App.get())
recyclerView.adapter = counterAdapter
+ val dividerItemDecoration = DividerItemDecoration(recyclerView.context, LinearLayoutManager.VERTICAL)
+ dividerItemDecoration.setDrawable(recyclerView.context.resources.getDrawable(R.drawable.divider))
+ recyclerView.addItemDecoration(dividerItemDecoration)
}
}
}
\ No newline at end of file
diff --git a/app/src/main/res/drawable-hdpi/icon_edit_title.png b/app/src/main/res/drawable-hdpi/icon_edit_title.png
new file mode 100644
index 0000000..e33c782
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/icon_edit_title.png
Binary files differ
diff --git a/app/src/main/res/drawable-hdpi/icon_minimization.png b/app/src/main/res/drawable-hdpi/icon_minimization.png
new file mode 100644
index 0000000..75e65bc
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/icon_minimization.png
Binary files differ
diff --git a/app/src/main/res/drawable-hdpi/icon_minus.png b/app/src/main/res/drawable-hdpi/icon_minus.png
new file mode 100644
index 0000000..fb83803
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/icon_minus.png
Binary files differ
diff --git a/app/src/main/res/drawable-hdpi/icon_plus.png b/app/src/main/res/drawable-hdpi/icon_plus.png
new file mode 100644
index 0000000..1ae5b2d
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/icon_plus.png
Binary files differ
diff --git a/app/src/main/res/drawable-hdpi/icon_power.png b/app/src/main/res/drawable-hdpi/icon_power.png
new file mode 100644
index 0000000..15129fd
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/icon_power.png
Binary files differ
diff --git a/app/src/main/res/drawable-hdpi/icon_reset.png b/app/src/main/res/drawable-hdpi/icon_reset.png
new file mode 100644
index 0000000..a61eb24
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/icon_reset.png
Binary files differ
diff --git a/app/src/main/res/drawable-hdpi/icon_set_title.png b/app/src/main/res/drawable-hdpi/icon_set_title.png
new file mode 100644
index 0000000..9096864
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/icon_set_title.png
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/icon_edit_title.png b/app/src/main/res/drawable-mdpi/icon_edit_title.png
new file mode 100644
index 0000000..f154794
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/icon_edit_title.png
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/icon_minimization.png b/app/src/main/res/drawable-mdpi/icon_minimization.png
new file mode 100644
index 0000000..a1816d4
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/icon_minimization.png
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/icon_minus.png b/app/src/main/res/drawable-mdpi/icon_minus.png
new file mode 100644
index 0000000..0ac651d
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/icon_minus.png
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/icon_plus.png b/app/src/main/res/drawable-mdpi/icon_plus.png
new file mode 100644
index 0000000..d51f0dd
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/icon_plus.png
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/icon_power.png b/app/src/main/res/drawable-mdpi/icon_power.png
new file mode 100644
index 0000000..786dee6
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/icon_power.png
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/icon_reset.png b/app/src/main/res/drawable-mdpi/icon_reset.png
new file mode 100644
index 0000000..85f0b3b
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/icon_reset.png
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/icon_set_title.png b/app/src/main/res/drawable-mdpi/icon_set_title.png
new file mode 100644
index 0000000..e0ea028
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/icon_set_title.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_edit_title.png b/app/src/main/res/drawable-xhdpi/icon_edit_title.png
new file mode 100644
index 0000000..0f2b7ba
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/icon_edit_title.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_minimization.png b/app/src/main/res/drawable-xhdpi/icon_minimization.png
new file mode 100644
index 0000000..ffbdaa6
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/icon_minimization.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_minus.png b/app/src/main/res/drawable-xhdpi/icon_minus.png
new file mode 100644
index 0000000..6ce07ab
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/icon_minus.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_plus.png b/app/src/main/res/drawable-xhdpi/icon_plus.png
new file mode 100644
index 0000000..9ea0eeb
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/icon_plus.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_power.png b/app/src/main/res/drawable-xhdpi/icon_power.png
new file mode 100644
index 0000000..33724d9
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/icon_power.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_reset.png b/app/src/main/res/drawable-xhdpi/icon_reset.png
new file mode 100644
index 0000000..6c9b809
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/icon_reset.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/icon_set_title.png b/app/src/main/res/drawable-xhdpi/icon_set_title.png
new file mode 100644
index 0000000..60bf0ae
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/icon_set_title.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_edit_title.png b/app/src/main/res/drawable-xxhdpi/icon_edit_title.png
new file mode 100644
index 0000000..9366267
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/icon_edit_title.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_minimization.png b/app/src/main/res/drawable-xxhdpi/icon_minimization.png
new file mode 100644
index 0000000..d35469d
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/icon_minimization.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_minus.png b/app/src/main/res/drawable-xxhdpi/icon_minus.png
new file mode 100644
index 0000000..d948e66
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/icon_minus.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_plus.png b/app/src/main/res/drawable-xxhdpi/icon_plus.png
new file mode 100644
index 0000000..75f192a
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/icon_plus.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_power.png b/app/src/main/res/drawable-xxhdpi/icon_power.png
new file mode 100644
index 0000000..61f01df
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/icon_power.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_reset.png b/app/src/main/res/drawable-xxhdpi/icon_reset.png
new file mode 100644
index 0000000..77dffe9
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/icon_reset.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_set_title.png b/app/src/main/res/drawable-xxhdpi/icon_set_title.png
new file mode 100644
index 0000000..1736553
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/icon_set_title.png
Binary files differ
diff --git a/app/src/main/res/drawable/divider.xml b/app/src/main/res/drawable/divider.xml
new file mode 100644
index 0000000..615d290
--- /dev/null
+++ b/app/src/main/res/drawable/divider.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_counter_button.xml b/app/src/main/res/drawable/shape_counter_button.xml
new file mode 100644
index 0000000..b6ef243
--- /dev/null
+++ b/app/src/main/res/drawable/shape_counter_button.xml
@@ -0,0 +1,19 @@
+
+
+
+
+ -
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/list_counter_item.xml b/app/src/main/res/layout/list_counter_item.xml
index b51f3f4..a7c1d84 100644
--- a/app/src/main/res/layout/list_counter_item.xml
+++ b/app/src/main/res/layout/list_counter_item.xml
@@ -11,24 +11,32 @@
+ android:layout_height="52dp"
+ android:paddingBottom="4dp"
+ android:paddingTop="4dp">
-
-
@@ -37,7 +45,9 @@
android:id="@+id/counter_count"
android:layout_width="@dimen/counter_count_width"
android:layout_height="wrap_content"
+ android:gravity="center_horizontal"
android:text="@{counterItemViewModel.count}"
+ android:textColor="#000000"
android:textSize="@dimen/counter_count_text_size"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/counter_plus"
@@ -47,9 +57,11 @@
android:id="@+id/counter_reset"
android:layout_width="@dimen/counter_minus_width"
android:layout_height="0dp"
+ android:background="@drawable/shape_counter_button"
android:onClick="@{counterItemViewModel.onClickReset}"
+ android:padding="4dp"
android:scaleType="fitCenter"
- android:src="@drawable/reset"
+ android:src="@drawable/icon_reset"
android:text="@string/reset"
android:textSize="8dp"
app:layout_constraintBottom_toBottomOf="parent"
@@ -69,10 +81,11 @@
android:layout_width="@dimen/counter_edit_icon_size"
android:layout_height="@dimen/counter_edit_icon_size"
android:layout_marginBottom="8dp"
+ android:layout_marginLeft="4dp"
android:layout_marginTop="8dp"
android:adjustViewBounds="true"
android:onClick="@{counterItemViewModel.onClickEdit}"
- android:src="@drawable/edit"
+ android:src="@drawable/icon_edit_title"
android:visibility="@{counterItemViewModel.editIconVisible}"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -83,6 +96,7 @@
android:layout_width="@dimen/counter_edit_icon_size"
android:layout_height="@dimen/counter_edit_icon_size"
android:layout_marginBottom="8dp"
+ android:layout_marginLeft="4dp"
android:layout_marginTop="8dp"
android:adjustViewBounds="true"
android:onClick="@{counterItemViewModel.onClickCheckEdit}"
@@ -98,6 +112,8 @@
android:layout_marginStart="4dp"
android:gravity="center_vertical"
android:text="@{counterItemViewModel.title}"
+ android:textColor="#000000"
+ android:textStyle="bold"
android:visibility="@{counterItemViewModel.titleVisible}"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@@ -109,6 +125,7 @@
android:layout_height="0dp"
android:layout_marginStart="4dp"
android:text="@={counterItemViewModel.editText}"
+ android:textColor="#000000"
android:visibility="@{counterItemViewModel.editTextVisible}"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/overlay_counter.xml b/app/src/main/res/layout/overlay_counter.xml
index ed797ef..238769a 100644
--- a/app/src/main/res/layout/overlay_counter.xml
+++ b/app/src/main/res/layout/overlay_counter.xml
@@ -16,60 +16,87 @@
+ android:background="#96ffffff"
+ android:paddingTop="8dp">
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+ app:layout_constraintTop_toBottomOf="@id/overlay_button_layout" />
\ No newline at end of file