From 0d8f41289785d53a5bb4b9b226a277bb2f396650 Mon Sep 17 00:00:00 2001 From: daqingkai <1132234509@qq.com> Date: Tue, 15 Sep 2015 14:11:08 +0800 Subject: [PATCH 01/19] 1.add largeHeap tag 2.delete useless files 3.update theme color --- app/src/main/AndroidManifest.xml | 3 +- .../java/com/customview/CommonTitleBar.java | 5 +- .../app/camera/ui/CameraActivity.java | 7 +-- .../app/camera/ui/PhotoProcessActivity.java | 2 - .../res/drawable-hdpi/aviary_delete_knob.png | Bin 0 -> 1604 bytes .../res/drawable-hdpi/aviary_resize_knob.png | Bin 0 -> 1769 bytes .../res/drawable-hdpi/camera_mall_paster.png | Bin 6625 -> 0 bytes .../main/res/drawable-hdpi/camera_trigger.png | Bin 6571 -> 0 bytes app/src/main/res/drawable-hdpi/cameraicon.png | Bin 6665 -> 0 bytes .../res/drawable-mdpi/aviary_delete_knob.png | Bin 3786 -> 1604 bytes .../res/drawable-mdpi/aviary_resize_knob.png | Bin 4505 -> 1769 bytes app/src/main/res/drawable/btn_take_photo.xml | 25 ++++++++++ app/src/main/res/layout/activity_camera.xml | 47 +++++++++--------- .../res/layout/activity_image_process.xml | 8 +-- app/src/main/res/values/colors.xml | 5 +- app/src/main/res/values/styles.xml | 7 +++ 16 files changed, 71 insertions(+), 38 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/aviary_delete_knob.png create mode 100644 app/src/main/res/drawable-hdpi/aviary_resize_knob.png delete mode 100644 app/src/main/res/drawable-hdpi/camera_mall_paster.png delete mode 100644 app/src/main/res/drawable-hdpi/camera_trigger.png delete mode 100644 app/src/main/res/drawable-hdpi/cameraicon.png create mode 100644 app/src/main/res/drawable/btn_take_photo.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index bcb855f..cd4afe6 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,8 +14,9 @@ android:name="com.stickercamera.App" android:allowBackup="true" android:icon="@drawable/ic_launcher" + android:largeHeap="true" android:label="@string/app_name" - android:theme="@style/RedTheme"> + android:theme="@style/BlueTheme"> diff --git a/app/src/main/java/com/customview/CommonTitleBar.java b/app/src/main/java/com/customview/CommonTitleBar.java index ff5e78d..067dd96 100644 --- a/app/src/main/java/com/customview/CommonTitleBar.java +++ b/app/src/main/java/com/customview/CommonTitleBar.java @@ -29,14 +29,12 @@ public class CommonTitleBar extends RelativeLayout { private TextView middleButton; private TextView rightButton; private ImageView rightButtonImg; - private int leftBtnIconId; private String leftBtnStr; private String titleTxtStr; private String rightBtnStr; private int rightBtnIconId; - private String bgStyle; //RED,WHITE 默认RED.红底与白底的 public CommonTitleBar(Context context) { super(context); @@ -51,14 +49,13 @@ public CommonTitleBar(Context context, AttributeSet attrs) { titleTxtStr = arr.getString(R.styleable.CommonTitleBar_titleTxt); rightBtnStr = arr.getString(R.styleable.CommonTitleBar_rightBtnTxt); rightBtnIconId = arr.getResourceId(R.styleable.CommonTitleBar_rightBtnIcon, 0); - bgStyle = arr.getString(R.styleable.CommonTitleBar_baseStyle); if (isInEditMode()) { LayoutInflater.from(context).inflate(R.layout.view_title_bar, this); return; } LayoutInflater.from(context).inflate(R.layout.view_title_bar, this); - findViewById(R.id.title_out_frame).setBackgroundResource(R.color.pink); + findViewById(R.id.title_out_frame).setBackgroundResource(R.color.blue); arr.recycle(); } diff --git a/app/src/main/java/com/stickercamera/app/camera/ui/CameraActivity.java b/app/src/main/java/com/stickercamera/app/camera/ui/CameraActivity.java index 183a73d..28e7a81 100644 --- a/app/src/main/java/com/stickercamera/app/camera/ui/CameraActivity.java +++ b/app/src/main/java/com/stickercamera/app/camera/ui/CameraActivity.java @@ -22,6 +22,7 @@ import android.view.View; import android.view.ViewGroup; import android.view.animation.ScaleAnimation; +import android.widget.Button; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.RelativeLayout; @@ -84,7 +85,7 @@ public class CameraActivity extends CameraBaseActivity { @InjectView(R.id.panel_take_photo) View takePhotoPanel; @InjectView(R.id.takepicture) - View takePicture; + Button takePicture; @InjectView(R.id.flashBtn) ImageView flashBtn; @InjectView(R.id.change) @@ -92,7 +93,7 @@ public class CameraActivity extends CameraBaseActivity { @InjectView(R.id.back) ImageView backBtn; @InjectView(R.id.next) - ImageView galaryBtn; + ImageView galleryBtn; @InjectView(R.id.focus_index) View focusIndex; @InjectView(R.id.surfaceView) @@ -197,7 +198,7 @@ private void initEvent() { changeBtn.setOnClickListener(v -> switchCamera()); } //跳转相册 - galaryBtn.setOnClickListener(v -> startActivity(new Intent(CameraActivity.this, AlbumActivity.class))); + galleryBtn.setOnClickListener(v -> startActivity(new Intent(CameraActivity.this, AlbumActivity.class))); //返回按钮 backBtn.setOnClickListener(v -> finish()); surfaceView.setOnTouchListener((v, event) -> { diff --git a/app/src/main/java/com/stickercamera/app/camera/ui/PhotoProcessActivity.java b/app/src/main/java/com/stickercamera/app/camera/ui/PhotoProcessActivity.java index d64d97f..810f94a 100644 --- a/app/src/main/java/com/stickercamera/app/camera/ui/PhotoProcessActivity.java +++ b/app/src/main/java/com/stickercamera/app/camera/ui/PhotoProcessActivity.java @@ -334,11 +334,9 @@ private boolean setCurrentBtn(TextView btn) { } else if (currentBtn.equals(btn)) { return false; } else { - currentBtn.setTextColor(Color.rgb(208, 190, 185)); currentBtn.setCompoundDrawablesWithIntrinsicBounds(null, null, null, null); } Drawable myImage = getResources().getDrawable(R.drawable.select_icon); - btn.setTextColor(Color.rgb(255, 255, 255)); btn.setCompoundDrawablesWithIntrinsicBounds(null, null, null, myImage); currentBtn = btn; return true; diff --git a/app/src/main/res/drawable-hdpi/aviary_delete_knob.png b/app/src/main/res/drawable-hdpi/aviary_delete_knob.png new file mode 100644 index 0000000000000000000000000000000000000000..85b36e8ad500c61ccba5e7e0182e4aa21f1361d1 GIT binary patch literal 1604 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/camera_mall_paster.png b/app/src/main/res/drawable-hdpi/camera_mall_paster.png deleted file mode 100644 index 5ee20bf0509208d8a5dae6c2953cb7bafc07f6e0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6625 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 HWyt>n5}X;h diff --git a/app/src/main/res/drawable-hdpi/camera_trigger.png b/app/src/main/res/drawable-hdpi/camera_trigger.png deleted file mode 100644 index 4b526d4d345ae104d8dfdaed23bc8d93e8aa3426..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6571 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 diff --git a/app/src/main/res/drawable-hdpi/cameraicon.png b/app/src/main/res/drawable-hdpi/cameraicon.png deleted file mode 100644 index 9273c92a898c5b62a1f96d96203bc7dbd528962f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6665 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 WJuJUG%l`9oMngqc`L&{L`2PUDd1%i7 diff --git a/app/src/main/res/drawable-mdpi/aviary_delete_knob.png b/app/src/main/res/drawable-mdpi/aviary_delete_knob.png index a3593b8c2ba1c5ead64aeab417511f27e9487594..85b36e8ad500c61ccba5e7e0182e4aa21f1361d1 100755 GIT binary patch literal 1604 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 literal 4505 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 Yul<=P2u+!o-#Px# diff --git a/app/src/main/res/drawable/btn_take_photo.xml b/app/src/main/res/drawable/btn_take_photo.xml new file mode 100644 index 0000000..4a14319 --- /dev/null +++ b/app/src/main/res/drawable/btn_take_photo.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_camera.xml b/app/src/main/res/layout/activity_camera.xml index b00573b..4428d42 100644 --- a/app/src/main/res/layout/activity_camera.xml +++ b/app/src/main/res/layout/activity_camera.xml @@ -1,7 +1,7 @@ + android:background="#ffffff"> @@ -13,24 +13,24 @@ + android:layout_height="match_parent"> + android:background="@color/white" + android:gravity="center_vertical" + android:padding="2dp"> - + android:background="@drawable/btn_take_photo" /> + + android:padding="5dp" + android:scaleType="fitXY" + android:src="@drawable/camera_library" /> - - - + android:background="@color/white" + android:orientation="horizontal"> + + android:background="#00000000"> - + - + + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 3310514..2978d2e 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -12,7 +12,6 @@ #cccccc #cbc4c6 #e8e3e3 - #3299cc #6e686a @@ -30,6 +29,10 @@ #FF5722 + #2196F3 + #1976D2 + #448AFF + #6633B5E5 #ffbebebe \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 759a5d7..dd4a6e4 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -23,6 +23,13 @@ @color/accent_red + + +