Skip to content

Commit bdffa8c

Browse files
committed
修改
1 parent 898a9c5 commit bdffa8c

File tree

10 files changed

+173
-220
lines changed

10 files changed

+173
-220
lines changed

.idea/compiler.xml

Lines changed: 0 additions & 22 deletions
This file was deleted.

.idea/copyright/profiles_settings.xml

Lines changed: 0 additions & 3 deletions
This file was deleted.

.idea/inspectionProfiles/Project_Default.xml

Lines changed: 0 additions & 10 deletions
This file was deleted.

.idea/inspectionProfiles/profiles_settings.xml

Lines changed: 0 additions & 7 deletions
This file was deleted.

.idea/misc.xml

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

app/src/main/java/com/example/identityimageview/MainActivity.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
package com.example.identityimageview;
22

3-
import android.support.v7.app.AppCompatActivity;
43
import android.os.Bundle;
5-
import android.util.Log;
4+
import android.support.v7.app.AppCompatActivity;
65
import android.view.View;
76
import android.widget.Button;
87

@@ -57,7 +56,6 @@ public void click(View view) {
5756
case R.id.bt4:
5857
//增加进度条,没按一次加10,以及改变的角度
5958
identityImageView.setIsprogress(true);
60-
identityImageView.setProgressColor(R.color.colorAccent);
6159

6260
identityImageView.setProgress(i += 10);
6361

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3-
xmlns:app="http://schemas.android.com/apk/res-auto"
4-
android:id="@+id/activity_main"
5-
android:layout_width="match_parent"
6-
android:layout_height="match_parent">
2+
<RelativeLayout android:id="@+id/activity_main"
3+
xmlns:android="http://schemas.android.com/apk/res/android"
4+
xmlns:app="http://schemas.android.com/apk/res-auto"
5+
android:layout_width="match_parent"
6+
android:layout_height="match_parent">
77

88

99
<LinearLayout
@@ -17,7 +17,7 @@
1717
android:layout_height="match_parent"
1818
android:layout_weight="1"
1919
android:onClick="click"
20-
android:text="变换头像" />
20+
android:text="变换头像"/>
2121

2222

2323
<Button
@@ -26,50 +26,50 @@
2626
android:layout_height="match_parent"
2727
android:layout_weight="1"
2828
android:onClick="click"
29-
android:text="生成小图" />
29+
android:text="生成小图"/>
3030

3131
<Button
3232
android:id="@+id/bt2"
3333
android:layout_width="1dp"
3434
android:layout_height="match_parent"
3535
android:layout_weight="1"
3636
android:onClick="click"
37-
android:text="小图变小" />
37+
android:text="小图变小"/>
3838

3939
<Button
4040
android:id="@+id/bt6"
4141
android:layout_width="1dp"
4242
android:layout_height="match_parent"
4343
android:layout_weight="1"
4444
android:onClick="click"
45-
android:text="移动小图" />
45+
android:text="移动小图"/>
4646

4747
<Button
4848
android:id="@+id/bt3"
4949
android:layout_width="1dp"
5050
android:layout_height="match_parent"
5151
android:layout_weight="1"
5252
android:onClick="click"
53-
android:text="有圆边" />
53+
android:text="有圆边"/>
5454

5555
<Button
5656
android:id="@+id/bt4"
5757
android:layout_width="1dp"
5858
android:layout_height="match_parent"
5959
android:layout_weight="1"
6060
android:onClick="click"
61-
android:text="有进度条" />
61+
android:text="有进度条"/>
6262

6363

6464
</LinearLayout>
6565

6666

6767
<com.exampleenen.ruedy.imagelib.widget.IdentityImageView
6868
android:id="@+id/iiv"
69-
android:layout_width="300dp"
70-
android:layout_height="300dp"
69+
android:layout_width="70dp"
70+
android:layout_height="70dp"
7171
android:layout_centerHorizontal="true"
7272
android:layout_centerVertical="true"
73-
android:background="@color/colorPrimary"
74-
app:iciv_progress_collor="@color/colorPrimary"/>
73+
app:iciv_border_color="#999"
74+
app:iciv_border_width="3dp"/>
7575
</RelativeLayout>

imagelib/src/main/java/com/exampleenen/ruedy/imagelib/widget/CircleImageView.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,11 @@
3434
import android.support.annotation.ColorRes;
3535
import android.support.annotation.DrawableRes;
3636
import android.util.AttributeSet;
37-
import android.widget.ImageView;
3837

3938
import com.exampleenen.ruedy.imagelib.R;
4039

4140

42-
public class CircleImageView extends ImageView {
41+
public class CircleImageView extends android.support.v7.widget.AppCompatImageView {
4342

4443
private static final ScaleType SCALE_TYPE = ScaleType.CENTER_CROP;
4544

0 commit comments

Comments
 (0)