Skip to content

Commit 37fcc70

Browse files
Young-GunYoung-Gun
committed
[구조변경] 레이아웃 상에서 참조하는 style 구조 변경
1 parent 1a09c7d commit 37fcc70

File tree

4 files changed

+121
-112
lines changed

4 files changed

+121
-112
lines changed

‎app/src/main/res/layout/activity_user_search.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
android:layout_marginStart="10dp"
4545
android:layout_marginVertical="3dp"
4646
app:cardUseCompatPadding="false"
47-
android:foreground="?android:selectableItemBackground"
4847
app:layout_constraintStart_toEndOf="@id/et_search"
4948
app:layout_constraintEnd_toEndOf="parent"
5049
app:layout_constraintTop_toTopOf="@id/et_search"

‎app/src/main/res/layout/holder_repository.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
<TextView
5252
android:id="@+id/tv_license"
5353
style="@style/TextView_Repository_Holder_Count_Style"
54-
android:textSize="12dp"
5554
tools:text="Apache License 2.0"
5655
android:text="@{repository.license.name}"
5756
app:layout_constraintEnd_toEndOf="parent"
@@ -109,7 +108,6 @@
109108
<TextView
110109
android:id="@+id/tv_fork_cnt"
111110
style="@style/TextView_Repository_Holder_Count_Style"
112-
android:layout_marginEnd="0dp"
113111
tools:text="@string/value_with_forks"
114112
android:text="@{@string/value_with_forks(repository.forksCount)}"
115113
app:layout_constraintStart_toEndOf="@id/iv_fork"

‎app/src/main/res/layout/holder_user_interesting.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
android:layout_margin="10dp"
4343
android:layout_gravity="center"
4444
android:layout_weight="1"
45-
android:textSize="11dp"
4645
tools:text="홍길동"
4746
android:text="@{user.login}"/>
4847

‎app/src/main/res/values/styles.xml‎

Lines changed: 121 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -1,171 +1,184 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
3-
<!-- TextView Activity Title -->
4-
<style name="TextView_Activity_Title_Style">
3+
<!--######################################### Base ##########################################-->
4+
5+
<style name="Base" />
6+
7+
<style name="Base.Size" />
8+
9+
<style name="Base.TextView" />
10+
11+
<style name="Base.Size.0_0">
512
<item name="android:layout_width">0dp</item>
6-
<item name="android:layout_height">wrap_content</item>
7-
<item name="android:gravity">start</item>
8-
<item name="android:textSize">20dp</item>
9-
<item name="android:textColor">@color/white</item>
10-
<item name="android:textStyle">bold</item>
13+
<item name="android:layout_height">0dp</item>
1114
</style>
1215

13-
<!-- TextView Label -->
14-
<style name="TextView_Input_Label_Style">
16+
<style name="Base.Size.0_Wrap">
1517
<item name="android:layout_width">0dp</item>
1618
<item name="android:layout_height">wrap_content</item>
17-
<item name="android:textColor">@color/color_common_label_white</item>
18-
<item name="android:textSize">15dp</item>
1919
</style>
2020

21-
<!-- TextView User Profile -->
22-
<style name="TextView_User_Profile_Style">
21+
<style name="Base.Size.Wrap_Wrap">
2322
<item name="android:layout_width">wrap_content</item>
2423
<item name="android:layout_height">wrap_content</item>
25-
<item name="android:textSize">15dp</item>
24+
</style>
25+
26+
<style name="Base.Size.Match_Wrap">
27+
<item name="android:layout_width">match_parent</item>
28+
<item name="android:layout_height">wrap_content</item>
29+
</style>
30+
31+
<style name="Base.TextView.Size.0_Wrap" parent="Base.Size.0_Wrap">
2632
<item name="android:maxLines">1</item>
2733
<item name="android:ellipsize">end</item>
34+
<item name="android:textSize">12dp</item>
2835
<item name="android:textColor">@color/color_common_normal_text_white</item>
2936
</style>
3037

