This repository was archived by the owner on Jul 25, 2024. It is now read-only.
File tree Expand file tree Collapse file tree 4 files changed +15
-8
lines changed Expand file tree Collapse file tree 4 files changed +15
-8
lines changed Original file line number Diff line number Diff line change @@ -1365,6 +1365,9 @@ private void setupFab() {
1365
1365
fab = (FloatingActionButton ) findViewById (R .id .fab );
1366
1366
chatBox = (SwipeRemoveLinearLayout ) findViewById (R .id .messageBoxContainer );
1367
1367
chatBox .registerToSwipeEvents (this );
1368
+ addFileBtn .setColorFilter (getResources ().getColorStateList (R .color .colorTextSecondary ).getColorForState (addFileBtn .getDrawableState (), 0 ));
1369
+ sendBtn .setColorFilter (getResources ().getColorStateList (R .color .colorTextSecondary ).getColorForState (sendBtn .getDrawableState (), 0 ));
1370
+ togglePrivateStreamBtn .setColorFilter (getResources ().getColorStateList (R .color .colorTextSecondary ).getColorForState (togglePrivateStreamBtn .getDrawableState (), 0 ));
1368
1371
fabHidder = new CountDownTimer (Constants .HIDE_FAB_AFTER_SEC * 1000 , Constants .HIDE_FAB_AFTER_SEC * 1000 ) {
1369
1372
public void onTick (long millisUntilFinished ) {
1370
1373
}
Original file line number Diff line number Diff line change 8
8
import android .os .Bundle ;
9
9
import android .view .LayoutInflater ;
10
10
import android .view .View ;
11
+ import android .widget .ImageView ;
11
12
12
13
import com .zulip .android .R ;
13
14
@@ -55,6 +56,12 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
55
56
View rootView = inflater .inflate (R .layout .list_dialog , null );
56
57
View cameraListItem = rootView .findViewById (R .id .picture_dialog );
57
58
View fileListItem = rootView .findViewById (R .id .pick_file_dialog );
59
+ ImageView cameraImage =(ImageView ) rootView .findViewById (R .id .camera_share_icon );
60
+ ImageView fileImage =(ImageView ) rootView .findViewById (R .id .file_share_icon );
61
+
62
+ //Add proper colorState tinting to the camera and fileList Icons
63
+ cameraImage .setColorFilter (getResources ().getColorStateList (R .color .colorTextSecondary ).getColorForState (cameraImage .getDrawableState (), 0 ));
64
+ fileImage .setColorFilter (getResources ().getColorStateList (R .color .colorTextSecondary ).getColorForState (fileImage .getDrawableState (), 0 ));
58
65
59
66
// if device doesn't have camera, disable camera option
60
67
if (!getActivity ().getPackageManager ().hasSystemFeature (PackageManager .FEATURE_CAMERA )) {
Original file line number Diff line number Diff line change 38
38
android : layout_height =" wrap_content"
39
39
android : contentDescription =" @string/stream_private_content_desp"
40
40
android : padding =" 3dp"
41
- android : src =" @drawable/ic_action_person"
42
- android : tint =" @color/colorTextSecondary" />
41
+ android : src =" @drawable/ic_action_person" />
43
42
</LinearLayout >
44
43
45
44
<LinearLayout
58
57
android : paddingLeft =" 8dp"
59
58
android : paddingRight =" 4dp"
60
59
android : paddingTop =" 4dp"
61
- android : src =" @drawable/ic_add_circle_outline_black_24dp"
62
- android : tint =" @color/colorTextSecondary" />
60
+ android : src =" @drawable/ic_add_circle_outline_black_24dp" />
63
61
64
62
<AutoCompleteTextView
65
63
android : id =" @+id/message_et"
78
76
android : alpha =" 0.7"
79
77
android : contentDescription =" @string/send_content_desp"
80
78
android : padding =" 4dp"
81
- android : src =" @drawable/ic_send_24dp"
82
- android : tint =" @color/colorTextSecondary" />
79
+ android : src =" @drawable/ic_send_24dp" />
83
80
84
81
</LinearLayout >
85
82
Original file line number Diff line number Diff line change 10
10
android : layout_marginBottom =" 16dp"
11
11
android : orientation =" horizontal" >
12
12
<ImageView
13
+ android : id =" @+id/camera_share_icon"
13
14
android : layout_width =" wrap_content"
14
15
android : layout_height =" wrap_content"
15
16
android : layout_gravity =" center_vertical"
16
17
android : src =" @drawable/ic_photo_camera_black_24dp"
17
- android : tint =" ?attr/colorControlNormal"
18
18
android : alpha =" 0.7" />
19
19
<TextView
20
20
android : layout_width =" wrap_content"
33
33
android : orientation =" horizontal"
34
34
android : layout_marginTop =" 8dp" >
35
35
<ImageView
36
+ android : id =" @+id/file_share_icon"
36
37
android : layout_width =" wrap_content"
37
38
android : layout_height =" wrap_content"
38
39
android : layout_gravity =" center_vertical"
39
40
android : src =" @drawable/ic_insert_drive_file_black_24dp"
40
- android : tint =" ?attr/colorControlNormal"
41
41
android : alpha =" 0.7" />
42
42
<TextView
43
43
android : layout_width =" wrap_content"
You can’t perform that action at this time.
0 commit comments