diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/fragments/ClockFragment.kt b/app/src/main/kotlin/com/simplemobiletools/clock/fragments/ClockFragment.kt
index 9a4bb48c..0f257110 100644
--- a/app/src/main/kotlin/com/simplemobiletools/clock/fragments/ClockFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/clock/fragments/ClockFragment.kt
@@ -7,8 +7,6 @@ import com.simplemobiletools.clock.R
import com.simplemobiletools.clock.extensions.config
import com.simplemobiletools.clock.models.MyTimeZone
import com.simplemobiletools.commons.extensions.beVisibleIf
-import com.simplemobiletools.commons.extensions.getAdjustedPrimaryColor
-import com.simplemobiletools.commons.extensions.underlineText
import com.simplemobiletools.commons.extensions.updateTextColors
import kotlinx.android.synthetic.main.fragment_clock.view.*
import java.util.*
@@ -26,21 +24,17 @@ class ClockFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerF
passedSeconds = ((calendar.timeInMillis + offset) / 1000).toInt()
updateCurrentTime()
updateDate()
-
- time_zones_placeholder_2.apply {
- underlineText()
- setOnClickListener {
- placeholderClicked()
- }
- }
-
setupViews()
}
private fun setupViews() {
- time_zones_holder.beVisibleIf(context.config.displayOtherTimeZones)
context.updateTextColors(clock_fragment)
- time_zones_placeholder_2.setTextColor(context.getAdjustedPrimaryColor())
+ val displayOtherTimeZones = context.config.displayOtherTimeZones
+ time_zones_list.beVisibleIf(displayOtherTimeZones)
+ clock_fab.beVisibleIf(displayOtherTimeZones)
+ clock_fab.setOnClickListener {
+ fabClicked()
+ }
}
private fun updateCurrentTime() {
@@ -87,7 +81,7 @@ class ClockFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerF
updateHandler.removeCallbacksAndMessages(null)
}
- private fun placeholderClicked() {
+ private fun fabClicked() {
}
diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/fragments/MyViewPagerFragment.kt b/app/src/main/kotlin/com/simplemobiletools/clock/fragments/MyViewPagerFragment.kt
index 5ee6b533..9a59aa47 100644
--- a/app/src/main/kotlin/com/simplemobiletools/clock/fragments/MyViewPagerFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/clock/fragments/MyViewPagerFragment.kt
@@ -1,9 +1,9 @@
package com.simplemobiletools.clock.fragments
import android.content.Context
+import android.support.design.widget.CoordinatorLayout
import android.util.AttributeSet
-import android.widget.RelativeLayout
-abstract class MyViewPagerFragment(context: Context, attributeSet: AttributeSet) : RelativeLayout(context, attributeSet) {
+abstract class MyViewPagerFragment(context: Context, attributeSet: AttributeSet) : CoordinatorLayout(context, attributeSet) {
abstract fun onActivityResume()
}
diff --git a/app/src/main/res/layout/fragment_clock.xml b/app/src/main/res/layout/fragment_clock.xml
index ab815b28..4bfcde59 100644
--- a/app/src/main/res/layout/fragment_clock.xml
+++ b/app/src/main/res/layout/fragment_clock.xml
@@ -7,61 +7,48 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
-
-
-
-
+ android:layout_height="match_parent">
+ android:layout_marginTop="@dimen/big_margin"
+ android:gravity="center_horizontal"
+ android:textSize="@dimen/clock_text_size"
+ tools:text="00:00:00"/>
+ android:layout_below="@+id/clock_time"
+ android:gravity="center_horizontal"
+ android:textSize="@dimen/big_text_size"
+ tools:text="Mon, 1 January"/>
+
+
+
+
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 291ec09b..c8c8ba39 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -2,10 +2,6 @@
Jednoduché hodinky
Hodinky
-
- Zdá sa, že ste nezvolil žiadne dodatočné časové pásma.
- Pridať nové časové pásma
-
Okno s časom
Okno s budíkom
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7e396477..e88875d9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,10 +2,6 @@
Simple Clock
Clock
-
- Seems like you haven\'t selected any extra time zones.
- Add new time zones
-
Clock tab
Alarm tab