31-
<!-- EditText -->
32-
<style name="EditText_Input_Style">
33-
<item name="android:layout_width">0dp</item>
34-
<item name="android:layout_height">wrap_content</item>
35-
<item name="android:inputType">text</item>
38+
<style name="Base.TextView.Size.Match_Wrap" parent="Base.Size.Match_Wrap">
3639
<item name="android:maxLines">1</item>
37-
<item name="android:imeOptions">actionDone</item>
38-
<item name="android:textColor">@color/color_common_label_white</item>
39-
<item name="android:textColorHint">@color/color_common_edit_hint_grey</item>
40-
<item name="android:textSize">15dp</item>
40+
<item name="android:ellipsize">end</item>
41+
<item name="android:textSize">12dp</item>
42+
<item name="android:textColor">@color/color_common_normal_text_white</item>
4143
</style>
4244

43-
<!-- Button Common -->
44-
<style name="Button_Common_Style">
45-
<item name="android:layout_width">0dp</item>
46-
<item name="android:layout_height">wrap_content</item>
47-
<item name="android:background">@color/color_common_btn_mint</item>
48-
<item name="android:textColor">@color/color_common_label_white</item>
49-
<item name="android:textSize">15dp</item>
45+
<style name="Base.TextView.Size.Wrap_Wrap" parent="Base.Size.Wrap_Wrap">
46+
<item name="android:maxLines">1</item>
47+
<item name="android:ellipsize">end</item>
48+
<item name="android:textSize">12dp</item>
49+
<item name="android:textColor">@color/color_common_normal_text_white</item>
5050
</style>
5151

52-
<!-- TextView Input Error -->
53-
<style name="TextView_Input_Error_Style">
52+
<!--######################################## View## #########################################-->
53+
54+
<!-- View Divider-->
55+
<style name="View_Divider_Style">
5456
<item name="android:layout_width">0dp</item>
55-
<item name="android:layout_height">wrap_content</item>
56-
<item name="android:textColor">@color/color_common_error_text_red</item>
57-
<item name="android:textSize">12dp</item>
57+
<item name="android:layout_height">1dp</item>
58+
<item name="android:background">@color/color_common_divider_grey</item>
5859
</style>
5960

60-
<!-- ProgressBar -->
61-
<style name="LoadingBar_Style" parent="Widget.AppCompat.ProgressBar">
62-
<item name="android:layout_width">wrap_content</item>
63-
<item name="android:layout_height">wrap_content</item>
64-
<item name="android:visibility">gone</item>
61+
<!--######################################### TextView ##########################################-->
62+
63+
<!-- TextView Activity Title -->
64+
<style name="TextView_Activity_Title_Style" parent="Base.TextView.Size.0_Wrap">
65+
<item name="android:gravity">start</item>
66+
<item name="android:textSize">20dp</item>
67+
<item name="android:textStyle">bold</item>
6568
</style>
6669

67-
<!-- RecyclerView -->
68-
<style name="RecyclerView_Style">
69-
<item name="android:layout_width">0dp</item>
70-
<item name="android:layout_height">0dp</item>
71-
<item name="android:orientation">vertical</item>
72-
<item name="android:clipToPadding">false</item>
73-
<item name="android:paddingBottom">20dp</item>
70+
<!-- TextView User Profile -->
71+
<style name="TextView_User_Profile_Style" parent="Base.TextView.Size.Wrap_Wrap">
72+
<item name="android:textSize">15dp</item>
73+
<item name="android:textColor">@color/color_common_normal_text_white</item>
7474
</style>
7575

