Skip to content

consistently use snake_case for color resources #4768

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AndyScherzinger merged 1 commit into from
Oct 31, 2019
Merged

consistently use snake_case for color resources #4768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -999,7 +999,7 @@ protected void setDrawerMenuItemChecked(int menuItemId) {
}
menuItem.setTitle(Html.fromHtml(
"<font color='"
+ ThemeUtils.colorToHexString(ContextCompat.getColor(this, R.color.textColor))
+ ThemeUtils.colorToHexString(ContextCompat.getColor(this, R.color.text_color))
+ "'>" + menuItem.getTitle()
+ "</font>"));
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/owncloud/android/ui/activity/SsoGrantPermissionActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,8 @@ private SpannableStringBuilder makeSpecialPartsBold(String text, String... toBeS
int start = text.indexOf(textBlock);
int end = start + textBlock.length();
ssb.setSpan(new StyleSpan(Typeface.BOLD), start, end, 0);
ssb.setSpan(new ForegroundColorSpan(getResources().getColor(R.color.textColor)), start, end,
Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
ssb.setSpan(new ForegroundColorSpan(getResources().getColor(R.color.text_color)), start, end,
Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
}

return ssb;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/owncloud/android/ui/adapter/ActivityListAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ public void updateDrawState(@NonNull TextPaint ds) {
}, idx1, idx2, 0);
ssb.setSpan(new StyleSpan(android.graphics.Typeface.BOLD), idx1, idx2, 0);
ssb.setSpan(
new ForegroundColorSpan(context.getResources().getColor(R.color.textColor)),
new ForegroundColorSpan(context.getResources().getColor(R.color.text_color)),
idx1,
idx2,
Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/owncloud/android/ui/adapter/NotificationListAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public NotificationListAdapter(OwnCloudClient client, NotificationsActivity noti
this.client = client;
this.notificationsActivity = notificationsActivity;
foregroundColorSpanBlack = new ForegroundColorSpan(
notificationsActivity.getResources().getColor(R.color.textColor));
notificationsActivity.getResources().getColor(R.color.text_color));
}

public void setNotificationItems(List<Notification> notificationItems) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/owncloud/android/utils/ThemeUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ public static int elementColor(Account account, Context context) {
float[] hsl = colorToHSL(primaryColor);

if (hsl[INDEX_LUMINATION] > LUMINATION_THRESHOLD) {
return context.getResources().getColor(R.color.elementFallbackColor);
return context.getResources().getColor(R.color.element_fallback_color);
} else {
return primaryColor;
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/res/drawable/list_selector.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@

<selector xmlns:android="http://schemas.android.com/apk/res/android" android:exitFadeDuration="@android:integer/config_mediumAnimTime">

<item android:drawable="@color/owncloud_blue_bright" android:state_pressed="true"/>
<item android:drawable="@color/owncloud_blue_bright" android:state_focused="true"/>
<item android:drawable="@color/list_selector_focused_pressed" android:state_pressed="true"/>
<item android:drawable="@color/list_selector_focused_pressed" android:state_focused="true"/>
<item android:drawable="@color/bg_default" />

</selector>
4 changes: 2 additions & 2 deletions src/main/res/layout/contacts_backup_fragment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
android:layout_margin="@dimen/standard_margin"
android:text="@string/contacts_automatic_backup"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/textColor" />
android:textColor="@color/text_color" />

<LinearLayout
android:layout_width="match_parent"
Expand All @@ -51,7 +51,7 @@
android:layout_weight="1"
android:text="@string/contacts_last_backup"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/textColor"/>
android:textColor="@color/text_color"/>

<TextView
android:id="@+id/contacts_last_backup_timestamp"
Expand Down
2 changes: 1 addition & 1 deletion src/main/res/layout/deep_link_login.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
android:layout_height="wrap_content"
android:ellipsize="middle"
android:text="@string/placeholder_filename"
android:textColor="@color/textColor"
android:textColor="@color/text_color"
android:textSize="20sp"
android:textStyle="bold" />

Expand Down
4 changes: 2 additions & 2 deletions src/main/res/layout/drawer_header.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
android:shadowRadius="2"
android:maxLines="1"
android:text="@string/app_name"
android:textColor="@color/textColor"
android:textColor="@color/text_color"
android:textSize="@dimen/drawer_header_text"
android:textStyle="bold"/>

Expand All @@ -122,7 +122,7 @@
android:shadowDy="0"
android:shadowRadius="2"
android:text="@string/app_name"
android:textColor="@color/textColor"
android:textColor="@color/text_color"
android:textSize="@dimen/drawer_header_subtext"/>

</LinearLayout>
Expand Down
2 changes: 1 addition & 1 deletion src/main/res/layout/file_details_activities_fragment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
android:layout_weight="1"
android:hint="@string/new_comment"
android:paddingTop="@dimen/standard_padding"
android:textColorHint="@color/secondaryTextColor" />
android:textColorHint="@color/secondary_text_color" />

<ImageButton
android:id="@+id/submitComment"
Expand Down
4 changes: 2 additions & 2 deletions src/main/res/layout/file_details_fragment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
android:layout_height="wrap_content"
android:ellipsize="middle"
android:text="@string/placeholder_filename"
android:textColor="@color/textColor"
android:textColor="@color/text_color"
android:textSize="20sp"
android:textStyle="bold"
tools:text="@string/placeholder_filename"/>
Expand Down Expand Up @@ -196,7 +196,7 @@
android:background="@color/bg_default"
app:tabGravity="center"
app:tabMode="fixed"
app:tabTextColor="@color/textColor"
app:tabTextColor="@color/text_color"
app:tabTextAppearance="@style/AppTabTextAppearance" />

<androidx.viewpager.widget.ViewPager
Expand Down
2 changes: 1 addition & 1 deletion src/main/res/layout/file_details_share_user_item.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
android:gravity="center_vertical"
android:singleLine="true"
android:text="@string/username"
android:textColor="@color/textColor"
android:textColor="@color/text_color"
android:textSize="@dimen/file_details_username_text_size" />

<androidx.appcompat.widget.AppCompatCheckBox
Expand Down
2 changes: 1 addition & 1 deletion src/main/res/layout/file_details_sharing_fragment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@
android:id="@+id/copyInternalLink"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/textColor"
android:textColor="@color/text_color"
android:text="@string/copy_internal_link" />

<TextView
Expand Down
16 changes: 8 additions & 8 deletions src/main/res/layout/file_list_actions_bottom_sheet_fragment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
android:padding="@dimen/standard_padding"
android:text="@string/add_to_cloud"
android:textSize="@dimen/bottom_sheet_text_size"
android:textColor="@color/textColor"/>
android:textColor="@color/text_color"/>

<LinearLayout
android:id="@+id/menu_upload_files"
Expand Down Expand Up @@ -58,7 +58,7 @@
android:layout_marginStart="@dimen/standard_margin"
android:layout_marginLeft="@dimen/standard_margin"
android:text="@string/upload_files"
android:textColor="@color/textColor"
android:textColor="@color/text_color"
android:textSize="@dimen/bottom_sheet_text_size" />

</LinearLayout>
Expand Down Expand Up @@ -89,7 +89,7 @@
android:layout_marginStart="@dimen/standard_margin"
android:layout_marginLeft="@dimen/standard_margin"
android:text="@string/upload_content_from_other_apps"
android:textColor="@color/textColor"
android:textColor="@color/text_color"
android:textSize="@dimen/bottom_sheet_text_size" />

</LinearLayout>
Expand Down Expand Up @@ -130,7 +130,7 @@
android:layout_marginStart="@dimen/standard_margin"
android:layout_marginLeft="@dimen/standard_margin"
android:text="@string/upload_direct_camera_upload"
android:textColor="@color/textColor"
android:textColor="@color/text_color"
android:textSize="@dimen/bottom_sheet_text_size" />

</LinearLayout>
Expand Down Expand Up @@ -171,7 +171,7 @@
android:layout_marginStart="@dimen/standard_margin"
android:layout_marginLeft="@dimen/standard_margin"
android:text="@string/create_new_folder"
android:textColor="@color/textColor"
android:textColor="@color/text_color"
android:textSize="@dimen/bottom_sheet_text_size" />

</LinearLayout>
Expand Down Expand Up @@ -218,7 +218,7 @@
android:layout_marginLeft="@dimen/standard_margin"
android:layout_marginStart="@dimen/standard_margin"
android:text="@string/create_new_document"
android:textColor="@color/textColor"
android:textColor="@color/text_color"
android:textSize="@dimen/bottom_sheet_text_size"/>
</LinearLayout>

Expand Down Expand Up @@ -247,7 +247,7 @@
android:layout_marginLeft="@dimen/standard_margin"
android:layout_marginStart="@dimen/standard_margin"
android:text="@string/create_new_spreadsheet"
android:textColor="@color/textColor"
android:textColor="@color/text_color"
android:textSize="@dimen/bottom_sheet_text_size"/>
</LinearLayout>

Expand Down Expand Up @@ -276,7 +276,7 @@
android:layout_marginLeft="@dimen/standard_margin"
android:layout_marginStart="@dimen/standard_margin"
android:text="@string/create_new_presentation"
android:textColor="@color/textColor"
android:textColor="@color/text_color"
android:textSize="@dimen/bottom_sheet_text_size"/>
</LinearLayout>
</LinearLayout>
Expand Down
2 changes: 1 addition & 1 deletion src/main/res/layout/grid_item.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
android:gravity="center_horizontal"
android:singleLine="true"
android:text="@string/placeholder_filename"
android:textColor="@color/textColor"
android:textColor="@color/text_color"
android:textSize="@dimen/grid_item_text_size" />

</com.owncloud.android.ui.SquareLinearLayout>
2 changes: 1 addition & 1 deletion src/main/res/layout/list_footer.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@
android:layout_marginBottom="@dimen/min_list_item_size"
android:gravity="center"
android:padding="@dimen/standard_padding"
android:textColor="@color/secondaryTextColor" />
android:textColor="@color/secondary_text_color" />

</LinearLayout>
2 changes: 1 addition & 1 deletion src/main/res/layout/list_item.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
android:ellipsize="middle"
android:singleLine="true"
android:text="@string/placeholder_filename"
android:textColor="@color/textColor"
android:textColor="@color/text_color"
android:textSize="@dimen/two_line_primary_text_size"/>

<LinearLayout
Expand Down
4 changes: 2 additions & 2 deletions src/main/res/layout/media_control.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
android:layout_height="wrap_content"
android:paddingEnd="@dimen/standard_quarter_padding"
android:text="@string/placeholder_media_time"
android:textColor="@color/textColor_inverse"
android:textColor="@color/text_color_inverse"
/>

<SeekBar
Expand All @@ -87,7 +87,7 @@
android:layout_height="wrap_content"
android:paddingStart="@dimen/standard_quarter_padding"
android:text="@string/placeholder_media_time"
android:textColor="@color/textColor_inverse"
android:textColor="@color/text_color_inverse"
/>

</LinearLayout>
Expand Down
2 changes: 1 addition & 1 deletion src/main/res/layout/passcodelock.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/pass_code_enter_pass_code"
android:textColor="@color/textColor"
android:textColor="@color/text_color"
android:gravity="center_horizontal"
android:textSize="@dimen/two_line_primary_text_size"
/>
Expand Down
2 changes: 1 addition & 1 deletion src/main/res/layout/richdocuments_webview.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
android:layout_height="wrap_content"
android:ellipsize="middle"
android:text="@string/placeholder_filename"
android:textColor="@color/textColor"
android:textColor="@color/text_color"
android:textSize="20sp"
android:textStyle="bold"/>

Expand Down
2 changes: 1 addition & 1 deletion src/main/res/layout/send_button.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,5 @@
android:layout_gravity="center"
android:gravity="center_horizontal"
android:paddingTop="@dimen/standard_half_padding"
android:textColor="@color/textColor" />
android:textColor="@color/text_color" />
</LinearLayout>
4 changes: 2 additions & 2 deletions src/main/res/layout/send_share_fragment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
android:drawable="@drawable/ic_share"
android:text="@string/share"
android:paddingTop="@dimen/standard_half_padding"
android:textColor="@color/textColor"/>
android:textColor="@color/text_color"/>
</LinearLayout>

<LinearLayout
Expand Down Expand Up @@ -98,7 +98,7 @@
android:drawable="@drawable/ic_share"
android:text="@string/link"
android:paddingTop="@dimen/standard_half_padding"
android:textColor="@color/textColor"/>
android:textColor="@color/text_color"/>
</LinearLayout>

</LinearLayout>
Expand Down
10 changes: 5 additions & 5 deletions src/main/res/layout/share_file_layout.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
android:ellipsize="middle"
android:singleLine="true"
android:text="@string/placeholder_filename"
android:textColor="@color/textColor"
android:textColor="@color/text_color"
android:textSize="@dimen/two_line_primary_text_size"/>

<TextView
Expand Down Expand Up @@ -193,7 +193,7 @@
android:layout_toStartOf="@id/shareViaLinkEditPermissionSwitch"
android:padding="@dimen/standard_half_padding"
android:text="@string/share_via_link_edit_permission_label"
android:textColor="@color/textColor"
android:textColor="@color/text_color"
android:textSize="14sp"
/>

Expand Down Expand Up @@ -227,7 +227,7 @@
android:layout_toStartOf="@id/shareViaLinkFileListingPermissionSwitch"
android:padding="@dimen/standard_half_padding"
android:text="@string/share_via_link_hide_file_listing_permission_label"
android:textColor="@color/textColor"
android:textColor="@color/text_color"
android:textSize="@dimen/two_line_secondary_text_size"
/>

Expand Down Expand Up @@ -261,7 +261,7 @@
android:paddingRight="@dimen/standard_half_padding"
android:paddingTop="@dimen/standard_half_padding"
android:text="@string/share_via_link_password_label"
android:textColor="@color/textColor"
android:textColor="@color/text_color"
android:textSize="@dimen/two_line_secondary_text_size"
/>

Expand Down Expand Up @@ -312,7 +312,7 @@
android:paddingRight="@dimen/standard_half_padding"
android:paddingTop="@dimen/standard_half_padding"
android:text="@string/share_via_link_expiration_date_label"
android:textColor="@color/textColor"
android:textColor="@color/text_color"
android:textSize="@dimen/two_line_secondary_text_size"
/>

Expand Down
2 changes: 1 addition & 1 deletion src/main/res/layout/share_user_item.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
android:id="@+id/userOrGroupName"
android:layout_marginLeft="@dimen/standard_half_margin"
android:layout_marginStart="@dimen/standard_half_margin"
android:textColor="@color/textColor"
android:textColor="@color/text_color"
android:singleLine="true"
android:ellipsize="middle"
android:gravity="center_vertical"/>
Expand Down
2 changes: 1 addition & 1 deletion src/main/res/layout/ssl_untrusted_cert_layout.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
android:paddingBottom="@dimen/standard_padding"
android:text="@string/ssl_validator_header"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/textColor"
android:textColor="@color/text_color"
/>

<TextView
Expand Down
2 changes: 1 addition & 1 deletion src/main/res/layout/ssl_validator_layout.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
android:text="@string/ssl_validator_header"
android:paddingBottom="@dimen/standard_padding"
android:textStyle="bold"
android:textColor="@color/textColor"
android:textColor="@color/text_color"
android:textAppearance="?android:attr/textAppearanceMedium" />

<TextView
Expand Down
2 changes: 1 addition & 1 deletion src/main/res/layout/storage_path_item.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
android:ellipsize="end"
android:gravity="center_vertical"
android:singleLine="true"
android:textColor="@color/textColor"
android:textColor="@color/text_color"
android:textSize="@dimen/file_details_username_text_size"
tools:text="DCIM" />
</LinearLayout>
2 changes: 1 addition & 1 deletion src/main/res/layout/template_button.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,5 @@
android:ellipsize="middle"
android:gravity="center_horizontal"
android:paddingTop="@dimen/standard_half_padding"
android:textColor="@color/textColor"/>
android:textColor="@color/text_color"/>
</LinearLayout>
Loading