Skip to content

Commit aef218a

Browse files
Updated examples. Fixed bug. Changed names layouts
1 parent 112c137 commit aef218a

File tree

12 files changed

+24
-27
lines changed

12 files changed

+24
-27
lines changed

CleanUI/src/main/java/devjdelasen/com/cleanui/SimpleToolbar.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package devjdelasen.com.cleanui
22

33
import android.content.Context
44
import android.content.res.ColorStateList
5-
import android.graphics.Typeface
65
import android.graphics.drawable.Drawable
76
import android.util.AttributeSet
87
import android.util.TypedValue
@@ -11,7 +10,7 @@ import android.widget.LinearLayout
1110
import android.widget.RelativeLayout
1211
import androidx.core.content.ContextCompat
1312
import androidx.core.widget.ImageViewCompat
14-
import kotlinx.android.synthetic.main.simple_toolbar.view.*
13+
import kotlinx.android.synthetic.main.simple_toolbar_clean_ui.view.*
1514

1615

1716
class SimpleToolbar : LinearLayout {
@@ -80,7 +79,7 @@ class SimpleToolbar : LinearLayout {
8079
}
8180

8281
private fun init() {
83-
View.inflate(context, R.layout.simple_toolbar, this)
82+
View.inflate(context, R.layout.simple_toolbar_clean_ui, this)
8483
setView()
8584
setListeners()
8685
}

CleanUI/src/main/java/devjdelasen/com/cleanui/TitleSection.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@ package devjdelasen.com.cleanui
22

33
import android.content.Context
44
import android.util.AttributeSet
5-
import android.util.TypedValue
65
import android.view.View
76
import android.widget.LinearLayout
8-
import android.widget.TextView
97
import androidx.core.content.ContextCompat
10-
import kotlinx.android.synthetic.main.title_section.view.*
8+
import kotlinx.android.synthetic.main.title_section_clean_ui.view.*
119

1210

1311
class TitleSection : LinearLayout {
@@ -43,7 +41,7 @@ class TitleSection : LinearLayout {
4341
}
4442

4543
private fun init() {
46-
View.inflate(context, R.layout.title_section, this)
44+
View.inflate(context, R.layout.title_section_clean_ui, this)
4745
setView()
4846
}
4947

CleanUI/src/main/java/devjdelasen/com/cleanui/settingsRow/SettingsRow.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import androidx.core.content.ContextCompat
77
import devjdelasen.com.cleanui.R
88
import devjdelasen.com.cleanui.TextStyle
99
import devjdelasen.com.cleanui.set
10-
import kotlinx.android.synthetic.main.title_section.view.*
10+
import kotlinx.android.synthetic.main.title_section_clean_ui.view.*
1111

1212

1313
abstract class SettingsRow: LinearLayout {

CleanUI/src/main/java/devjdelasen/com/cleanui/settingsRow/SettingsRowAction.kt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,9 @@ import android.content.Context
44
import android.content.res.ColorStateList
55
import android.util.AttributeSet
66
import android.view.View
7-
import androidx.core.content.ContextCompat
87
import androidx.core.widget.ImageViewCompat
98
import devjdelasen.com.cleanui.R
10-
import devjdelasen.com.cleanui.TextStyle
11-
import devjdelasen.com.cleanui.set
12-
import kotlinx.android.synthetic.main.settings_row_action.view.*
9+
import kotlinx.android.synthetic.main.settings_row_action_clean_ui.view.*
1310

1411

1512
class SettingsRowAction: SettingsRow {
@@ -51,7 +48,7 @@ class SettingsRowAction: SettingsRow {
5148

5249

5350
private fun setView() {
54-
View.inflate(context, R.layout.settings_row_action, this)
51+
View.inflate(context, R.layout.settings_row_action_clean_ui, this)
5552
if (icTintColor != -1) ImageViewCompat.setImageTintList(clean_ui_ivIcAction, ColorStateList.valueOf(icTintColor))
5653
}
5754

CleanUI/src/main/java/devjdelasen/com/cleanui/settingsRow/SettingsRowCheckBox.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,10 @@ import android.content.res.ColorStateList
66
import android.util.AttributeSet
77
import android.view.View
88
import android.widget.CompoundButton
9-
import android.widget.RadioGroup
109
import androidx.core.content.ContextCompat
1110
import androidx.core.widget.CompoundButtonCompat
12-
import androidx.core.widget.ImageViewCompat
1311
import devjdelasen.com.cleanui.R
14-
import kotlinx.android.synthetic.main.settings_row_check.view.*
12+
import kotlinx.android.synthetic.main.settings_row_check_clean_ui.view.*
1513

1614

1715
class SettingsRowCheckBox: SettingsRow {
@@ -53,7 +51,7 @@ class SettingsRowCheckBox: SettingsRow {
5351
}
5452

5553
private fun setView() {
56-
View.inflate(context, R.layout.settings_row_check, this)
54+
View.inflate(context, R.layout.settings_row_check_clean_ui, this)
5755
CompoundButtonCompat.setButtonTintList(clean_ui_cb, ColorStateList.valueOf(cbTintColor));
5856
}
5957

CleanUI/src/main/java/devjdelasen/com/cleanui/settingsRow/SettingsRowSubtext.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import androidx.core.content.ContextCompat
77
import devjdelasen.com.cleanui.R
88
import devjdelasen.com.cleanui.TextStyle
99
import devjdelasen.com.cleanui.set
10-
import kotlinx.android.synthetic.main.settings_row_subtext.view.*
10+
import kotlinx.android.synthetic.main.settings_row_subtext_clean_ui.view.*
1111

1212

1313
class SettingsRowSubtext: SettingsRow {
@@ -55,7 +55,7 @@ class SettingsRowSubtext: SettingsRow {
5555
}
5656

5757
private fun setView() {
58-
View.inflate(context, R.layout.settings_row_subtext, this)
58+
View.inflate(context, R.layout.settings_row_subtext_clean_ui, this)
5959
clean_ui_tvSubtext?.set(subtext, subtextColor, subtextSize, subtextTextStyle)
6060
}
6161

CleanUI/src/main/res/layout/settings_row_action.xml renamed to CleanUI/src/main/res/layout/settings_row_action_clean_ui.xml

File renamed without changes.

CleanUI/src/main/res/layout/settings_row_check.xml renamed to CleanUI/src/main/res/layout/settings_row_check_clean_ui.xml

File renamed without changes.

CleanUI/src/main/res/layout/settings_row_subtext.xml renamed to CleanUI/src/main/res/layout/settings_row_subtext_clean_ui.xml

File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)