76-
<!-- ImageView Circle-->
77-
<style name="ImageView_Circle_Style">
78-
<item name="android:layout_width">80dp</item>
79-
<item name="android:layout_height">80dp</item>
80-
<item name="android:src">@drawable/icon_profile_blank</item>
81-
<item name="civ_border_color">@color/transparent</item>
76+
<!-- TextView Repository Holder Count -->
77+
<style name="TextView_Repository_Holder_Count_Style" parent="Base.TextView.Size.Wrap_Wrap">
78+
<item name="android:layout_marginStart">5dp</item>
79+
<item name="android:layout_marginEnd">5dp</item>
80+
</style>
81+
82+
<!-- TextView Repository Holder Title -->
83+
<style name="TextView_Repository_Holder_Title_Style" parent="Base.TextView.Size.0_Wrap">
84+
<item name="android:textSize">20dp</item>
85+
<item name="android:textStyle">bold</item>
86+
</style>
87+
88+
<!-- TextView Repository Holder Description -->
89+
<style name="TextView_Repository_Holder_Description_Style" parent="Base.TextView.Size.0_Wrap">
90+
<item name="android:maxLines">5</item>
8291
</style>
8392

8493
<!-- TextView User contents count value -->
85-
<style name="TextView_User_Contents_Count_Value_Style">
86-
<item name="android:layout_width">match_parent</item>
87-
<item name="android:layout_height">wrap_content</item>
94+
<style name="TextView_User_Contents_Count_Value_Style" parent="Base.TextView.Size.Match_Wrap">
8895
<item name="android:gravity">center</item>
89-
<item name="android:maxLines">1</item>
90-
<item name="android:ellipsize">end</item>
9196
<item name="android:textStyle">bold</item>
9297
<item name="android:textColor">@color/selector_tab_menu</item>
9398
</style>
9499

95100
<!-- TextView User contents count label -->
96-
<style name="TextView_User_Contents_Count_Label_Style">
97-
<item name="android:layout_width">match_parent</item>
98-
<item name="android:layout_height">wrap_content</item>
101+
<style name="TextView_User_Contents_Count_Label_Style" parent="Base.TextView.Size.Match_Wrap">
99102
<item name="android:gravity">center</item>
100-
<item name="android:maxLines">1</item>
101-
<item name="android:ellipsize">end</item>
102103
<item name="android:textColor">@color/selector_tab_menu</item>
103104
</style>
104105

105-
<!-- View Divider-->
106-
<style name="View_Divider_Style">
107-
<item name="android:layout_width">0dp</item>
108-
<item name="android:layout_height">1dp</item>
109-
<item name="android:background">@color/color_common_divider_grey</item>
106+
<!-- TextView Input Error -->
107+
<style name="TextView_Input_Error_Style" parent="Base.TextView.Size.0_Wrap">
108+
<item name="android:textColor">@color/color_common_error_text_red</item>
110109
</style>
111110

112-
<!-- CardView Default-->
113-
<style name="CardView_Default_Style">
114-
<item name="android:layout_width">match_parent</item>
115-
<item name="android:layout_height">wrap_content</item>
116-
<item name="android:foreground">?android:selectableItemBackground</item>
117-
<item name="android:clickable">true</item>
118-
<item name="cardCornerRadius">5dp</item>
119-
<item name="cardUseCompatPadding">true</item>
120-
<item name="cardElevation">5dp</item>
121-
<item name="cardBackgroundColor">@color/color_card_view_background_grey</item>
111+
<!--####################################### EditText ########################################-->
112+
113+
<!-- EditText -->
114+
<style name="EditText_Input_Style" parent="Base.Size.0_Wrap">
115+
<item name="android:inputType">text</item>
116+
<item name="android:maxLines">1</item>
117+
<item name="android:imeOptions">actionDone</item>
118+
<item name="android:textColor">@color/color_common_label_white</item>
119+
<item name="android:textColorHint">@color/color_common_edit_hint_grey</item>
120+
<item name="android:textSize">15dp</item>
121+
</style>
122+
123+
<!--####################################### ImageView #######################################-->
124+
125+
<!-- ImageView Circle-->
126+
<style name="ImageView_Circle_Style">
127+
<item name="android:layout_width">80dp</item>
128+
<item name="android:layout_height">80dp</item>
129+
<item name="android:src">@drawable/icon_profile_blank</item>
130+
<item name="civ_border_color">@color/transparent</item>
122131
</style>
123132

