Remove redundant colors and use icons
Этот коммит содержится в:
@@ -1,5 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
<background android:drawable="@color/ic_launcher_background"/>
|
<background android:drawable="@color/white"/>
|
||||||
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
|
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
|
||||||
</adaptive-icon>
|
</adaptive-icon>
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
<background android:drawable="@color/ic_launcher_background"/>
|
<background android:drawable="@color/white"/>
|
||||||
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
|
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
|
||||||
</adaptive-icon>
|
</adaptive-icon>
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<resources>
|
|
||||||
<color name="ic_launcher_background">#FFFFFF</color>
|
|
||||||
</resources>
|
|
||||||
@@ -65,13 +65,13 @@ public class ShortcutActivity extends AppCompatActivity {
|
|||||||
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
|
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
|
||||||
switch (position) {
|
switch (position) {
|
||||||
case 0:
|
case 0:
|
||||||
setShortcutResult(items[position], R.mipmap.ic_launcher, ACTION_START);
|
setShortcutResult(items[position], R.mipmap.ic_start, ACTION_START);
|
||||||
break;
|
break;
|
||||||
case 1:
|
case 1:
|
||||||
setShortcutResult(items[position], R.mipmap.ic_launcher, ACTION_STOP);
|
setShortcutResult(items[position], R.mipmap.ic_stop, ACTION_STOP);
|
||||||
break;
|
break;
|
||||||
case 2:
|
case 2:
|
||||||
setShortcutResult(items[position], R.mipmap.ic_launcher, ACTION_SOS);
|
setShortcutResult(items[position], R.mipmap.ic_sos, ACTION_SOS);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
finish();
|
finish();
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
<background android:drawable="@color/ic_launcher_background"/>
|
<background android:drawable="@color/primary"/>
|
||||||
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
|
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
|
||||||
</adaptive-icon>
|
</adaptive-icon>
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
<background android:drawable="@color/ic_launcher_background"/>
|
<background android:drawable="@color/primary"/>
|
||||||
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
|
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
|
||||||
</adaptive-icon>
|
</adaptive-icon>
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
<background android:drawable="@color/ic_sos_background"/>
|
<background android:drawable="@color/white"/>
|
||||||
<foreground android:drawable="@mipmap/ic_sos_foreground"/>
|
<foreground android:drawable="@mipmap/ic_sos_foreground"/>
|
||||||
</adaptive-icon>
|
</adaptive-icon>
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
<background android:drawable="@color/ic_sos_background"/>
|
<background android:drawable="@color/white"/>
|
||||||
<foreground android:drawable="@mipmap/ic_sos_foreground"/>
|
<foreground android:drawable="@mipmap/ic_sos_foreground"/>
|
||||||
</adaptive-icon>
|
</adaptive-icon>
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
<background android:drawable="@color/ic_start_background"/>
|
<background android:drawable="@color/white"/>
|
||||||
<foreground android:drawable="@mipmap/ic_start_foreground"/>
|
<foreground android:drawable="@mipmap/ic_start_foreground"/>
|
||||||
</adaptive-icon>
|
</adaptive-icon>
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
<background android:drawable="@color/ic_start_background"/>
|
<background android:drawable="@color/white"/>
|
||||||
<foreground android:drawable="@mipmap/ic_start_foreground"/>
|
<foreground android:drawable="@mipmap/ic_start_foreground"/>
|
||||||
</adaptive-icon>
|
</adaptive-icon>
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
<background android:drawable="@color/ic_stop_background"/>
|
<background android:drawable="@color/white"/>
|
||||||
<foreground android:drawable="@mipmap/ic_stop_foreground"/>
|
<foreground android:drawable="@mipmap/ic_stop_foreground"/>
|
||||||
</adaptive-icon>
|
</adaptive-icon>
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
<background android:drawable="@color/ic_stop_background"/>
|
<background android:drawable="@color/white"/>
|
||||||
<foreground android:drawable="@mipmap/ic_stop_foreground"/>
|
<foreground android:drawable="@mipmap/ic_stop_foreground"/>
|
||||||
</adaptive-icon>
|
</adaptive-icon>
|
||||||
@@ -4,7 +4,6 @@
|
|||||||
<color name="primary">#43A047</color>
|
<color name="primary">#43A047</color>
|
||||||
<color name="primary_dark">#2E7D32</color>
|
<color name="primary_dark">#2E7D32</color>
|
||||||
<color name="accent">#388E3C</color>
|
<color name="accent">#388E3C</color>
|
||||||
|
<color name="white">#FFFFFF</color>
|
||||||
<color name="ic_launcher_background">#43A047</color>
|
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
|
|||||||
@@ -1,4 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<resources>
|
|
||||||
<color name="ic_sos_background">#FFFFFF</color>
|
|
||||||
</resources>
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<resources>
|
|
||||||
<color name="ic_start_background">#FFFFFF</color>
|
|
||||||
</resources>
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<resources>
|
|
||||||
<color name="ic_stop_background">#FFFFFF</color>
|
|
||||||
</resources>
|
|
||||||
@@ -7,7 +7,7 @@
|
|||||||
<shortcut
|
<shortcut
|
||||||
android:shortcutId="start"
|
android:shortcutId="start"
|
||||||
android:enabled="true"
|
android:enabled="true"
|
||||||
android:icon="@mipmap/ic_launcher"
|
android:icon="@mipmap/ic_start"
|
||||||
android:shortcutShortLabel="@string/shortcut_start">
|
android:shortcutShortLabel="@string/shortcut_start">
|
||||||
<intent
|
<intent
|
||||||
android:action="android.intent.action.VIEW"
|
android:action="android.intent.action.VIEW"
|
||||||
@@ -22,7 +22,7 @@
|
|||||||
<shortcut
|
<shortcut
|
||||||
android:shortcutId="stop"
|
android:shortcutId="stop"
|
||||||
android:enabled="true"
|
android:enabled="true"
|
||||||
android:icon="@mipmap/ic_launcher"
|
android:icon="@mipmap/ic_stop"
|
||||||
android:shortcutShortLabel="@string/shortcut_stop">
|
android:shortcutShortLabel="@string/shortcut_stop">
|
||||||
<intent
|
<intent
|
||||||
android:action="android.intent.action.VIEW"
|
android:action="android.intent.action.VIEW"
|
||||||
@@ -37,7 +37,7 @@
|
|||||||
<shortcut
|
<shortcut
|
||||||
android:shortcutId="sos"
|
android:shortcutId="sos"
|
||||||
android:enabled="true"
|
android:enabled="true"
|
||||||
android:icon="@mipmap/ic_launcher"
|
android:icon="@mipmap/ic_sos"
|
||||||
android:shortcutShortLabel="@string/shortcut_sos">
|
android:shortcutShortLabel="@string/shortcut_sos">
|
||||||
<intent
|
<intent
|
||||||
android:action="android.intent.action.VIEW"
|
android:action="android.intent.action.VIEW"
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user