Skip to content

Commit 5d42ac2

Browse files
committed
Rename internal resources conventions
1 parent b5c1a41 commit 5d42ac2

23 files changed

+370
-157
lines changed

app/build.gradle

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
// Designed and developed by 2019 skydoves (Jaewoong Eum)
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
6+
//
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
14+
115
apply plugin: 'com.android.application'
216
apply from: '../dependencies.gradle'
317

build.gradle

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,19 @@
1+
// Designed and developed by 2019 skydoves (Jaewoong Eum)
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
6+
//
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
14+
115
buildscript {
216
apply from: './dependencies.gradle'
3-
417
repositories {
518
jcenter()
619
google()

colorpickerview/build.gradle

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
// Designed and developed by 2019 skydoves (Jaewoong Eum)
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
6+
//
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
14+
115
apply plugin: 'com.android.library'
216
apply from: '../dependencies.gradle'
317
apply from: '../publish.gradle'

colorpickerview/src/main/java/com/skydoves/colorpickerview/ColorPickerDialog.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import android.widget.ListAdapter;
2727
import androidx.annotation.NonNull;
2828
import androidx.appcompat.app.AlertDialog;
29-
import com.skydoves.colorpickerview.databinding.DialogColorpickerBinding;
29+
import com.skydoves.colorpickerview.databinding.DialogColorpickerColorpickerviewSkydovesBinding;
3030
import com.skydoves.colorpickerview.listeners.ColorEnvelopeListener;
3131
import com.skydoves.colorpickerview.listeners.ColorListener;
3232
import com.skydoves.colorpickerview.listeners.ColorPickerViewListener;
@@ -49,7 +49,7 @@ public ColorPickerDialog(Context context) {
4949

5050
/** Builder class for create {@link ColorPickerDialog}. */
5151
public static class Builder extends AlertDialog.Builder {
52-
private DialogColorpickerBinding dialogBinding;
52+
private DialogColorpickerColorpickerviewSkydovesBinding dialogBinding;
5353
private ColorPickerView colorPickerView;
5454
private boolean shouldAttachAlphaSlideBar = true;
5555
private boolean shouldAttachBrightnessSlideBar = true;
@@ -67,7 +67,8 @@ public Builder(Context context, int themeResId) {
6767

6868
private void onCreate() {
6969
LayoutInflater layoutInflater = LayoutInflater.from(getContext());
70-
this.dialogBinding = DialogColorpickerBinding.inflate(layoutInflater, null, false);
70+
this.dialogBinding =
71+
DialogColorpickerColorpickerviewSkydovesBinding.inflate(layoutInflater, null, false);
7172
this.colorPickerView = dialogBinding.colorPickerView;
7273
this.colorPickerView.attachAlphaSlider(dialogBinding.alphaSlideBar);
7374
this.colorPickerView.attachBrightnessSlider(dialogBinding.brightnessSlideBar);

colorpickerview/src/main/java/com/skydoves/colorpickerview/FadeUtils.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,15 @@
2727
public class FadeUtils {
2828

2929
public static void fadeIn(View view) {
30-
Animation fadeIn = AnimationUtils.loadAnimation(view.getContext(), R.anim.fade_in);
30+
Animation fadeIn =
31+
AnimationUtils.loadAnimation(view.getContext(), R.anim.fade_in_colorpickerview_skydoves);
3132
fadeIn.setFillAfter(true);
3233
view.startAnimation(fadeIn);
3334
}
3435

3536
public static void fadeOut(View view) {
36-
Animation fadeOut = AnimationUtils.loadAnimation(view.getContext(), R.anim.fade_out);
37+
Animation fadeOut =
38+
AnimationUtils.loadAnimation(view.getContext(), R.anim.fade_out_colorpickerview_skydoves);
3739
fadeOut.setFillAfter(true);
3840
view.startAnimation(fadeOut);
3941
}

colorpickerview/src/main/java/com/skydoves/colorpickerview/flag/BubbleFlag.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class BubbleFlag extends FlagView {
2929
private AppCompatImageView bubble;
3030

3131
public BubbleFlag(Context context) {
32-
super(context, R.layout.flag_bubble);
32+
super(context, R.layout.flag_bubble_colorpickerview_skydoves);
3333
this.bubble = findViewById(R.id.bubble);
3434
}
3535

colorpickerview/src/main/res/anim/fade_in.xml

Lines changed: 0 additions & 8 deletions
This file was deleted.
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="utf-8"?><!--
2+
Designed and developed by 2019 skydoves (Jaewoong Eum)
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
-->
16+
<set xmlns:android="http://schemas.android.com/apk/res/android"
17+
android:interpolator="@android:anim/linear_interpolator">
18+
<alpha
19+
android:duration="500"
20+
android:fromAlpha="0"
21+
android:toAlpha="1.0" />
22+
</set>

colorpickerview/src/main/res/anim/fade_out.xml

Lines changed: 0 additions & 8 deletions
This file was deleted.
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="utf-8"?><!--
2+
Designed and developed by 2019 skydoves (Jaewoong Eum)
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
-->
16+
<set xmlns:android="http://schemas.android.com/apk/res/android"
17+
android:interpolator="@android:anim/linear_interpolator">
18+
<alpha
19+
android:duration="500"
20+
android:fromAlpha="1.0"
21+
android:toAlpha="0" />
22+
</set>

0 commit comments

Comments
 (0)