Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/quite/mumla.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Lublin <daniel@lublin.se>2020-04-22 23:25:23 +0300
committerDaniel Lublin <daniel@lublin.se>2020-04-22 23:32:39 +0300
commite02996e576ce9bd78cd7d11adc6ab100857da206 (patch)
treef98f7ba1b75e4fc768380a9e6c29ea485f584c1b
parent4381b7dd7defce230aaeedb9bf1ba5fa9384af0d (diff)
Use the same user state icons in the overlay as in the main channel list
Fixes #7 Delete those old, now unused icons.
-rw-r--r--app/src/main/java/se/lublin/mumla/channel/ChannelAdapter.java14
-rw-r--r--app/src/main/res/drawable-hdpi/ic_deafened.pngbin3633 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-hdpi/ic_muted.pngbin3541 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-hdpi/ic_muted_local.pngbin3768 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-hdpi/ic_server_deafened.pngbin4023 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-hdpi/ic_server_muted.pngbin3874 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-hdpi/ic_suppressed.pngbin3975 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-hdpi/ic_talking_on.pngbin2934 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-mdpi/ic_deafened.pngbin2213 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-mdpi/ic_muted.pngbin2055 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-mdpi/ic_muted_local.pngbin2200 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-mdpi/ic_server_deafened.pngbin2397 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-mdpi/ic_server_muted.pngbin2214 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-mdpi/ic_suppressed.pngbin2271 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-mdpi/ic_talking_on.pngbin1600 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-xhdpi/ic_deafened.pngbin4255 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-xhdpi/ic_muted.pngbin4043 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-xhdpi/ic_muted_local.pngbin5438 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-xhdpi/ic_server_deafened.pngbin3926 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-xhdpi/ic_server_muted.pngbin3888 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-xhdpi/ic_suppressed.pngbin3943 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-xhdpi/ic_talking_on.pngbin3649 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-xxhdpi/ic_deafened.pngbin5799 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-xxhdpi/ic_muted.pngbin6021 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-xxhdpi/ic_muted_local.pngbin6227 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-xxhdpi/ic_server_deafened.pngbin5841 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-xxhdpi/ic_server_muted.pngbin6057 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-xxhdpi/ic_suppressed.pngbin6316 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-xxhdpi/ic_talking_on.pngbin5768 -> 0 bytes
29 files changed, 7 insertions, 7 deletions
diff --git a/app/src/main/java/se/lublin/mumla/channel/ChannelAdapter.java b/app/src/main/java/se/lublin/mumla/channel/ChannelAdapter.java
index c7454c0..9fed2c3 100644
--- a/app/src/main/java/se/lublin/mumla/channel/ChannelAdapter.java
+++ b/app/src/main/java/se/lublin/mumla/channel/ChannelAdapter.java
@@ -76,20 +76,20 @@ public class ChannelAdapter extends BaseAdapter {
ImageView state = (ImageView) v.findViewById(R.id.user_row_state);
if (user.isSelfDeafened())
- state.setImageResource(R.drawable.ic_deafened);
+ state.setImageResource(R.drawable.outline_circle_deafened);
else if (user.isSelfMuted())
- state.setImageResource(R.drawable.ic_muted);
+ state.setImageResource(R.drawable.outline_circle_muted);
else if (user.isDeafened())
- state.setImageResource(R.drawable.ic_server_deafened);
+ state.setImageResource(R.drawable.outline_circle_server_deafened);
else if (user.isMuted())
- state.setImageResource(R.drawable.ic_server_muted);
+ state.setImageResource(R.drawable.outline_circle_server_muted);
else if (user.isSuppressed())
- state.setImageResource(R.drawable.ic_suppressed);
+ state.setImageResource(R.drawable.outline_circle_suppressed);
else
if (user.getTalkState() == TalkState.TALKING)
- state.setImageResource(R.drawable.ic_talking_on);
+ state.setImageResource(R.drawable.outline_circle_talking_on);
else
- state.setImageResource(R.drawable.ic_talking_off);
+ state.setImageResource(R.drawable.outline_circle_talking_off);
return v;
}
diff --git a/app/src/main/res/drawable-hdpi/ic_deafened.png b/app/src/main/res/drawable-hdpi/ic_deafened.png
deleted file mode 100644
index bbffe5d..0000000
--- a/app/src/main/res/drawable-hdpi/ic_deafened.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-hdpi/ic_muted.png b/app/src/main/res/drawable-hdpi/ic_muted.png
deleted file mode 100644
index fe37b64..0000000
--- a/app/src/main/res/drawable-hdpi/ic_muted.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-hdpi/ic_muted_local.png b/app/src/main/res/drawable-hdpi/ic_muted_local.png
deleted file mode 100644
index e9367fe..0000000
--- a/app/src/main/res/drawable-hdpi/ic_muted_local.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-hdpi/ic_server_deafened.png b/app/src/main/res/drawable-hdpi/ic_server_deafened.png
deleted file mode 100644
index 72100a7..0000000
--- a/app/src/main/res/drawable-hdpi/ic_server_deafened.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-hdpi/ic_server_muted.png b/app/src/main/res/drawable-hdpi/ic_server_muted.png
deleted file mode 100644
index b5d213d..0000000
--- a/app/src/main/res/drawable-hdpi/ic_server_muted.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-hdpi/ic_suppressed.png b/app/src/main/res/drawable-hdpi/ic_suppressed.png
deleted file mode 100644
index ababf02..0000000
--- a/app/src/main/res/drawable-hdpi/ic_suppressed.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-hdpi/ic_talking_on.png b/app/src/main/res/drawable-hdpi/ic_talking_on.png
deleted file mode 100644
index 6c4e2cf..0000000
--- a/app/src/main/res/drawable-hdpi/ic_talking_on.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/ic_deafened.png b/app/src/main/res/drawable-mdpi/ic_deafened.png
deleted file mode 100644
index 640d27a..0000000
--- a/app/src/main/res/drawable-mdpi/ic_deafened.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/ic_muted.png b/app/src/main/res/drawable-mdpi/ic_muted.png
deleted file mode 100644
index 45d1104..0000000
--- a/app/src/main/res/drawable-mdpi/ic_muted.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/ic_muted_local.png b/app/src/main/res/drawable-mdpi/ic_muted_local.png
deleted file mode 100644
index e0878fa..0000000
--- a/app/src/main/res/drawable-mdpi/ic_muted_local.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/ic_server_deafened.png b/app/src/main/res/drawable-mdpi/ic_server_deafened.png
deleted file mode 100644
index 55ee8ab..0000000
--- a/app/src/main/res/drawable-mdpi/ic_server_deafened.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/ic_server_muted.png b/app/src/main/res/drawable-mdpi/ic_server_muted.png
deleted file mode 100644
index 74d3fb0..0000000
--- a/app/src/main/res/drawable-mdpi/ic_server_muted.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/ic_suppressed.png b/app/src/main/res/drawable-mdpi/ic_suppressed.png
deleted file mode 100644
index 3102ee0..0000000
--- a/app/src/main/res/drawable-mdpi/ic_suppressed.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/ic_talking_on.png b/app/src/main/res/drawable-mdpi/ic_talking_on.png
deleted file mode 100644
index 20b49b9..0000000
--- a/app/src/main/res/drawable-mdpi/ic_talking_on.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_deafened.png b/app/src/main/res/drawable-xhdpi/ic_deafened.png
deleted file mode 100644
index f9cb953..0000000
--- a/app/src/main/res/drawable-xhdpi/ic_deafened.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_muted.png b/app/src/main/res/drawable-xhdpi/ic_muted.png
deleted file mode 100644
index 84e399d..0000000
--- a/app/src/main/res/drawable-xhdpi/ic_muted.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_muted_local.png b/app/src/main/res/drawable-xhdpi/ic_muted_local.png
deleted file mode 100644
index 8756a87..0000000
--- a/app/src/main/res/drawable-xhdpi/ic_muted_local.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_server_deafened.png b/app/src/main/res/drawable-xhdpi/ic_server_deafened.png
deleted file mode 100644
index 5f9d055..0000000
--- a/app/src/main/res/drawable-xhdpi/ic_server_deafened.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_server_muted.png b/app/src/main/res/drawable-xhdpi/ic_server_muted.png
deleted file mode 100644
index 72dca45..0000000
--- a/app/src/main/res/drawable-xhdpi/ic_server_muted.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_suppressed.png b/app/src/main/res/drawable-xhdpi/ic_suppressed.png
deleted file mode 100644
index ac5b1bb..0000000
--- a/app/src/main/res/drawable-xhdpi/ic_suppressed.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_talking_on.png b/app/src/main/res/drawable-xhdpi/ic_talking_on.png
deleted file mode 100644
index 2730632..0000000
--- a/app/src/main/res/drawable-xhdpi/ic_talking_on.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_deafened.png b/app/src/main/res/drawable-xxhdpi/ic_deafened.png
deleted file mode 100644
index f17ef45..0000000
--- a/app/src/main/res/drawable-xxhdpi/ic_deafened.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_muted.png b/app/src/main/res/drawable-xxhdpi/ic_muted.png
deleted file mode 100644
index 6c44eb6..0000000
--- a/app/src/main/res/drawable-xxhdpi/ic_muted.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_muted_local.png b/app/src/main/res/drawable-xxhdpi/ic_muted_local.png
deleted file mode 100644
index 07c7a8d..0000000
--- a/app/src/main/res/drawable-xxhdpi/ic_muted_local.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_server_deafened.png b/app/src/main/res/drawable-xxhdpi/ic_server_deafened.png
deleted file mode 100644
index 014725c..0000000
--- a/app/src/main/res/drawable-xxhdpi/ic_server_deafened.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_server_muted.png b/app/src/main/res/drawable-xxhdpi/ic_server_muted.png
deleted file mode 100644
index 2937682..0000000
--- a/app/src/main/res/drawable-xxhdpi/ic_server_muted.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_suppressed.png b/app/src/main/res/drawable-xxhdpi/ic_suppressed.png
deleted file mode 100644
index f264b88..0000000
--- a/app/src/main/res/drawable-xxhdpi/ic_suppressed.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_talking_on.png b/app/src/main/res/drawable-xxhdpi/ic_talking_on.png
deleted file mode 100644
index 585a737..0000000
--- a/app/src/main/res/drawable-xxhdpi/ic_talking_on.png
+++ /dev/null
Binary files differ