124133
<!-- ImageView Repository Holder Icon -->
125-
<style name="ImageView_Repository_Holder_Icon_Style">
126-
<item name="android:layout_width">wrap_content</item>
127-
<item name="android:layout_height">wrap_content</item>
128-
<item name="android:textColor">@color/color_common_normal_text_white</item>
134+
<style name="ImageView_Repository_Holder_Icon_Style" parent="Base.Size.Wrap_Wrap">
129135
</style>
130136

131137
<!-- ImageView Back Button Icon -->
132-
<style name="ImageView_Back_Button_Style">
133-
<item name="android:layout_width">wrap_content</item>
134-
<item name="android:layout_height">wrap_content</item>
138+
<style name="ImageView_Back_Button_Style" parent="Base.Size.Wrap_Wrap">
135139
<item name="android:padding">20dp</item>
136140
<item name="android:layout_marginTop">10dp</item>
137141
<item name="android:clickable">true</item>
138142
<item name="android:src">@drawable/selector_back_button</item>
139143
</style>
140144

141-
<!-- TextView Repository Holder Count -->
142-
<style name="TextView_Repository_Holder_Count_Style">
145+
<!--######################################## Button #########################################-->
146+
147+
<!-- Button Common -->
148+
<style name="Button_Common_Style" parent="Base.Size.0_Wrap">
149+
<item name="android:background">@color/color_common_btn_mint</item>
150+
<item name="android:textColor">@color/color_common_label_white</item>
151+
<item name="android:textSize">15dp</item>
152+
</style>
153+
154+
<!--###################################### ProgressBar ######################################-->
155+
156+
<!-- ProgressBar -->
157+
<style name="LoadingBar_Style" parent="Widget.AppCompat.ProgressBar">
143158
<item name="android:layout_width">wrap_content</item>
144159
<item name="android:layout_height">wrap_content</item>
145-
<item name="android:layout_marginStart">5dp</item>
146-
<item name="android:layout_marginEnd">5dp</item>
147-
<item name="android:maxLines">1</item>
148-
<item name="android:ellipsize">end</item>
149-
<item name="android:textColor">@color/color_common_normal_text_white</item>
160+
<item name="android:visibility">gone</item>
150161
</style>
151162

152-
<!-- TextView Repository Holder Title -->
153-
<style name="TextView_Repository_Holder_Title_Style">
154-
<item name="android:layout_width">0dp</item>
155-
<item name="android:layout_height">wrap_content</item>
156-
<item name="android:maxLines">1</item>
157-
<item name="android:ellipsize">end</item>
158-
<item name="android:textSize">20dp</item>
159-
<item name="android:textStyle">bold</item>
160-
<item name="android:textColor">@color/color_common_normal_text_white</item>
163+
<!--###################################### RecyclerView #####################################-->
164+
165+
<!-- RecyclerView -->
166+
<style name="RecyclerView_Style" parent="Base.Size.0_0">
167+
<item name="android:orientation">vertical</item>
168+
<item name="android:clipToPadding">false</item>
169+
<item name="android:paddingBottom">20dp</item>
161170
</style>
162171

163-
<!-- TextView Repository Holder Description -->
164-
<style name="TextView_Repository_Holder_Description_Style">
165-
<item name="android:layout_width">0dp</item>
166-
<item name="android:layout_height">wrap_content</item>
167-
<item name="android:maxLines">5</item>
168-
<item name="android:ellipsize">end</item>
169-
<item name="android:textColor">@color/color_common_normal_text_white</item>
172+
<!--####################################### CardView ########################################-->
173+
174+
<!-- CardView Default-->
175+
<style name="CardView_Default_Style" parent="Base.Size.Match_Wrap">
176+
<item name="android:foreground">?android:selectableItemBackground</item>
177+
<item name="android:clickable">true</item>
178+
<item name="cardCornerRadius">5dp</item>
179+
<item name="cardUseCompatPadding">true</item>
180+
<item name="cardElevation">5dp</item>
181+
<item name="cardBackgroundColor">@color/color_card_view_background_grey</item>
170182
</style>
183+
171184
</resources>

0 commit comments

Comments
 (0)