Skip to content

Commit bda7c2f

Browse files
werbheliuswerbhelius
committed
adjust
1 parent 95e464e commit bda7c2f

File tree

6 files changed

+67
-55
lines changed

6 files changed

+67
-55
lines changed

‎app/src/main/java/com/werb/pickphotosample/MainActivity.java

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ public void onClick(View view) {
4949
.setLightStatusBar(true)
5050
.setStatusBarColor(R.color.white)
5151
.setToolbarColor(R.color.white)
52-
.setToolbarTextcolor(R.color.pick_black)
52+
.setToolbarTextColor(R.color.black)
53+
.setSelectIconColor(R.color.pink)
5354
.setShowGif(false)
5455
.start();
5556
}
@@ -64,11 +65,11 @@ public void onClick(View view) {
6465
.setPickPhotoSize(3)
6566
.setShowCamera(true)
6667
.setSpanCount(4)
67-
.setLightStatusBar(true)
68-
.setStatusBarColor(R.color.white)
69-
.setToolbarColor(R.color.white)
70-
.setSelectIconColor(R.color.pick_black)
71-
.setClickSelectable(true)
68+
.setLightStatusBar(false)
69+
.setStatusBarColor(R.color.green_primary_dark)
70+
.setToolbarColor(R.color.green_primary)
71+
.setToolbarTextColor(R.color.white)
72+
.setSelectIconColor(R.color.green_primary)
7273
.start();
7374
}
7475
});
@@ -78,16 +79,16 @@ public void onClick(View view) {
7879
btn3.setOnClickListener(new View.OnClickListener() {
7980
@Override
8081
public void onClick(View view) {
81-
// new PickPhotoView.Builder(MainActivity.this)
82-
// .setPickPhotoSize(6)
83-
// .setShowCamera(true)
84-
// .setSpanCount(4)
85-
// .setLightStatusBar(true)
86-
// .setStatusBarColor("#ffffff")
87-
// .setToolbarColor("#ffffff")
88-
// .setToolbarIconColor("#000000")
89-
// .setClickSelectable(false)
90-
// .start();
82+
new PickPhotoView.Builder(MainActivity.this)
83+
.setPickPhotoSize(6)
84+
.setShowCamera(true)
85+
.setSpanCount(4)
86+
.setLightStatusBar(false)
87+
.setStatusBarColor(R.color.blue_primary_dark)
88+
.setToolbarColor(R.color.blue_primary)
89+
.setToolbarTextColor(R.color.white)
90+
.setSelectIconColor(R.color.blue_primary)
91+
.start();
9192
}
9293
});
9394

‎app/src/main/res/values/colors.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,16 @@
66

77
<!-- Basic Colors -->
88
<color name="white">#FFFFFF</color>
9+
<color name="black">#191919</color>
10+
<color name="pink">#FF0458</color>
911
<color name="white_pressed">#c8ffffff</color>
1012
<color name="transparent">#00FFFFFF</color>
13+
14+
<color name="green_primary">#0f9f58</color>
15+
<color name="green_primary_dark">#0c7e46</color>
16+
<color name="green_accent">#0f9f58</color>
17+
18+
<color name="blue_primary">#4184f3</color>
19+
<color name="blue_primary_dark">#346ac2</color>
20+
<color name="blue_accent">#4184f3</color>
1121
</resources>

‎pickphotoview/src/main/java/com/werb/pickphotoview/BasePickActivity.kt

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
package com.werb.pickphotoview
2+
3+
import android.os.Build
4+
import android.os.Bundle
5+
import android.support.v7.app.AppCompatActivity
6+
import android.view.View
7+
import com.werb.pickphotoview.extensions.color
8+
9+
/** Created by wanbo <[email protected]> on 2017/10/23. */
10+
11+
open class BasePickActivity : AppCompatActivity() {
12+
13+
override fun onCreate(savedInstanceState: Bundle?) {
14+
super.onCreate(savedInstanceState)
15+
theme()
16+
}
17+
18+
private fun theme() {
19+
GlobalData.model?.let {
20+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
21+
window.statusBarColor = color(it.statusBarColor)
22+
}
23+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
24+
if (it.lightStatusBar) {
25+
window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
26+
}
27+
}
28+
}
29+
}
30+
31+
}

‎pickphotoview/src/main/java/com/werb/pickphotoview/PickPhotoActivity.kt

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import java.util.ArrayList
3232
* Created by wanbo on 2016/12/30.
3333
*/
3434

