Skip to content
This repository was archived by the owner on Jul 25, 2024. It is now read-only.

Commit f6224f5

Browse files
nitish1211Sam1301
authored andcommitted
Fix: Crash in API<21 due to tinting of drawables using ColorStateList.
Fixes: #431
1 parent 7041b4d commit f6224f5

File tree

4 files changed

+15
-8
lines changed

4 files changed

+15
-8
lines changed

app/src/main/java/com/zulip/android/activities/ZulipActivity.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1365,6 +1365,9 @@ private void setupFab() {
13651365
fab = (FloatingActionButton) findViewById(R.id.fab);
13661366
chatBox = (SwipeRemoveLinearLayout) findViewById(R.id.messageBoxContainer);
13671367
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));
13681371
fabHidder = new CountDownTimer(Constants.HIDE_FAB_AFTER_SEC * 1000, Constants.HIDE_FAB_AFTER_SEC * 1000) {
13691372
public void onTick(long millisUntilFinished) {
13701373
}

app/src/main/java/com/zulip/android/util/ListDialog.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import android.os.Bundle;
99
import android.view.LayoutInflater;
1010
import android.view.View;
11+
import android.widget.ImageView;
1112

1213
import com.zulip.android.R;
1314

@@ -55,6 +56,12 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
5556
View rootView = inflater.inflate(R.layout.list_dialog, null);
5657
View cameraListItem = rootView.findViewById(R.id.picture_dialog);
5758
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));
5865

5966
// if device doesn't have camera, disable camera option
6067
if (!getActivity().getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA)) {

app/src/main/res/layout/chatbox.xml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@
3838
android:layout_height="wrap_content"
3939
android:contentDescription="@string/stream_private_content_desp"
4040
android:padding="3dp"
41-
android:src="@drawable/ic_action_person"
42-
android:tint="@color/colorTextSecondary" />
41+
android:src="@drawable/ic_action_person" />
4342
</LinearLayout>
4443

4544
<LinearLayout
@@ -58,8 +57,7 @@
5857
android:paddingLeft="8dp"
5958
android:paddingRight="4dp"
6059
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" />
6361

6462
<AutoCompleteTextView
6563
android:id="@+id/message_et"
@@ -78,8 +76,7 @@
7876
android:alpha="0.7"
7977
android:contentDescription="@string/send_content_desp"
8078
android:padding="4dp"
81-
android:src="@drawable/ic_send_24dp"
82-
android:tint="@color/colorTextSecondary" />
79+
android:src="@drawable/ic_send_24dp" />
8380

8481
</LinearLayout>
8582

app/src/main/res/layout/list_dialog.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
android:layout_marginBottom="16dp"
1111
android:orientation="horizontal">
1212
<ImageView
13+
android:id="@+id/camera_share_icon"
1314
android:layout_width="wrap_content"
1415
android:layout_height="wrap_content"
1516
android:layout_gravity="center_vertical"
1617
android:src="@drawable/ic_photo_camera_black_24dp"
17-
android:tint="?attr/colorControlNormal"
1818
android:alpha="0.7"/>
1919
<TextView
2020
android:layout_width="wrap_content"
@@ -33,11 +33,11 @@
3333
android:orientation="horizontal"
3434
android:layout_marginTop="8dp">
3535
<ImageView
36+
android:id="@+id/file_share_icon"
3637
android:layout_width="wrap_content"
3738
android:layout_height="wrap_content"
3839
android:layout_gravity="center_vertical"
3940
android:src="@drawable/ic_insert_drive_file_black_24dp"
40-
android:tint="?attr/colorControlNormal"
4141
android:alpha="0.7"/>
4242
<TextView
4343
android:layout_width="wrap_content"

0 commit comments

Comments
 (0)