Skip to content

Commit 9a780b8

Browse files
hannesa2hannesa2
authored
Merge pull request #99 from hannesa2/CodeFormat
Common code format
2 parents a63912c + 097a462 commit 9a780b8

22 files changed

+343
-153
lines changed

‎.gitignore‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,8 @@ proguard/
2828
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm
2929

3030
## Directory-based project format
31-
.idea/
32-
# if you remove the above rule, at least ignore user-specific stuff:
33-
# .idea/workspace.xml
34-
# .idea/tasks.xml
35-
# and these sensitive or high-churn files:
36-
# .idea/dataSources.ids
37-
# .idea/dataSources.xml
38-
# .idea/sqlDataSources.xml
39-
# .idea/dynamic.xml
31+
.idea/*
32+
!.idea/codeStyles/
4033

4134
## File-based project format
4235
*.ipr

‎.idea/codeStyles/Project.xml‎

Lines changed: 215 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/codeStyles/codeStyleConfig.xml‎

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎library/src/main/AndroidManifest.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
<manifest package="com.dd.circular.progress.button">
2-
<application/>
2+
3+
<application />
34
</manifest>

‎library/src/main/java/com/dd/CircularAnimatedDrawable.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -91,18 +91,18 @@ protected void onBoundsChange(Rect bounds) {
9191
fBounds.bottom = bounds.bottom - mBorderWidth / 2f - .5f;
9292
}
9393

94-
private Property<CircularAnimatedDrawable, Float> mAngleProperty =
94+
private Property<CircularAnimatedDrawable, Float> mAngleProperty =
9595
new Property<CircularAnimatedDrawable, Float>(Float.class, "angle") {
96-
@Override
97-
public Float get(CircularAnimatedDrawable object) {
98-
return object.getCurrentGlobalAngle();
99-
}
100-
101-
@Override
102-
public void set(CircularAnimatedDrawable object, Float value) {
103-
object.setCurrentGlobalAngle(value);
104-
}
105-
};
96+
@Override
97+
public Float get(CircularAnimatedDrawable object) {
98+
return object.getCurrentGlobalAngle();
99+
}
100+
101+
@Override
102+
public void set(CircularAnimatedDrawable object, Float value) {
103+
object.setCurrentGlobalAngle(value);
104+
}
105+
};
106106

107107
private Property<CircularAnimatedDrawable, Float> mSweepProperty
108108
= new Property<CircularAnimatedDrawable, Float>(Float.class, "arc") {

‎library/src/main/java/com/dd/CircularProgressButton.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package com.dd;
22

3-
import com.dd.circular.progress.button.R;
4-
53
import android.annotation.SuppressLint;
64
import android.content.Context;
75
import android.content.res.ColorStateList;
@@ -17,6 +15,8 @@
1715
import android.util.StateSet;
1816
import android.widget.Button;
1917

18+
import com.dd.circular.progress.button.R;
19+
2020
public class CircularProgressButton extends Button {
2121

2222
public static final int IDLE_STATE_PROGRESS = 0;

‎library/src/main/java/com/dd/StateManager.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public int getProgress() {
2525
public void checkState(CircularProgressButton progressButton) {
2626
if (progressButton.getProgress() != getProgress()) {
2727
progressButton.setProgress(progressButton.getProgress());
28-
} else if(progressButton.isEnabled() != isEnabled()) {
28+
} else if (progressButton.isEnabled() != isEnabled()) {
2929
progressButton.setEnabled(progressButton.isEnabled());
3030
}
3131
}

‎library/src/main/res/color/cpb_complete_state_selector.xml‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<selector xmlns:android="http://schemas.android.com/apk/res/android">
3-
<item android:state_pressed="true"
4-
android:color="@color/cpb_green_dark"/>
5-
<item android:state_focused="true"
6-
android:color="@color/cpb_green_dark"/>
7-
<item android:state_enabled="false"
8-
android:color="@color/cpb_grey"/>
9-
<item android:state_enabled="true"
10-
android:color="@color/cpb_green"/>
3+
<item android:state_pressed="true" android:color="@color/cpb_green_dark" />
4+
<item android:state_focused="true" android:color="@color/cpb_green_dark" />
5+
<item android:state_enabled="false" android:color="@color/cpb_grey" />
6+
<item android:state_enabled="true" android:color="@color/cpb_green" />
117
</selector>

‎library/src/main/res/color/cpb_error_state_selector.xml‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<selector xmlns:android="http://schemas.android.com/apk/res/android">
3-
<item android:state_pressed="true"
4-
android:color="@color/cpb_red_dark"/>
5-
<item android:state_focused="true"
6-
android:color="@color/cpb_red_dark"/>
7-
<item android:state_enabled="false"
8-
android:color="@color/cpb_grey"/>
9-
<item android:state_enabled="true"
10-
android:color="@color/cpb_red"/>
3+
<item android:state_pressed="true" android:color="@color/cpb_red_dark" />
4+
<item android:state_focused="true" android:color="@color/cpb_red_dark" />
5+
<item android:state_enabled="false" android:color="@color/cpb_grey" />
6+
<item android:state_enabled="true" android:color="@color/cpb_red" />
117
</selector>

‎library/src/main/res/color/cpb_idle_state_selector.xml‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<selector xmlns:android="http://schemas.android.com/apk/res/android">
3-
<item android:state_pressed="true"
4-
android:color="@color/cpb_blue_dark"/>
5-
<item android:state_focused="true"
6-
android:color="@color/cpb_blue_dark"/>
7-
<item android:state_enabled="false"
8-
android:color="@color/cpb_grey"/>
9-
<item android:state_enabled="true"
10-
android:color="@color/cpb_blue"/>
3+
<item android:state_pressed="true" android:color="@color/cpb_blue_dark" />
4+
<item android:state_focused="true" android:color="@color/cpb_blue_dark" />
5+
<item android:state_enabled="false" android:color="@color/cpb_grey" />
6+
<item android:state_enabled="true" android:color="@color/cpb_blue" />
117
</selector>

0 commit comments

Comments
 (0)