diff --git a/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt index 376dd51..e8c62a2 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt @@ -25,7 +25,7 @@ class MainActivity : KotlinBaseActivity() { private val kTag = "MainActivity" - private val marginOffset by lazy { 5.dp2px(this) } + private val marginOffset by lazy { 15.dp2px(this) } private val workSiteViewModel by lazy { ViewModelProvider(this)[WorkSiteViewModel::class.java] } private lateinit var workSiteAdapter: NormalRecyclerAdapter private var page = 1 diff --git a/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt index 376dd51..e8c62a2 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt @@ -25,7 +25,7 @@ class MainActivity : KotlinBaseActivity() { private val kTag = "MainActivity" - private val marginOffset by lazy { 5.dp2px(this) } + private val marginOffset by lazy { 15.dp2px(this) } private val workSiteViewModel by lazy { ViewModelProvider(this)[WorkSiteViewModel::class.java] } private lateinit var workSiteAdapter: NormalRecyclerAdapter private var page = 1 diff --git a/app/src/main/res/drawable/bg_solid_layout_dark_blue_10.xml b/app/src/main/res/drawable/bg_solid_layout_dark_blue_10.xml deleted file mode 100644 index 0a64a44..0000000 --- a/app/src/main/res/drawable/bg_solid_layout_dark_blue_10.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt index 376dd51..e8c62a2 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt @@ -25,7 +25,7 @@ class MainActivity : KotlinBaseActivity() { private val kTag = "MainActivity" - private val marginOffset by lazy { 5.dp2px(this) } + private val marginOffset by lazy { 15.dp2px(this) } private val workSiteViewModel by lazy { ViewModelProvider(this)[WorkSiteViewModel::class.java] } private lateinit var workSiteAdapter: NormalRecyclerAdapter private var page = 1 diff --git a/app/src/main/res/drawable/bg_solid_layout_dark_blue_10.xml b/app/src/main/res/drawable/bg_solid_layout_dark_blue_10.xml deleted file mode 100644 index 0a64a44..0000000 --- a/app/src/main/res/drawable/bg_solid_layout_dark_blue_10.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/bg_stroke_layout_blue.xml b/app/src/main/res/drawable/bg_stroke_layout_blue.xml deleted file mode 100644 index 3bc9de5..0000000 --- a/app/src/main/res/drawable/bg_stroke_layout_blue.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt index 376dd51..e8c62a2 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt @@ -25,7 +25,7 @@ class MainActivity : KotlinBaseActivity() { private val kTag = "MainActivity" - private val marginOffset by lazy { 5.dp2px(this) } + private val marginOffset by lazy { 15.dp2px(this) } private val workSiteViewModel by lazy { ViewModelProvider(this)[WorkSiteViewModel::class.java] } private lateinit var workSiteAdapter: NormalRecyclerAdapter private var page = 1 diff --git a/app/src/main/res/drawable/bg_solid_layout_dark_blue_10.xml b/app/src/main/res/drawable/bg_solid_layout_dark_blue_10.xml deleted file mode 100644 index 0a64a44..0000000 --- a/app/src/main/res/drawable/bg_solid_layout_dark_blue_10.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/bg_stroke_layout_blue.xml b/app/src/main/res/drawable/bg_stroke_layout_blue.xml deleted file mode 100644 index 3bc9de5..0000000 --- a/app/src/main/res/drawable/bg_stroke_layout_blue.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/button_check_selector.xml b/app/src/main/res/drawable/button_check_selector.xml deleted file mode 100644 index 46c4f6b..0000000 --- a/app/src/main/res/drawable/button_check_selector.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt index 376dd51..e8c62a2 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt @@ -25,7 +25,7 @@ class MainActivity : KotlinBaseActivity() { private val kTag = "MainActivity" - private val marginOffset by lazy { 5.dp2px(this) } + private val marginOffset by lazy { 15.dp2px(this) } private val workSiteViewModel by lazy { ViewModelProvider(this)[WorkSiteViewModel::class.java] } private lateinit var workSiteAdapter: NormalRecyclerAdapter private var page = 1 diff --git a/app/src/main/res/drawable/bg_solid_layout_dark_blue_10.xml b/app/src/main/res/drawable/bg_solid_layout_dark_blue_10.xml deleted file mode 100644 index 0a64a44..0000000 --- a/app/src/main/res/drawable/bg_solid_layout_dark_blue_10.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/bg_stroke_layout_blue.xml b/app/src/main/res/drawable/bg_stroke_layout_blue.xml deleted file mode 100644 index 3bc9de5..0000000 --- a/app/src/main/res/drawable/bg_stroke_layout_blue.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/button_check_selector.xml b/app/src/main/res/drawable/button_check_selector.xml deleted file mode 100644 index 46c4f6b..0000000 --- a/app/src/main/res/drawable/button_check_selector.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_turn_back.xml b/app/src/main/res/drawable/ic_turn_back.xml deleted file mode 100644 index b5e1502..0000000 --- a/app/src/main/res/drawable/ic_turn_back.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt index 376dd51..e8c62a2 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt @@ -25,7 +25,7 @@ class MainActivity : KotlinBaseActivity() { private val kTag = "MainActivity" - private val marginOffset by lazy { 5.dp2px(this) } + private val marginOffset by lazy { 15.dp2px(this) } private val workSiteViewModel by lazy { ViewModelProvider(this)[WorkSiteViewModel::class.java] } private lateinit var workSiteAdapter: NormalRecyclerAdapter private var page = 1 diff --git a/app/src/main/res/drawable/bg_solid_layout_dark_blue_10.xml b/app/src/main/res/drawable/bg_solid_layout_dark_blue_10.xml deleted file mode 100644 index 0a64a44..0000000 --- a/app/src/main/res/drawable/bg_solid_layout_dark_blue_10.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/bg_stroke_layout_blue.xml b/app/src/main/res/drawable/bg_stroke_layout_blue.xml deleted file mode 100644 index 3bc9de5..0000000 --- a/app/src/main/res/drawable/bg_stroke_layout_blue.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/button_check_selector.xml b/app/src/main/res/drawable/button_check_selector.xml deleted file mode 100644 index 46c4f6b..0000000 --- a/app/src/main/res/drawable/button_check_selector.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_turn_back.xml b/app/src/main/res/drawable/ic_turn_back.xml deleted file mode 100644 index b5e1502..0000000 --- a/app/src/main/res/drawable/ic_turn_back.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/select_switch_background.xml b/app/src/main/res/drawable/select_switch_background.xml deleted file mode 100644 index 30f4f28..0000000 --- a/app/src/main/res/drawable/select_switch_background.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt index 376dd51..e8c62a2 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt @@ -25,7 +25,7 @@ class MainActivity : KotlinBaseActivity() { private val kTag = "MainActivity" - private val marginOffset by lazy { 5.dp2px(this) } + private val marginOffset by lazy { 15.dp2px(this) } private val workSiteViewModel by lazy { ViewModelProvider(this)[WorkSiteViewModel::class.java] } private lateinit var workSiteAdapter: NormalRecyclerAdapter private var page = 1 diff --git a/app/src/main/res/drawable/bg_solid_layout_dark_blue_10.xml b/app/src/main/res/drawable/bg_solid_layout_dark_blue_10.xml deleted file mode 100644 index 0a64a44..0000000 --- a/app/src/main/res/drawable/bg_solid_layout_dark_blue_10.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/bg_stroke_layout_blue.xml b/app/src/main/res/drawable/bg_stroke_layout_blue.xml deleted file mode 100644 index 3bc9de5..0000000 --- a/app/src/main/res/drawable/bg_stroke_layout_blue.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/button_check_selector.xml b/app/src/main/res/drawable/button_check_selector.xml deleted file mode 100644 index 46c4f6b..0000000 --- a/app/src/main/res/drawable/button_check_selector.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_turn_back.xml b/app/src/main/res/drawable/ic_turn_back.xml deleted file mode 100644 index b5e1502..0000000 --- a/app/src/main/res/drawable/ic_turn_back.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/select_switch_background.xml b/app/src/main/res/drawable/select_switch_background.xml deleted file mode 100644 index 30f4f28..0000000 --- a/app/src/main/res/drawable/select_switch_background.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/select_switch_circle.xml b/app/src/main/res/drawable/select_switch_circle.xml deleted file mode 100644 index 4e06301..0000000 --- a/app/src/main/res/drawable/select_switch_circle.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt index 376dd51..e8c62a2 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt @@ -25,7 +25,7 @@ class MainActivity : KotlinBaseActivity() { private val kTag = "MainActivity" - private val marginOffset by lazy { 5.dp2px(this) } + private val marginOffset by lazy { 15.dp2px(this) } private val workSiteViewModel by lazy { ViewModelProvider(this)[WorkSiteViewModel::class.java] } private lateinit var workSiteAdapter: NormalRecyclerAdapter private var page = 1 diff --git a/app/src/main/res/drawable/bg_solid_layout_dark_blue_10.xml b/app/src/main/res/drawable/bg_solid_layout_dark_blue_10.xml deleted file mode 100644 index 0a64a44..0000000 --- a/app/src/main/res/drawable/bg_solid_layout_dark_blue_10.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/bg_stroke_layout_blue.xml b/app/src/main/res/drawable/bg_stroke_layout_blue.xml deleted file mode 100644 index 3bc9de5..0000000 --- a/app/src/main/res/drawable/bg_stroke_layout_blue.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/button_check_selector.xml b/app/src/main/res/drawable/button_check_selector.xml deleted file mode 100644 index 46c4f6b..0000000 --- a/app/src/main/res/drawable/button_check_selector.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_turn_back.xml b/app/src/main/res/drawable/ic_turn_back.xml deleted file mode 100644 index b5e1502..0000000 --- a/app/src/main/res/drawable/ic_turn_back.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/select_switch_background.xml b/app/src/main/res/drawable/select_switch_background.xml deleted file mode 100644 index 30f4f28..0000000 --- a/app/src/main/res/drawable/select_switch_background.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/select_switch_circle.xml b/app/src/main/res/drawable/select_switch_circle.xml deleted file mode 100644 index 4e06301..0000000 --- a/app/src/main/res/drawable/select_switch_circle.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_direction_button.xml b/app/src/main/res/drawable/selector_direction_button.xml deleted file mode 100644 index a1bc9ce..0000000 --- a/app/src/main/res/drawable/selector_direction_button.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt index 376dd51..e8c62a2 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt @@ -25,7 +25,7 @@ class MainActivity : KotlinBaseActivity() { private val kTag = "MainActivity" - private val marginOffset by lazy { 5.dp2px(this) } + private val marginOffset by lazy { 15.dp2px(this) } private val workSiteViewModel by lazy { ViewModelProvider(this)[WorkSiteViewModel::class.java] } private lateinit var workSiteAdapter: NormalRecyclerAdapter private var page = 1 diff --git a/app/src/main/res/drawable/bg_solid_layout_dark_blue_10.xml b/app/src/main/res/drawable/bg_solid_layout_dark_blue_10.xml deleted file mode 100644 index 0a64a44..0000000 --- a/app/src/main/res/drawable/bg_solid_layout_dark_blue_10.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/bg_stroke_layout_blue.xml b/app/src/main/res/drawable/bg_stroke_layout_blue.xml deleted file mode 100644 index 3bc9de5..0000000 --- a/app/src/main/res/drawable/bg_stroke_layout_blue.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/button_check_selector.xml b/app/src/main/res/drawable/button_check_selector.xml deleted file mode 100644 index 46c4f6b..0000000 --- a/app/src/main/res/drawable/button_check_selector.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_turn_back.xml b/app/src/main/res/drawable/ic_turn_back.xml deleted file mode 100644 index b5e1502..0000000 --- a/app/src/main/res/drawable/ic_turn_back.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/select_switch_background.xml b/app/src/main/res/drawable/select_switch_background.xml deleted file mode 100644 index 30f4f28..0000000 --- a/app/src/main/res/drawable/select_switch_background.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/select_switch_circle.xml b/app/src/main/res/drawable/select_switch_circle.xml deleted file mode 100644 index 4e06301..0000000 --- a/app/src/main/res/drawable/select_switch_circle.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_direction_button.xml b/app/src/main/res/drawable/selector_direction_button.xml deleted file mode 100644 index a1bc9ce..0000000 --- a/app/src/main/res/drawable/selector_direction_button.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/switch_background_off.xml b/app/src/main/res/drawable/switch_background_off.xml deleted file mode 100644 index 7a7205e..0000000 --- a/app/src/main/res/drawable/switch_background_off.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt index 376dd51..e8c62a2 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt @@ -25,7 +25,7 @@ class MainActivity : KotlinBaseActivity() { private val kTag = "MainActivity" - private val marginOffset by lazy { 5.dp2px(this) } + private val marginOffset by lazy { 15.dp2px(this) } private val workSiteViewModel by lazy { ViewModelProvider(this)[WorkSiteViewModel::class.java] } private lateinit var workSiteAdapter: NormalRecyclerAdapter private var page = 1 diff --git a/app/src/main/res/drawable/bg_solid_layout_dark_blue_10.xml b/app/src/main/res/drawable/bg_solid_layout_dark_blue_10.xml deleted file mode 100644 index 0a64a44..0000000 --- a/app/src/main/res/drawable/bg_solid_layout_dark_blue_10.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/bg_stroke_layout_blue.xml b/app/src/main/res/drawable/bg_stroke_layout_blue.xml deleted file mode 100644 index 3bc9de5..0000000 --- a/app/src/main/res/drawable/bg_stroke_layout_blue.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/button_check_selector.xml b/app/src/main/res/drawable/button_check_selector.xml deleted file mode 100644 index 46c4f6b..0000000 --- a/app/src/main/res/drawable/button_check_selector.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_turn_back.xml b/app/src/main/res/drawable/ic_turn_back.xml deleted file mode 100644 index b5e1502..0000000 --- a/app/src/main/res/drawable/ic_turn_back.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/select_switch_background.xml b/app/src/main/res/drawable/select_switch_background.xml deleted file mode 100644 index 30f4f28..0000000 --- a/app/src/main/res/drawable/select_switch_background.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/select_switch_circle.xml b/app/src/main/res/drawable/select_switch_circle.xml deleted file mode 100644 index 4e06301..0000000 --- a/app/src/main/res/drawable/select_switch_circle.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_direction_button.xml b/app/src/main/res/drawable/selector_direction_button.xml deleted file mode 100644 index a1bc9ce..0000000 --- a/app/src/main/res/drawable/selector_direction_button.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/switch_background_off.xml b/app/src/main/res/drawable/switch_background_off.xml deleted file mode 100644 index 7a7205e..0000000 --- a/app/src/main/res/drawable/switch_background_off.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/switch_background_on.xml b/app/src/main/res/drawable/switch_background_on.xml deleted file mode 100644 index 91213fc..0000000 --- a/app/src/main/res/drawable/switch_background_on.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt index 376dd51..e8c62a2 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt @@ -25,7 +25,7 @@ class MainActivity : KotlinBaseActivity() { private val kTag = "MainActivity" - private val marginOffset by lazy { 5.dp2px(this) } + private val marginOffset by lazy { 15.dp2px(this) } private val workSiteViewModel by lazy { ViewModelProvider(this)[WorkSiteViewModel::class.java] } private lateinit var workSiteAdapter: NormalRecyclerAdapter private var page = 1 diff --git a/app/src/main/res/drawable/bg_solid_layout_dark_blue_10.xml b/app/src/main/res/drawable/bg_solid_layout_dark_blue_10.xml deleted file mode 100644 index 0a64a44..0000000 --- a/app/src/main/res/drawable/bg_solid_layout_dark_blue_10.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/bg_stroke_layout_blue.xml b/app/src/main/res/drawable/bg_stroke_layout_blue.xml deleted file mode 100644 index 3bc9de5..0000000 --- a/app/src/main/res/drawable/bg_stroke_layout_blue.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/button_check_selector.xml b/app/src/main/res/drawable/button_check_selector.xml deleted file mode 100644 index 46c4f6b..0000000 --- a/app/src/main/res/drawable/button_check_selector.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_turn_back.xml b/app/src/main/res/drawable/ic_turn_back.xml deleted file mode 100644 index b5e1502..0000000 --- a/app/src/main/res/drawable/ic_turn_back.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/select_switch_background.xml b/app/src/main/res/drawable/select_switch_background.xml deleted file mode 100644 index 30f4f28..0000000 --- a/app/src/main/res/drawable/select_switch_background.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/select_switch_circle.xml b/app/src/main/res/drawable/select_switch_circle.xml deleted file mode 100644 index 4e06301..0000000 --- a/app/src/main/res/drawable/select_switch_circle.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_direction_button.xml b/app/src/main/res/drawable/selector_direction_button.xml deleted file mode 100644 index a1bc9ce..0000000 --- a/app/src/main/res/drawable/selector_direction_button.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/switch_background_off.xml b/app/src/main/res/drawable/switch_background_off.xml deleted file mode 100644 index 7a7205e..0000000 --- a/app/src/main/res/drawable/switch_background_off.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/switch_background_on.xml b/app/src/main/res/drawable/switch_background_on.xml deleted file mode 100644 index 91213fc..0000000 --- a/app/src/main/res/drawable/switch_background_on.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/switch_circle_off.xml b/app/src/main/res/drawable/switch_circle_off.xml deleted file mode 100644 index e9a7924..0000000 --- a/app/src/main/res/drawable/switch_circle_off.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt index 376dd51..e8c62a2 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt @@ -25,7 +25,7 @@ class MainActivity : KotlinBaseActivity() { private val kTag = "MainActivity" - private val marginOffset by lazy { 5.dp2px(this) } + private val marginOffset by lazy { 15.dp2px(this) } private val workSiteViewModel by lazy { ViewModelProvider(this)[WorkSiteViewModel::class.java] } private lateinit var workSiteAdapter: NormalRecyclerAdapter private var page = 1 diff --git a/app/src/main/res/drawable/bg_solid_layout_dark_blue_10.xml b/app/src/main/res/drawable/bg_solid_layout_dark_blue_10.xml deleted file mode 100644 index 0a64a44..0000000 --- a/app/src/main/res/drawable/bg_solid_layout_dark_blue_10.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/bg_stroke_layout_blue.xml b/app/src/main/res/drawable/bg_stroke_layout_blue.xml deleted file mode 100644 index 3bc9de5..0000000 --- a/app/src/main/res/drawable/bg_stroke_layout_blue.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/button_check_selector.xml b/app/src/main/res/drawable/button_check_selector.xml deleted file mode 100644 index 46c4f6b..0000000 --- a/app/src/main/res/drawable/button_check_selector.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_turn_back.xml b/app/src/main/res/drawable/ic_turn_back.xml deleted file mode 100644 index b5e1502..0000000 --- a/app/src/main/res/drawable/ic_turn_back.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/select_switch_background.xml b/app/src/main/res/drawable/select_switch_background.xml deleted file mode 100644 index 30f4f28..0000000 --- a/app/src/main/res/drawable/select_switch_background.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/select_switch_circle.xml b/app/src/main/res/drawable/select_switch_circle.xml deleted file mode 100644 index 4e06301..0000000 --- a/app/src/main/res/drawable/select_switch_circle.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_direction_button.xml b/app/src/main/res/drawable/selector_direction_button.xml deleted file mode 100644 index a1bc9ce..0000000 --- a/app/src/main/res/drawable/selector_direction_button.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/switch_background_off.xml b/app/src/main/res/drawable/switch_background_off.xml deleted file mode 100644 index 7a7205e..0000000 --- a/app/src/main/res/drawable/switch_background_off.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/switch_background_on.xml b/app/src/main/res/drawable/switch_background_on.xml deleted file mode 100644 index 91213fc..0000000 --- a/app/src/main/res/drawable/switch_background_on.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/switch_circle_off.xml b/app/src/main/res/drawable/switch_circle_off.xml deleted file mode 100644 index e9a7924..0000000 --- a/app/src/main/res/drawable/switch_circle_off.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/switch_circle_on.xml b/app/src/main/res/drawable/switch_circle_on.xml deleted file mode 100644 index 0b4f0d5..0000000 --- a/app/src/main/res/drawable/switch_circle_on.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt index 376dd51..e8c62a2 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt @@ -25,7 +25,7 @@ class MainActivity : KotlinBaseActivity() { private val kTag = "MainActivity" - private val marginOffset by lazy { 5.dp2px(this) } + private val marginOffset by lazy { 15.dp2px(this) } private val workSiteViewModel by lazy { ViewModelProvider(this)[WorkSiteViewModel::class.java] } private lateinit var workSiteAdapter: NormalRecyclerAdapter private var page = 1 diff --git a/app/src/main/res/drawable/bg_solid_layout_dark_blue_10.xml b/app/src/main/res/drawable/bg_solid_layout_dark_blue_10.xml deleted file mode 100644 index 0a64a44..0000000 --- a/app/src/main/res/drawable/bg_solid_layout_dark_blue_10.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/bg_stroke_layout_blue.xml b/app/src/main/res/drawable/bg_stroke_layout_blue.xml deleted file mode 100644 index 3bc9de5..0000000 --- a/app/src/main/res/drawable/bg_stroke_layout_blue.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/button_check_selector.xml b/app/src/main/res/drawable/button_check_selector.xml deleted file mode 100644 index 46c4f6b..0000000 --- a/app/src/main/res/drawable/button_check_selector.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_turn_back.xml b/app/src/main/res/drawable/ic_turn_back.xml deleted file mode 100644 index b5e1502..0000000 --- a/app/src/main/res/drawable/ic_turn_back.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/select_switch_background.xml b/app/src/main/res/drawable/select_switch_background.xml deleted file mode 100644 index 30f4f28..0000000 --- a/app/src/main/res/drawable/select_switch_background.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/select_switch_circle.xml b/app/src/main/res/drawable/select_switch_circle.xml deleted file mode 100644 index 4e06301..0000000 --- a/app/src/main/res/drawable/select_switch_circle.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_direction_button.xml b/app/src/main/res/drawable/selector_direction_button.xml deleted file mode 100644 index a1bc9ce..0000000 --- a/app/src/main/res/drawable/selector_direction_button.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/switch_background_off.xml b/app/src/main/res/drawable/switch_background_off.xml deleted file mode 100644 index 7a7205e..0000000 --- a/app/src/main/res/drawable/switch_background_off.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/switch_background_on.xml b/app/src/main/res/drawable/switch_background_on.xml deleted file mode 100644 index 91213fc..0000000 --- a/app/src/main/res/drawable/switch_background_on.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/switch_circle_off.xml b/app/src/main/res/drawable/switch_circle_off.xml deleted file mode 100644 index e9a7924..0000000 --- a/app/src/main/res/drawable/switch_circle_off.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/switch_circle_on.xml b/app/src/main/res/drawable/switch_circle_on.xml deleted file mode 100644 index 0b4f0d5..0000000 --- a/app/src/main/res/drawable/switch_circle_on.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index a580fe1..c505c76 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -35,6 +35,7 @@ android:id="@+id/recyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginVertical="@dimen/dp_7" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> () { private val kTag = "MainActivity" - private val marginOffset by lazy { 5.dp2px(this) } + private val marginOffset by lazy { 15.dp2px(this) } private val workSiteViewModel by lazy { ViewModelProvider(this)[WorkSiteViewModel::class.java] } private lateinit var workSiteAdapter: NormalRecyclerAdapter private var page = 1 diff --git a/app/src/main/res/drawable/bg_solid_layout_dark_blue_10.xml b/app/src/main/res/drawable/bg_solid_layout_dark_blue_10.xml deleted file mode 100644 index 0a64a44..0000000 --- a/app/src/main/res/drawable/bg_solid_layout_dark_blue_10.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/bg_stroke_layout_blue.xml b/app/src/main/res/drawable/bg_stroke_layout_blue.xml deleted file mode 100644 index 3bc9de5..0000000 --- a/app/src/main/res/drawable/bg_stroke_layout_blue.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/button_check_selector.xml b/app/src/main/res/drawable/button_check_selector.xml deleted file mode 100644 index 46c4f6b..0000000 --- a/app/src/main/res/drawable/button_check_selector.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_turn_back.xml b/app/src/main/res/drawable/ic_turn_back.xml deleted file mode 100644 index b5e1502..0000000 --- a/app/src/main/res/drawable/ic_turn_back.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/select_switch_background.xml b/app/src/main/res/drawable/select_switch_background.xml deleted file mode 100644 index 30f4f28..0000000 --- a/app/src/main/res/drawable/select_switch_background.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/select_switch_circle.xml b/app/src/main/res/drawable/select_switch_circle.xml deleted file mode 100644 index 4e06301..0000000 --- a/app/src/main/res/drawable/select_switch_circle.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_direction_button.xml b/app/src/main/res/drawable/selector_direction_button.xml deleted file mode 100644 index a1bc9ce..0000000 --- a/app/src/main/res/drawable/selector_direction_button.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/switch_background_off.xml b/app/src/main/res/drawable/switch_background_off.xml deleted file mode 100644 index 7a7205e..0000000 --- a/app/src/main/res/drawable/switch_background_off.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/switch_background_on.xml b/app/src/main/res/drawable/switch_background_on.xml deleted file mode 100644 index 91213fc..0000000 --- a/app/src/main/res/drawable/switch_background_on.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/switch_circle_off.xml b/app/src/main/res/drawable/switch_circle_off.xml deleted file mode 100644 index e9a7924..0000000 --- a/app/src/main/res/drawable/switch_circle_off.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/switch_circle_on.xml b/app/src/main/res/drawable/switch_circle_on.xml deleted file mode 100644 index 0b4f0d5..0000000 --- a/app/src/main/res/drawable/switch_circle_on.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index a580fe1..c505c76 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -35,6 +35,7 @@ android:id="@+id/recyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginVertical="@dimen/dp_7" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + app:cardBackgroundColor="@color/white" + app:cardCornerRadius="@dimen/dp_10" + app:cardElevation="@dimen/dp_5"> + android:orientation="vertical" + android:padding="15dp"> - + + + + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_5" + android:text="@string/unknown" + android:textColor="@color/mainTextColor" + android:textSize="@dimen/sp_16" /> - - - - - - - + + android:layout_height="@dimen/lineViewSize" + android:layout_marginTop="@dimen/dp_10" + android:background="@color/hintTextColor" /> - + + + + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_5" + android:text="@string/unknown" + android:textColor="@color/mainTextColor" + android:textSize="@dimen/sp_16" /> + + + - - - - - - - - - - - - - - - - - - - - - - + android:textColor="@color/mainThemeColor" + android:textSize="@dimen/sp_16" + android:textStyle="bold" /> - + + + + - - - - - - + android:textColor="@color/mainTextColor" + android:textSize="@dimen/sp_16" /> + android:textColor="@color/mainTextColor" + android:textSize="@dimen/sp_16" /> - + + + + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_5" + android:text="@string/unknown" + android:textColor="@color/mainTextColor" + android:textSize="@dimen/sp_16" /> - + + + - - - - - - - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_5" + android:text="@string/unknown" + android:textColor="@color/mainTextColor" + android:textSize="@dimen/sp_16" /> \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt index 376dd51..e8c62a2 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt @@ -25,7 +25,7 @@ class MainActivity : KotlinBaseActivity() { private val kTag = "MainActivity" - private val marginOffset by lazy { 5.dp2px(this) } + private val marginOffset by lazy { 15.dp2px(this) } private val workSiteViewModel by lazy { ViewModelProvider(this)[WorkSiteViewModel::class.java] } private lateinit var workSiteAdapter: NormalRecyclerAdapter private var page = 1 diff --git a/app/src/main/res/drawable/bg_solid_layout_dark_blue_10.xml b/app/src/main/res/drawable/bg_solid_layout_dark_blue_10.xml deleted file mode 100644 index 0a64a44..0000000 --- a/app/src/main/res/drawable/bg_solid_layout_dark_blue_10.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/bg_stroke_layout_blue.xml b/app/src/main/res/drawable/bg_stroke_layout_blue.xml deleted file mode 100644 index 3bc9de5..0000000 --- a/app/src/main/res/drawable/bg_stroke_layout_blue.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/button_check_selector.xml b/app/src/main/res/drawable/button_check_selector.xml deleted file mode 100644 index 46c4f6b..0000000 --- a/app/src/main/res/drawable/button_check_selector.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_turn_back.xml b/app/src/main/res/drawable/ic_turn_back.xml deleted file mode 100644 index b5e1502..0000000 --- a/app/src/main/res/drawable/ic_turn_back.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/select_switch_background.xml b/app/src/main/res/drawable/select_switch_background.xml deleted file mode 100644 index 30f4f28..0000000 --- a/app/src/main/res/drawable/select_switch_background.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/select_switch_circle.xml b/app/src/main/res/drawable/select_switch_circle.xml deleted file mode 100644 index 4e06301..0000000 --- a/app/src/main/res/drawable/select_switch_circle.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_direction_button.xml b/app/src/main/res/drawable/selector_direction_button.xml deleted file mode 100644 index a1bc9ce..0000000 --- a/app/src/main/res/drawable/selector_direction_button.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/switch_background_off.xml b/app/src/main/res/drawable/switch_background_off.xml deleted file mode 100644 index 7a7205e..0000000 --- a/app/src/main/res/drawable/switch_background_off.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/switch_background_on.xml b/app/src/main/res/drawable/switch_background_on.xml deleted file mode 100644 index 91213fc..0000000 --- a/app/src/main/res/drawable/switch_background_on.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/switch_circle_off.xml b/app/src/main/res/drawable/switch_circle_off.xml deleted file mode 100644 index e9a7924..0000000 --- a/app/src/main/res/drawable/switch_circle_off.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/switch_circle_on.xml b/app/src/main/res/drawable/switch_circle_on.xml deleted file mode 100644 index 0b4f0d5..0000000 --- a/app/src/main/res/drawable/switch_circle_on.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index a580fe1..c505c76 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -35,6 +35,7 @@ android:id="@+id/recyclerView" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginVertical="@dimen/dp_7" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + app:cardBackgroundColor="@color/white" + app:cardCornerRadius="@dimen/dp_10" + app:cardElevation="@dimen/dp_5"> + android:orientation="vertical" + android:padding="15dp"> - + + + + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_5" + android:text="@string/unknown" + android:textColor="@color/mainTextColor" + android:textSize="@dimen/sp_16" /> - - - - - - - + + android:layout_height="@dimen/lineViewSize" + android:layout_marginTop="@dimen/dp_10" + android:background="@color/hintTextColor" /> - + + + + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_5" + android:text="@string/unknown" + android:textColor="@color/mainTextColor" + android:textSize="@dimen/sp_16" /> + + + - - - - - - - - - - - - - - - - - - - - - - + android:textColor="@color/mainThemeColor" + android:textSize="@dimen/sp_16" + android:textStyle="bold" /> - + + + + - - - - - - + android:textColor="@color/mainTextColor" + android:textSize="@dimen/sp_16" /> + android:textColor="@color/mainTextColor" + android:textSize="@dimen/sp_16" /> - + + + + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_5" + android:text="@string/unknown" + android:textColor="@color/mainTextColor" + android:textSize="@dimen/sp_16" /> - + + + - - - - - - - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_5" + android:text="@string/unknown" + android:textColor="@color/mainTextColor" + android:textSize="@dimen/sp_16" /> \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 58dda70..3fb1002 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,7 +1,7 @@ #1D55C6 - #424242 + #232323 #626262 #F2F2F2 #CCCCCC