From af5c7cb7ca8aa7e20a0a12b1b1463c3f23b8f85c Mon Sep 17 00:00:00 2001 From: Alan Evans Date: Sat, 9 Nov 2019 07:45:53 -0500 Subject: [PATCH] Added dotted lines to time icons. --- res/drawable/ic_timer_00_12.xml | 9 +++++++ res/drawable/ic_timer_00_16.xml | 9 ------- res/drawable/ic_timer_05_12.xml | 9 +++++++ res/drawable/ic_timer_05_16.xml | 9 ------- res/drawable/ic_timer_10_12.xml | 9 +++++++ res/drawable/ic_timer_10_16.xml | 9 ------- res/drawable/ic_timer_15_12.xml | 9 +++++++ res/drawable/ic_timer_15_16.xml | 9 ------- res/drawable/ic_timer_20_12.xml | 9 +++++++ res/drawable/ic_timer_20_16.xml | 9 ------- res/drawable/ic_timer_25_12.xml | 9 +++++++ res/drawable/ic_timer_25_16.xml | 9 ------- res/drawable/ic_timer_30_12.xml | 9 +++++++ res/drawable/ic_timer_30_16.xml | 9 ------- res/drawable/ic_timer_35_12.xml | 9 +++++++ res/drawable/ic_timer_35_16.xml | 9 ------- res/drawable/ic_timer_40_12.xml | 9 +++++++ res/drawable/ic_timer_40_16.xml | 9 ------- res/drawable/ic_timer_45_12.xml | 9 +++++++ res/drawable/ic_timer_45_16.xml | 9 ------- res/drawable/ic_timer_50_12.xml | 9 +++++++ res/drawable/ic_timer_50_16.xml | 9 ------- res/drawable/ic_timer_55_12.xml | 9 +++++++ res/drawable/ic_timer_55_16.xml | 9 ------- res/drawable/ic_timer_60_12.xml | 9 +++++++ res/drawable/ic_timer_60_16.xml | 9 ------- .../components/ExpirationTimerView.java | 26 +++++++++---------- 27 files changed, 130 insertions(+), 130 deletions(-) create mode 100644 res/drawable/ic_timer_00_12.xml delete mode 100644 res/drawable/ic_timer_00_16.xml create mode 100644 res/drawable/ic_timer_05_12.xml delete mode 100644 res/drawable/ic_timer_05_16.xml create mode 100644 res/drawable/ic_timer_10_12.xml delete mode 100644 res/drawable/ic_timer_10_16.xml create mode 100644 res/drawable/ic_timer_15_12.xml delete mode 100644 res/drawable/ic_timer_15_16.xml create mode 100644 res/drawable/ic_timer_20_12.xml delete mode 100644 res/drawable/ic_timer_20_16.xml create mode 100644 res/drawable/ic_timer_25_12.xml delete mode 100644 res/drawable/ic_timer_25_16.xml create mode 100644 res/drawable/ic_timer_30_12.xml delete mode 100644 res/drawable/ic_timer_30_16.xml create mode 100644 res/drawable/ic_timer_35_12.xml delete mode 100644 res/drawable/ic_timer_35_16.xml create mode 100644 res/drawable/ic_timer_40_12.xml delete mode 100644 res/drawable/ic_timer_40_16.xml create mode 100644 res/drawable/ic_timer_45_12.xml delete mode 100644 res/drawable/ic_timer_45_16.xml create mode 100644 res/drawable/ic_timer_50_12.xml delete mode 100644 res/drawable/ic_timer_50_16.xml create mode 100644 res/drawable/ic_timer_55_12.xml delete mode 100644 res/drawable/ic_timer_55_16.xml create mode 100644 res/drawable/ic_timer_60_12.xml delete mode 100644 res/drawable/ic_timer_60_16.xml diff --git a/res/drawable/ic_timer_00_12.xml b/res/drawable/ic_timer_00_12.xml new file mode 100644 index 0000000000..de6d32d21f --- /dev/null +++ b/res/drawable/ic_timer_00_12.xml @@ -0,0 +1,9 @@ + + + diff --git a/res/drawable/ic_timer_00_16.xml b/res/drawable/ic_timer_00_16.xml deleted file mode 100644 index d2a85220f0..0000000000 --- a/res/drawable/ic_timer_00_16.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/res/drawable/ic_timer_05_12.xml b/res/drawable/ic_timer_05_12.xml new file mode 100644 index 0000000000..b401c124a0 --- /dev/null +++ b/res/drawable/ic_timer_05_12.xml @@ -0,0 +1,9 @@ + + + diff --git a/res/drawable/ic_timer_05_16.xml b/res/drawable/ic_timer_05_16.xml deleted file mode 100644 index df924cc202..0000000000 --- a/res/drawable/ic_timer_05_16.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/res/drawable/ic_timer_10_12.xml b/res/drawable/ic_timer_10_12.xml new file mode 100644 index 0000000000..83bfa77384 --- /dev/null +++ b/res/drawable/ic_timer_10_12.xml @@ -0,0 +1,9 @@ + + + diff --git a/res/drawable/ic_timer_10_16.xml b/res/drawable/ic_timer_10_16.xml deleted file mode 100644 index 546472307f..0000000000 --- a/res/drawable/ic_timer_10_16.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/res/drawable/ic_timer_15_12.xml b/res/drawable/ic_timer_15_12.xml new file mode 100644 index 0000000000..55b412926c --- /dev/null +++ b/res/drawable/ic_timer_15_12.xml @@ -0,0 +1,9 @@ + + + diff --git a/res/drawable/ic_timer_15_16.xml b/res/drawable/ic_timer_15_16.xml deleted file mode 100644 index 230e22b16e..0000000000 --- a/res/drawable/ic_timer_15_16.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/res/drawable/ic_timer_20_12.xml b/res/drawable/ic_timer_20_12.xml new file mode 100644 index 0000000000..9f985f5b27 --- /dev/null +++ b/res/drawable/ic_timer_20_12.xml @@ -0,0 +1,9 @@ + + + diff --git a/res/drawable/ic_timer_20_16.xml b/res/drawable/ic_timer_20_16.xml deleted file mode 100644 index 3a1f1f0713..0000000000 --- a/res/drawable/ic_timer_20_16.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/res/drawable/ic_timer_25_12.xml b/res/drawable/ic_timer_25_12.xml new file mode 100644 index 0000000000..7628fab791 --- /dev/null +++ b/res/drawable/ic_timer_25_12.xml @@ -0,0 +1,9 @@ + + + diff --git a/res/drawable/ic_timer_25_16.xml b/res/drawable/ic_timer_25_16.xml deleted file mode 100644 index 690c632574..0000000000 --- a/res/drawable/ic_timer_25_16.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/res/drawable/ic_timer_30_12.xml b/res/drawable/ic_timer_30_12.xml new file mode 100644 index 0000000000..13639f7f84 --- /dev/null +++ b/res/drawable/ic_timer_30_12.xml @@ -0,0 +1,9 @@ + + + diff --git a/res/drawable/ic_timer_30_16.xml b/res/drawable/ic_timer_30_16.xml deleted file mode 100644 index b3536a7023..0000000000 --- a/res/drawable/ic_timer_30_16.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/res/drawable/ic_timer_35_12.xml b/res/drawable/ic_timer_35_12.xml new file mode 100644 index 0000000000..ff02bad9b4 --- /dev/null +++ b/res/drawable/ic_timer_35_12.xml @@ -0,0 +1,9 @@ + + + diff --git a/res/drawable/ic_timer_35_16.xml b/res/drawable/ic_timer_35_16.xml deleted file mode 100644 index d5373b3eee..0000000000 --- a/res/drawable/ic_timer_35_16.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/res/drawable/ic_timer_40_12.xml b/res/drawable/ic_timer_40_12.xml new file mode 100644 index 0000000000..4cbcac258b --- /dev/null +++ b/res/drawable/ic_timer_40_12.xml @@ -0,0 +1,9 @@ + + + diff --git a/res/drawable/ic_timer_40_16.xml b/res/drawable/ic_timer_40_16.xml deleted file mode 100644 index bd85eb118c..0000000000 --- a/res/drawable/ic_timer_40_16.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/res/drawable/ic_timer_45_12.xml b/res/drawable/ic_timer_45_12.xml new file mode 100644 index 0000000000..9e868025a2 --- /dev/null +++ b/res/drawable/ic_timer_45_12.xml @@ -0,0 +1,9 @@ + + + diff --git a/res/drawable/ic_timer_45_16.xml b/res/drawable/ic_timer_45_16.xml deleted file mode 100644 index 9d56666c68..0000000000 --- a/res/drawable/ic_timer_45_16.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/res/drawable/ic_timer_50_12.xml b/res/drawable/ic_timer_50_12.xml new file mode 100644 index 0000000000..00bf75c4ec --- /dev/null +++ b/res/drawable/ic_timer_50_12.xml @@ -0,0 +1,9 @@ + + + diff --git a/res/drawable/ic_timer_50_16.xml b/res/drawable/ic_timer_50_16.xml deleted file mode 100644 index a671f312d0..0000000000 --- a/res/drawable/ic_timer_50_16.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/res/drawable/ic_timer_55_12.xml b/res/drawable/ic_timer_55_12.xml new file mode 100644 index 0000000000..bb66f6a4d1 --- /dev/null +++ b/res/drawable/ic_timer_55_12.xml @@ -0,0 +1,9 @@ + + + diff --git a/res/drawable/ic_timer_55_16.xml b/res/drawable/ic_timer_55_16.xml deleted file mode 100644 index 769754652b..0000000000 --- a/res/drawable/ic_timer_55_16.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/res/drawable/ic_timer_60_12.xml b/res/drawable/ic_timer_60_12.xml new file mode 100644 index 0000000000..57d3316994 --- /dev/null +++ b/res/drawable/ic_timer_60_12.xml @@ -0,0 +1,9 @@ + + + diff --git a/res/drawable/ic_timer_60_16.xml b/res/drawable/ic_timer_60_16.xml deleted file mode 100644 index 1a7da0ec8c..0000000000 --- a/res/drawable/ic_timer_60_16.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/src/org/thoughtcrime/securesms/components/ExpirationTimerView.java b/src/org/thoughtcrime/securesms/components/ExpirationTimerView.java index 33a0004339..052e772d1f 100644 --- a/src/org/thoughtcrime/securesms/components/ExpirationTimerView.java +++ b/src/org/thoughtcrime/securesms/components/ExpirationTimerView.java @@ -19,19 +19,19 @@ public class ExpirationTimerView extends androidx.appcompat.widget.AppCompatImag private boolean visible = false; private boolean stopped = true; - private final int[] frames = new int[]{ R.drawable.ic_timer_00_16, - R.drawable.ic_timer_05_16, - R.drawable.ic_timer_10_16, - R.drawable.ic_timer_15_16, - R.drawable.ic_timer_20_16, - R.drawable.ic_timer_25_16, - R.drawable.ic_timer_30_16, - R.drawable.ic_timer_35_16, - R.drawable.ic_timer_40_16, - R.drawable.ic_timer_45_16, - R.drawable.ic_timer_50_16, - R.drawable.ic_timer_55_16, - R.drawable.ic_timer_60_16 }; + private final int[] frames = new int[]{ R.drawable.ic_timer_00_12, + R.drawable.ic_timer_05_12, + R.drawable.ic_timer_10_12, + R.drawable.ic_timer_15_12, + R.drawable.ic_timer_20_12, + R.drawable.ic_timer_25_12, + R.drawable.ic_timer_30_12, + R.drawable.ic_timer_35_12, + R.drawable.ic_timer_40_12, + R.drawable.ic_timer_45_12, + R.drawable.ic_timer_50_12, + R.drawable.ic_timer_55_12, + R.drawable.ic_timer_60_12 }; public ExpirationTimerView(Context context) { super(context);