From 05f7f7aa89c4c9e1cdcfeb9b5b18e74522f03bc5 Mon Sep 17 00:00:00 2001 From: machiav3lli Date: Fri, 26 Jun 2020 20:17:25 +0200 Subject: [PATCH 01/12] Update: gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index c6cbe56..a80a5ff 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ *.iml .gradle +.idea /local.properties /.idea/workspace.xml /.idea/libraries From 52706ad34b1163f30d200f1d93994dfa35fda281 Mon Sep 17 00:00:00 2001 From: machiav3lli Date: Fri, 26 Jun 2020 20:18:28 +0200 Subject: [PATCH 02/12] Update: to Java 1.8 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 567ec58..1b25d26 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -24,8 +24,8 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 } } From 15f324f4842f9bca655c675bd7d677254673ca55 Mon Sep 17 00:00:00 2001 From: machiav3lli Date: Fri, 26 Jun 2020 20:19:05 +0200 Subject: [PATCH 03/12] Update: androidx-ify --- app/build.gradle | 14 +++++++------- gradle.properties | 4 +++- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 1b25d26..4cdf827 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -37,13 +37,13 @@ repositories { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.android.support:appcompat-v7:28.0.0' - implementation 'com.android.support:design:28.0.0' - implementation 'com.github.bumptech.glide:glide:4.9.0' - implementation 'com.android.support:support-v4:28.0.0' - implementation 'com.android.support:support-annotations:28.0.0' - implementation 'com.android.support:cardview-v7:28.0.0' - implementation 'com.android.support.constraint:constraint-layout:1.1.3' + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'com.google.android.material:material:1.1.0' + implementation 'com.github.bumptech.glide:glide:4.11.0' + implementation 'androidx.legacy:legacy-support-v4:1.0.0' + implementation 'androidx.annotation:annotation:1.1.0' + implementation 'androidx.cardview:cardview:1.0.0' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' implementation 'com.nex3z:flow-layout:1.0.0' implementation 'com.readystatesoftware.sqliteasset:sqliteassethelper:2.0.1' testImplementation 'junit:junit:4.12' diff --git a/gradle.properties b/gradle.properties index 1d3591c..915f0e6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,4 +15,6 @@ # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true \ No newline at end of file +# org.gradle.parallel=true +android.enableJetifier=true +android.useAndroidX=true \ No newline at end of file From c7bee54416493920063640e8c16aad36f15dd175 Mon Sep 17 00:00:00 2001 From: machiav3lli Date: Fri, 26 Jun 2020 20:28:33 +0200 Subject: [PATCH 04/12] Clean up all .png drawables --- .../main/res/drawable-hdpi/ic_add_black_48dp.png | Bin 114 -> 0 bytes .../main/res/drawable-hdpi/ic_add_white_24dp.png | Bin 127 -> 0 bytes .../res/drawable-hdpi/ic_delete_black_24dp.png | Bin 155 -> 0 bytes .../res/drawable-hdpi/ic_list_white_24dp.png | Bin 116 -> 0 bytes .../drawable-hdpi/ic_mode_edit_black_24dp.png | Bin 202 -> 0 bytes .../res/drawable-hdpi/ic_pause_white_24dp.png | Bin 105 -> 0 bytes .../drawable-hdpi/ic_play_arrow_white_24dp.png | Bin 195 -> 0 bytes .../ic_play_circle_filled_white_24dp.png | Bin 358 -> 0 bytes .../ic_play_circle_outline_black_48dp.png | Bin 1005 -> 0 bytes .../ic_play_circle_outline_white_24dp.png | Bin 500 -> 0 bytes .../res/drawable-hdpi/ic_replay_black_48dp.png | Bin 647 -> 0 bytes .../res/drawable-hdpi/ic_replay_white_24dp.png | Bin 391 -> 0 bytes .../res/drawable-hdpi/ic_settings_black_48dp.png | Bin 827 -> 0 bytes .../drawable-hdpi/ic_skip_next_black_48dp.png | Bin 284 -> 0 bytes .../drawable-hdpi/ic_skip_next_white_24dp.png | Bin 187 -> 0 bytes .../ic_skip_previous_black_48dp.png | Bin 295 -> 0 bytes .../ic_skip_previous_white_24dp.png | Bin 201 -> 0 bytes .../main/res/drawable-mdpi/ic_add_black_48dp.png | Bin 108 -> 0 bytes .../main/res/drawable-mdpi/ic_add_white_24dp.png | Bin 88 -> 0 bytes .../res/drawable-mdpi/ic_delete_black_24dp.png | Bin 111 -> 0 bytes .../res/drawable-mdpi/ic_list_white_24dp.png | Bin 86 -> 0 bytes .../drawable-mdpi/ic_mode_edit_black_24dp.png | Bin 160 -> 0 bytes .../res/drawable-mdpi/ic_pause_white_24dp.png | Bin 83 -> 0 bytes .../drawable-mdpi/ic_play_arrow_white_24dp.png | Bin 157 -> 0 bytes .../ic_play_circle_filled_white_24dp.png | Bin 255 -> 0 bytes .../ic_play_circle_outline_black_48dp.png | Bin 680 -> 0 bytes .../ic_play_circle_outline_white_24dp.png | Bin 351 -> 0 bytes .../res/drawable-mdpi/ic_replay_black_48dp.png | Bin 437 -> 0 bytes .../res/drawable-mdpi/ic_replay_white_24dp.png | Bin 244 -> 0 bytes .../res/drawable-mdpi/ic_settings_black_48dp.png | Bin 557 -> 0 bytes .../drawable-mdpi/ic_skip_next_black_48dp.png | Bin 225 -> 0 bytes .../drawable-mdpi/ic_skip_next_white_24dp.png | Bin 147 -> 0 bytes .../ic_skip_previous_black_48dp.png | Bin 233 -> 0 bytes .../ic_skip_previous_white_24dp.png | Bin 152 -> 0 bytes .../res/drawable-xhdpi/ic_add_black_48dp.png | Bin 119 -> 0 bytes .../res/drawable-xhdpi/ic_add_white_24dp.png | Bin 97 -> 0 bytes .../res/drawable-xhdpi/ic_delete_black_24dp.png | Bin 148 -> 0 bytes .../res/drawable-xhdpi/ic_list_white_24dp.png | Bin 95 -> 0 bytes .../drawable-xhdpi/ic_mode_edit_black_24dp.png | Bin 222 -> 0 bytes .../res/drawable-xhdpi/ic_pause_white_24dp.png | Bin 90 -> 0 bytes .../drawable-xhdpi/ic_play_arrow_white_24dp.png | Bin 220 -> 0 bytes .../ic_play_circle_filled_white_24dp.png | Bin 464 -> 0 bytes .../ic_play_circle_outline_black_48dp.png | Bin 1339 -> 0 bytes .../ic_play_circle_outline_white_24dp.png | Bin 699 -> 0 bytes .../res/drawable-xhdpi/ic_replay_black_48dp.png | Bin 866 -> 0 bytes .../res/drawable-xhdpi/ic_replay_white_24dp.png | Bin 457 -> 0 bytes .../drawable-xhdpi/ic_settings_black_48dp.png | Bin 1073 -> 0 bytes .../drawable-xhdpi/ic_skip_next_black_48dp.png | Bin 340 -> 0 bytes .../drawable-xhdpi/ic_skip_next_white_24dp.png | Bin 222 -> 0 bytes .../ic_skip_previous_black_48dp.png | Bin 354 -> 0 bytes .../ic_skip_previous_white_24dp.png | Bin 242 -> 0 bytes .../res/drawable-xxhdpi/ic_add_black_48dp.png | Bin 130 -> 0 bytes .../res/drawable-xxhdpi/ic_add_white_24dp.png | Bin 97 -> 0 bytes .../res/drawable-xxhdpi/ic_delete_black_24dp.png | Bin 191 -> 0 bytes .../res/drawable-xxhdpi/ic_list_white_24dp.png | Bin 94 -> 0 bytes .../drawable-xxhdpi/ic_mode_edit_black_24dp.png | Bin 269 -> 0 bytes .../res/drawable-xxhdpi/ic_pause_white_24dp.png | Bin 92 -> 0 bytes .../drawable-xxhdpi/ic_play_arrow_white_24dp.png | Bin 283 -> 0 bytes .../ic_play_circle_filled_white_24dp.png | Bin 666 -> 0 bytes .../ic_play_circle_outline_black_48dp.png | Bin 2032 -> 0 bytes .../ic_play_circle_outline_white_24dp.png | Bin 1023 -> 0 bytes .../res/drawable-xxhdpi/ic_replay_black_48dp.png | Bin 1298 -> 0 bytes .../res/drawable-xxhdpi/ic_replay_white_24dp.png | Bin 675 -> 0 bytes .../drawable-xxhdpi/ic_settings_black_48dp.png | Bin 1591 -> 0 bytes .../drawable-xxhdpi/ic_skip_next_black_48dp.png | Bin 437 -> 0 bytes .../drawable-xxhdpi/ic_skip_next_white_24dp.png | Bin 292 -> 0 bytes .../ic_skip_previous_black_48dp.png | Bin 441 -> 0 bytes .../ic_skip_previous_white_24dp.png | Bin 309 -> 0 bytes .../res/drawable-xxxhdpi/ic_add_black_48dp.png | Bin 133 -> 0 bytes .../res/drawable-xxxhdpi/ic_add_white_24dp.png | Bin 102 -> 0 bytes .../drawable-xxxhdpi/ic_delete_black_24dp.png | Bin 237 -> 0 bytes .../res/drawable-xxxhdpi/ic_list_white_24dp.png | Bin 100 -> 0 bytes .../drawable-xxxhdpi/ic_mode_edit_black_24dp.png | Bin 319 -> 0 bytes .../res/drawable-xxxhdpi/ic_pause_white_24dp.png | Bin 94 -> 0 bytes .../ic_play_arrow_white_24dp.png | Bin 343 -> 0 bytes .../ic_play_circle_filled_white_24dp.png | Bin 883 -> 0 bytes .../ic_play_circle_outline_black_48dp.png | Bin 2699 -> 0 bytes .../ic_play_circle_outline_white_24dp.png | Bin 1379 -> 0 bytes .../drawable-xxxhdpi/ic_replay_black_48dp.png | Bin 1736 -> 0 bytes .../drawable-xxxhdpi/ic_replay_white_24dp.png | Bin 908 -> 0 bytes .../drawable-xxxhdpi/ic_settings_black_48dp.png | Bin 2130 -> 0 bytes .../drawable-xxxhdpi/ic_skip_next_black_48dp.png | Bin 563 -> 0 bytes .../drawable-xxxhdpi/ic_skip_next_white_24dp.png | Bin 357 -> 0 bytes .../ic_skip_previous_black_48dp.png | Bin 564 -> 0 bytes .../ic_skip_previous_white_24dp.png | Bin 372 -> 0 bytes 85 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 app/src/main/res/drawable-hdpi/ic_add_black_48dp.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_add_white_24dp.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_delete_black_24dp.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_list_white_24dp.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_mode_edit_black_24dp.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_pause_white_24dp.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_play_arrow_white_24dp.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_play_circle_filled_white_24dp.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_play_circle_outline_black_48dp.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_play_circle_outline_white_24dp.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_replay_black_48dp.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_replay_white_24dp.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_settings_black_48dp.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_skip_next_black_48dp.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_skip_next_white_24dp.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_skip_previous_black_48dp.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_skip_previous_white_24dp.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_add_black_48dp.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_add_white_24dp.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_delete_black_24dp.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_list_white_24dp.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_mode_edit_black_24dp.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_pause_white_24dp.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_play_arrow_white_24dp.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_play_circle_filled_white_24dp.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_play_circle_outline_black_48dp.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_play_circle_outline_white_24dp.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_replay_black_48dp.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_replay_white_24dp.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_settings_black_48dp.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_skip_next_black_48dp.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_skip_next_white_24dp.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_skip_previous_black_48dp.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_skip_previous_white_24dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_add_black_48dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_add_white_24dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_delete_black_24dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_list_white_24dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_mode_edit_black_24dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_pause_white_24dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_play_arrow_white_24dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_play_circle_filled_white_24dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_play_circle_outline_black_48dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_play_circle_outline_white_24dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_replay_black_48dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_replay_white_24dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_settings_black_48dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_skip_next_black_48dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_skip_next_white_24dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_skip_previous_black_48dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_skip_previous_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_add_black_48dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_delete_black_24dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_list_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_mode_edit_black_24dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_pause_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_play_arrow_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_play_circle_filled_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_play_circle_outline_black_48dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_play_circle_outline_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_replay_black_48dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_replay_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_settings_black_48dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_skip_next_black_48dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_skip_next_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_skip_previous_black_48dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_skip_previous_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_add_black_48dp.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_add_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_delete_black_24dp.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_list_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_mode_edit_black_24dp.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_pause_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_play_circle_filled_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_play_circle_outline_black_48dp.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_play_circle_outline_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_replay_black_48dp.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_replay_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_settings_black_48dp.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_skip_next_black_48dp.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_skip_next_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_skip_previous_black_48dp.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_skip_previous_white_24dp.png diff --git a/app/src/main/res/drawable-hdpi/ic_add_black_48dp.png b/app/src/main/res/drawable-hdpi/ic_add_black_48dp.png deleted file mode 100644 index a84106b01fd4402e5d15b08c496a75b76e811999..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 114 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xf3?%cF6p=fS?83{ F1OO~S9V-9; diff --git a/app/src/main/res/drawable-hdpi/ic_add_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_add_white_24dp.png deleted file mode 100644 index 694179bd46b685e55da1b4dde2575bde0b2bfd64..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 127 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K;o2QFoh{y5d1PRu~4CX)Hf7s8+ zA**4&;-Ni|k0wldT1B8K8lBbJfNCo5DGaETu4Mf}?2B)#l zb-AONd&)YjO`v_^^{gD%3xA&6WO--#_jr6|V@s@Giq9W;kX&`+h3Nr=!>9&BGH7*ROEODjfLq?tE}C&^887S3j3^P6|k0wldT1B8K;wWo_?h{y5d1PRu~2@%cz`Tk2c zTwv_<E5juBY?z2sqDoGA^{8xbs2ogzZvA71C3$u MboFyt=akR{08!Q;k^lez diff --git a/app/src/main/res/drawable-hdpi/ic_mode_edit_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_mode_edit_black_24dp.png deleted file mode 100644 index e531d72a5b717f4eeccbea70fa4bd8f53cc117fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 202 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8LpL{AsTkP61P7i_r>If%GEZ1z2K zZqg3>wYjYh2jpF1B6Lz%|k+Hiq>)?FnR#(|jB< zXJfC_Gl$@rr~a@ucR3zikQ89JLL!7mzGu%Z=7meuW_4=1G65aO;OXk;vd$@?2>`qC BP#^#R diff --git a/app/src/main/res/drawable-hdpi/ic_pause_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_pause_white_24dp.png deleted file mode 100644 index 4d2ea05c462291e4a4f8bd30856a25ad33fd420f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 105 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K;fv1aOh{y5d1PRu~43dBH9UPL5 z6iT|k0wldT1B8K8m#2$kh{y4_Q_k`_IEb*R=ADxY zV6uJDq_v_+Z-tYfR|K!cZcn#wZ_1w*Zwfx3^1JLFH&cH)|4gqfmxMH3rgg?BZ~AgX zO7P4Ssfnoy7dsLbs)cmuJnq)8IA+UruCTi)d!Bot@+%Rg#TB=_7E65dSjDj^h($AU t;!LNFTjoCMkvN)I{QpIN|NiIvIZ;mvueQI+xBzq&gQu&X%Q~loCIB@QN?HH_ diff --git a/app/src/main/res/drawable-hdpi/ic_play_circle_filled_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_play_circle_filled_white_24dp.png deleted file mode 100644 index f8c7bc9f80c56f38fb6d26a5124e84b8c6c65840..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 358 zcmV-s0h#`ZP) zv1-Cl6oxNG9SRbBjrL6x9UKB~eGn1x2@FPX>{x_8hU5wQ3Xy0PJdxJ~q z_iq_K_!G`KG5-+yOv%WxTyL@DY?;u*$dMlpS#w6BVnysLnq$!@NFIwK_V|zyX`+ZP zd^r#`i}r-DYZA=~C6Po!ETI&{_o6itALuOWqCRIN4DbBVOhwNXO_4DeUiqe(u`9|H zk>N$Dn7X1|6&a=C(G^);q*N?j(Nz~I6)(>hc~^VWt3CN;Z(D!+iZPr<2l1p@Pfbv{pl^PO}DlaJVIs5J_9-K-!D zDKo<kPg37sq>DnH}sLSQNTB&8>?yoYe2kI-7=&iVqYljys`bGHkIsN5vVzkH9?6rwUn zQ+k8G#v_U#EYO98&yHT7G?CZ;Qi{;DA>nW1=x*pM962Ig(?=+tQ$u1LT}B_fTqV+~ zzAS)SLuz#PQ{Wj9JbiWNl&K-h=+3IAK5&Fk1%3SjTSJD?bx=}IT_n_`D!XTI$S}J5 z>WK+LEvm9HdqalN6;=H_q1IJd!QPNzbi=B8jZoXFtk2$%VRZefa*I%9Rn}{7$S}IB zsw)vnZ~BzIA;aj>s;YXB4UNWYDA|#1#2H!gi+Vo(qE2$#kH*;ciGML}7{3_j+>VYV znlp|{d7z#cC)6cX_Lin1MrAo%zadnY-uRq0Hnfra^#fk0(pj1@jY`qKIIXxZwq3&& zb`*C$74<1sh?J+UimwyNGAd9h~Ei+NpY2 z9x6$rNkC%%rVZ_d`4Sa b+b8Nj_5ab?X<5&;!mC$>Ye$wegmi*brfqwcnvpH7s!&HEKMb|Y zp}G?Qw|2~#(bP0!&aOUyp1M4w?gyZ6RZWParegrOP|rgrfK%^FS7-_`NGPr&7rQoNJ z38?N4EXGg|>kF7Cgn!D`@7SM8yg4@^{du zJXF2fO-Z$ihyAtMVIP6r1Qb<@vJVbpXbJR_7xE@^AqQX~hMGp8BSeWRMOg=h@fZrW zz`$gsAMFPZU_%f?T87}P(i*u0kET+KtqnLZR>E`vE4fwM1Du-@vZXEoUHRqj0&s6l zJ@KX1JpjI|{rNdM25@K3yjc?_%$m1v0HCW@{y?@3k)KB^RiEsZO(Ur(Y^2XG$faRX q*OezPUOc&SXu){NpNQ)Dcc9H z!Y^TG(J!vfX!u3`2BNZWp$)o1-*Kt%8^tX8Tq;>;rO%Ymt%YGjUI}#=A#`HAD5Vt) zaIA#N7@(kpDi|QAgsK=|SP9iIKtc(%=$kKH4O$R-Rm+nELE7Idds54%Eqv4$YWbRl z-~Lc7KOzWD{2h#|YWXw%iSbMAxJ=(<5S4j+;ksPYc;HTLaf)Bg)owR36LUf#FZD0DUf5B1PRjQC~%_hEcJBO37AFR5s!Ief#6|+2TwZp zjPp&z*`eO&KzN%WzLin-Y4kY7-y_37NKxXJ4$?hzxM7nd17?I3%2cRQqeY7vRVtKO hCQVR8L_|bH`~}oaFRkf%3C92c002ovPDHLkV1nyUC&B;# diff --git a/app/src/main/res/drawable-hdpi/ic_replay_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_replay_white_24dp.png deleted file mode 100644 index 5ef425a17081a52d92e540c1f774617b3c85e4a3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 391 zcmV;20eJq2P)fyTno#awEM#RSB_%5p3%Lj69yGEsC1iyimWGdo zGlOzwn0K=B?9Tf>eb0N&`#iry;_sxtK^WH!!q6a0FsO_P1btwFK%X&KGAE@a6jRod zT|I?eWh8;!=MLmJnZ{9OF(i9j-Q(nPra7C-mq-NO6`l)3`+5aN6;C5qBD@H2^s^1c*D+nvuc8JU_0J0 z32v+RTZelv9&bsy0lBK6b#PTR+0x+ERIFn<>e@{8uWxb;o-KU4zZkXupmx}L6r-tg zWaP_EDtZa$x_^?}K84COytFSXYu{C6?L_ZSE6`@s%eOPTWJBxk`ZQ=KN_trj@&@WF lXVQqYjEuBl$;7{c^aj8h;`WV_+Q$F@002ovPDHLkV1l8Dub}_{ diff --git a/app/src/main/res/drawable-hdpi/ic_settings_black_48dp.png b/app/src/main/res/drawable-hdpi/ic_settings_black_48dp.png deleted file mode 100644 index 3023ff8daa925ac79e863caf679d03c56c3afc93..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 827 zcmV-B1H}A^P)>`06 zl!7Kix5q+Fq6=w?Bq2zRX%{Q=l9q~JFAfaD-fMk(ql{OMJp*hZ8Le@FKzb36b`fRvPbJZ#ihbmi`-huQ`v`H+dnnz5 zIO;AGB7BE9YM!%LJ&ic*2`mcPKpgfvmoR!03D^-c43Z$hAhR4H0ecmL8#qMtu}v3c zWQvny2hqm?F??uNd0r4z>Rub{-SwiV_KcJlc$@G(Y7OnY{oYXaZ@4M{dXjJ$v z`$eh=sKvO?Cei3I?)A;6Md`CXq2t(8SWgZw6G7n$pCQ&JiDGgU(}=YRim_lq5{{Tt>$z%L(Sw8>(002ovPDHLk FV1g%Ge~AD9 diff --git a/app/src/main/res/drawable-hdpi/ic_skip_next_black_48dp.png b/app/src/main/res/drawable-hdpi/ic_skip_next_black_48dp.png deleted file mode 100644 index 16e8a4000d1bedf2e7b2ce8fd06bef4beaae4b4d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw9(%ethEy=Vow1RZu~5RjexgQ* z)zWFR{)ug9MJ>sMlGb zq+9e?52uZ@kEtxY;q5&oKqsqR$ZIPz$I@GjEkSP?oK}`GEDW)pa$%-QNcPcRf&L!n z>)flpP3`*c(f+tfb*_A`*%IcpS9(eg$$gsme!t_+5TJ6chJYzv9ANtBuY}g0OVWEl cjyuEtn|VQ@%-j#xfZk>BboFyt=akR{0EVS@xBvhE diff --git a/app/src/main/res/drawable-hdpi/ic_skip_next_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_skip_next_white_24dp.png deleted file mode 100644 index 044b6b079364403c8f2a7d3cb79b15df8d564e8d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 187 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8lc$Sgh{y4_R~GUfa*$|yIEyPJ zHe6#@h1d%v15OHpWS3VONUILmHM(|d)q z-#kZdN6u|{kT<(ALdICY=N8YA(-RsWWKC|YxUqDB9b>FeIJfOL-H(5}ozq-)9l0=1 m$ocn~H50ESX-}=Y&hhEy=Vy|K}dHISk8VSQQJ zWM4DkNnIy38@N`$kjVlD!<8RWl^P|BS=1-SFg6L#d2jaN{GRXM?$rKiUIheNwbuK$ z7R?taIic;vIcw)L;iW8ZKeYsSU9fzwp_Q1-l$~8B0@uMGaMgGr`SRd;l5Vw1c!uq@O dLqVXH@%_sMeJq+y?}0vN@O1TaS?83{1ORJ?eS`o2 diff --git a/app/src/main/res/drawable-hdpi/ic_skip_previous_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_skip_previous_white_24dp.png deleted file mode 100644 index 23faeeb0264f26fee6a64ad9af46cece572394d1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8Lp1Wy;okP61PlNSm)849o_?>l%T zkXgz`grV0#Ie;;QLG%LKto;2;7-cqhs2lqnv2NTEE56Zq`jb=hC#!UPx_oM_t*%L# zleAiaGqbwggElc6fv^_`r0-mqV||G0ZAGK>tU||#g`&zXEz@iS85hr0b}Gt_EBo{L z^xpr9&fzY6GRo7!*3JAgVNFc6;$fatjYIm}3)5$rX*=ry-NxYQ>gTe~DWM4fws}NQ diff --git a/app/src/main/res/drawable-mdpi/ic_add_black_48dp.png b/app/src/main/res/drawable-mdpi/ic_add_black_48dp.png deleted file mode 100644 index 3191d5283e981b9eecdcaa54feda419515ef656f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 108 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}tV^0^ykP61P7Z(aL7zi*O{Br+` z`;vw;dk$=HXVkVR^_;bx1E`8&^BsGK4=F%~hW8~_)0*>!J6N0?fLsPoS3j3^P6_&aj!VDzSo@fq7N>%r!;1bAd`3JYD@<);T3K0RTZ}7R&$u diff --git a/app/src/main/res/drawable-mdpi/ic_delete_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_delete_black_24dp.png deleted file mode 100644 index 999aa4ccc3f87967d30bed76cd980653d9ad2e95..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 111 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1Gfx-CkP60R2`-1mhm42oHEI~1 zJY@V|=xk&fz~^CFA98pF+nfiYVNdl7vOlC(bh_?*uW)yDOtOuIF;OXk; Jvd$@?2>??mBq{&^ diff --git a/app/src/main/res/drawable-mdpi/ic_list_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_list_white_24dp.png deleted file mode 100644 index 15d8fc2bb488d6654651ec05f3ecba1fb7163394..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 86 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1Sx*gTe~DWM4fOr#gq diff --git a/app/src/main/res/drawable-mdpi/ic_mode_edit_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_mode_edit_black_24dp.png deleted file mode 100644 index 9efbaae2884ce2b15d160cbc1b1d3aa806545068..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 160 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+ibWaz@kP61D=hpHz7>Kw&+${6o zc#5UgjfG8?g)9b3IOaK+ZePjZ_qKfYae3(oPRl=yvsP5SM2GG$rsh6 zMNd}k{yVQ?;_V}i=US6@3GLf|`nFNrWWDK=Pgj0m)0|tso;$cJM>=9x638tKp00i_ I>zopr03PT%=>Px# diff --git a/app/src/main/res/drawable-mdpi/ic_pause_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_pause_white_24dp.png deleted file mode 100644 index 2272d478c38ddb2a4b3c592b2eadee8d4e296432..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 83 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1DNh&25R22v2@)?K*o!=P)So4B g)u6(pM}&c4fy8~qgOCMtu*=z2v@^=eS1UZ1g)78&qol`;+ E0Fs_H=>Px# diff --git a/app/src/main/res/drawable-mdpi/ic_play_circle_filled_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_play_circle_filled_white_24dp.png deleted file mode 100644 index 9681bf5a5ec96da881f1d74e32bc0a33337be9ec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 255 zcmVk$HD;~t$S=!+dM^Y4w`a(JmQ1r_Tu?R;EyWb3-v3h_rb-vx5Y^;8Dbt^ zQ}Ho=u+BTJ?2Yr5Bo;JA_qo!LvEf2ZOH0L>buj8*cmczFVu{wv1nvL;002ovPDHLk FV1lb#Y}x<- diff --git a/app/src/main/res/drawable-mdpi/ic_play_circle_outline_black_48dp.png b/app/src/main/res/drawable-mdpi/ic_play_circle_outline_black_48dp.png deleted file mode 100644 index a9e0143b746ffcf81ac90ccf1afefd969fd0e812..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 680 zcmV;Z0$2TsP)Y`Z0kQZn%`T*LxwMf90cBR;Wna7T(s7TKmwldCA2)Y)c%LX^2N zk67Ucp&?Fq#Rwe}u+9~sBidBR(gDx-N$43(rb$E(@2(a2%?5Mi$yR5fHZ_p84Xm~AuvmRoIHD-GGt|}~{WrQoUgIa6!pUW1*7^o=8C1WJziTpBG zF_M*aJ0M3A?sKS4o-%}mX_=N?atX@U z{U^HdU;t?m#Xdy_4Qo|G4W=sJk0)uwD7D>Nlqe9;7ezpU5>?dJiaFgRVwy8T&p2g@ z4#==Z+gZHDDnoS4LzX!<7C&N%VQx%{3CdKd(V!hggBn%l$|qLombF&&Q9`7)#zlLCG~Ik{q8abKL@WQ@ z9L||J=l}mnk{y>++gN5}BQw&H{zbp=AzusU<>Wn&;6=xQs;Wa>6VSI;6g*<-CWlsZ ztk5r-Vd=Q^?S>W3wxfO!Zg-TEbTL;AKpQU+;nQ`_*aVjW7^4#r;MsnJ++rAx84hv+ z-hwqXya&RD$YJt3gI{Y>tp6jpDi>rpEC^mBOLfcwVT5i@@U#{B4uf!PVWJYX^(xoa zDVp)%7I9+>gXeA4=wY8an=2q05)Hi4Z3@Fs$ZxED}&gP}3ipiOF$;?aR< zwdpUvl<=)V%1zF)bCe7YwzaHvMJwCd zBoA%(KRLFo1M(0#$5f_ri-#*OvMf5>B;b^LD*Li3ia0Q}?K`)20{+<(6P&0^RA;!b zkcifBWQ4KxlUw}8rKQf`lLnzT@%#wtZl!PT? fIu!X5o;>*kv!`kZsnY~t00000NkvXXu0mjf_W#G= diff --git a/app/src/main/res/drawable-mdpi/ic_replay_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_replay_white_24dp.png deleted file mode 100644 index 5a79970a98b6bd85fcc354a541125bb9b6b54f23..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 244 zcmV?Vq?j@7sSH+=vGVcrbMdJhNy0000Nkla9V}f0{{|82kXi@9MRd@?$weK4A^ju7 zLRBcZi6~YV4Y?x0YCBk^ee93}@A5qN9`;=V`Fy9md5-r894+Q7Vwa zKGHbsTJ3CbB>k$}G!3du63TIxO+;yvI}8$@RV#hZwGsJa1 zG(UeLOQIW*%YP$A_S8JsifkZzY=a`Er-+B1U^vMR;-MW*pvdqV@zg66vq)lJDKSEJ zw`0sxb4<_B;v8FuS(#q`)kg&}+hPL6xOrb?GQ?%fExvFHL!Kq|$LU4WPhFXQ&M?@z zxR1mtVOeOIy~lo>;tz)rETgf>fK;}TNLegBvB^KiQ=u3Ot|-Y( z2Uu+mzU3;1m}L#YE?|a1uJMlWb*&qR^Q=+kG@*msHr|$gaEk##XL&}z6#u1a9Hidf vu2=2VHre2#z3N8+Q5wRd6(rV6I@-ivWBUX&LwAlh00000NkvXXu0mjfs0IG% diff --git a/app/src/main/res/drawable-mdpi/ic_skip_next_black_48dp.png b/app/src/main/res/drawable-mdpi/ic_skip_next_black_48dp.png deleted file mode 100644 index 97a05c3ae613aae8f92f0a18d054a0c09a2a2731..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 225 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0D6`n4RAr*{or)@lWh(Uy{UtTBZ zX5_7`xA%89NLw`eEs%b}w5w701%p*XX_W5UoJ%Y!pAIl?u`v1Yj?Kd3(Ce54VfR#Tqwz*{VY$x=7KTv!`@D5j_o383OYZ{nG?@WvNsl( z_hNSAhjUx5HZK0zktO!bTTgQ4{FiNuwk}V~m)qSn)7pZ$*eLv2N?glD^SbDL{*zQr Z3jcD_x?347v=HcK22WQ%mvv4FO#o`>SX=-A diff --git a/app/src/main/res/drawable-mdpi/ic_skip_next_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_skip_next_white_24dp.png deleted file mode 100644 index f9c60b74031d904074118d4318e0f39d7cadcb0b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+iC{Gv15R21qFKrZb2oPWi=!{s# zx+;Kw>V*!j3}=3kkItV(5?E&6{*V?|P#qpxe<;Fqz2rW|>59yE#7dbSTu5(7I>qqj v7EcbR#<852dMiu)vTQdWUb_C{b7lVXzZOMJ4EwSfXbXd|{!oJ0ZH_#wW*h2O6}U)*YB6 zUc@H$j^WGP{Td-TbNXf6?(AjEu&`iGbW7*`(H|ROd46ks0h6iq^OUyE;xEppJDZkH axy0Wuq4jaQc)S$Q?F^o-elF{r5}E+-a#&yh diff --git a/app/src/main/res/drawable-mdpi/ic_skip_previous_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_skip_previous_white_24dp.png deleted file mode 100644 index dac36407a0f73f1b53d8ab094fbf9d927670ad4b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 152 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+icuyC{kP60R1<{_S{|W~h*na-k zcYe0mD=BNk|NjDNZV}9{|M&f`PfTht&G=)_{YYrF;_LtB3bQ?Ulm2gSkl1pWp>3vt z`o$xcI}&o$%_0OZ^c5UQRO?-uA;oc6a6Kb~NaSaQid|R#1Fd54boFyt=akR{0MV&8 A?*IS* diff --git a/app/src/main/res/drawable-xhdpi/ic_add_black_48dp.png b/app/src/main/res/drawable-xhdpi/ic_add_black_48dp.png deleted file mode 100644 index 3cb10924a0912d9f64d338b9769da053bc051da6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 119 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeK3?y%aJ*@^(YymzYu0R?HmZtAK52P4Ng8YIR z9G=}s19Id&T^vIy7?T^C0uTIeOgX2~{@-4rW`SaRO?zLF8zVzTLHf)E76O$Z{hqFV JF6*2UngE2qAnO1C diff --git a/app/src/main/res/drawable-xhdpi/ic_add_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_add_white_24dp.png deleted file mode 100644 index 67bb598e52a36b6caba846efe733501479965a41..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 97 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZA`BpB)|k7xlYrjj7PUCQj>eo}T~gdcQ3PU;8~!-+H4~OaKZjoIg)3i005} qiMH7Fyj-Y9Kzr+B%hn@D&gi|3kyH5eQnCbS4TGnvpUXO@geCyhvNFd2 diff --git a/app/src/main/res/drawable-xhdpi/ic_list_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_list_white_24dp.png deleted file mode 100644 index 2b7253975cc58f5814084bab87ca50729cbfa262..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 95 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZA`BpB)|k7xlYrjj7PU64_{qyg@{QSjgwU#qa z4m4P{;Lhvwjx;vjkO;gju?@H-u^UM2HOE<{iHGL)J?kWK5`Arw=$J_OB+)UI@Pi2f z-xB$l*f{u@(DEU%bn=GVhgbaVcl>4C{Ji+@`PrCx+&peR4_q}oZXP#}o5#%~;0>$Q Y-lS`>2u|CQasU7T07*qoM6N<$f(W@`r~m)} diff --git a/app/src/main/res/drawable-xhdpi/ic_pause_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_pause_white_24dp.png deleted file mode 100644 index f49aed757118a941b567629ec217cde1aaf257e8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 90 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZA`BpB)|k7xlYrjj7PUzopr0AgTe~DWM4fm)lPg diff --git a/app/src/main/res/drawable-xhdpi/ic_play_circle_filled_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_play_circle_filled_white_24dp.png deleted file mode 100644 index 5dcdf0d7a4b7daca244384a566c3a36ddf563b71..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 464 zcmV;>0WbcEP)8qwL)}Di@L#=vc2@L4ggOYl3qLMETUUz&Y@xg0B7)Z;_5v!psA;D{ljZ5) zc#?BoPeMz<=Us&de(}5?&XfNETsn+db08ohBH+N95p7%?Q<;9yV8)pwPJEzlFQ~F4 z!bFHq#YWKQ2T}rhj|mEV;Zb}%si4RX8@3cBf&x2i+2WZ6pGkvn67)&SJDs4)PttOu zoGe(91&bs>L;I}W^9vavFY$sIIvn2c4H?rofy)^k_ZRXN2}g3Opo1RgUc#tas$eV= z2%{RRg0)N_jB2F{4l;o-s=X=*WCCGSS5*+n1j4AozbLSe=q>Vyvj52c;BPuYixQ2V zfhuTc+A5l=z~z)#v-=*`>>NI#;~tHSN&GyhXEbnrQ%f3|K3OnNp2-yg(sH4sTU&ah zrE6NeeA4jAyxDndv1LPEw*1;DHoTIq?;gHIIQhp8kRCUrT9hOk$WB22A84i7{daE4tCRGqG{gs-a#()X<>yAMipz#cSeLqdTLb(l#|( zf?F4O+Za-sE;XSoA_lL)3m0jum3h19%HPXm&N=Tn1B>}Q>o+;CJm)v(90^fDK|w)5 z!940YLEkX}I7B^F%t$3PaESrLL;7iFD@kUEBI@blZ^UON=wv-b zOsi5_c!C%*NHZy>MUtbuL+s%VZ6wIECY~W7W{5`eW)XLg2-3|$@?baPNJJT>iAcry z$wL`BX=5|XsU}X07;&mu!4?kF$rx``EWPmRS*)m=tQ|2vgqzIyvql_R^<~enQXmOUypX3~Ku_)&PnJg=$ z2}yO9^8Cdr!myf0S&CGN9q}x;?$0C%ON#4=4!sm(_T!Y*X(nt3rmWIsjCLa`|Ik1b zw(}8D*@?j-#`Wd%Em7I1S73}90=uKjLjzITp^HQ}0W~2i%|z`WqS8nJNuKGGhkW=& zKVOl+wUV1n;8Q7YRr^=r#SbK~`bymiuPMQo7R1Rpyb&I<6svZ`$v%9D zsfUNR%*7i)nBaSCD%7*;V~X&s9&yr!SMq<%RXTwUlrqcL8&i%GBTB8XlFX z&s3+t_X74RopG+>JqbK%P%n$=01Mcwv;=Xo2~RFLWB0+ZfTc>k$Y(i^7wTtZuVDd8 zmGoi$2Oi8roTLp4*s8P?aZ=&`2ps~$0@fo09e!>h3 zn5%TmnQkYid(Oya!vfYS=_CC%IrTXs%MA&Z&`3BF57<7h5 zD90OnbpWauQ~z&23m=*hCl~OpOhN%2OVMXT|^TpfTlh?8NG_|%3tc|?kQ zC{qO%TJSBw5aQ%I`Ot+pc|x238WEKPMC}NovW8G5Kq@6@*bvP(~1QILR0?WuCHx zkfnKyWL@G6U*bm{XR}_s&`%8!sB&*-C%v?=lw6k4>b&c^>7ks66mtd1kr#Avj0RRR zp9C>tB$>}j8aU1kUgn%X&uk*KlQATsjL=9P)X0od5ze^ zFfGKH7A5TCF=EI7dq^^^idf4v-XlIU&Q-o<7BfVGO`PXX#6$Wx#|GleNR_Okm3D6P xkXKCbiBC-Miih0dA}y??g3uHc6ciK`{0F;pyd4Fm&FTOE002ovPDHLkV1j=EXw?7! diff --git a/app/src/main/res/drawable-xhdpi/ic_play_circle_outline_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_play_circle_outline_white_24dp.png deleted file mode 100644 index 615b80d08543f8285c7ac5ffd66435bf0da1b7ff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 699 zcmV;s0!00ZP)9ER~}Ocb>nNr>2151>$#LL?rDP#4l7hMYi)F$bWnTZ;s2>AO;FAR7@pi(*JO z#wdzz)U=@XHOb~`;O1G)$1@Y!MZw>_4PNj!84~BgzknDs6sb_7NvFFeH7YEVC5B_0 z?FAF8ae<$6-ZS2NAk8KnY}%Aa^%9up2Vpgtixx=m8Ic>dSR_M|{_av_$g#~WA|>Ks z14Ha%z#$6^;{Ccs>KL%cP?$i1eT@HkOB^R)36{7AlOS#ne8Q;n0>?fkX<(FWfq9H? zq;W!Slmm=cL4hCF$h139M7D5( z0+v(lAO&}zf-D9HET_sNWp|*4WP$^hQ)Q8=JJ3Xu!2!#u(#VxN&_Vix1C~<_AniXD zcpW~_L{gyxwP+`b`cM86^`Bfpa`u2u6ZLJnjBHy2I*s?fB1`T-7P<9)6j)B9J?0L{ zcs=aSgFefy(*zyp)azmA@Byil@CpQ+M(gJoS;6rNjMD*gLDzy#qZN@BPuu~mgxoWU z6LBwTA?rAPffP-o!6;6Ijd6lpGU6T3<}eN-B*v&>%-X(ql`tAig*?s)#z!1mAkH4f zJp~e$cTSNO#x8x~zWgd7N8}jx`B>#S28>+>!+w2_Q$pmH9r9#JGtga{EP2Y@Vdyx0 z(SCr;aZOm4%=YpVD#-?IY+9@{()*9VXRLCDpHo)!skHK+2t{RV2URfJy|Ab$V=002ovPDHLkV1oZnH8lVL diff --git a/app/src/main/res/drawable-xhdpi/ic_replay_black_48dp.png b/app/src/main/res/drawable-xhdpi/ic_replay_black_48dp.png deleted file mode 100644 index 16567dc82526207ad0fe37ee71215e29ebfe12d4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 866 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%&M7z^v)%;uuoF_;%)5@90dC_W9MU z%$_DuF&eZtJ+?D-uQNS*pDNfpw9uRk8Gs@X`0 z`A|CEGG(@s^PVUBw*I)k`?$#Yk8h4%H~p2lSuDQ#oWa{`Tp6qP9N!-6_@lf1n)a27 zz4vE`&f4ibO}r+dQTYkGn5W6Vut%K6ArrD=vX5}xpZr9b-D83F53_BTHQjc& zFwNOgyr9yBlk>yYxyq@trXFzp+BnyF?|GZ1GUof2wt5A$mQT~$R@2q7$!Ye|)knon zbrfB=_Viuymqk@>$F6<-rLpME=C21PJ_-=kczm-e=~s)!{F_xzyccb+6uveuGCj00 zw&$Zr;Jw2la>rLWm>-J>VP!LL>(|=QW4J4%QMc#fO0JrN60)lfupaYR!4%%|Z1%qA z8^a!~ma1I7&VHfP!i&{Ma$^5?*bC3fHT~ooJN=@s)8g~1G6) zu75_{s)_C{?Z-QRpS@G-^0Q^d3B^;pEfV~B=PGJFyE473;LsGQXhlzvB`a3x_daZS z-tkE}@ItpnvBkmUcwRe&*6d3!*jEUhd*MDsc}JQ|;I~ITX6LSc@RoZx>Hd%K+J{rZ zWQ=+=yq6TZYX9yq>JPrP((RkV^&?t~Y!sW5?khaP{o( zb7!%6!sHmeMD<91y{Kcg+q8~~W|oL&ANAMS{Pt*A-!UOm<$$-FXQA+=p4F|FKYn}o zoWJOnv)#le|0gW!S5~>eBqumIfp_OIuFW=o9a;KiibE!5|CyZj%E4*>dhPzmCGC1v zFBKe{_^e(oYHzYzr@?I!tX`ugc)agnaCls>vrOeV?Yu_z90k4@_0zf!KlgD79jdSB zKEC$SIfe8S`W0UDcz7M#>`tBF)w$@c&D(n1SnY;u-6Ou_Cm9LvE}msLo%6Akd)bP0l+XkK_$rnr diff --git a/app/src/main/res/drawable-xhdpi/ic_replay_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_replay_white_24dp.png deleted file mode 100644 index 3b41913257dbe14e552f8203ba4612c9e49fa7a7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 457 zcmV;)0XF`LP)FTt0oJ-PWqJo#>PDsS z`vtg-Yj!6pz?ENDOXxEq##k{R3pG`V_=<^3NWfR4)j)KkE?kf% zU}CHb1trze6>4h;sTD;rtpyq(711_6TOXmFPeL**CLQm0&Kbrt$^HG8P44Zq_ne-d zIYT6GB9TZWvWW>Kq@TD8Z%rbKCJFFT3Q=|)UTQ^@t;I_ZBg!7bOS=$dFXN?m5M}%E z(wB&`ukq3!h_Yz{ypu!>x)$#=AqKVLoh^t#k5E8sIL>$MVhOq3&gY0hM`8YgceIr|YY&iqQ@`QK~6 zQos?!gFYj`%4WoqwqT*0?-5V>feMW6L_F#x3@zbr#H0S91|$0r&w3vNHzOXl4y8E9 z5Dz;}9F@lr$I={PD~(h#??P2Hv5k*OBaS_R%D0F^Gwfz5bE%<=S;V1HRE7}izM+=? zvXWuMx}&JnaTc-a1LhN^j9$d5v#dlZNx#*%UxG%$>Lq+a5(6c?YW(obN2{C>#Hd#& z!B{)f219oRCRP~?=PB;R(sE89s&->)k9y|05eEzCQO)~HF|~}eY5{Q-jsl(y{dFJ0 zLg+*>%Tom8#bC&-wqj#@$W=cjZ_b3=su3H_Ay*wEUqWZ2%FD7H{2O^AAiF$gQgUe1!CaxCt9AAy+*GP?%|S8#ZFe%*GOO> z#bLy_Ugb>^^dZI#kVL7TbBI;FloO_cKI?z#>rnXuv2KJ_AwQf^#JVG>3?mNBvWI0k zCeFQ%8(UwY@+jh1ntry^Op?+IC23&?1EdS}PEAbz5c&FESu5gU4Th($JgXZci}?%j zAcuGCUqC#n17l^3BOc^%YUO^!lkUMvz+uFL`muJC2Zudosl~w?NY31kB51DEg_A{d zo(4V7yWC2^CMFTbCfGp0ZS3d#oLeiEIC_%o8Q~cgkx|9lh(m9&kc<=^oYC)hXq9s6 z($m<(9mL4iY&qBmXe3*lJNfX^nst-}xU1(FC+XyRa$C!w;mW?1+!pg9Cm5oZ0(uZJ z=)Phh(s diff --git a/app/src/main/res/drawable-xhdpi/ic_skip_next_black_48dp.png b/app/src/main/res/drawable-xhdpi/ic_skip_next_black_48dp.png deleted file mode 100644 index ce88b61841f771915716b235388a1ab040a31dda..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 340 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%&M7z$oqM;uuoF_;!||UW+4x+kOub zt+_?fS-7-=ng5Brkf)`YuGz79v@&zx5e%_&Z zVeeC=XrIP+irmW_zRwa~;cz{wiEGQW1x#yI*EnQzYF~(A;@&cC1CYA`mAlO$+q2P< zX|>LY_8)Uj(&KHZe z@@SmK=eJ<#<9HuomMAM1ATMCS(q@s2mjSF%R>mxU?zp)?!9QmC*0k02*F^UD07Hwx M)78&qol`;+0MgWo7XSbN diff --git a/app/src/main/res/drawable-xhdpi/ic_skip_next_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_skip_next_white_24dp.png deleted file mode 100644 index e722d104767465785e4cc04d3dc8cdecf5d519da..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 222 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0DrJgR1ArXh)Ufamq7%0)2I8h_S zYU#9D_n6EK7=<@5a&KtllxSeQ66H1bS-#4r3?7HVmM8nZ`rdnT@Aur#SF>837JfK< zBV%vryQ9yU^x7gB`MrCWF!WVLGEU75W3Ya^reSqp7(@2iH4T#;!w%eyvDIv7_6s|3 z_Q!hG-%mvEo}JWRbIHH%a%jCVa9WF&s_luf#~{oZXNT&;)1E17E4 W^OrqQ+j$Y_Uhj+|2`rstnE1mDxlJ}{}eP9yt(qP|Ef?~Z5Po7moLTnOY_%1<#(II8R#$=p}Dcnu?W z-p^%g7};|)Pe~P=RDa6zVrlRc(*@J}OcJK`8G$g2jZQ=5EFK(^WB8qOmvO^`V}FFV zE5`v@j}FRQICmuYko~h`Q_K8*^UvD&GNnaqFs yYc@|i!}zcLU8MJ|hDh&s4RPMqFrRh&VEs2~_43ryOwquwWAJqKb6Mw<&;$UM{F3Yd diff --git a/app/src/main/res/drawable-xhdpi/ic_skip_previous_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_skip_previous_white_24dp.png deleted file mode 100644 index 01dd12b3f40b7f90af78ddf25fd16f9cbe65a0f8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 242 zcmVrfRW1hf~_@91(yO*n%%kY1DGxK4;3=Nm#D=w@Ma7_^DVParA VdDB(ycCsqSC{I^Emvv4FO#nC^B`*K~ diff --git a/app/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png deleted file mode 100644 index 0fdced8fce76a0f9a527388935adecebf63d0dae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 97 zcmeAS@N?(olHy`uVBq!ia0vp^9w5vJBp7O^^}Pa8OeH~n!3+##lh0ZJc~YJ(jv*C{ s$r5`OFVdQ&MBb@07vc`*Z=?k diff --git a/app/src/main/res/drawable-xxhdpi/ic_delete_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_delete_black_24dp.png deleted file mode 100644 index 6d7cb81c566fddaa41239598fabbbd79e95644f3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 191 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw+B{txLn;{GUfRfe$biA+V!W!g z!(>+78J86lXD9?ml%z3p{T2}VQ_sEUk%94MA8G5qXUn$f7kye{^E`RUy!i@_O?8T| zXL1UuyzqByVgb?~6M$kc#(9qAg0H0*LzCtzFK}8j^|;CNV@?~Czk8l*EYMch+tR2V g&c&TPbLLHMiMh-N{H%+20$s%5>FVdQ&MBb@004zT7ytkO diff --git a/app/src/main/res/drawable-xxhdpi/ic_list_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_list_white_24dp.png deleted file mode 100644 index 4d2807e4ebe3f77a5b830c06d76082532d9a91de..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 94 zcmeAS@N?(olHy`uVBq!ia0vp^9w5vJBp7O^^}Pa8OeH~n!3+##lh0ZJdE%Zfjv*C{ p$r5b~`u^Gr{8653n)QAHJHzX3N$>My@67>e^mO%eS?83{1OWFN8fX9j diff --git a/app/src/main/res/drawable-xxhdpi/ic_mode_edit_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_mode_edit_black_24dp.png deleted file mode 100644 index 4af4ae634b4c805b2b13c209262bba92d4ef5bdb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 269 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhawu6VjQhEy=Vy==(G$SBbIuwHt% zp3_UKM>>291zL-BrWtE$WMrxY&q^|md-S)saec+%`%mT+^YR*%zN!3_;NI;JthdL` z{KCnCCY1w%imdJpA~Ld3FOd=(E`?RG0HH+`PU-POx#QYR|iePyTZek-J~XvsWJ zNp;6pnWrr{gH+WWS3OqoV4b69!Fg%ZjL8ar=LoBC`b|jln)7GMS;OOVHd`te@;#f8 z>^I4HhOyA|j6Ta%GFL2C6b3wAaO`BGUn!j9*xM|{uGv?7Zl}4O+1d4_3mOH1{$ucT L^>bP0l+XkKk9}#` diff --git a/app/src/main/res/drawable-xxhdpi/ic_pause_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_pause_white_24dp.png deleted file mode 100644 index 7192ad487eacb4f8f530ebe2878760e2528fbc5f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 92 zcmeAS@N?(olHy`uVBq!ia0vp^9w5vJBp7O^^}Pa8OeH~n!3+##lh0ZJd7_>!jv*C{ m$r5W0{Noqkjk>0hJ%NeAb!~d=tj~okAZ?zmelF{r5}E*xz!xz9 diff --git a/app/src/main/res/drawable-xxhdpi/ic_play_arrow_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_play_arrow_white_24dp.png deleted file mode 100644 index 547ef30aacdebbd5bc27a3831971aa49be8813f7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw9(lSrhEy=Vy|FR(PyjfM61bK%=q7O8Xj0w7EPdhfr5^#S_IEwe==vgFzHZ{arrqiL9p^2}oCQR8HlO`a zfBt>_q&-EaGMH-9&z)oSy0%IOibq!5=i7xQ8?znl*Ho#q?l1C zmLwh%pdb>pKr}hv!ldkF|5nzo_`k zc}eR_hl%VF4-<)DT=alRfHl0KMErSu6_?hE1x;YW&OCE+==ML_XMw(D@O1TaS?83{ F1OO`naDo5; diff --git a/app/src/main/res/drawable-xxhdpi/ic_play_circle_filled_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_play_circle_filled_white_24dp.png deleted file mode 100644 index 30330cfad6fc31d88d473c30deb4f1b101e70b23..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 666 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 diff --git a/app/src/main/res/drawable-xxhdpi/ic_replay_black_48dp.png b/app/src/main/res/drawable-xxhdpi/ic_replay_black_48dp.png deleted file mode 100644 index 13fc60779a1e278eb8d96c77bc15fa6f931cee09..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1298 zcmV+t1?~EYP)Zd+Rc}6ME(Bc_dJVT3TXz>g!o>9s(N_j>p&nV>? zr97jQXO!{`h)0jdkLNlbKc4G&{CKY8@#DFU=lHdAMlVsNZyf&|ozg~_#_@VS8s-T(-jkMBDKTlaiR^S3ZmRq}H9ee0w8u>zfI?JwRb+G|6c3FlrkM#9E`Q@lh}Pk;@QH##b{ z*HnRBMd(6QvjBFP}3Y#V@GsOv=(e*v&7nH%`1_K4~M>{9PJM6n0J zu7&@PoD$F@0I)w6xS_sewE*_l6fKBi2Y}%*qXcvn0F29O*$RNMPdzbP4`3u&QX*;w z0OOgvXf+0ufGz@naY_kj1OSXSC7>q&U^FQKO#*xc_AQ8vudBQ9J~p6~^s za9vq`nt0&xCfZ}4BS@@U;=2&V!-PVeTCffh2Zp0RdVZ`t!aQ|EO-3!J9}*g85XG}Z z&3PpH-}(*s%0ql0O_Xfplk#LsWC)SFh~fpJoYb8IJUn#duF)2t-|vWV&gDZ(VpzliEFA|b&z zqI!=6VX=n$i0a=|M%-3V9Ks_EJcbd6yNQqy#9@C35qS(C4sQ}E^}G-G6eTDmYXUw! zvuq+_IuNJ#NKq)#+((=qA_fd0PA6!j5HvA`IK4(JNHU5zou`Y{#p4t?#OWVY6BD-Z z4hir9+g7pW`W*@IEt`oEEi51bex{dNzLkw!Vi5^2#|~mfJ3bQVN6xW{uO-8IJ|Thn z93+Nxl1G9i#|>KWSP34x7$%1VOP-^|lumr)3w_OH_K_rr8d|x+8{`Z1IZBLaX8~D( zOFUzMQ?$`U14$}LP(uSvv~ijNp0k9kz#IpOIW4?HBJwReC<3-HibUX_Y^F#^GKhri zHL58p+CzNRW;sL=lHnE-f;ZVj(Xy8@q=5dzZi<`)CwPq%z-f+ANl8#emPuq4o!~fY zDJd#w<5zs-8(rcK`|&7I>gnOpSH|S?kZv-R0UPMxDr4l4V9E1>pEyh{WygA&$#Rhq zo-oNQbNKkoG0P-R7@?Oe&7>#_48t%C!!QiPFbu;m48t(~1CFu3Ur3bHjQ{`u07*qo IM6N<$g2B#34gdfE diff --git a/app/src/main/res/drawable-xxhdpi/ic_replay_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_replay_white_24dp.png deleted file mode 100644 index fcddcf02ddb58ee1680889e7315757d76419b4b2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 675 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 diff --git a/app/src/main/res/drawable-xxhdpi/ic_skip_next_black_48dp.png b/app/src/main/res/drawable-xxhdpi/ic_skip_next_black_48dp.png deleted file mode 100644 index 809b93b28f2f479f9f792d00c18a2d6da291a892..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 437 zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q1xWh(YZ)^zFxGgwIEGX(zP+qV>tj;2I~|_dq}wxH{XEgQ(QWy9)5c@jz6Qr%rU(UKeO$s&?L4dbM2noaG-5yiw@3 zDcbw(MCs2xl^O5P+tu&f!t%=7d%-?9^+~_t@lw@*_$a2YFv|4&@r5-D{E!sQijUei t%Lyj1YYU4O(2Px6SU#CH?neaI2j;!Kjo+GP2swj-&(qbToEd2eLB&!_2;jg#O9-yaw1fb5 z^t6PaV4@`iHETLbLI5X*T0(GRt|bJtr(Kj#Yud#LwWM97(A%_&7J5m$c%eqxX$a*? zLKO?GOPwk``%LNCms%gARCI`i>rrX^s97luXa!@X5q7II1_cf!)(T9_# zUrBg1A>rbKO6CJB28=!o!eHtE6Hmjlo9cxcES#FlzCG(`3;0;eQ!qQ;>GEg)%Rtkh zAZP2<58tJyRf=SMGylJQHf2|VdmulEZBFA1LhEy=Vow3lDC6IwtUnSeX zLM6haLW4o8folQN3J4{2gXuy-_@e+0A)}7;FrAZZXFAN!$LUSJllScZ?H?b5y)>6j z37WC_=i{=9sLwk~H7I1a9b+I9z(wwyM0R4h4W9nrF_QbD7o zuY$Szf|z+tqie?ei3a0*vaM<8q{jM`H4oj_8U!Sv5MfELEMddHv1B)0M!Xmsb ZvF=KqSHL-&YavjW!PC{xWt~$(69A{7Cn*2` diff --git a/app/src/main/res/drawable-xxxhdpi/ic_add_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_add_white_24dp.png deleted file mode 100644 index d64c22e9edfdcf9babea9681c44e2dee53a6d2f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 102 zcmeAS@N?(olHy`uVBq!ia0vp^2_Vb}Bp6OT_L>T$m`Z~Df*BafCZDwc^5i{T978G? xlN*`>5BzUTIj7P7-(I3-fns}2dtZ?oBSS_(`pg9u0+k>GJYD@<);T3K0RZru9Krwq diff --git a/app/src/main/res/drawable-xxxhdpi/ic_delete_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_delete_black_24dp.png deleted file mode 100644 index f2b75c31107d301df6e48c209636a60930a7776f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 237 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%xcgws^WYhEy=Vy>igE%|WE~;_ky~ z9J-g7C00J`4^4Q(VxGV~>&)ykk80L8RtvRxOj23tnLW?`p4GoUTuy)g1Of3yPXFiG zazK+98kT&N|Lg!_5daPIFZ~QZ^;?g1j^_KtA{&T$m`Z~Df*BafCZDwc@?O(%@xS>XdsLA^!WH|)|0G!%Hn8t^oG?pW9;DsV)z4*}Q$iB}k@*`j diff --git a/app/src/main/res/drawable-xxxhdpi/ic_mode_edit_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_mode_edit_black_24dp.png deleted file mode 100644 index d6761ba161c4bc5f665968f7cb761cc7db671822..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 319 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%&M7z{uw5;uuoF`1aC%Pu4&Qmyah! ze2xg^967?*v-Zf>_jYly&(gvcB=EW&nl+QJS~z`2`aZTgc00pk63IOq8}7b}wf}V~ zaJkl*gx| zSU!~+b=xx@hobrFbsnm9*iR@BKO*lDA@tKuao&63M?h+BzR;zgY9MOem-p3$Ig=-x z_xClZ0aE6i&(HqxJ>66D!mZ=q)@=QJ x^_)CsMaZRFKeL{%p1Zzm9}?r#b7Qbi;^!wF?pNJ-s1q1444$rjF6*2UngDHgmazZ; diff --git a/app/src/main/res/drawable-xxxhdpi/ic_pause_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_pause_white_24dp.png deleted file mode 100644 index 660ac658589240d14b259e91e6864dc8a8f3665d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 94 zcmeAS@N?(olHy`uVBq!ia0vp^2_Vb}Bp6OT_L>T$m`Z~Df*BafCZDwc^29w|978G? plNp)=Km51n;8#DVkv_$ki-GCDeZ`wzAGd%sdb;|#taD0e0szsl7@+_F diff --git a/app/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_24dp.png deleted file mode 100644 index be5c062b5feeba5eff766b2fdae6dccb60cb4b0e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 343 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%&M7z$oYG;uuoF`1aODUuH)UwnS^i z62=e)(*V{`2k`*b5=Y_d%(4?EPx_&_WMu+pnDW{BolE^Uxj)}+yLIc`8R zg{90Lt0f&`?lL^eViO2AZ`iSm@yJ!6R31a2DNst&xD8@?udTeN#I8%r_sg2!eom$?*X_%R&Z!t~|1-cBYK4gm#+1_nk5gW={^?qALV VOCpPJ@c;vi!PC{xWt~$(69D@(h;je` diff --git a/app/src/main/res/drawable-xxxhdpi/ic_play_circle_filled_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_play_circle_filled_white_24dp.png deleted file mode 100644 index 9dc082586133b569032724aed8cec9e6386bb2d0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 883 zcmV-(1C0EMP)VtW-#)^unfcGG6`1cl!3TbBCbQR4az#Z&MMXt1K#o;*Iio^@SKfK& zl?D|~*ndW&kOE z<`WV$Xn z5mr^ck_L=(N0{9*CJ7kj4j^R0h!o&UYM7`>p9CPm1*SSD?jP_QCfoK4Sip4iegMNX zG2Js6?|>6*sN@wehb`s308-pwOLda&0Y70=Kez>S^B>;&o)+?bB<&7Rz-x+cC?nsJ z8^9OTd;k9y{0}cfM@>AN^1*G{b0Fa;33rRh|EQkQ)r!=hx z*b)NBPiaFBP!$5mPw8(RzyOE=JFu=%`1 z-tU2@ZA|tH$}b?!Ii~uPPX7Q!A5~0rNsrXA%Moq~yBji+2VciRCj86S(npU+xC(JR znIH~-_j4Z7pKec3$M56p5Of=K273Wwo@avUk$f0eP%@MPdgmDo?-Ed+I+9)UA?#~d zNq*!b5;Z80Fmn+u%@SAmsmdZL(^nC*?DK-#n(Xl{9kyHsO)|{}|DaQab*8jOBM)$R z@ta_UBFB`ur^Op@w793t5t|gq(rf-YuK6bdM1Tko0V06Z^FN`6oF-LpM=}5a002ov JPDHLkV1l`OfX)B_ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_play_circle_outline_black_48dp.png b/app/src/main/res/drawable-xxxhdpi/ic_play_circle_outline_black_48dp.png deleted file mode 100644 index 86a407d14be075eeab50cdc21837df350d094efd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2699 zcmV;63Uu{}P)G0000V7Nkl|M=&eqO?tG^#AfVI=7=ewV^_S$PZLK$^j&7HLJDsAlJ2;H2dmjMRoMuwwO zWFo8RU;v50e)iHrE$(AN6{|Uj#NYu|GJzt$QAQK(NX&l1EtE0n8Os_@AV&7^1Y;Pq zT*~Y8BgSU=8U>agN9nRAkLZNO{yt)MzD^4#8I<6NhJkKnk5`Z9QPP^ zkSfgJ*^4B^c4{an&SEuZkOX;#7KTtDOkf|9Ksy*m0kDw&APMzX7LaJlcsay2@d#Ua zilxluGU_;w3d$&^~So0+|)Cls4iJvwY1ozhW{j@&^w23eW}|;X+@F z4x1TLW)8l#a0B}|05=9>G!ncHjF|c!(l|Vk1Aqei>Hg3Od&Ca zETX!J7`OyM_m31BEr@E4i-??Uh-y1&!s12Bae)##5Y@Mcm`h`ymIw#6i*&A4O@t zK@@8Ul~su1a)`13wozpN_vldPe8NB8BiA_Lu7dI@wK4ufk6SRqiAPbt>|!dXUshY1+b5z zW$N+a6@sN0qmnlpBv4N=l#d;z@z~7QPdsJT;L65nAeR8U>`-Bm222YD14<1 zbC*#8?4xL@as>wofiiUxHqEF2_E9uLos117Fm>u?q;rf4U>`*pM6sH{T&)ao1k4Ix zA4Nx%v9BO7cPc|{H7tOA6m3^VUQA$Gl_8!oEP#C!tye~UjKI9A46)R#0QOO&&xT(j zFm1{Za}5h%A4NArzfVMa7x*&60@z2<<;rNC1m=h`M4e#)?4zh&8S8NL>mBDA7QjA= zMk*uyKwwTPLsS?Rz&?s9)emI_rdJuF%&-9VQBKy6CsAtqtl?ixHXgz_);0>ZX(1mdUWnn7raAZljTWiL88a}^t_GnY)}85 z2(gPE9rbMKWiyoZ^)K`>-5fTTKp>_}%X3?Yb zk#aTr361B}V_GYT2&3rHIahs6bseE`Bcga45n&WPI*X9_)`^F!ld(1;!YF!lK2RrN z6@d_M~yAj2o8A?PvfvCE26rG zG-0v9na@~#il}ZTawd^O3}%8!_@rl!iNwI0h-#KgDI})RkEm`W7OFjE;UO{<3d89_ zRQniDOgxF`@-`_7fi!K1F0I5yCC3n5R#6E23DKpS3S#6AM3)?mB%NCkPc9@@QtU=_ zIZXpeW)^1q-dsZ8bsqDwCmOh0j~*i8*dq*l4pna_HL(1CdJ`vjJt zmVYCjY^MYx#__AyUqQlxXtL-3{*#QwkOhcGdzeX5n8gXiqc>s92E?PMnV*oxvk&p; zvzSxLXNX60tR{uar1>-A*-p;J9>#DC@$6PIxXN(a5YKjVK9119X~eUKnSzT=dMskQ}v#cPEOO&vhe#Emm=HVF4h%Y;+!xifJ6!GQ#I7lnv%RU~a6l=CA zM{$&A5TAB2&p0}dB0gPh_^^ByFa!M$noJvMf&*j{}GS<_^w@7F{%TN+c6Tct{ z^&~e@0E}ZVl0e%TOMx(i6`V#AWG@d=LP1eOJCYDTW&#CBibec{IBqu!Nl~z5SVItbQeeCcu7cpqLfX6wG7?7TEC<*~Gqb6nNMMFi%@r)>F`W z@9+|jv6$IZF_c8}-}c}@1^@s6V35D{J-!M600000_y{dR?xd)=vqS&@002ovPDHLk FV1g3X&CUP- diff --git a/app/src/main/res/drawable-xxxhdpi/ic_play_circle_outline_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_play_circle_outline_white_24dp.png deleted file mode 100644 index 516f6432693ac6d89901a2c9a0e76baa01045808..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1379 zcmV-p1)TbcP)y%WEavn41Afhq;gFm$1qB5K1qI<@ z9`ziggS+%G$_J*H;sc}fafeGBq@F5Fm}dy*N@?H%0|e1eJ6lQ2lz<}Y>Eb=ECh257 zMbjHlPLd%s25F{jdIAz0;Vof!O)K$y2Q=}FFb&g~zko&DCJNmw%tyd3CWuOkrf36V z{1IRbowTxm||j7vx+SoqLZiixj;!&0rU8q?9$w0549MdTg*Os_>#YMY}V#CI6|v4+Q4hEy3wKrG9T?qw2~kgkktcr}I*2yX{zY~8sAG?A$p6Y(7& zQ)4ax37%oQjLF0OiEWs;d%$6Ak4WStpqv40`&|Rdd4n_+@YmLF#MKGklSX<)sarr2 zTN@_O!9$j-6WX!ubqOeD26U*$AJR%ifPPA=?RfuyQKV``fPPBzkzV=- zd_amR0`yagBTf1TOd%C30`yZVM*2L{0)9~hO#6f$1ej35PM$eG#2r!n5ceUiau3i? zNAody2Wd;_0S^?v$Zq-vTtYhJ7NDPwxMN7?BY&9FPe;f&Ziw*N)WV7NDDsxcf+L!2-4-rCmm(n~u0; z*fs$|Lo>E>K?9W2@qVCz-58gEGF~I4S%dMvT&E*$Ew)h- zZUKf?Y>z3!-+5!P#$wLHg5ns(+YpLsg)_Kcb^ zUwmDbB>_?#XHJd}%qJMf+f$Z?{pxWoPatc=X})#*YwHZ-WYbSg6fb{Q(aV?gk__-1 zx`Gz&^Cdl0MD_Z8377Emf-a8Iz-s0brJ{_QMkc^{Cx?ikzv9#$hLfc4J*z8UJ-^-lEkLxi*Tjv?SeYUq!6rD(`SL z!4-aB)=c>_Xq-))+*+~&F lGp`V!zd}GEpb$_9_#bazb~6%eta1PV002ovPDHLkV1nTeaFqZ6 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_replay_black_48dp.png b/app/src/main/res/drawable-xxxhdpi/ic_replay_black_48dp.png deleted file mode 100644 index 97d1d29f239a0a364f26b44c7002c177a370d02a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1736 zcmb7_dpy$%AICSjWRH!_j!Q=yHa#wnh8$6yG&b8jMRP9^CfZygB-dPO?6~cRgEdle zS23!&L?m~yqbcU$n9Gxe3LO+WXFY#Bujk+A`+9vp-}m?P=lAt}eZQ=;4kRe#00aaA zK`CT{leBhz&;7De-5xK`1cBspC`tj9?YPid?53wq${cH zERQjF+C+_Tgx+Taa5B8NliQK8Z^K1Jmp|EK@McUWS=-ZN{YuDtn#WlrK;*zG5_0XR zrf39qVC`9iwaL!(4z@0?K5uJlS0Sim^vRZY#zhamWTW`uozLqhO3V?nZ0PeDNU6Z_ z=pReL+a(r5KSr|gf!!Y)E-|mC7)Dy`!gjJ>oA2}KF7+TDqBn^hTSsHYnAVc@-L6C0 zl97nQGx)|3K{t$>;?KQ5U8yaZ!3H_AgWWAJOSSF<&6yop@9ZmOns5S1sJ~sZvItTZ z^cX3bzA|eZI7vII*YwX^u$8x8zFzr4z-0HKN#Yj>YQb0y$Zd7NECoZ%HCr|AdyF9` z+Cc4>H#bmn*np-@ue<8gCuaiov0P^o;q;z78iX}ow1?Y|dz2LT1;wJGJ%>?(<`QML z#zET9B*q@sphnB8zGWP!ESVnCLhx_{jf*R$<6fsR@Z~;m+}So}4x9W#3{oMuF2#@u zkP}`#wDjRd$pTfgS1f&}#$AZJ+UMW#Eq#Bq7&pnfdo&yK^wK%wjs3AX;`9(vG&(3< zq%<<|^jDnD(!nmxspcqI>d<^QIZsX5hga`s}n6L6@Qw@>RT zQl-K@yg%DS^HhFE1tM@or8Gfm^+_$>0lWN}9-ZU;s~{rwF|iiRmASwnUvuq;ZLB<< za?SmD#G-D-D*;+H3@VFMfN|1PDyqW!T^fp4_(_^18}18(4KsuY;lPPgsc5(KmvLhY zj)e^_0D^29GE{wWWH#T5b@LjmYM6?B{5Q)>Fr9l|y#{%ce%&qnxooeF0 z3f2`7BK?lrr)=8DhM()|^C0mqH68po%B@g>1Ro!%L5=;zrJ9sK^MdqoJ0kAugIMw5 z)GLke+kbPXWF2KUdcuz}_1o@oD<)SvYxkg`6RU^E!P@USSPyBu9|cmpdFG5+u4{x_X!* z)o_dqIit%M&AoQRE`EHT+u z0+R4ebD?=_X%t}Ka;DwH zz^ld#Wk4fJT=N#t*z1gtZC3lFo=ET$rt%FnZ2f*B!V1r~+G{b6TB^en`6MMY z3x>7jux_tcIwRURL_as5qP^e>wUJ&_yx3YOw%!ao$npXdTL&7?oy!itql;*Zd2gVa zb%A8hV1ZF(DNZg|i=sVj>=}3D2m4V0K(1#%abZhZlD^D&t1ek1@_^Ug)Za6se>|q0ULCYOCS#}i`522(gWor z8r=m#?%u)y$W6KErZfJMs`T<|-30#$H`HPfRxhEaJJ^!3i{Kk@45V9PdiBYt$ zSDl*q$iX9)et+x>O2RAv+zF+UUFD7asz`X>51R8Pf2PsrTsw$bPdW__nEqmqdgrAE z7zYFRW7RJSZm(#c!=aP@?lD={Y7KxdP{-GO$RToOK{FZW7_Q*iyHb%lUo6&AZytuK zovS#N?3y?yU)a)VH4;_~`>^nQwTmbHL7-0U8_T{cHQ(_+VFAuDthYXZT9^6WQiu+O JM>akwe*w;XHQ@jN diff --git a/app/src/main/res/drawable-xxxhdpi/ic_replay_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_replay_white_24dp.png deleted file mode 100644 index 1573fb111b535e5e0df9371ff7f804ce2c40a0fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 908 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 XQa`UV-tzO#Mv#=JtDnm{r-UW|cJtcB diff --git a/app/src/main/res/drawable-xxxhdpi/ic_skip_next_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_skip_next_white_24dp.png deleted file mode 100644 index 19c4929cca13b462dee093c2156ca904e52c4fad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 357 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%&M7z^LQt;uuoF`1Y2e9%~|l>%&f$ zg_kt9Uio5{z#evh>jtB=g!P7|jSU+azGiEd&dOAqxOz`#SLZX8=YO~-=s(>1`@F;% z7^n-LS2W|H{Q2{3`{(M~f3OwLariW~{mo=X&rh?0%@iVwoLRR#m)Xd8(p_(5!?zjC zW(qf-&f)dAb|Q2qMDd?P2140PE}_?HYd-Es6#;R0aPwX z)}VoZ#>xFo*?A}HkL;c^(caDdlelD!m(LT!?N4UaF0@pP*L;66{M7c`=~eQpe$#u6{1-oD!MWgRJ*37*6h35c^4-ARzU|x|q)oQAfQvV|n^}wB+M3~L&=?GA9=cqVv&%iW`HEwy9<;72claaCf7n>KDW7<$32ae>N}6KfLv)XJmOs-IeQS z@9bub^-glQI!Wrn)+MYZx}A)n-dPUUCrK>$fAad)C2TM1OUi+QU^SPr8vZbGC@}nF q6>wnq#I4Z4a75gJfsqBsyTA2URmg#B2af_nlfl!~&t;ucLK6TQaGnhS From 0affee3182325839711626dce23ecd70e43db396 Mon Sep 17 00:00:00 2001 From: machiav3lli Date: Fri, 26 Jun 2020 20:30:40 +0200 Subject: [PATCH 05/12] Change: to xml-based Drawables --- .../drawable-v21/ic_notifications_black_24dp.xml | 9 --------- .../main/res/drawable-v21/ic_sync_black_24dp.xml | 9 --------- app/src/main/res/drawable/bg_splash_screen.xml | 2 +- app/src/main/res/drawable/button_normal.xml | 2 +- app/src/main/res/drawable/button_section.xml | 8 ++++---- .../main/res/drawable/button_section_textcolor.xml | 4 ++-- app/src/main/res/drawable/ic_about.xml | 3 ++- app/src/main/res/drawable/ic_add_24.xml | 10 ++++++++++ .../{ic_alarm_black.xml => ic_alarm_24.xml} | 13 +++++++------ app/src/main/res/drawable/ic_alarm_white.xml | 9 --------- app/src/main/res/drawable/ic_close_24.xml | 10 ++++++++++ app/src/main/res/drawable/ic_close_white.xml | 9 --------- app/src/main/res/drawable/ic_create_black.xml | 4 ---- app/src/main/res/drawable/ic_delete_24.xml | 10 ++++++++++ app/src/main/res/drawable/ic_delete_white.xml | 9 --------- app/src/main/res/drawable/ic_edit_24.xml | 10 ++++++++++ app/src/main/res/drawable/ic_edit_white_24dp.xml | 9 --------- app/src/main/res/drawable/ic_help.xml | 3 ++- app/src/main/res/drawable/ic_home_black.xml | 12 +++++++++--- .../drawable/{ic_info_black.xml => ic_info_24.xml} | 3 ++- app/src/main/res/drawable/ic_info_black_24dp.xml | 9 --------- app/src/main/res/drawable/ic_list_24.xml | 10 ++++++++++ app/src/main/res/drawable/ic_list_black_24px.xml | 5 ----- app/src/main/res/drawable/ic_list_white_24px.xml | 9 --------- app/src/main/res/drawable/ic_menu_tutorial.xml | 3 ++- .../res/drawable/ic_notifications_black_24dp.xml | 9 --------- app/src/main/res/drawable/ic_pause_48.xml | 5 +++++ app/src/main/res/drawable/ic_pause_black_48dp.xml | 4 ---- app/src/main/res/drawable/ic_play_arrow_48.xml | 5 +++++ app/src/main/res/drawable/ic_play_arrow_black.xml | 5 ----- app/src/main/res/drawable/ic_repeat_48.xml | 11 +++++++++++ app/src/main/res/drawable/ic_repeat_black_48dp.xml | 5 ----- app/src/main/res/drawable/ic_replay_48.xml | 10 ++++++++++ ...c_settings_black_24dp.xml => ic_settings_24.xml} | 13 +++++++------ app/src/main/res/drawable/ic_skip_next_24.xml | 10 ++++++++++ app/src/main/res/drawable/ic_skip_next_48.xml | 10 ++++++++++ app/src/main/res/drawable/ic_skip_previous_24.xml | 10 ++++++++++ app/src/main/res/drawable/ic_skip_previous_48.xml | 10 ++++++++++ app/src/main/res/drawable/ic_sync_24.xml | 10 ++++++++++ app/src/main/res/drawable/ic_sync_black_24dp.xml | 9 --------- app/src/main/res/drawable/ic_theme_24.xml | 10 ++++++++++ app/src/main/res/drawable/ic_update_40.xml | 11 +++++++++++ app/src/main/res/drawable/ic_update_black_40dp.xml | 5 ----- app/src/main/res/drawable/ic_view_list_24.xml | 10 ++++++++++ .../main/res/drawable/ic_view_list_black_24px.xml | 5 ----- app/src/main/res/drawable/progress_circular.xml | 2 +- .../main/res/drawable/progress_circular_small.xml | 2 +- app/src/main/res/drawable/side_nav_bar.xml | 9 --------- 48 files changed, 203 insertions(+), 161 deletions(-) delete mode 100644 app/src/main/res/drawable-v21/ic_notifications_black_24dp.xml delete mode 100644 app/src/main/res/drawable-v21/ic_sync_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_add_24.xml rename app/src/main/res/drawable/{ic_alarm_black.xml => ic_alarm_24.xml} (56%) delete mode 100644 app/src/main/res/drawable/ic_alarm_white.xml create mode 100644 app/src/main/res/drawable/ic_close_24.xml delete mode 100644 app/src/main/res/drawable/ic_close_white.xml delete mode 100644 app/src/main/res/drawable/ic_create_black.xml create mode 100644 app/src/main/res/drawable/ic_delete_24.xml delete mode 100644 app/src/main/res/drawable/ic_delete_white.xml create mode 100644 app/src/main/res/drawable/ic_edit_24.xml delete mode 100644 app/src/main/res/drawable/ic_edit_white_24dp.xml rename app/src/main/res/drawable/{ic_info_black.xml => ic_info_24.xml} (78%) delete mode 100644 app/src/main/res/drawable/ic_info_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_list_24.xml delete mode 100644 app/src/main/res/drawable/ic_list_black_24px.xml delete mode 100644 app/src/main/res/drawable/ic_list_white_24px.xml delete mode 100644 app/src/main/res/drawable/ic_notifications_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_pause_48.xml delete mode 100644 app/src/main/res/drawable/ic_pause_black_48dp.xml create mode 100644 app/src/main/res/drawable/ic_play_arrow_48.xml delete mode 100644 app/src/main/res/drawable/ic_play_arrow_black.xml create mode 100644 app/src/main/res/drawable/ic_repeat_48.xml delete mode 100644 app/src/main/res/drawable/ic_repeat_black_48dp.xml create mode 100644 app/src/main/res/drawable/ic_replay_48.xml rename app/src/main/res/drawable/{ic_settings_black_24dp.xml => ic_settings_24.xml} (81%) create mode 100644 app/src/main/res/drawable/ic_skip_next_24.xml create mode 100644 app/src/main/res/drawable/ic_skip_next_48.xml create mode 100644 app/src/main/res/drawable/ic_skip_previous_24.xml create mode 100644 app/src/main/res/drawable/ic_skip_previous_48.xml create mode 100644 app/src/main/res/drawable/ic_sync_24.xml delete mode 100644 app/src/main/res/drawable/ic_sync_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_theme_24.xml create mode 100644 app/src/main/res/drawable/ic_update_40.xml delete mode 100644 app/src/main/res/drawable/ic_update_black_40dp.xml create mode 100644 app/src/main/res/drawable/ic_view_list_24.xml delete mode 100644 app/src/main/res/drawable/ic_view_list_black_24px.xml delete mode 100644 app/src/main/res/drawable/side_nav_bar.xml diff --git a/app/src/main/res/drawable-v21/ic_notifications_black_24dp.xml b/app/src/main/res/drawable-v21/ic_notifications_black_24dp.xml deleted file mode 100644 index e3400cf..0000000 --- a/app/src/main/res/drawable-v21/ic_notifications_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable-v21/ic_sync_black_24dp.xml b/app/src/main/res/drawable-v21/ic_sync_black_24dp.xml deleted file mode 100644 index 5a283aa..0000000 --- a/app/src/main/res/drawable-v21/ic_sync_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_splash_screen.xml b/app/src/main/res/drawable/bg_splash_screen.xml index 831014f..5501d2d 100644 --- a/app/src/main/res/drawable/bg_splash_screen.xml +++ b/app/src/main/res/drawable/bg_splash_screen.xml @@ -1,7 +1,7 @@ + android:drawable="?colorAccent"/> - + diff --git a/app/src/main/res/drawable/button_section.xml b/app/src/main/res/drawable/button_section.xml index 8ace8f7..2d900b8 100644 --- a/app/src/main/res/drawable/button_section.xml +++ b/app/src/main/res/drawable/button_section.xml @@ -2,9 +2,9 @@ - + - + - + - + - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml index 9e5d312..471546a 100644 --- a/app/src/main/res/drawable/ic_about.xml +++ b/app/src/main/res/drawable/ic_about.xml @@ -2,9 +2,10 @@ \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_add_24.xml b/app/src/main/res/drawable/ic_add_24.xml new file mode 100644 index 0000000..eb23254 --- /dev/null +++ b/app/src/main/res/drawable/ic_add_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_alarm_black.xml b/app/src/main/res/drawable/ic_alarm_24.xml similarity index 56% rename from app/src/main/res/drawable/ic_alarm_black.xml rename to app/src/main/res/drawable/ic_alarm_24.xml index 87e80a6..f7c9624 100644 --- a/app/src/main/res/drawable/ic_alarm_black.xml +++ b/app/src/main/res/drawable/ic_alarm_24.xml @@ -1,9 +1,10 @@ + android:width="24dp" + android:height="24dp" + android:tint="?attr/colorControlNormal" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/white" + android:pathData="M22,5.72l-4.6,-3.86 -1.29,1.53 4.6,3.86L22,5.72zM7.88,3.39L6.6,1.86 2,5.71l1.29,1.53 4.59,-3.85zM12.5,8L11,8v6l4.75,2.85 0.75,-1.23 -4,-2.37L12.5,8zM12,4c-4.97,0 -9,4.03 -9,9s4.02,9 9,9c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,20c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7z" /> diff --git a/app/src/main/res/drawable/ic_alarm_white.xml b/app/src/main/res/drawable/ic_alarm_white.xml deleted file mode 100644 index bd50ddd..0000000 --- a/app/src/main/res/drawable/ic_alarm_white.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_close_24.xml b/app/src/main/res/drawable/ic_close_24.xml new file mode 100644 index 0000000..da6ccc8 --- /dev/null +++ b/app/src/main/res/drawable/ic_close_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_close_white.xml b/app/src/main/res/drawable/ic_close_white.xml deleted file mode 100644 index d11cc5c..0000000 --- a/app/src/main/res/drawable/ic_close_white.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_create_black.xml b/app/src/main/res/drawable/ic_create_black.xml deleted file mode 100644 index 7575f1a..0000000 --- a/app/src/main/res/drawable/ic_create_black.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_delete_24.xml b/app/src/main/res/drawable/ic_delete_24.xml new file mode 100644 index 0000000..2be8d8c --- /dev/null +++ b/app/src/main/res/drawable/ic_delete_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_delete_white.xml b/app/src/main/res/drawable/ic_delete_white.xml deleted file mode 100644 index 2b8ab5b..0000000 --- a/app/src/main/res/drawable/ic_delete_white.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_edit_24.xml b/app/src/main/res/drawable/ic_edit_24.xml new file mode 100644 index 0000000..2844baf --- /dev/null +++ b/app/src/main/res/drawable/ic_edit_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_edit_white_24dp.xml b/app/src/main/res/drawable/ic_edit_white_24dp.xml deleted file mode 100644 index 35a774a..0000000 --- a/app/src/main/res/drawable/ic_edit_white_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_help.xml b/app/src/main/res/drawable/ic_help.xml index ffc9118..bfa2049 100644 --- a/app/src/main/res/drawable/ic_help.xml +++ b/app/src/main/res/drawable/ic_help.xml @@ -2,9 +2,10 @@ \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_home_black.xml b/app/src/main/res/drawable/ic_home_black.xml index 31e1a7a..e53fd58 100644 --- a/app/src/main/res/drawable/ic_home_black.xml +++ b/app/src/main/res/drawable/ic_home_black.xml @@ -1,4 +1,10 @@ - - + + diff --git a/app/src/main/res/drawable/ic_info_black.xml b/app/src/main/res/drawable/ic_info_24.xml similarity index 78% rename from app/src/main/res/drawable/ic_info_black.xml rename to app/src/main/res/drawable/ic_info_24.xml index 34b8202..9f3e294 100644 --- a/app/src/main/res/drawable/ic_info_black.xml +++ b/app/src/main/res/drawable/ic_info_24.xml @@ -1,9 +1,10 @@ diff --git a/app/src/main/res/drawable/ic_info_black_24dp.xml b/app/src/main/res/drawable/ic_info_black_24dp.xml deleted file mode 100644 index 34b8202..0000000 --- a/app/src/main/res/drawable/ic_info_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_list_24.xml b/app/src/main/res/drawable/ic_list_24.xml new file mode 100644 index 0000000..b0e68e0 --- /dev/null +++ b/app/src/main/res/drawable/ic_list_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_list_black_24px.xml b/app/src/main/res/drawable/ic_list_black_24px.xml deleted file mode 100644 index 5ab5d87..0000000 --- a/app/src/main/res/drawable/ic_list_black_24px.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_list_white_24px.xml b/app/src/main/res/drawable/ic_list_white_24px.xml deleted file mode 100644 index f5ea0e9..0000000 --- a/app/src/main/res/drawable/ic_list_white_24px.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_menu_tutorial.xml b/app/src/main/res/drawable/ic_menu_tutorial.xml index f8d18b2..ea4731d 100644 --- a/app/src/main/res/drawable/ic_menu_tutorial.xml +++ b/app/src/main/res/drawable/ic_menu_tutorial.xml @@ -2,9 +2,10 @@ \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_notifications_black_24dp.xml b/app/src/main/res/drawable/ic_notifications_black_24dp.xml deleted file mode 100644 index e3400cf..0000000 --- a/app/src/main/res/drawable/ic_notifications_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_pause_48.xml b/app/src/main/res/drawable/ic_pause_48.xml new file mode 100644 index 0000000..8d5e417 --- /dev/null +++ b/app/src/main/res/drawable/ic_pause_48.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_pause_black_48dp.xml b/app/src/main/res/drawable/ic_pause_black_48dp.xml deleted file mode 100644 index 0887d64..0000000 --- a/app/src/main/res/drawable/ic_pause_black_48dp.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_play_arrow_48.xml b/app/src/main/res/drawable/ic_play_arrow_48.xml new file mode 100644 index 0000000..c775d2c --- /dev/null +++ b/app/src/main/res/drawable/ic_play_arrow_48.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_play_arrow_black.xml b/app/src/main/res/drawable/ic_play_arrow_black.xml deleted file mode 100644 index 54a30db..0000000 --- a/app/src/main/res/drawable/ic_play_arrow_black.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_repeat_48.xml b/app/src/main/res/drawable/ic_repeat_48.xml new file mode 100644 index 0000000..79e6e54 --- /dev/null +++ b/app/src/main/res/drawable/ic_repeat_48.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/drawable/ic_repeat_black_48dp.xml b/app/src/main/res/drawable/ic_repeat_black_48dp.xml deleted file mode 100644 index 9092e30..0000000 --- a/app/src/main/res/drawable/ic_repeat_black_48dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_replay_48.xml b/app/src/main/res/drawable/ic_replay_48.xml new file mode 100644 index 0000000..bccd425 --- /dev/null +++ b/app/src/main/res/drawable/ic_replay_48.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_settings_black_24dp.xml b/app/src/main/res/drawable/ic_settings_24.xml similarity index 81% rename from app/src/main/res/drawable/ic_settings_black_24dp.xml rename to app/src/main/res/drawable/ic_settings_24.xml index ace746c..d3a36a0 100644 --- a/app/src/main/res/drawable/ic_settings_black_24dp.xml +++ b/app/src/main/res/drawable/ic_settings_24.xml @@ -1,9 +1,10 @@ + android:width="24dp" + android:height="24dp" + android:tint="?attr/colorControlNormal" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@android:color/white" + android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z" /> diff --git a/app/src/main/res/drawable/ic_skip_next_24.xml b/app/src/main/res/drawable/ic_skip_next_24.xml new file mode 100644 index 0000000..4fff247 --- /dev/null +++ b/app/src/main/res/drawable/ic_skip_next_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_skip_next_48.xml b/app/src/main/res/drawable/ic_skip_next_48.xml new file mode 100644 index 0000000..94aebd9 --- /dev/null +++ b/app/src/main/res/drawable/ic_skip_next_48.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_skip_previous_24.xml b/app/src/main/res/drawable/ic_skip_previous_24.xml new file mode 100644 index 0000000..1805b7d --- /dev/null +++ b/app/src/main/res/drawable/ic_skip_previous_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_skip_previous_48.xml b/app/src/main/res/drawable/ic_skip_previous_48.xml new file mode 100644 index 0000000..fb87381 --- /dev/null +++ b/app/src/main/res/drawable/ic_skip_previous_48.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_sync_24.xml b/app/src/main/res/drawable/ic_sync_24.xml new file mode 100644 index 0000000..c2f773a --- /dev/null +++ b/app/src/main/res/drawable/ic_sync_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_sync_black_24dp.xml b/app/src/main/res/drawable/ic_sync_black_24dp.xml deleted file mode 100644 index 5a283aa..0000000 --- a/app/src/main/res/drawable/ic_sync_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_theme_24.xml b/app/src/main/res/drawable/ic_theme_24.xml new file mode 100644 index 0000000..a3e222a --- /dev/null +++ b/app/src/main/res/drawable/ic_theme_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_update_40.xml b/app/src/main/res/drawable/ic_update_40.xml new file mode 100644 index 0000000..4310621 --- /dev/null +++ b/app/src/main/res/drawable/ic_update_40.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/drawable/ic_update_black_40dp.xml b/app/src/main/res/drawable/ic_update_black_40dp.xml deleted file mode 100644 index 52577d1..0000000 --- a/app/src/main/res/drawable/ic_update_black_40dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_view_list_24.xml b/app/src/main/res/drawable/ic_view_list_24.xml new file mode 100644 index 0000000..9884aeb --- /dev/null +++ b/app/src/main/res/drawable/ic_view_list_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_view_list_black_24px.xml b/app/src/main/res/drawable/ic_view_list_black_24px.xml deleted file mode 100644 index 0873a39..0000000 --- a/app/src/main/res/drawable/ic_view_list_black_24px.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/progress_circular.xml b/app/src/main/res/drawable/progress_circular.xml index 298f701..11b1e1a 100644 --- a/app/src/main/res/drawable/progress_circular.xml +++ b/app/src/main/res/drawable/progress_circular.xml @@ -15,7 +15,7 @@ android:useLevel="true" android:shape="ring" android:thicknessRatio="12"> - + \ No newline at end of file diff --git a/app/src/main/res/drawable/progress_circular_small.xml b/app/src/main/res/drawable/progress_circular_small.xml index 464a170..6365414 100644 --- a/app/src/main/res/drawable/progress_circular_small.xml +++ b/app/src/main/res/drawable/progress_circular_small.xml @@ -15,7 +15,7 @@ android:shape="ring" android:useLevel="true" android:thicknessRatio="6"> - + \ No newline at end of file diff --git a/app/src/main/res/drawable/side_nav_bar.xml b/app/src/main/res/drawable/side_nav_bar.xml deleted file mode 100644 index 3dc0e1a..0000000 --- a/app/src/main/res/drawable/side_nav_bar.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - \ No newline at end of file From fef037d2bd3f47eafb3ed87c1e45767d7bff6e44 Mon Sep 17 00:00:00 2001 From: machiav3lli Date: Fri, 26 Jun 2020 20:33:40 +0200 Subject: [PATCH 06/12] Change: to DayNight Style --- app/src/main/res/values-night/styles.xml | 75 +++++++++++++++++++ .../{values => values-notnight}/styles.xml | 40 +++++----- 2 files changed, 97 insertions(+), 18 deletions(-) create mode 100644 app/src/main/res/values-night/styles.xml rename app/src/main/res/{values => values-notnight}/styles.xml (63%) diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml new file mode 100644 index 0000000..3c95bf8 --- /dev/null +++ b/app/src/main/res/values-night/styles.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values-notnight/styles.xml similarity index 63% rename from app/src/main/res/values/styles.xml rename to app/src/main/res/values-notnight/styles.xml index 483ff70..6d6904e 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values-notnight/styles.xml @@ -1,39 +1,37 @@ - - - - - + + From 3256ac686bc6e396910b2a9379bcc22586bbb541 Mon Sep 17 00:00:00 2001 From: machiav3lli Date: Fri, 26 Jun 2020 20:39:39 +0200 Subject: [PATCH 07/12] Update: Colors --- app/src/main/res/values/colors.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index e05cce4..9112045 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,15 +1,15 @@ - #024265 - #024265 #0274B2 + #024265 #8aa5ce #00000000 #ffffff + #d9dddf #000000 + #333639 #0274B2 #8aa5ce - #024265 #A8A8A8 #f6d126 #B71C1C From 822a989abcaf4fb11f9434d722f9692202fa7dd4 Mon Sep 17 00:00:00 2001 From: machiav3lli Date: Fri, 26 Jun 2020 20:42:25 +0200 Subject: [PATCH 08/12] Update: Layouts (responding to 3256ac686bc6e396910b2a9379bcc22586bbb541, 0affee3182325839711626dce23ecd70e43db396 and 15f324f4842f9bca655c675bd7d677254673ca55) --- .../res/layout/activity_choose_exercise.xml | 10 ++-- .../res/layout/activity_edit_exercise_set.xml | 35 ++++++------- app/src/main/res/layout/activity_exercise.xml | 49 +++++++++---------- app/src/main/res/layout/activity_help.xml | 10 ++-- .../layout/activity_manage_exercise_set.xml | 22 ++++----- app/src/main/res/layout/activity_settings.xml | 14 +++--- app/src/main/res/layout/activity_timer.xml | 42 ++++++++-------- app/src/main/res/layout/activity_tutorial.xml | 2 +- .../res/layout/dialog_add_exercise_set.xml | 10 ++-- app/src/main/res/layout/dialog_exercise.xml | 8 +-- .../res/layout/layout_exercise_grid_item.xml | 4 +- .../main/res/layout/layout_exercise_set.xml | 21 ++++---- .../layout/layout_section_filter_button.xml | 2 +- app/src/main/res/layout/layout_toolbar.xml | 8 +-- app/src/main/res/layout/nav_header.xml | 9 ++-- app/src/main/res/layout/tutorial_slide1.xml | 2 +- app/src/main/res/layout/tutorial_slide2.xml | 2 +- app/src/main/res/layout/tutorial_slide3.xml | 2 +- app/src/main/res/layout/tutorial_slide4.xml | 2 +- app/src/main/res/layout/tutorial_slide5.xml | 2 +- app/src/main/res/layout/tutorial_slide6.xml | 2 +- 21 files changed, 128 insertions(+), 130 deletions(-) diff --git a/app/src/main/res/layout/activity_choose_exercise.xml b/app/src/main/res/layout/activity_choose_exercise.xml index 466943d..46c9169 100644 --- a/app/src/main/res/layout/activity_choose_exercise.xml +++ b/app/src/main/res/layout/activity_choose_exercise.xml @@ -1,5 +1,5 @@ - - - - + diff --git a/app/src/main/res/layout/activity_edit_exercise_set.xml b/app/src/main/res/layout/activity_edit_exercise_set.xml index 4ab2d4a..d7e7128 100644 --- a/app/src/main/res/layout/activity_edit_exercise_set.xml +++ b/app/src/main/res/layout/activity_edit_exercise_set.xml @@ -1,28 +1,28 @@ - - - - + android:background="?colorPrimary"/> - @@ -53,7 +53,7 @@ android:layout_marginBottom="8dp" android:layout_marginEnd="8dp" android:layout_marginTop="8dp" - android:drawableStart="@drawable/ic_alarm_white" + android:drawableStart="@drawable/ic_alarm_24" android:gravity="center" android:text="@string/exercise_time" android:textColor="@color/white" @@ -63,17 +63,17 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> - + - + - - - + - + - + app:srcCompat="@drawable/ic_edit_24" /> - + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_exercise.xml b/app/src/main/res/layout/activity_exercise.xml index 157adf9..d4173a0 100644 --- a/app/src/main/res/layout/activity_exercise.xml +++ b/app/src/main/res/layout/activity_exercise.xml @@ -1,5 +1,5 @@ - + app:srcCompat="@drawable/ic_play_arrow_48" /> + app:srcCompat="@drawable/ic_repeat_48" /> + app:srcCompat="@drawable/ic_update_40" /> - - + app:srcCompat="@drawable/ic_about"/> - + - - + - + - - + - + diff --git a/app/src/main/res/layout/activity_help.xml b/app/src/main/res/layout/activity_help.xml index 985f85a..55aa23d 100644 --- a/app/src/main/res/layout/activity_help.xml +++ b/app/src/main/res/layout/activity_help.xml @@ -1,5 +1,5 @@ - - - + - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_manage_exercise_set.xml b/app/src/main/res/layout/activity_manage_exercise_set.xml index c8d4530..1431cbc 100644 --- a/app/src/main/res/layout/activity_manage_exercise_set.xml +++ b/app/src/main/res/layout/activity_manage_exercise_set.xml @@ -1,5 +1,5 @@ - - - - - + - + - + app:srcCompat="@drawable/ic_add_24" /> - + - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 006b4d0..41235bd 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -1,5 +1,5 @@ - - - - + - + - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_timer.xml b/app/src/main/res/layout/activity_timer.xml index d2ba8e8..d09d360 100644 --- a/app/src/main/res/layout/activity_timer.xml +++ b/app/src/main/res/layout/activity_timer.xml @@ -1,5 +1,5 @@ - - - - @@ -141,7 +141,7 @@ android:layout_marginEnd="-2dp" android:layout_marginStart="-3dp" android:text=":" - android:textColor="@color/colorAccent" + android:textColor="?colorAccent" android:textSize="@dimen/picker_selected_text_size" android:textStyle="bold" android:theme="@style/AppTheme.NumberPicker" /> @@ -177,7 +177,7 @@ @@ -237,8 +237,8 @@ + app:srcCompat="@drawable/ic_replay_48" /> + app:srcCompat="@drawable/ic_play_arrow_48" /> - + - + - - + diff --git a/app/src/main/res/layout/activity_tutorial.xml b/app/src/main/res/layout/activity_tutorial.xml index 6a58d17..a5b4c85 100644 --- a/app/src/main/res/layout/activity_tutorial.xml +++ b/app/src/main/res/layout/activity_tutorial.xml @@ -6,7 +6,7 @@ android:layout_height="match_parent" tools:showIn="@layout/activity_tutorial"> - diff --git a/app/src/main/res/layout/dialog_add_exercise_set.xml b/app/src/main/res/layout/dialog_add_exercise_set.xml index 2b2366e..9c12f22 100644 --- a/app/src/main/res/layout/dialog_add_exercise_set.xml +++ b/app/src/main/res/layout/dialog_add_exercise_set.xml @@ -1,5 +1,5 @@ - - - - + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_exercise.xml b/app/src/main/res/layout/dialog_exercise.xml index 747b5dd..761df08 100644 --- a/app/src/main/res/layout/dialog_exercise.xml +++ b/app/src/main/res/layout/dialog_exercise.xml @@ -1,5 +1,5 @@ - - - + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/layout_exercise_grid_item.xml b/app/src/main/res/layout/layout_exercise_grid_item.xml index d03b7be..9629a18 100644 --- a/app/src/main/res/layout/layout_exercise_grid_item.xml +++ b/app/src/main/res/layout/layout_exercise_grid_item.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/layout_exercise_set.xml b/app/src/main/res/layout/layout_exercise_set.xml index a92bac8..382523f 100644 --- a/app/src/main/res/layout/layout_exercise_set.xml +++ b/app/src/main/res/layout/layout_exercise_set.xml @@ -1,5 +1,5 @@ - - - @@ -50,11 +51,11 @@ android:layout_marginTop="8dp" android:background="?android:selectableItemBackgroundBorderless" android:hapticFeedbackEnabled="true" - android:tint="@color/colorAccent" + android:tint="?colorAccent" android:visibility="gone" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" - app:srcCompat="@drawable/ic_mode_edit_black_24dp" /> + app:srcCompat="@drawable/ic_edit_24" /> @@ -91,7 +91,6 @@ android:layout_marginRight="8dp" android:layout_marginTop="8dp" android:text="@string/set_contains_no_exercises" - android:textColor="@color/black" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHorizontal_bias="0.0" @@ -117,7 +116,7 @@ - - + + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/layout_section_filter_button.xml b/app/src/main/res/layout/layout_section_filter_button.xml index 9d29f88..96b849f 100644 --- a/app/src/main/res/layout/layout_section_filter_button.xml +++ b/app/src/main/res/layout/layout_section_filter_button.xml @@ -1,5 +1,5 @@ - - - + android:background="?colorPrimary" /> - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/nav_header.xml b/app/src/main/res/layout/nav_header.xml index b6b2296..d85d6e1 100644 --- a/app/src/main/res/layout/nav_header.xml +++ b/app/src/main/res/layout/nav_header.xml @@ -2,17 +2,16 @@ + android:paddingTop="@dimen/activity_vertical_margin"> @@ -29,7 +28,7 @@ android:layout_height="wrap_content" android:paddingLeft="@dimen/activity_horizontal_margin" android:text="@string/app_name_short" - android:textColor="@color/colorPrimary" + android:textColor="?colorPrimary" android:textSize="18sp" android:textAppearance="@style/TextAppearance.AppCompat.Body1" android:layout_centerVertical="true" diff --git a/app/src/main/res/layout/tutorial_slide1.xml b/app/src/main/res/layout/tutorial_slide1.xml index 6b79a07..aebf28b 100644 --- a/app/src/main/res/layout/tutorial_slide1.xml +++ b/app/src/main/res/layout/tutorial_slide1.xml @@ -2,7 +2,7 @@ + android:background="@color/colorDarkAccent"> + android:background="@color/colorDarkAccent"> + android:background="@color/colorDarkAccent"> + android:background="@color/colorDarkAccent"> + android:background="@color/colorDarkAccent"> + android:background="@color/colorDarkAccent"> Date: Fri, 26 Jun 2020 20:48:26 +0200 Subject: [PATCH 09/12] Clean up: Drawables and androidx-ify related --- .../aktivpause/activities/AboutActivity.java | 4 +-- .../activities/ChooseExerciseActivity.java | 20 ++++++------ .../activities/EditExerciseSetActivity.java | 22 +++++++------ .../activities/ExerciseActivity.java | 29 ++++++++--------- .../ManageExerciseSetsActivity.java | 31 ++++++++++--------- .../aktivpause/activities/SplashActivity.java | 7 ++++- .../aktivpause/activities/TimerActivity.java | 21 +++++++------ .../activities/adapter/ExerciseAdapter.java | 13 ++++---- .../adapter/ExerciseSetListAdapter.java | 4 +-- .../adapter/ExerciseSetSpinnerAdapter.java | 6 ++-- .../helper/AppCompatPreferenceActivity.java | 10 +++--- .../activities/helper/BaseActivity.java | 19 +++++++----- .../tutorial/FirstLaunchManager.java | 7 +---- .../activities/tutorial/TutorialActivity.java | 8 ++--- .../aktivpause/database/SQLiteHelper.java | 2 +- .../aktivpause/database/data/Exercise.java | 2 +- .../aktivpause/dialog/ExerciseDialog.java | 6 ++-- .../exercises/ExerciseSections.java | 2 +- .../receivers/TimerSchedulerReceiver.java | 4 +-- .../aktivpause/service/TimerService.java | 20 ++++++------ .../res/menu/menu_manage_exercise_sets.xml | 2 +- app/src/main/res/menu/nav_drawer.xml | 6 ++-- app/src/main/res/xml/pref_headers.xml | 4 +-- 23 files changed, 128 insertions(+), 121 deletions(-) diff --git a/app/src/main/java/org/secuso/aktivpause/activities/AboutActivity.java b/app/src/main/java/org/secuso/aktivpause/activities/AboutActivity.java index 8bff426..cea9e8b 100644 --- a/app/src/main/java/org/secuso/aktivpause/activities/AboutActivity.java +++ b/app/src/main/java/org/secuso/aktivpause/activities/AboutActivity.java @@ -2,8 +2,8 @@ package org.secuso.aktivpause.activities; import android.os.Bundle; import android.os.Handler; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; import android.text.method.LinkMovementMethod; import android.view.MenuItem; import android.view.View; diff --git a/app/src/main/java/org/secuso/aktivpause/activities/ChooseExerciseActivity.java b/app/src/main/java/org/secuso/aktivpause/activities/ChooseExerciseActivity.java index b35e59a..daaf490 100644 --- a/app/src/main/java/org/secuso/aktivpause/activities/ChooseExerciseActivity.java +++ b/app/src/main/java/org/secuso/aktivpause/activities/ChooseExerciseActivity.java @@ -2,16 +2,16 @@ package org.secuso.aktivpause.activities; import android.content.Intent; import android.os.PersistableBundle; -import android.support.annotation.Nullable; -import android.support.design.chip.Chip; -import android.support.design.chip.ChipGroup; -import android.support.v4.content.ContextCompat; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.Nullable; +import com.google.android.material.chip.Chip; +import com.google.android.material.chip.ChipGroup; +import androidx.core.content.ContextCompat; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; -import android.support.v7.widget.CardView; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.cardview.widget.CardView; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.MenuItem; import android.view.View; import android.widget.TextView; @@ -138,7 +138,7 @@ public class ChooseExerciseActivity extends AppCompatActivity implements IExerci buttonStates[i] = !buttonStates[i]; CardView b = (CardView) v; b.setBackgroundColor(buttonStates[i] ? - ContextCompat.getColor(this, R.color.colorAccent) : + ContextCompat.getColor(this, R.color.colorDarkAccent) : ContextCompat.getColor(this, R.color.middlegrey)); } } diff --git a/app/src/main/java/org/secuso/aktivpause/activities/EditExerciseSetActivity.java b/app/src/main/java/org/secuso/aktivpause/activities/EditExerciseSetActivity.java index dd3504a..6e8e0bc 100644 --- a/app/src/main/java/org/secuso/aktivpause/activities/EditExerciseSetActivity.java +++ b/app/src/main/java/org/secuso/aktivpause/activities/EditExerciseSetActivity.java @@ -4,15 +4,17 @@ import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.content.DialogInterface; import android.content.Intent; -import android.support.v4.content.AsyncTaskLoader; -import android.support.v4.content.Loader; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AlertDialog; -import android.support.v7.app.AppCompatActivity; + +import androidx.loader.app.LoaderManager; +import androidx.loader.content.AsyncTaskLoader; +import androidx.loader.content.Loader; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.Toolbar; import android.text.Editable; import android.text.TextUtils; import android.text.TextWatcher; @@ -44,7 +46,7 @@ import static org.secuso.aktivpause.activities.adapter.ExerciseAdapter.ID_COMPAR * @version 2.0 * @see ChooseExerciseActivity */ -public class EditExerciseSetActivity extends AppCompatActivity implements android.support.v4.app.LoaderManager.LoaderCallbacks { +public class EditExerciseSetActivity extends AppCompatActivity implements LoaderManager.LoaderCallbacks { private static final String TAG = EditExerciseSetActivity.class.getSimpleName(); @@ -143,7 +145,7 @@ public class EditExerciseSetActivity extends AppCompatActivity implements androi if(actionBar != null) { actionBar.setTitle(R.string.activity_title_edit_exercise_set); actionBar.setDisplayHomeAsUpEnabled(true); - actionBar.setHomeAsUpIndicator(R.drawable.ic_close_white); + actionBar.setHomeAsUpIndicator(R.drawable.ic_close_24); } } diff --git a/app/src/main/java/org/secuso/aktivpause/activities/ExerciseActivity.java b/app/src/main/java/org/secuso/aktivpause/activities/ExerciseActivity.java index 431f89e..7c36b1b 100644 --- a/app/src/main/java/org/secuso/aktivpause/activities/ExerciseActivity.java +++ b/app/src/main/java/org/secuso/aktivpause/activities/ExerciseActivity.java @@ -15,14 +15,15 @@ import android.os.Handler; import android.os.VibrationEffect; import android.os.Vibrator; import android.preference.PreferenceManager; -import android.support.constraint.ConstraintLayout; -import android.support.v4.app.ActivityCompat; -import android.support.v4.content.AsyncTaskLoader; -import android.support.v4.content.Loader; -import android.support.v4.view.MenuItemCompat; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AlertDialog; -import android.support.v7.app.AppCompatActivity; +import androidx.constraintlayout.widget.ConstraintLayout; +import androidx.core.app.ActivityCompat; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.AsyncTaskLoader; +import androidx.loader.content.Loader; +import androidx.core.view.MenuItemCompat; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; import android.view.Menu; import android.view.MenuItem; import android.view.View; @@ -58,7 +59,7 @@ import static org.secuso.aktivpause.service.TimerService.ACTION_STOP_TIMER; * @author Christopher Beckmann * @version 2.0 */ -public class ExerciseActivity extends AppCompatActivity implements android.support.v4.app.LoaderManager.LoaderCallbacks { +public class ExerciseActivity extends AppCompatActivity implements LoaderManager.LoaderCallbacks { private static final String TAG = ExerciseActivity.class.getSimpleName(); private static boolean confirmationDialogShown = false; @@ -154,7 +155,7 @@ public class ExerciseActivity extends AppCompatActivity implements android.suppo ActionBar ab = getSupportActionBar(); if (ab != null) { ab.setDisplayHomeAsUpEnabled(true); - ab.setHomeAsUpIndicator(R.drawable.ic_close_white); + ab.setHomeAsUpIndicator(R.drawable.ic_close_24); } if (keepScreenOn) { @@ -376,9 +377,9 @@ public class ExerciseActivity extends AppCompatActivity implements android.suppo private void updatePlayButton(boolean isRunning) { if (isRunning) { - playButton.setImageResource(R.drawable.ic_pause_black_48dp); + playButton.setImageResource(R.drawable.ic_pause_48); } else { - playButton.setImageResource(R.drawable.ic_play_arrow_black); + playButton.setImageResource(R.drawable.ic_play_arrow_48); } } @@ -634,7 +635,7 @@ public class ExerciseActivity extends AppCompatActivity implements android.suppo private void setRepeatButtonStatus(boolean repeatStatus) { repeatButton.setColorFilter( repeatStatus ? - ActivityCompat.getColor(this, R.color.colorPrimary) : + ActivityCompat.getColor(this, R.color.colorAccent) : ActivityCompat.getColor(this, R.color.middlegrey)); } @@ -652,7 +653,7 @@ public class ExerciseActivity extends AppCompatActivity implements android.suppo private void setContinuousButtonStatus(boolean continuousStatus) { continuousButton.setColorFilter( continuousStatus ? - ActivityCompat.getColor(this, R.color.colorPrimary) : + ActivityCompat.getColor(this, R.color.colorAccent) : ActivityCompat.getColor(this, R.color.middlegrey)); } diff --git a/app/src/main/java/org/secuso/aktivpause/activities/ManageExerciseSetsActivity.java b/app/src/main/java/org/secuso/aktivpause/activities/ManageExerciseSetsActivity.java index 446d93d..1ab162a 100644 --- a/app/src/main/java/org/secuso/aktivpause/activities/ManageExerciseSetsActivity.java +++ b/app/src/main/java/org/secuso/aktivpause/activities/ManageExerciseSetsActivity.java @@ -8,21 +8,22 @@ import android.content.DialogInterface; import android.content.Intent; import android.content.res.ColorStateList; import android.graphics.drawable.ColorDrawable; -import android.support.annotation.NonNull; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.TextInputEditText; -import android.support.v4.app.ActivityCompat; -import android.support.v4.app.DialogFragment; -import android.support.v4.app.FragmentActivity; -import android.support.v4.content.AsyncTaskLoader; -import android.support.v4.content.ContextCompat; -import android.support.v4.content.Loader; -import android.support.v4.widget.DrawerLayout; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AlertDialog; +import androidx.annotation.NonNull; +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.textfield.TextInputEditText; +import androidx.core.app.ActivityCompat; +import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.FragmentActivity; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.AsyncTaskLoader; +import androidx.core.content.ContextCompat; +import androidx.loader.content.Loader; +import androidx.drawerlayout.widget.DrawerLayout; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AlertDialog; import android.os.Bundle; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.util.Log; import android.view.LayoutInflater; @@ -54,7 +55,7 @@ import static android.view.View.VISIBLE; * @version 2.0 * @see EditExerciseSetActivity */ -public class ManageExerciseSetsActivity extends BaseActivity implements android.support.v4.app.LoaderManager.LoaderCallbacks> { +public class ManageExerciseSetsActivity extends BaseActivity implements LoaderManager.LoaderCallbacks> { private static final String TAG = ManageExerciseSetsActivity.class.getSimpleName(); private RecyclerView exerciseSetList; diff --git a/app/src/main/java/org/secuso/aktivpause/activities/SplashActivity.java b/app/src/main/java/org/secuso/aktivpause/activities/SplashActivity.java index 9b20d6f..e320223 100644 --- a/app/src/main/java/org/secuso/aktivpause/activities/SplashActivity.java +++ b/app/src/main/java/org/secuso/aktivpause/activities/SplashActivity.java @@ -2,11 +2,16 @@ package org.secuso.aktivpause.activities; import android.content.Intent; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import android.preference.PreferenceManager; + +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatDelegate; import org.secuso.aktivpause.activities.tutorial.FirstLaunchManager; import org.secuso.aktivpause.activities.tutorial.TutorialActivity; +import static androidx.appcompat.app.AppCompatDelegate.setDefaultNightMode; + /** * @author yonjuni * @version 1.0 diff --git a/app/src/main/java/org/secuso/aktivpause/activities/TimerActivity.java b/app/src/main/java/org/secuso/aktivpause/activities/TimerActivity.java index a9a2d43..0d02a8f 100644 --- a/app/src/main/java/org/secuso/aktivpause/activities/TimerActivity.java +++ b/app/src/main/java/org/secuso/aktivpause/activities/TimerActivity.java @@ -12,14 +12,15 @@ import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.IBinder; import android.preference.PreferenceManager; -import android.support.annotation.NonNull; -import android.support.constraint.ConstraintLayout; -import android.support.constraint.ConstraintSet; -import android.support.v4.app.ActivityCompat; -import android.support.v4.content.AsyncTaskLoader; -import android.support.v4.content.Loader; + +import androidx.constraintlayout.widget.ConstraintLayout; +import androidx.constraintlayout.widget.ConstraintSet; +import androidx.core.app.ActivityCompat; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.AsyncTaskLoader; +import androidx.loader.content.Loader; import android.os.Bundle; -import android.support.v7.app.AlertDialog; +import androidx.appcompat.app.AlertDialog; import android.transition.TransitionManager; import android.view.Menu; import android.view.MenuInflater; @@ -58,7 +59,7 @@ import static org.secuso.aktivpause.activities.tutorial.FirstLaunchManager.PAUSE * @version 2.0 * @see TimerService */ -public class TimerActivity extends BaseActivity implements android.support.v4.app.LoaderManager.LoaderCallbacks> { +public class TimerActivity extends BaseActivity implements LoaderManager.LoaderCallbacks> { private static final String TAG = TimerActivity.class.getSimpleName(); // UI @@ -561,9 +562,9 @@ public class TimerActivity extends BaseActivity implements android.support.v4.ap private void updatePlayButton(boolean isRunning) { if(isRunning) { - playButton.setImageResource(R.drawable.ic_pause_black_48dp); + playButton.setImageResource(R.drawable.ic_pause_48); } else { - playButton.setImageResource(R.drawable.ic_play_arrow_black); + playButton.setImageResource(R.drawable.ic_play_arrow_48); } } diff --git a/app/src/main/java/org/secuso/aktivpause/activities/adapter/ExerciseAdapter.java b/app/src/main/java/org/secuso/aktivpause/activities/adapter/ExerciseAdapter.java index 755f5ca..44a40f5 100644 --- a/app/src/main/java/org/secuso/aktivpause/activities/adapter/ExerciseAdapter.java +++ b/app/src/main/java/org/secuso/aktivpause/activities/adapter/ExerciseAdapter.java @@ -2,12 +2,12 @@ package org.secuso.aktivpause.activities.adapter; import android.content.Context; import android.graphics.drawable.Drawable; -import android.preference.PreferenceManager; -import android.support.annotation.NonNull; -import android.support.constraint.ConstraintLayout; -import android.support.v4.app.ActivityCompat; -import android.support.v7.util.SortedList; -import android.support.v7.widget.RecyclerView; + +import androidx.annotation.NonNull; +import androidx.constraintlayout.widget.ConstraintLayout; +import androidx.core.app.ActivityCompat; +import androidx.recyclerview.widget.SortedList; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -20,7 +20,6 @@ import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions; import org.secuso.aktivpause.R; import org.secuso.aktivpause.activities.helper.IExerciseTimeUpdateable; -import org.secuso.aktivpause.activities.tutorial.FirstLaunchManager; import org.secuso.aktivpause.database.data.Exercise; import org.secuso.aktivpause.dialog.ExerciseDialog; diff --git a/app/src/main/java/org/secuso/aktivpause/activities/adapter/ExerciseSetListAdapter.java b/app/src/main/java/org/secuso/aktivpause/activities/adapter/ExerciseSetListAdapter.java index 345fa95..fc496b9 100644 --- a/app/src/main/java/org/secuso/aktivpause/activities/adapter/ExerciseSetListAdapter.java +++ b/app/src/main/java/org/secuso/aktivpause/activities/adapter/ExerciseSetListAdapter.java @@ -2,8 +2,8 @@ package org.secuso.aktivpause.activities.adapter; import android.content.Intent; import android.preference.PreferenceManager; -import android.support.v7.widget.CardView; -import android.support.v7.widget.RecyclerView; +import androidx.cardview.widget.CardView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/org/secuso/aktivpause/activities/adapter/ExerciseSetSpinnerAdapter.java b/app/src/main/java/org/secuso/aktivpause/activities/adapter/ExerciseSetSpinnerAdapter.java index aca1836..ea7a14b 100644 --- a/app/src/main/java/org/secuso/aktivpause/activities/adapter/ExerciseSetSpinnerAdapter.java +++ b/app/src/main/java/org/secuso/aktivpause/activities/adapter/ExerciseSetSpinnerAdapter.java @@ -2,9 +2,9 @@ package org.secuso.aktivpause.activities.adapter; import android.content.Context; import android.preference.PreferenceManager; -import android.support.annotation.LayoutRes; -import android.support.annotation.NonNull; -import android.support.v7.widget.CardView; +import androidx.annotation.LayoutRes; +import androidx.annotation.NonNull; +import androidx.cardview.widget.CardView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/org/secuso/aktivpause/activities/helper/AppCompatPreferenceActivity.java b/app/src/main/java/org/secuso/aktivpause/activities/helper/AppCompatPreferenceActivity.java index 2e7a68c..944171f 100644 --- a/app/src/main/java/org/secuso/aktivpause/activities/helper/AppCompatPreferenceActivity.java +++ b/app/src/main/java/org/secuso/aktivpause/activities/helper/AppCompatPreferenceActivity.java @@ -3,11 +3,11 @@ package org.secuso.aktivpause.activities.helper; import android.content.res.Configuration; import android.os.Bundle; import android.preference.PreferenceActivity; -import android.support.annotation.LayoutRes; -import android.support.annotation.Nullable; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatDelegate; -import android.support.v7.widget.Toolbar; +import androidx.annotation.LayoutRes; +import androidx.annotation.Nullable; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatDelegate; +import androidx.appcompat.widget.Toolbar; import android.view.MenuInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/org/secuso/aktivpause/activities/helper/BaseActivity.java b/app/src/main/java/org/secuso/aktivpause/activities/helper/BaseActivity.java index 4177693..23e59c2 100644 --- a/app/src/main/java/org/secuso/aktivpause/activities/helper/BaseActivity.java +++ b/app/src/main/java/org/secuso/aktivpause/activities/helper/BaseActivity.java @@ -5,14 +5,17 @@ import android.content.SharedPreferences; import android.os.Bundle; import android.os.Handler; import android.preference.PreferenceManager; -import android.support.design.widget.NavigationView; -import android.support.design.widget.NavigationView.OnNavigationItemSelectedListener; -import android.support.v4.app.TaskStackBuilder; -import android.support.v4.view.GravityCompat; -import android.support.v4.widget.DrawerLayout; -import android.support.v7.app.ActionBarDrawerToggle; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; +import com.google.android.material.navigation.NavigationView; +import com.google.android.material.navigation.NavigationView.OnNavigationItemSelectedListener; + +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatDelegate; +import androidx.core.app.TaskStackBuilder; +import androidx.core.view.GravityCompat; +import androidx.drawerlayout.widget.DrawerLayout; +import androidx.appcompat.app.ActionBarDrawerToggle; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import android.view.MenuItem; import android.view.View; diff --git a/app/src/main/java/org/secuso/aktivpause/activities/tutorial/FirstLaunchManager.java b/app/src/main/java/org/secuso/aktivpause/activities/tutorial/FirstLaunchManager.java index c5e770e..17f29ea 100644 --- a/app/src/main/java/org/secuso/aktivpause/activities/tutorial/FirstLaunchManager.java +++ b/app/src/main/java/org/secuso/aktivpause/activities/tutorial/FirstLaunchManager.java @@ -5,19 +5,14 @@ import android.app.NotificationChannelGroup; import android.app.NotificationManager; import android.content.Context; import android.content.SharedPreferences; -import android.database.Cursor; import android.os.Build; import android.preference.PreferenceManager; -import android.support.annotation.RequiresApi; +import androidx.annotation.RequiresApi; -import org.secuso.aktivpause.R; import org.secuso.aktivpause.database.SQLiteHelper; -import org.secuso.aktivpause.database.columns.ExerciseSetColumns; -import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; -import java.util.List; /** * Class structure taken from tutorial at http://www.androidhive.info/2016/05/android-build-intro-slider-app/ diff --git a/app/src/main/java/org/secuso/aktivpause/activities/tutorial/TutorialActivity.java b/app/src/main/java/org/secuso/aktivpause/activities/tutorial/TutorialActivity.java index c0451b5..6cad83f 100644 --- a/app/src/main/java/org/secuso/aktivpause/activities/tutorial/TutorialActivity.java +++ b/app/src/main/java/org/secuso/aktivpause/activities/tutorial/TutorialActivity.java @@ -5,10 +5,10 @@ import android.content.Intent; import android.graphics.Color; import android.os.Build; import android.os.Bundle; -import android.support.v4.content.ContextCompat; -import android.support.v4.view.PagerAdapter; -import android.support.v4.view.ViewPager; -import android.support.v7.app.AppCompatActivity; +import androidx.core.content.ContextCompat; +import androidx.viewpager.widget.PagerAdapter; +import androidx.viewpager.widget.ViewPager; +import androidx.appcompat.app.AppCompatActivity; import android.text.Html; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/org/secuso/aktivpause/database/SQLiteHelper.java b/app/src/main/java/org/secuso/aktivpause/database/SQLiteHelper.java index d5e45e6..2073690 100644 --- a/app/src/main/java/org/secuso/aktivpause/database/SQLiteHelper.java +++ b/app/src/main/java/org/secuso/aktivpause/database/SQLiteHelper.java @@ -5,7 +5,7 @@ import android.content.ContentValues; import android.content.Context; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.readystatesoftware.sqliteasset.SQLiteAssetHelper; diff --git a/app/src/main/java/org/secuso/aktivpause/database/data/Exercise.java b/app/src/main/java/org/secuso/aktivpause/database/data/Exercise.java index 3c48425..236c24d 100644 --- a/app/src/main/java/org/secuso/aktivpause/database/data/Exercise.java +++ b/app/src/main/java/org/secuso/aktivpause/database/data/Exercise.java @@ -2,7 +2,7 @@ package org.secuso.aktivpause.database.data; import android.content.Context; -import android.support.annotation.DrawableRes; +import androidx.annotation.DrawableRes; import org.secuso.aktivpause.exercises.ExerciseSections; diff --git a/app/src/main/java/org/secuso/aktivpause/dialog/ExerciseDialog.java b/app/src/main/java/org/secuso/aktivpause/dialog/ExerciseDialog.java index 8251a8b..0c06d75 100644 --- a/app/src/main/java/org/secuso/aktivpause/dialog/ExerciseDialog.java +++ b/app/src/main/java/org/secuso/aktivpause/dialog/ExerciseDialog.java @@ -2,9 +2,9 @@ package org.secuso.aktivpause.dialog; import android.content.Context; import android.content.DialogInterface; -import android.support.annotation.NonNull; -import android.support.v4.app.FragmentActivity; -import android.support.v7.app.AlertDialog; +import androidx.annotation.NonNull; +import androidx.fragment.app.FragmentActivity; +import androidx.appcompat.app.AlertDialog; import android.view.LayoutInflater; import android.view.View; import android.widget.ImageView; diff --git a/app/src/main/java/org/secuso/aktivpause/exercises/ExerciseSections.java b/app/src/main/java/org/secuso/aktivpause/exercises/ExerciseSections.java index 7cec142..ac1fe34 100644 --- a/app/src/main/java/org/secuso/aktivpause/exercises/ExerciseSections.java +++ b/app/src/main/java/org/secuso/aktivpause/exercises/ExerciseSections.java @@ -1,7 +1,7 @@ package org.secuso.aktivpause.exercises; import android.content.Context; -import android.support.annotation.StringRes; +import androidx.annotation.StringRes; import org.secuso.aktivpause.R; diff --git a/app/src/main/java/org/secuso/aktivpause/receivers/TimerSchedulerReceiver.java b/app/src/main/java/org/secuso/aktivpause/receivers/TimerSchedulerReceiver.java index 4ce3279..2ec053d 100644 --- a/app/src/main/java/org/secuso/aktivpause/receivers/TimerSchedulerReceiver.java +++ b/app/src/main/java/org/secuso/aktivpause/receivers/TimerSchedulerReceiver.java @@ -10,8 +10,8 @@ import android.content.SharedPreferences; import android.os.Build; import android.os.IBinder; import android.preference.PreferenceManager; -import android.support.annotation.NonNull; -import android.support.v4.content.WakefulBroadcastReceiver; +import androidx.annotation.NonNull; +import androidx.legacy.content.WakefulBroadcastReceiver; import org.secuso.aktivpause.service.TimerService; diff --git a/app/src/main/java/org/secuso/aktivpause/service/TimerService.java b/app/src/main/java/org/secuso/aktivpause/service/TimerService.java index fff70b7..782ffe4 100644 --- a/app/src/main/java/org/secuso/aktivpause/service/TimerService.java +++ b/app/src/main/java/org/secuso/aktivpause/service/TimerService.java @@ -14,8 +14,8 @@ import android.os.CountDownTimer; import android.os.IBinder; import android.preference.PreferenceManager; import android.provider.Settings; -import android.support.v4.app.NotificationCompat; -import android.support.v4.content.ContextCompat; +import androidx.core.app.NotificationCompat; +import androidx.core.content.ContextCompat; import org.secuso.aktivpause.R; import org.secuso.aktivpause.activities.ExerciseActivity; @@ -112,7 +112,7 @@ public class TimerService extends Service { builder.setContentTitle(getString(R.string.app_name)) .setContentText(getString(R.string.take_a_break_now)) .setContentIntent(startExercises) - .setColor(ContextCompat.getColor(this, R.color.colorAccent)) + .setColor(ContextCompat.getColor(this, R.color.colorDarkAccent)) .setPriority(NotificationCompat.PRIORITY_MAX) .setWhen(0) .setOngoing(false) @@ -129,8 +129,8 @@ public class TimerService extends Service { builder.addAction(0, getString(R.string.dismiss_and_dont_repeat), PendingIntent.getBroadcast(getApplicationContext(), 0, new Intent(ACTION_NOTIFICATION_CANCELED), FLAG_UPDATE_CURRENT)); } - builder.addAction(R.drawable.ic_replay_black_48dp, getString(R.string.snooze), snoozeExercise); - builder.addAction(R.drawable.ic_play_arrow_black, getString(R.string.start), startExercises); + builder.addAction(R.drawable.ic_replay_48, getString(R.string.snooze), snoozeExercise); + builder.addAction(R.drawable.ic_play_arrow_48, getString(R.string.start), startExercises); notificationManager.notify(NOTIFICATION_ID, builder.build()); } @@ -330,7 +330,7 @@ public class TimerService extends Service { PendingIntent startExercises = PendingIntent.getActivity(this, 0, exerciseIntent, FLAG_CANCEL_CURRENT); builder.setContentText(time); - builder.setColor(ContextCompat.getColor(this, R.color.colorAccent)); + builder.setColor(ContextCompat.getColor(this, R.color.colorDarkAccent)); builder.setPriority(NotificationCompat.PRIORITY_DEFAULT); builder.setOnlyAlertOnce(true); builder.setSound(null); @@ -343,19 +343,19 @@ public class TimerService extends Service { intent.addFlags(FLAG_ACTIVITY_CLEAR_TOP); builder.setContentIntent(PendingIntent.getActivity(this, 0, intent, FLAG_UPDATE_CURRENT)); - builder.addAction(R.drawable.ic_play_arrow_black, getString(R.string.start_break), startExercises); + builder.addAction(R.drawable.ic_play_arrow_48, getString(R.string.start_break), startExercises); Intent stopIntent = new Intent(this, TimerService.class); stopIntent.setAction(ACTION_STOP_TIMER); - builder.addAction(R.drawable.ic_replay_black_48dp, getString(R.string.stop), PendingIntent.getService(this, 0, stopIntent, FLAG_UPDATE_CURRENT)); + builder.addAction(R.drawable.ic_replay_48, getString(R.string.stop), PendingIntent.getService(this, 0, stopIntent, FLAG_UPDATE_CURRENT)); Intent pauseIntent = new Intent(this, TimerService.class); if(!isPaused()) { pauseIntent.setAction(ACTION_PAUSE_TIMER); - builder.addAction(R.drawable.ic_pause_black_48dp, getString(R.string.pause), PendingIntent.getService(this, 0, pauseIntent, FLAG_UPDATE_CURRENT)); + builder.addAction(R.drawable.ic_pause_48, getString(R.string.pause), PendingIntent.getService(this, 0, pauseIntent, FLAG_UPDATE_CURRENT)); } else { pauseIntent.setAction(ACTION_RESUME_TIMER); - builder.addAction(R.drawable.ic_play_arrow_black, getString(R.string.resume), PendingIntent.getService(this, 0, pauseIntent, FLAG_UPDATE_CURRENT)); + builder.addAction(R.drawable.ic_play_arrow_48, getString(R.string.resume), PendingIntent.getService(this, 0, pauseIntent, FLAG_UPDATE_CURRENT)); } return builder.build(); diff --git a/app/src/main/res/menu/menu_manage_exercise_sets.xml b/app/src/main/res/menu/menu_manage_exercise_sets.xml index 5847e7d..381a933 100644 --- a/app/src/main/res/menu/menu_manage_exercise_sets.xml +++ b/app/src/main/res/menu/menu_manage_exercise_sets.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/menu/nav_drawer.xml b/app/src/main/res/menu/nav_drawer.xml index 57ce8df..9711168 100644 --- a/app/src/main/res/menu/nav_drawer.xml +++ b/app/src/main/res/menu/nav_drawer.xml @@ -4,11 +4,11 @@ @@ -20,7 +20,7 @@ android:title="@string/title_activity_tutorial" />
From 736197f289207509efa663313f978d526d2dba90 Mon Sep 17 00:00:00 2001 From: machiav3lli Date: Fri, 26 Jun 2020 20:49:41 +0200 Subject: [PATCH 10/12] Add: Dark Theme --- .../aktivpause/activities/SplashActivity.java | 14 +++++++++++ .../activities/helper/BaseActivity.java | 25 +++++++++++++++++++ app/src/main/res/menu/nav_drawer.xml | 4 +++ app/src/main/res/values-de/strings.xml | 4 +++ app/src/main/res/values/strings.xml | 4 +++ 5 files changed, 51 insertions(+) diff --git a/app/src/main/java/org/secuso/aktivpause/activities/SplashActivity.java b/app/src/main/java/org/secuso/aktivpause/activities/SplashActivity.java index e320223..98b7f20 100644 --- a/app/src/main/java/org/secuso/aktivpause/activities/SplashActivity.java +++ b/app/src/main/java/org/secuso/aktivpause/activities/SplashActivity.java @@ -22,6 +22,7 @@ public class SplashActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { + setDayNightTheme(PreferenceManager.getDefaultSharedPreferences(this).getInt("theme", AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM)); super.onCreate(savedInstanceState); Intent mainIntent = null; @@ -40,4 +41,17 @@ public class SplashActivity extends AppCompatActivity { SplashActivity.this.finish(); } + private void setDayNightTheme(int theme) { + switch (theme) { + case AppCompatDelegate.MODE_NIGHT_NO: + setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO); + break; + case AppCompatDelegate.MODE_NIGHT_YES: + setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES); + break; + default: + setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM); + } + } + } diff --git a/app/src/main/java/org/secuso/aktivpause/activities/helper/BaseActivity.java b/app/src/main/java/org/secuso/aktivpause/activities/helper/BaseActivity.java index 23e59c2..237d877 100644 --- a/app/src/main/java/org/secuso/aktivpause/activities/helper/BaseActivity.java +++ b/app/src/main/java/org/secuso/aktivpause/activities/helper/BaseActivity.java @@ -27,7 +27,9 @@ import org.secuso.aktivpause.activities.SettingsActivity; import org.secuso.aktivpause.activities.TimerActivity; import org.secuso.aktivpause.activities.tutorial.TutorialActivity; + import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP; +import static androidx.appcompat.app.AppCompatDelegate.setDefaultNightMode; /** * @@ -168,6 +170,29 @@ public abstract class BaseActivity extends AppCompatActivity implements OnNaviga //intent.putExtra( PreferenceActivity.EXTRA_NO_HEADERS, true ); createBackStack(intent); break; + case R.id.nav_theme: + new AlertDialog.Builder(this) + .setTitle(R.string.title_theme) + .setPositiveButton(R.string.follow_system, (dialog, which) -> { + mSharedPreferences.edit().putInt("theme",AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM).apply(); + setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM); + Intent thisIntent = new Intent(this, getClass()); + createBackStack(thisIntent); + }) + .setNegativeButton(R.string.dark, (dialog, which) -> { + mSharedPreferences.edit().putInt("theme",AppCompatDelegate.MODE_NIGHT_YES).apply(); + setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES); + Intent thisIntent = new Intent(this, getClass()); + createBackStack(thisIntent); + }) + .setNeutralButton(R.string.light, (dialog, which) -> { + mSharedPreferences.edit().putInt("theme",AppCompatDelegate.MODE_NIGHT_NO).apply(); + setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO); + Intent thisIntent = new Intent(this, getClass()); + createBackStack(thisIntent); + }) + .show(); + break; default: } overridePendingTransition(0,0); diff --git a/app/src/main/res/menu/nav_drawer.xml b/app/src/main/res/menu/nav_drawer.xml index 9711168..3d92a94 100644 --- a/app/src/main/res/menu/nav_drawer.xml +++ b/app/src/main/res/menu/nav_drawer.xml @@ -22,6 +22,10 @@ android:id="@+id/nav_settings" android:icon="@drawable/ic_settings_24" android:title="@string/title_activity_settings" /> + Online-Befragung Ja Online-Befragung + Theme + Standard + Dunkel + Hell \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8c4bb58..f763d4a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -59,6 +59,10 @@ This set contains no exercises. Take a break now! Click here to do your chosen exercises. Settings + Theme + Standard + Dark Theme + Light Theme No exercise sets available. Please create a new one. Exercise Sets Edit Exercise Set From d06c27cdd393c604cc42295322e2a9c0f901202f Mon Sep 17 00:00:00 2001 From: machiav3lli Date: Fri, 26 Jun 2020 20:50:33 +0200 Subject: [PATCH 11/12] Fix: dots style for displays with high density --- .../secuso/aktivpause/activities/tutorial/TutorialActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/org/secuso/aktivpause/activities/tutorial/TutorialActivity.java b/app/src/main/java/org/secuso/aktivpause/activities/tutorial/TutorialActivity.java index 6cad83f..c4fbdc7 100644 --- a/app/src/main/java/org/secuso/aktivpause/activities/tutorial/TutorialActivity.java +++ b/app/src/main/java/org/secuso/aktivpause/activities/tutorial/TutorialActivity.java @@ -114,7 +114,7 @@ public class TutorialActivity extends AppCompatActivity { for (int i = 0; i < dots.length; i++) { dots[i] = new TextView(this); dots[i].setText(Html.fromHtml("•")); - dots[i].setTextSize(35); + dots[i].setTextSize(30); dots[i].setTextColor(inactiveColor); dotsLayout.addView(dots[i]); } From 3ea899b3fe9dd14d1c042b5ed97c1a68b0cc34f7 Mon Sep 17 00:00:00 2001 From: machiav3lli Date: Fri, 26 Jun 2020 20:50:41 +0200 Subject: [PATCH 12/12] Clean up --- .../aktivpause/activities/ManageExerciseSetsActivity.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/secuso/aktivpause/activities/ManageExerciseSetsActivity.java b/app/src/main/java/org/secuso/aktivpause/activities/ManageExerciseSetsActivity.java index 1ab162a..49757a2 100644 --- a/app/src/main/java/org/secuso/aktivpause/activities/ManageExerciseSetsActivity.java +++ b/app/src/main/java/org/secuso/aktivpause/activities/ManageExerciseSetsActivity.java @@ -282,7 +282,7 @@ public class ManageExerciseSetsActivity extends BaseActivity implements LoaderMa } fabButton.setBackgroundTintList(ColorStateList.valueOf(ActivityCompat.getColor(this, R.color.red))); - fabButton.setImageResource(R.drawable.ic_delete_white); + fabButton.setImageResource(R.drawable.ic_delete_24); } public void disableDeleteMode() { @@ -296,13 +296,13 @@ public class ManageExerciseSetsActivity extends BaseActivity implements LoaderMa toolbarDeleteIcon.setVisible(true); } if(android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP) { - getWindow().setStatusBarColor(ContextCompat.getColor(this, R.color.colorPrimary)); + getWindow().setStatusBarColor(ContextCompat.getColor(this, R.color.colorAccent)); } - getSupportActionBar().setBackgroundDrawable(new ColorDrawable(ActivityCompat.getColor(this, R.color.colorPrimary))); + getSupportActionBar().setBackgroundDrawable(new ColorDrawable(ActivityCompat.getColor(this, R.color.colorAccent))); getSupportActionBar().setTitle(R.string.activity_title_manage_exercise_sets); fabButton.setBackgroundTintList(fabDefaultBackgroundTint); - fabButton.setImageResource(R.drawable.ic_add_white_24dp); + fabButton.setImageResource(R.drawable.ic_add_24); } public static class AddExerciseSetDialogFragment extends DialogFragment {