Merge pull request #296 from arberg/lang_sv_nb

Added swedish and norwegian language
florent37 · Oct 6, 2020 · e6656f7 · e6656f7
2 parents 61a2915 + bcf6a86
commit e6656f7
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 0 deletions.
diff --git a/app/src/main/res/layout/single_date_picker_activity_main.xml b/app/src/main/res/layout/single_date_picker_activity_main.xml
@@ -25,6 +25,7 @@
         android:layout_gravity="center_horizontal"
         android:text="Full half-circle wheel, with only future selection" />
 
+    <!-- divider color is overridden with picker_default_divider_color in the app-projcet, giving us the top+bottom divider around Today  -->
     <com.github.florent37.singledateandtimepicker.SingleDateAndTimePicker
         android:id="@+id/single_day_picker"
         android:layout_width="wrap_content"
@@ -34,6 +35,7 @@
         app:picker_dayCount="31"
         app:picker_itemSpacing="6dp"
         app:picker_mustBeOnFuture="true"
+        app:picker_selectorColor="@android:color/transparent"
         app:picker_textAlign="center"
         app:picker_visibleItemCount="9"
         app:fontFamily="@font/dinot_bold"/>

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -6,4 +6,7 @@
     <color name="colorInnactive">#AAA</color>
     <color name="textColor">#6E6E6E</color>
 
+    <!-- Override divider color -->
+    <color name="picker_default_divider_color">#E3E3E3</color>
+
 </resources>
diff --git a/singledateandtimepicker/src/main/res/values-nb/strings.xml b/singledateandtimepicker/src/main/res/values-nb/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="picker_today">Idag</string>
+</resources>
diff --git a/singledateandtimepicker/src/main/res/values-sv/strings.xml b/singledateandtimepicker/src/main/res/values-sv/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="picker_today">Idag</string>
+</resources>