35-
class PickPhotoActivity : AppCompatActivity() {
35+
class PickPhotoActivity : BasePickActivity() {
3636

3737
private var mode = PickConfig.PICK_GIRD
3838
private val selectImages = PickPhotoHelper.selectImages
@@ -63,16 +63,7 @@ class PickPhotoActivity : AppCompatActivity() {
6363
private fun initToolbar() {
6464
val select = drawable(R.drawable.pick_svg_select)
6565
GlobalData.model?.let {
66-
val window = window
67-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
68-
window.statusBarColor = color(it.statusBarColor)
69-
}
70-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
71-
if (it.lightStatusBar) {
72-
window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
73-
}
74-
}
75-
toolbar.setBackgroundColor(color(it.toolbarColor))
66+
appbar.setBackgroundColor(color(it.toolbarColor))
7667
midTitle.setTextColor(color(it.toolbarTextColor))
7768
cancel.setTextColor(color(it.toolbarTextColor))
7869
sure.setTextColor(alphaColor(color(it.toolbarTextColor)))
@@ -131,20 +122,6 @@ class PickPhotoActivity : AppCompatActivity() {
131122
showFragment()
132123
}
133124

134-
135-
// internal var imageClick: View.OnClickListener = View.OnClickListener { v ->
136-
// val imgPath = v.getTag(R.id.pick_image_path) as String
137-
// val intent = Intent()
138-
// intent.setClass(this@PickPhotoActivity, PickPhotoPreviewActivity::class.java)
139-
// intent.putExtra(PickConfig.INTENT_IMG_PATH, imgPath)
140-
// intent.putExtra(PickConfig.INTENT_IMG_LIST, allPhotos)
141-
// intent.putExtra(PickConfig.INTENT_IMG_LIST_SELECT, pickGridAdapter!!.selectPath)
142-
// intent.putExtra(PickConfig.INTENT_PICK_DATA, GlobalData.model)
143-
// startActivityForResult(intent, PickConfig.PREVIEW_PHOTO_DATA)
144-
// }
145-
//
146-
// private val selectClick = View.OnClickListener { select() }
147-
148125
private fun add() {
149126
if (selectImages.isNotEmpty()) {
150127
val intent = Intent()

‎pickphotoview/src/main/java/com/werb/pickphotoview/PickPhotoPreviewActivity.kt

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import java.io.Serializable
2929
* Created by wanbo on 2017/1/4.
3030
*/
3131

32-
class PickPhotoPreviewActivity : AppCompatActivity() {
32+
class PickPhotoPreviewActivity : BasePickActivity() {
3333

3434
private var path: String? = null
3535
private var dir: String? = null
@@ -55,14 +55,6 @@ class PickPhotoPreviewActivity : AppCompatActivity() {
5555

5656
private fun initToolbar() {
5757
GlobalData.model?.let {
58-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
59-
window.statusBarColor = color(it.statusBarColor)
60-
}
61-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
62-
if (it.lightStatusBar) {
63-
window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
64-
}
65-
}
6658
appbar.setBackgroundColor(color(it.toolbarColor))
6759
midTitle.setTextColor(color(it.toolbarTextColor))
6860
cancel.setTextColor(color(it.toolbarTextColor))

‎pickphotoview/src/main/java/com/werb/pickphotoview/PickPhotoView.kt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ class PickPhotoView private constructor(private val builder: Builder) {
3434
return this
3535
}
3636

37+
/** clickSelectable used with photoSize == 1 */
3738
fun setClickSelectable(clickSelectable: Boolean): Builder {
3839
pickModel.isClickSelectable = clickSelectable
3940
return this
@@ -49,7 +50,7 @@ class PickPhotoView private constructor(private val builder: Builder) {
4950
return this
5051
}
5152

52-
fun setToolbarTextcolor(toolbarTextColor: Int): Builder {
53+
fun setToolbarTextColor(toolbarTextColor: Int): Builder {
5354
pickModel.toolbarTextColor = toolbarTextColor
5455
return this
5556
}
@@ -69,10 +70,10 @@ class PickPhotoView private constructor(private val builder: Builder) {
6970
return this
7071
}
7172

72-
fun setShowVideo(showVideo: Boolean): Builder {
73-
pickModel.isShowVideo = showVideo
74-
return this
75-
}
73+
// fun setShowVideo(showVideo: Boolean): Builder {
74+
// pickModel.isShowVideo = showVideo
75+
// return this
76+
// }
7677

7778
private fun create(): PickPhotoView {
7879
GlobalData.model = pickModel

0 commit comments

Comments
 (0)