Skip to content

Commit 0cc339c

Browse files
cymcsgcymcsg
committed
update for new sdk
1 parent 9ec62ab commit 0cc339c

14 files changed

Lines changed: 102 additions & 97 deletions

File tree

‎UltimateAndroidGradle/app/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 22
5-
buildToolsVersion "22.0.1"
4+
compileSdkVersion 23
5+
buildToolsVersion "23.0.1"
66

77
defaultConfig {
88
applicationId "com.marshalchen.ultimateandroidframework"
99
minSdkVersion 9
10-
targetSdkVersion 22
10+
targetSdkVersion 23
1111
versionCode 1
1212
versionName "1.0"
1313
}
@@ -21,5 +21,5 @@ android {
2121

2222
dependencies {
2323
compile fileTree(dir: 'libs', include: ['*.jar'])
24-
compile 'com.android.support:appcompat-v7:22.2.0'
24+
compile 'com.android.support:appcompat-v7:23.1.0'
2525
}

‎UltimateAndroidGradle/demoofui/build.gradle‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ idea {
99
}
1010

1111
android {
12-
compileSdkVersion 22
13-
buildToolsVersion "22.0.1"
12+
compileSdkVersion 23
13+
buildToolsVersion "23.0.1"
1414

1515
defaultConfig {
1616
applicationId "com.marshalchen.common.demoofui"
@@ -61,23 +61,27 @@ android {
6161
exclude 'META-INF/NOTICE'
6262
exclude 'META-INF/LICENSE'
6363
}
64+
65+
dexOptions {
66+
jumboMode true
67+
}
6468
}
6569
configurations.all {
6670
// check for updates every build
6771
resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
6872
}
6973
dependencies {
7074
compile fileTree(dir: 'libs', include: ['*.jar'])
71-
compile 'com.android.support:appcompat-v7:22.2.0'
72-
compile 'com.android.support:support-v4:22.2.0'
73-
compile 'com.android.support:support-v13:22.2.0'
74-
compile 'com.android.support:recyclerview-v7:22.2.0'
75+
compile 'com.android.support:appcompat-v7:23.1.0'
76+
compile 'com.android.support:support-v4:23.1.0'
77+
compile 'com.android.support:support-v13:23.1.0'
78+
compile 'com.android.support:recyclerview-v7:23.1.0'
7579
// compile project(':ultimateandroidui')
7680
compile project(':ultimateandroiduiwidget')
7781
compile project(':ultimateandroiduianimation')
7882
compile project(':ultimateandroiduicomponent')
7983
compile project(':ultimateandroiduilollipop')
8084
// compile 'com.marshalchen.ultimateandroid:ultimateandroidui:0.6.0'
81-
compile 'com.android.support:percent:22.2.0'
85+
compile 'com.android.support:percent:23.1.0'
8286

8387
}

‎UltimateAndroidGradle/demoofui/src/main/java/com/marshalchen/common/demoofui/artbook/models/DribbbleFetch.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@
2929

3030
import android.os.AsyncTask;
3131
import android.util.Log;
32-
import org.apache.http.Header;
32+
33+
import cz.msebera.android.httpclient.Header;
3334

3435

3536
public class DribbbleFetch {

‎UltimateAndroidGradle/demoofui/src/main/res/layout/calendar_dialog_customized.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
android:scrollbarStyle="outsideOverlay"
1111
android:clipToPadding="false"
1212
android:background="@color/custom_background"
13-
app:dayBackground="@drawable/calendar_custom_calendar_bg_selector"
14-
app:dayTextColor="@color/calendar_custom_calendar_text_selector"
15-
app:dividerColor="@color/transparent"
16-
app:titleTextColor="@color/calendar_custom_calendar_text_selector"
17-
app:headerTextColor="@color/custom_header_text"
13+
app:cp_dayBackground="@drawable/calendar_custom_calendar_bg_selector"
14+
app:cp_dayTextColor="@color/calendar_custom_calendar_text_selector"
15+
app:cp_dividerColor="@color/transparent"
16+
app:cp_titleTextColor="@color/calendar_custom_calendar_text_selector"
17+
app:cp_headerTextColor="@color/custom_header_text"
1818
/>

‎UltimateAndroidGradle/demoofui/src/main/res/layout/material_progress_wheel_activity_main.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
android:layout_height="80dp"
8787
android:layout_centerHorizontal="true"
8888
android:layout_centerVertical="true"
89-
wheel:barColor="#5588FF"
89+
wheel:mpwBarColor="#5588FF"
9090
wheel:mpwProgressIndeterminate="true" />
9191

9292
</RelativeLayout>

‎UltimateAndroidGradle/demoofui/src/main/res/layout/progress_wheel_activity.xml‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@
3535
android:id="@+id/progressBarTwo"
3636
android:layout_width="150dp"
3737
android:layout_height="150dp"
38-
ProgressWheel:text="Click\none of the\nbuttons"
39-
ProgressWheel:textColor="#222222"
38+
ProgressWheel:pw_text="Click\none of the\nbuttons"
39+
ProgressWheel:pw_textColor="#222222"
4040
ProgressWheel:textSize="14sp"
41-
ProgressWheel:rimColor="#44000000"
42-
ProgressWheel:barLength="60dp"
43-
ProgressWheel:barColor="#339BB9"
44-
ProgressWheel:barWidth="25dp"
45-
ProgressWheel:rimWidth="25dp"
46-
ProgressWheel:spinSpeed="3dp" />
41+
ProgressWheel:pw_rimColor="#44000000"
42+
ProgressWheel:pw_barLength="60dp"
43+
ProgressWheel:pw_barColor="#339BB9"
44+
ProgressWheel:pw_barWidth="25dp"
45+
ProgressWheel:pw_rimWidth="25dp"
46+
ProgressWheel:pw_spinSpeed="3dp" />
4747
</LinearLayout>
4848

4949
<LinearLayout android:layout_width="wrap_content"
@@ -54,31 +54,31 @@
5454
android:id="@+id/progressBarThree"
5555
android:layout_width="150dp"
5656
android:layout_height="150dp"
57-
ProgressWheel:text=""
58-
ProgressWheel:textColor="#222222"
57+
ProgressWheel:pw_text=""
58+
ProgressWheel:pw_textColor="#222222"
5959
ProgressWheel:textSize="14sp"
60-
ProgressWheel:rimColor="#44000000"
61-
ProgressWheel:circleColor="#2E9121"
62-
ProgressWheel:barLength="20dp"
63-
ProgressWheel:barColor="#8000"
64-
ProgressWheel:barWidth="25dp"
65-
ProgressWheel:rimWidth="25dp"
66-
ProgressWheel:spinSpeed="-1dp" />
60+
ProgressWheel:pw_rimColor="#44000000"
61+
ProgressWheel:pw_circleColor="#2E9121"
62+
ProgressWheel:pw_barLength="20dp"
63+
ProgressWheel:pw_barColor="#8000"
64+
ProgressWheel:pw_barWidth="25dp"
65+
ProgressWheel:pw_rimWidth="25dp"
66+
ProgressWheel:pw_spinSpeed="-1dp" />
6767

6868
<com.marshalchen.common.uimodule.simplemodule.ProgressWheel
6969
android:id="@+id/progressBarFour"
7070
android:layout_width="50dp"
7171
android:layout_height="50dp"
72-
ProgressWheel:text=""
73-
ProgressWheel:textColor="#222222"
72+
ProgressWheel:pw_text=""
73+
ProgressWheel:pw_textColor="#222222"
7474
ProgressWheel:textSize="14sp"
75-
ProgressWheel:rimColor="#4000"
76-
ProgressWheel:barLength="30dp"
77-
ProgressWheel:barColor="#222"
78-
ProgressWheel:barWidth="4dp"
79-
ProgressWheel:rimWidth="1dp"
80-
ProgressWheel:spinSpeed="30dp"
81-
ProgressWheel:delayMillis="75" />
75+
ProgressWheel:pw_rimColor="#4000"
76+
ProgressWheel:pw_barLength="30dp"
77+
ProgressWheel:pw_barColor="#222"
78+
ProgressWheel:pw_barWidth="4dp"
79+
ProgressWheel:pw_rimWidth="1dp"
80+
ProgressWheel:pw_spinSpeed="30dp"
81+
ProgressWheel:pw_delayMillis="75" />
8282

8383
</LinearLayout>
8484

‎UltimateAndroidGradle/ultimateandroidui/build.gradle‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,15 @@ dependencies {
4747
compile 'com.android.support:appcompat-v7:23.0.1'
4848
compile 'com.android.support:support-v13:23.0.1'
4949
compile 'com.android.support:recyclerview-v7:23.0.1'
50-
// compile project(':ultimateandroid')
51-
compile 'com.marshalchen.ultimateandroid:ultimateandroid:0.7.0'
52-
compile 'com.marshalchen.ultimateandroid:ultimateandroiduiwidget:0.7.0'
53-
compile 'com.marshalchen.ultimateandroid:ultimateandroiduicomponent:0.7.0'
54-
compile 'com.marshalchen.ultimateandroid:ultimateandroiduilollipop:0.7.0'
55-
compile 'com.marshalchen.ultimateandroid:ultimateandroiduianimation:0.7.0'
56-
// compile project(':ultimateandroiduiwidget')
57-
// compile project(':ultimateandroiduianimation')
58-
// compile project(':ultimateandroiduicomponent')
59-
// compile project(':ultimateandroiduilollipop')
50+
compile project(':ultimateandroid')
51+
// compile 'com.marshalchen.ultimateandroid:ultimateandroid:0.7.0'
52+
// compile 'com.marshalchen.ultimateandroid:ultimateandroiduiwidget:0.7.0'
53+
// compile 'com.marshalchen.ultimateandroid:ultimateandroiduicomponent:0.7.0'
54+
// compile 'com.marshalchen.ultimateandroid:ultimateandroiduilollipop:0.7.0'
55+
// compile 'com.marshalchen.ultimateandroid:ultimateandroiduianimation:0.7.0'
56+
compile project(':ultimateandroiduiwidget')
57+
compile project(':ultimateandroiduianimation')
58+
compile project(':ultimateandroiduicomponent')
59+
compile project(':ultimateandroiduilollipop')
6060

6161
}

‎UltimateAndroidGradle/ultimateandroiduicomponent/src/main/java/com/marshalchen/common/uimodule/gesturedetectors/TwoFingerGestureDetector.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import android.content.Context;
44
import android.util.DisplayMetrics;
5-
import android.util.FloatMath;
5+
66
import android.view.MotionEvent;
77
import android.view.ViewConfiguration;
88

‎UltimateAndroidGradle/ultimateandroiduicomponent/src/main/java/com/marshalchen/common/uimodule/viewpagerindicator/LinePageIndicator.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import android.support.v4.view.ViewConfigurationCompat;
2828
import android.support.v4.view.ViewPager;
2929
import android.util.AttributeSet;
30-
import android.util.FloatMath;
3130
import android.view.MotionEvent;
3231
import android.view.View;
3332
import android.view.ViewConfiguration;
@@ -398,7 +397,8 @@ private int measureHeight(int measureSpec) {
398397
result = Math.min(result, specSize);
399398
}
400399
}
401-
return (int)FloatMath.ceil(result);
400+
401+
return (int)Math.ceil(result);
402402
}
403403

404404
@Override

‎UltimateAndroidGradle/ultimateandroiduiwidget/src/main/java/com/marshalchen/common/uimodule/photoview/PhotoViewAttacher.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import android.graphics.Matrix.ScaleToFit;
2222
import android.graphics.RectF;
2323
import android.graphics.drawable.Drawable;
24-
import android.util.FloatMath;
24+
2525
import android.util.Log;
2626
import android.view.*;
2727
import android.view.View.OnLongClickListener;
@@ -329,7 +329,7 @@ public float getMaximumScale() {
329329

330330
@Override
331331
public float getScale() {
332-
return FloatMath.sqrt((float) Math.pow(getValue(mSuppMatrix, Matrix.MSCALE_X), 2) + (float) Math.pow(getValue(mSuppMatrix, Matrix.MSKEW_Y), 2));
332+
return (float)Math.sqrt(Math.pow(getValue(mSuppMatrix, Matrix.MSCALE_X), 2) + Math.pow(getValue(mSuppMatrix, Matrix.MSKEW_Y), 2));
333333
}
334334

335335
@Override

0 commit comments

Comments
 (0)