Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c7531eb652 | ||
|
|
5c1452ff57 | ||
|
|
e467044e41 | ||
|
|
5c5780f720 | ||
|
|
7119bab9c9 | ||
|
|
2eccc92510 | ||
|
|
b9e0fcdb04 | ||
|
|
5c15912b1b |
@@ -4,6 +4,7 @@ import com.vk.apps.AppsFragment;
|
||||
import com.vk.discover.DiscoverFeedFragment;
|
||||
import com.vk.discover.DiscoverFragment;
|
||||
import com.vk.fave.fragments.FaveTabFragment;
|
||||
import com.vk.feedlikes.fragments.FeedLikesFragment;
|
||||
import com.vk.menu.MenuFragment;
|
||||
import com.vk.music.fragment.MusicFragment;
|
||||
import com.vk.newsfeed.Feed2049;
|
||||
@@ -82,6 +83,7 @@ public class DockBarManager {
|
||||
mDisabledTabs.add(new DockBarTab("tab_videos", R.drawable.ic_video_24, R.string.videos, R.id.menu_videos, VideosFragment.class));
|
||||
mDisabledTabs.add(new DockBarTab("tab_lives", R.drawable.ic_live_filter_24dp, R.string.sett_live, R.id.menu_lives, LivesPostListFragment.class));
|
||||
mDisabledTabs.add(new DockBarTab("tab_games", R.drawable.ic_games_24, R.string.games, R.id.menu_games, GamesFragment.class));
|
||||
mDisabledTabs.add(new DockBarTab("tab_liked", R.drawable.ic_menu_like_24, R.string.sett_likes, R.id.menu_feed_likes, FeedLikesFragment.class));
|
||||
mDisabledTabs.add(new DockBarTab("tab_fave", R.drawable.ic_favorite_24, R.string.exo_track_selection_title_video_res_0x7f11031e, R.id.menu_fave, FaveTabFragment.class));
|
||||
mDisabledTabs.add(new DockBarTab("tab_documents", R.drawable.ic_document_24, R.string.docs, R.id.menu_documents, DocumentsViewFragment.class));
|
||||
mDisabledTabs.add(new DockBarTab("tab_payments", R.drawable.ic_money_transfer_24, R.string.money_transfer_money_transfers, R.id.menu_payments, MoneyTransfersFragment.class));
|
||||
|
||||
@@ -30,6 +30,10 @@ public class Themes {
|
||||
return VKThemeHelper.a((int) R.attr.tabbar_background);
|
||||
}
|
||||
|
||||
public static int getHeaderBackground() {
|
||||
return VKThemeHelper.a((int) R.attr.header_background);
|
||||
}
|
||||
|
||||
public static int getAmoledTheme() {
|
||||
return Helper.GetContext().getResources().getIdentifier("BaseAmoledStyle", "style", Helper.GetContext().getPackageName());
|
||||
}
|
||||
@@ -126,6 +130,13 @@ public class Themes {
|
||||
return new RecoloredDrawable(drawable, getAccentColor());
|
||||
}
|
||||
|
||||
public static Drawable recolorDrawableToolbar(Drawable drawable) {
|
||||
if (drawable == null) {
|
||||
return null;
|
||||
}
|
||||
return new RecoloredDrawable(drawable, getHeaderText());
|
||||
}
|
||||
|
||||
public static ColorStateList recolorCSL(ColorStateList colorStateList) {
|
||||
if (colorStateList == null) {
|
||||
return null;
|
||||
|
||||
@@ -44,7 +44,10 @@ public class VKUIInjector {
|
||||
|
||||
public static void load() {
|
||||
loadedCSS = load("vt_ui_accent.css")
|
||||
.replace("%accent%", Themes.hex(Themes.getAccentColor()))
|
||||
.replace("%header_background%", Themes.hex(Themes.getColorFromAttr(R.attr.header_background)))
|
||||
.replace("%background_content%", Themes.hex(Themes.getColorFromAttr(R.attr.background_content)))
|
||||
.replace("%header_text%", Themes.hex(Themes.getColorFromAttr(R.attr.header_text)))
|
||||
.replace("%accent%", Themes.hex(Themes.getColorFromAttr(R.attr.accent)))
|
||||
.replace("%background_page%", Themes.hex(Themes.getColorFromAttr(R.attr.background_page)))
|
||||
.replace("%background_content%", Themes.hex(Themes.getColorFromAttr(R.attr.background_content)))
|
||||
.replace("%text_primary%", Themes.hex(Themes.getColorFromAttr(R.attr.text_primary)));
|
||||
|
||||
@@ -19,10 +19,6 @@ body[scheme=bright_light] {
|
||||
--cell_button_foreground: %accent% !important;
|
||||
--control_foreground: %accent% !important;
|
||||
--counter_primary_background: %accent% !important;
|
||||
--header_alternate_tab_active_indicator: %accent% !important;
|
||||
--header_tab_active_indicator: %accent% !important;
|
||||
--header_tint: %accent% !important;
|
||||
--header_tint_alternate: %accent% !important;
|
||||
--im_attach_tint: %accent% !important;
|
||||
--im_reply_sender_text: %accent% !important;
|
||||
--im_reply_separator: %accent% !important;
|
||||
@@ -42,24 +38,70 @@ body[scheme=bright_light] {
|
||||
--writebar_icon: %accent% !important;
|
||||
--dynamic_blue: %accent% !important;
|
||||
/* backgrounds */
|
||||
--background_content: %background_page% !important;
|
||||
--background_content: %background_content% !important;
|
||||
--background_page: %background_page% !important;
|
||||
--content_tint_background: %background_page% !important;
|
||||
--loader_background: %background_page% !important;
|
||||
--header_background: %background_page% !important;
|
||||
--header_background_before_blur: %background_page% !important;
|
||||
--header_background_before_blur_alternate: %background_page% !important;
|
||||
--header_alternate_background: %background_page% !important;
|
||||
--header_background: %header_background% !important;
|
||||
--header_background_before_blur: %header_background% !important;
|
||||
--header_background_before_blur_alternate: %header_background% !important;
|
||||
--header_alternate_background: %header_background% !important;
|
||||
|
||||
--header_text_alternate: %header_text% !important;
|
||||
--header_text: %header_text% !important;
|
||||
--header_text_secondary: %header_text% !important;
|
||||
--header_tint: %header_text% !important;
|
||||
--header_tint_alternate: %header_text% !important;
|
||||
}
|
||||
|
||||
|
||||
|
||||
body[scheme=space_gray] {
|
||||
--accent: %accent% !important;
|
||||
--action_sheet_action_foreground: %accent% !important;
|
||||
--attach_picker_tab_active_background: %accent% !important;
|
||||
--attach_picker_tab_active_text: %accent% !important;
|
||||
--button_muted_foreground: %accent% !important;
|
||||
--button_outline_border: %accent% !important;
|
||||
--button_outline_foreground: %accent% !important;
|
||||
--button_primary_background: %accent% !important;
|
||||
--button_secondary_foreground: %accent% !important;
|
||||
--button_tertiary_foreground: %accent% !important;
|
||||
--cell_button_foreground: %accent% !important;
|
||||
--control_foreground: %accent% !important;
|
||||
--counter_primary_background: %accent% !important;
|
||||
--im_attach_tint: %accent% !important;
|
||||
--im_reply_sender_text: %accent% !important;
|
||||
--im_reply_separator: %accent% !important;
|
||||
--im_text_name: %accent% !important;
|
||||
--landing_login_button_background: %accent% !important;
|
||||
--landing_primary_button_background: %accent% !important;
|
||||
--landing_tertiary_button_foreground: %accent% !important;
|
||||
--landing_text_title: %accent% !important;
|
||||
--landing_secondary_button_foreground: %accent% !important;
|
||||
--link_alternate: %accent% !important;
|
||||
--loader_track_value_fill: %accent% !important;
|
||||
--feed_recommended_friend_promo_background: %accent% !important;
|
||||
--tabbar_active_icon: %accent% !important;
|
||||
--tabbar_tablet_active_icon: %accent% !important;
|
||||
--text_link: %accent% !important;
|
||||
--text_link_hightlighted_background: %accent% !important;
|
||||
--text_name: %accent% !important;
|
||||
--writebar_icon: %accent% !important;
|
||||
--dynamic_blue: %accent% !important;
|
||||
--background_content: %background_content% !important;
|
||||
--background_page: %background_page% !important;
|
||||
--content_tint_background: %background_page% !important;
|
||||
--loader_background: %background_page% !important;
|
||||
--header_background: %header_background% !important;
|
||||
--header_background_before_blur: %header_background% !important;
|
||||
--header_background_before_blur_alternate: %header_background% !important;
|
||||
--header_alternate_background: %header_background% !important;
|
||||
--header_tint: %header_text% !important;
|
||||
--header_tint_alternate: %header_text% !important;
|
||||
|
||||
--header_text_alternate: %header_text% !important;
|
||||
--header_text: %header_text% !important;
|
||||
--header_text_secondary: %header_text% !important;
|
||||
}
|
||||
|
||||
/* фиксы статей */
|
||||
|
||||
|
Before Width: | Height: | Size: 4.5 KiB After Width: | Height: | Size: 4.2 KiB |
|
Before Width: | Height: | Size: 9.0 KiB After Width: | Height: | Size: 8.8 KiB |
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layer-list android:opacity="opaque"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:drawable="@color/im_old_accent" />
|
||||
<item android:drawable="@color/iclauncher" />
|
||||
<item>
|
||||
<bitmap
|
||||
android:gravity="center"
|
||||
|
||||
|
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 2.9 KiB |
|
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 5.8 KiB |
@@ -1,3 +1,3 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<ripple android:color="#30ffffff"
|
||||
<ripple android:color="?header_text"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" />
|
||||
|
Before Width: | Height: | Size: 6.0 KiB After Width: | Height: | Size: 4.2 KiB |
|
Before Width: | Height: | Size: 5.9 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 8.9 KiB After Width: | Height: | Size: 8.3 KiB |
|
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 25 KiB After Width: | Height: | Size: 25 KiB |
@@ -9,7 +9,7 @@
|
||||
<size
|
||||
android:height="4.0dip"
|
||||
android:width="4.0dip" />
|
||||
<solid android:color="@color/toolbar_blue_textColorSecondary" />
|
||||
<solid android:color="?header_text" />
|
||||
</shape>
|
||||
</item>
|
||||
<item
|
||||
@@ -21,7 +21,7 @@
|
||||
<size
|
||||
android:height="4.0dip"
|
||||
android:width="4.0dip" />
|
||||
<solid android:color="@color/toolbar_blue_textColorSecondary" />
|
||||
<solid android:color="?header_text" />
|
||||
</shape>
|
||||
</item>
|
||||
<item
|
||||
@@ -33,7 +33,7 @@
|
||||
<size
|
||||
android:height="4.0dip"
|
||||
android:width="4.0dip" />
|
||||
<solid android:color="@color/toolbar_blue_textColorSecondary" />
|
||||
<solid android:color="?header_text" />
|
||||
</shape>
|
||||
</item>
|
||||
</layer-list>
|
||||
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layer-list android:opacity="opaque"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:drawable="@color/gray_20" />
|
||||
<item android:drawable="@color/iclauncher" />
|
||||
<item>
|
||||
<bitmap
|
||||
android:gravity="center"
|
||||
|
||||
@@ -3,14 +3,14 @@
|
||||
<item android:id="@android:id/secondaryProgress">
|
||||
<clip>
|
||||
<shape>
|
||||
<solid android:color="#337aa0cc" />
|
||||
<solid android:color="?accent" />
|
||||
</shape>
|
||||
</clip>
|
||||
</item>
|
||||
<item android:id="@android:id/progress">
|
||||
<clip>
|
||||
<shape>
|
||||
<solid android:color="#ff7aa0cc" />
|
||||
<solid android:color="?accent" />
|
||||
</shape>
|
||||
</clip>
|
||||
</item>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape android:shape="rectangle"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<solid android:color="@color/toolbar_white_textColorSecondary" />
|
||||
<solid android:color="?header_text" />
|
||||
<size android:width="1.0dip" />
|
||||
</shape>
|
||||
@@ -20,7 +20,7 @@
|
||||
android:layout_height="56.0dip"
|
||||
android:src="@drawable/ic_search_params_24"
|
||||
android:scaleType="centerInside"
|
||||
android:tint="?accent"
|
||||
android:tint="?header_text"
|
||||
android:contentDescription="@null" />
|
||||
|
||||
<LinearLayout
|
||||
|
||||
@@ -36,6 +36,7 @@
|
||||
android:background="@drawable/picker_white_ripple_unbounded"
|
||||
android:layout_width="48.0dip"
|
||||
android:layout_height="48.0dip"
|
||||
android:tint="?header_text"
|
||||
android:src="@drawable/ic_friend_add_24"
|
||||
android:scaleType="centerInside" />
|
||||
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
android:layout_height="56.0dip"
|
||||
android:src="@drawable/ic_search_params_24"
|
||||
android:scaleType="centerInside"
|
||||
android:tint="?button_outline_border" />
|
||||
android:tint="?header_text" />
|
||||
|
||||
<LinearLayout
|
||||
android:layout_gravity="center"
|
||||
|
||||
@@ -36,6 +36,7 @@
|
||||
android:background="@drawable/picker_white_ripple_unbounded"
|
||||
android:layout_width="48.0dip"
|
||||
android:layout_height="48.0dip"
|
||||
android:tint="?header_text"
|
||||
android:src="@drawable/ic_friend_add_24"
|
||||
android:scaleType="centerInside" />
|
||||
|
||||
|
||||
@@ -32,6 +32,7 @@
|
||||
android:textStyle="normal"
|
||||
android:gravity="center_vertical"
|
||||
android:id="@id/playlist_title"
|
||||
android:textColor="?text_primary"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="4.0dip"
|
||||
|
||||
@@ -30,6 +30,7 @@
|
||||
<android.support.v7.widget.AppCompatEditText
|
||||
android:textSize="20.0dip"
|
||||
android:textColorHint="@color/music_text_hint"
|
||||
android:textColor="?text_primary"
|
||||
android:id="@id/playlist_title"
|
||||
android:layout_width="0.0dip"
|
||||
android:layout_height="wrap_content"
|
||||
|
||||
@@ -55,7 +55,7 @@
|
||||
|
||||
<TextView
|
||||
android:textSize="17.0dip"
|
||||
android:textColor="@color/white"
|
||||
android:textColor="?text_primary"
|
||||
android:ellipsize="end"
|
||||
android:gravity="center_horizontal"
|
||||
android:id="@id/playlist_title"
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
|
||||
<com.vtosters.lite.ui.CorrectlyMeasuringTextView
|
||||
android:textSize="20.0dip"
|
||||
android:textColor="@color/music_text_primary"
|
||||
android:textColor="?text_primary"
|
||||
android:ellipsize="end"
|
||||
android:id="@id/playlist_title"
|
||||
android:layout_width="wrap_content"
|
||||
|
||||
@@ -23,6 +23,7 @@
|
||||
android:textStyle="normal"
|
||||
android:gravity="center_vertical"
|
||||
android:id="@id/playlist_title"
|
||||
android:textColor="?text_primary"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="4.0dip"
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
<TextView
|
||||
android:textSize="14.0dip"
|
||||
android:textStyle="normal"
|
||||
android:textColor="?text_muted"
|
||||
android:textColor="?text_primary"
|
||||
android:ellipsize="end"
|
||||
android:gravity="center_vertical"
|
||||
android:id="@id/playlist_title"
|
||||
|
||||
@@ -20,6 +20,7 @@
|
||||
|
||||
<TextView
|
||||
android:textStyle="normal"
|
||||
android:textColor="?text_primary"
|
||||
android:id="@id/playlist_title"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
|
||||
@@ -36,7 +36,7 @@
|
||||
|
||||
<TextView
|
||||
android:textSize="17.0dip"
|
||||
android:textColor="@color/white"
|
||||
android:textColor="?text_primary"
|
||||
android:ellipsize="end"
|
||||
android:id="@id/playlist_title"
|
||||
android:layout_width="0.0dip"
|
||||
|
||||
@@ -54,7 +54,7 @@
|
||||
android:layout_height="56.0dip"
|
||||
android:src="@drawable/ic_search_params_24"
|
||||
android:scaleType="centerInside"
|
||||
android:tint="#ff528bcc" />
|
||||
android:tint="?header_text" />
|
||||
|
||||
<LinearLayout
|
||||
android:layout_gravity="center"
|
||||
|
||||
@@ -64,7 +64,7 @@
|
||||
android:layout_height="40.0dip"
|
||||
android:src="@drawable/ic_search_params_24"
|
||||
android:scaleType="centerInside"
|
||||
android:tint="#ff909499" />
|
||||
android:tint="?header_text" />
|
||||
|
||||
<ImageView
|
||||
android:layout_gravity="center_vertical"
|
||||
|
||||
@@ -42,9 +42,10 @@
|
||||
|
||||
<EditText
|
||||
android:textSize="16.0sp"
|
||||
android:textColor="#ff2c2d2e"
|
||||
android:textColor="?text_primary"
|
||||
android:id="@id/title"
|
||||
android:background="@drawable/vkui_bg_field_nonfocusable"
|
||||
android:backgroundTint="?background_page"
|
||||
android:paddingTop="13.0dip"
|
||||
android:paddingBottom="11.0dip"
|
||||
android:fadingEdgeLength="6.0dip"
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
<item
|
||||
android:icon="@drawable/ic_add_24"
|
||||
android:id="@id/add"
|
||||
android:tint="?header_text"
|
||||
android:title="@string/add"
|
||||
android:showAsAction="always" />
|
||||
</menu>
|
||||
@@ -3,6 +3,8 @@
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<item
|
||||
android:id="@id/copy_link"
|
||||
app:menuTint="?header_text"
|
||||
android:tint="?header_text"
|
||||
android:title="@string/copy_link"
|
||||
app:showAsAction="never" />
|
||||
</menu>
|
||||
@@ -4,6 +4,8 @@
|
||||
<item
|
||||
android:icon="@drawable/ic_temp_close"
|
||||
android:id="@id/close"
|
||||
app:menuTint="?header_text"
|
||||
android:tint="?header_text"
|
||||
android:title="@string/close"
|
||||
app:showAsAction="always" />
|
||||
</menu>
|
||||
@@ -6,5 +6,8 @@
|
||||
android:id="@id/add"
|
||||
android:title="@string/action_create_group"
|
||||
android:showAsAction="always"
|
||||
app:menuTint="?header_text"
|
||||
android:tint="?header_text"
|
||||
app:iconTint="?header_text"
|
||||
app:showAsAction="always" />
|
||||
</menu>
|
||||
@@ -5,6 +5,8 @@
|
||||
android:icon="@drawable/ic_add_24"
|
||||
android:id="@id/documents_add"
|
||||
android:visible="false"
|
||||
app:menuTint="?header_text"
|
||||
android:tint="?header_text"
|
||||
android:title="@string/add"
|
||||
android:showAsAction="always"
|
||||
app:showAsAction="always" />
|
||||
@@ -12,6 +14,8 @@
|
||||
android:icon="@drawable/ic_search_24"
|
||||
android:id="@id/documents_search"
|
||||
android:visible="false"
|
||||
app:menuTint="?header_text"
|
||||
android:tint="?header_text"
|
||||
android:title="@string/add"
|
||||
android:showAsAction="always"
|
||||
app:showAsAction="always" />
|
||||
|
||||
@@ -6,5 +6,7 @@
|
||||
android:id="@id/tags"
|
||||
android:title="@string/fave_tag_icon_title"
|
||||
app:menuTint="?header_text"
|
||||
android:tint="?header_text"
|
||||
app:iconTint="?header_text"
|
||||
app:showAsAction="always" />
|
||||
</menu>
|
||||
@@ -5,6 +5,8 @@
|
||||
android:icon="@drawable/ic_add_24"
|
||||
android:id="@id/friends_add"
|
||||
android:title="@string/add"
|
||||
app:menuTint="?header_text"
|
||||
android:tint="?header_text"
|
||||
android:showAsAction="always"
|
||||
app:showAsAction="always" />
|
||||
</menu>
|
||||
@@ -4,6 +4,8 @@
|
||||
<item
|
||||
android:icon="@drawable/ic_market_28"
|
||||
android:id="@id/menu_cart"
|
||||
app:menuTint="?header_text"
|
||||
android:tint="?header_text"
|
||||
android:title="@string/market_cart"
|
||||
app:showAsAction="always" />
|
||||
<item
|
||||
|
||||
@@ -4,6 +4,9 @@
|
||||
<item
|
||||
android:icon="@drawable/ic_add_24"
|
||||
android:id="@id/tags"
|
||||
app:menuTint="?header_text"
|
||||
android:tint="?header_text"
|
||||
app:iconTint="?header_text"
|
||||
android:title="@string/camera_ui_live_start"
|
||||
app:showAsAction="always" />
|
||||
</menu>
|
||||
@@ -5,6 +5,7 @@
|
||||
android:icon="@drawable/ic_done_24"
|
||||
android:id="@id/done"
|
||||
android:title="@string/save"
|
||||
app:iconTint="?im_app_icon_toolbar"
|
||||
app:menuTint="?header_text"
|
||||
android:tint="?header_text"
|
||||
app:showAsAction="always" />
|
||||
</menu>
|
||||
@@ -4,6 +4,9 @@
|
||||
<item
|
||||
android:icon="@drawable/ic_settings_24"
|
||||
android:id="@id/menu_settings"
|
||||
app:menuTint="?header_text"
|
||||
android:tint="?header_text"
|
||||
app:iconTint="?header_text"
|
||||
android:title="@string/menu_settings"
|
||||
android:showAsAction="always"
|
||||
app:showAsAction="always" />
|
||||
|
||||
@@ -4,6 +4,8 @@
|
||||
<item
|
||||
android:icon="@drawable/ic_write_24"
|
||||
android:id="@id/edit"
|
||||
app:menuTint="?header_text"
|
||||
android:tint="?header_text"
|
||||
android:title="@string/edit"
|
||||
app:showAsAction="always" />
|
||||
</menu>
|
||||
@@ -4,8 +4,9 @@
|
||||
<item
|
||||
android:icon="@drawable/ic_check_24"
|
||||
android:id="@id/ok"
|
||||
app:menuTint="?header_text"
|
||||
android:tint="?header_text"
|
||||
android:title="@string/ok"
|
||||
android:showAsAction="always"
|
||||
app:menuTint="?header_text"
|
||||
app:showAsAction="always" />
|
||||
</menu>
|
||||
@@ -7,18 +7,24 @@
|
||||
<item
|
||||
android:icon="@drawable/vkui_ic_voip_call_24"
|
||||
android:id="@id/call"
|
||||
app:menuTint="?header_text"
|
||||
android:tint="?header_text"
|
||||
android:visible="false"
|
||||
android:title="@string/voip_call_user"
|
||||
app:showAsAction="always" />
|
||||
<item
|
||||
android:icon="@drawable/vkui_ic_voip_call_video_24"
|
||||
android:id="@id/call_video"
|
||||
app:menuTint="?header_text"
|
||||
android:tint="?header_text"
|
||||
android:visible="false"
|
||||
android:title="@string/voip_call_user"
|
||||
app:showAsAction="always" />
|
||||
<item
|
||||
android:icon="@drawable/ic_settings_24"
|
||||
android:id="@id/edit_group"
|
||||
app:menuTint="?header_text"
|
||||
android:tint="?header_text"
|
||||
android:title="@string/edit_group"
|
||||
android:showAsAction="always"
|
||||
app:showAsAction="always" />
|
||||
|
||||
@@ -4,6 +4,8 @@
|
||||
<item
|
||||
android:icon="@drawable/ic_check_24"
|
||||
android:id="@id/save"
|
||||
app:menuTint="?header_text"
|
||||
android:tint="?header_text"
|
||||
android:title="@string/save"
|
||||
android:showAsAction="always"
|
||||
app:showAsAction="always" />
|
||||
|
||||
@@ -4,6 +4,8 @@
|
||||
<item
|
||||
android:icon="@drawable/libverify_ic_delete_white"
|
||||
android:id="@id/history_clear"
|
||||
app:menuTint="?header_text"
|
||||
android:tint="?header_text"
|
||||
android:title="@string/notification_history_clear"
|
||||
app:showAsAction="ifRoom" />
|
||||
</menu>
|
||||
@@ -4,6 +4,9 @@
|
||||
<item
|
||||
android:icon="@drawable/ic_add_24"
|
||||
android:id="@id/add"
|
||||
app:menuTint="?header_text"
|
||||
android:tint="?header_text"
|
||||
app:iconTint="?header_text"
|
||||
android:title="@string/add"
|
||||
android:showAsAction="always"
|
||||
app:showAsAction="always">
|
||||
|
||||
@@ -4,6 +4,9 @@
|
||||
<item
|
||||
android:icon="@drawable/ic_done_24_menu"
|
||||
android:id="@id/save"
|
||||
app:menuTint="?header_text"
|
||||
android:tint="?header_text"
|
||||
app:iconTint="?header_text"
|
||||
android:title="@string/vkim_accessibility_save"
|
||||
android:contentDescription="@string/vkim_accessibility_save"
|
||||
app:showAsAction="always" />
|
||||
|
||||
@@ -7,21 +7,27 @@
|
||||
android:id="@id/call"
|
||||
android:visible="false"
|
||||
android:title="@string/vkim_msg_header_menu_call"
|
||||
app:iconTint="?header_tint"
|
||||
app:menuTint="?header_text"
|
||||
android:tint="?header_text"
|
||||
app:iconTint="?header_text"
|
||||
app:showAsAction="always" />
|
||||
<item
|
||||
android:icon="?im_ic_voip_call_video"
|
||||
android:id="@id/call_video"
|
||||
android:visible="false"
|
||||
android:title="@string/vkim_msg_header_menu_call"
|
||||
app:iconTint="?header_tint"
|
||||
app:menuTint="?header_text"
|
||||
android:tint="?header_text"
|
||||
app:iconTint="?header_text"
|
||||
app:showAsAction="always" />
|
||||
<item
|
||||
android:icon="@drawable/vkim_ic_more_vertical_24"
|
||||
android:id="@id/more"
|
||||
android:visible="false"
|
||||
android:title="@string/vkim_toolbar_more_options"
|
||||
app:iconTint="?header_tint"
|
||||
app:menuTint="?header_text"
|
||||
android:tint="?header_text"
|
||||
app:iconTint="?header_text"
|
||||
app:showAsAction="always" />
|
||||
</group>
|
||||
</menu>
|
||||
@@ -5,6 +5,8 @@
|
||||
android:icon="@drawable/vkim_ic_search"
|
||||
android:id="@id/action_search"
|
||||
android:title="@string/vkim_dialogs_header_search"
|
||||
app:iconTint="?im_app_icon_toolbar"
|
||||
app:menuTint="?header_text"
|
||||
android:tint="?header_text"
|
||||
app:iconTint="?header_text"
|
||||
app:showAsAction="always" />
|
||||
</menu>
|
||||
@@ -6,13 +6,17 @@
|
||||
android:id="@id/im_dialogs_create"
|
||||
android:title="@string/vkim_accessibility_create_dialog"
|
||||
android:showAsAction="always"
|
||||
app:iconTint="?im_app_icon_toolbar"
|
||||
app:menuTint="?header_text"
|
||||
android:tint="?header_text"
|
||||
app:iconTint="?header_text"
|
||||
app:showAsAction="always" />
|
||||
<item
|
||||
android:icon="@drawable/ic_search_24"
|
||||
android:id="@id/im_dialogs_search"
|
||||
android:title="@string/search"
|
||||
android:showAsAction="always"
|
||||
app:iconTint="?im_app_icon_toolbar"
|
||||
app:menuTint="?header_text"
|
||||
android:tint="?header_text"
|
||||
app:iconTint="?header_text"
|
||||
app:showAsAction="always" />
|
||||
</menu>
|
||||
@@ -6,7 +6,9 @@
|
||||
android:id="@id/im_dialogs_search"
|
||||
android:title="@string/search"
|
||||
android:showAsAction="always"
|
||||
app:iconTint="?header_tint"
|
||||
app:menuTint="?header_text"
|
||||
android:tint="?header_text"
|
||||
app:iconTint="?header_text"
|
||||
app:showAsAction="always" />
|
||||
<item
|
||||
android:icon="@drawable/ic_logo_vk_outline_28"
|
||||
@@ -14,6 +16,8 @@
|
||||
android:visible="false"
|
||||
android:title="@string/vkim_accessibility_back_to_vk_app"
|
||||
android:showAsAction="always"
|
||||
app:iconTint="?header_tint"
|
||||
app:menuTint="?header_text"
|
||||
android:tint="?header_text"
|
||||
app:iconTint="?header_text"
|
||||
app:showAsAction="always" />
|
||||
</menu>
|
||||
@@ -5,6 +5,8 @@
|
||||
android:icon="@drawable/ic_search_theme_tinted"
|
||||
android:id="@id/vkim_search_menu"
|
||||
android:visible="true"
|
||||
app:menuTint="?header_text"
|
||||
android:tint="?header_text"
|
||||
android:title="@string/search"
|
||||
app:showAsAction="always" />
|
||||
</menu>
|
||||
@@ -5,6 +5,7 @@
|
||||
android:icon="@drawable/ic_done_24"
|
||||
android:id="@id/vkim_done"
|
||||
android:title="@string/vkim_ok"
|
||||
app:iconTint="?im_app_icon_toolbar"
|
||||
app:menuTint="?header_text"
|
||||
android:tint="?header_text"
|
||||
app:showAsAction="always" />
|
||||
</menu>
|
||||
@@ -5,6 +5,8 @@
|
||||
android:icon="@drawable/ic_search_theme_tinted"
|
||||
android:id="@id/vkim_search_menu"
|
||||
android:visible="true"
|
||||
app:menuTint="?header_text"
|
||||
android:tint="?header_text"
|
||||
android:title="@string/search"
|
||||
app:showAsAction="always" />
|
||||
</menu>
|
||||
@@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<background android:drawable="@color/im_old_accent" />
|
||||
<background android:drawable="@color/iclauncher" />
|
||||
<foreground android:drawable="@mipmap/vt_adaptive_launcher_foneground" />
|
||||
</adaptive-icon>
|
||||
@@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<background android:drawable="@color/im_old_accent" />
|
||||
<background android:drawable="@color/iclauncher" />
|
||||
<foreground android:drawable="@mipmap/vt_adaptive_launcher_foneground" />
|
||||
</adaptive-icon>
|
||||
|
Before Width: | Height: | Size: 3.6 KiB After Width: | Height: | Size: 6.1 KiB |
|
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 5.6 KiB |
|
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 5.6 KiB |
@@ -28,7 +28,7 @@
|
||||
<item name="colorPrimary">@color/toolbar_blue_background</item>
|
||||
<item name="layout_scrollFlags">enterAlways|scroll|snap</item>
|
||||
<item name="titleTextAppearance">@style/ToolbarTitle</item>
|
||||
<item name="toolbarIconsColor">@color/toolbar_blue_textColorSecondary</item>
|
||||
<item name="toolbarIconsColor">?header_text</item>
|
||||
</style>
|
||||
|
||||
<style name="ActionBarTheme.ItemsFull" parent="@style/ActionBarTheme">
|
||||
@@ -48,15 +48,15 @@
|
||||
</style>
|
||||
|
||||
<style name="ActionBarTheme.White" parent="@style/ThemeOverlay.AppCompat.ActionBar">
|
||||
<item name="android:textColorPrimary">@color/toolbar_white_textColorPrimary</item>
|
||||
<item name="android:textColorSecondary">@color/toolbar_white_textColorSecondary</item>
|
||||
<item name="android:textColorPrimary">?text_primary</item>
|
||||
<item name="android:textColorSecondary">?text_secondary</item>
|
||||
<item name="android:titleTextAppearance">@style/ToolbarTitle</item>
|
||||
<item name="android:colorAccent">?accent</item>
|
||||
<item name="colorAccent">?accent</item>
|
||||
<item name="colorPrimary">@color/toolbar_white_background</item>
|
||||
<item name="layout_scrollFlags">enterAlways|scroll|snap</item>
|
||||
<item name="titleTextAppearance">@style/ToolbarTitle</item>
|
||||
<item name="toolbarIconsColor">@color/toolbar_white_textColorSecondary</item>
|
||||
<item name="toolbarIconsColor">?header_text</item>
|
||||
</style>
|
||||
|
||||
<style name="ActionBarTitleStyle" parent="@android:style/TextAppearance.Material.Widget.ActionBar.Title.Inverse">
|
||||
@@ -248,7 +248,7 @@
|
||||
<item name="android:activatedBackgroundIndicator">@drawable/highlight</item>
|
||||
<item name="android:selectableItemBackground">@drawable/highlight</item>
|
||||
<item name="android:windowCloseOnTouchOutside">true</item>
|
||||
<item name="android:actionMenuTextColor">@color/base_action_menu_text_color</item>
|
||||
<item name="android:actionMenuTextColor">?header_text</item>
|
||||
<item name="android:actionBarDivider">@null</item>
|
||||
<item name="android:textAppearanceListItem">@style/MaterialMediumText</item>
|
||||
<item name="android:listPreferredItemPaddingLeft">@dimen/standard_list_item_padding</item>
|
||||
@@ -282,7 +282,7 @@
|
||||
<item name="shadowBottom">@drawable/bg_toolbar_shadow_dark</item>
|
||||
<item name="tabBarBorderReference">@drawable/tab_bar_blue_border</item>
|
||||
<item name="tabBarTheme">@style/TabBarTheme</item>
|
||||
<item name="toolbarIconsColor">@color/toolbar_blue_textColorSecondary</item>
|
||||
<item name="toolbarIconsColor">?header_text</item>
|
||||
<item name="windowActionModeOverlay">true</item>
|
||||
</style>
|
||||
|
||||
@@ -309,7 +309,7 @@
|
||||
<item name="android:activatedBackgroundIndicator">@drawable/highlight</item>
|
||||
<item name="android:selectableItemBackground">@drawable/highlight</item>
|
||||
<item name="android:windowCloseOnTouchOutside">true</item>
|
||||
<item name="android:actionMenuTextColor">@color/base_action_menu_text_color</item>
|
||||
<item name="android:actionMenuTextColor">?header_text</item>
|
||||
<item name="android:actionBarDivider">@null</item>
|
||||
<item name="android:textAppearanceListItem">@style/MaterialMediumText</item>
|
||||
<item name="android:listPreferredItemPaddingLeft">@dimen/standard_list_item_padding</item>
|
||||
@@ -343,7 +343,7 @@
|
||||
<item name="shadowBottom">@drawable/bg_toolbar_shadow_dark</item>
|
||||
<item name="tabBarBorderReference">@drawable/tab_bar_blue_border</item>
|
||||
<item name="tabBarTheme">@style/TabBarTheme</item>
|
||||
<item name="toolbarIconsColor">@color/toolbar_blue_textColorSecondary</item>
|
||||
<item name="toolbarIconsColor">?header_text</item>
|
||||
<item name="windowActionModeOverlay">true</item>
|
||||
</style>
|
||||
|
||||
@@ -371,7 +371,7 @@
|
||||
<item name="android:activatedBackgroundIndicator">@drawable/highlight</item>
|
||||
<item name="android:selectableItemBackground">@drawable/highlight</item>
|
||||
<item name="android:windowCloseOnTouchOutside">true</item>
|
||||
<item name="android:actionMenuTextColor">@color/base_action_menu_text_color</item>
|
||||
<item name="android:actionMenuTextColor">?header_text</item>
|
||||
<item name="android:actionBarDivider">@null</item>
|
||||
<item name="android:textAppearanceListItem">@style/MaterialMediumText</item>
|
||||
<item name="android:listPreferredItemPaddingLeft">@dimen/standard_list_item_padding</item>
|
||||
@@ -405,7 +405,7 @@
|
||||
<item name="shadowBottom">@drawable/bg_toolbar_shadow_dark</item>
|
||||
<item name="tabBarBorderReference">@drawable/tab_bar_blue_border</item>
|
||||
<item name="tabBarTheme">@style/TabBarTheme</item>
|
||||
<item name="toolbarIconsColor">@color/toolbar_blue_textColorSecondary</item>
|
||||
<item name="toolbarIconsColor">?header_text</item>
|
||||
<item name="windowActionModeOverlay">true</item>
|
||||
</style>
|
||||
|
||||
@@ -469,7 +469,7 @@
|
||||
<item name="statusBarColorFront">@color/toolbar_blueDialog_statusBarColorFront</item>
|
||||
<item name="tabBarBorderReference">@drawable/tab_bar_blue_border</item>
|
||||
<item name="tabBarTheme">@style/TabBarTheme</item>
|
||||
<item name="toolbarIconsColor">@color/toolbar_blue_textColorSecondary</item>
|
||||
<item name="toolbarIconsColor">?header_text</item>
|
||||
<item name="windowActionModeOverlay">true</item>
|
||||
</style>
|
||||
|
||||
@@ -540,7 +540,7 @@
|
||||
<item name="statusBarColorFront">@color/toolbar_white_statusBarColorFront</item>
|
||||
<item name="tabBarBorderReference">@drawable/tab_bar_white_border</item>
|
||||
<item name="tabBarTheme">@style/TabBarTheme</item>
|
||||
<item name="toolbarIconsColor">@color/toolbar_white_textColorSecondary</item>
|
||||
<item name="toolbarIconsColor">?header_text</item>
|
||||
</style>
|
||||
|
||||
<style name="BaseStyleNoTitle" parent="@android:style/Theme.Material.Light">
|
||||
@@ -581,7 +581,7 @@
|
||||
<item name="android:layout_margin">0.0dip</item>
|
||||
<item name="android:backgroundDimEnabled">false</item>
|
||||
<item name="android:navigationBarColor">@android:color/black</item>
|
||||
<item name="toolbarIconsColor">@color/toolbar_white_textColorSecondary</item>
|
||||
<item name="toolbarIconsColor">?header_text</item>
|
||||
</style>
|
||||
|
||||
<style name="GradientActionBarSubtitleStyle" parent="@android:style/TextAppearance.Material.Widget.ActionBar.Subtitle.Inverse">
|
||||
@@ -628,7 +628,7 @@
|
||||
<item name="android:windowTranslucentStatus">true</item>
|
||||
<item name="android:navigationBarColor">@android:color/black</item>
|
||||
<item name="android:windowElevation">0.0px</item>
|
||||
<item name="toolbarIconsColor">@color/toolbar_white_textColorSecondary</item>
|
||||
<item name="toolbarIconsColor">?header_text</item>
|
||||
</style>
|
||||
|
||||
<style name="PickerFullScreenNoStatusDialog" parent="@style/Theme.AppCompat.Light.Dialog">
|
||||
@@ -654,7 +654,7 @@
|
||||
<item name="colorAccent">@color/picker_blue</item>
|
||||
<item name="colorPrimary">@color/picker_blue</item>
|
||||
<item name="colorPrimaryDark">@color/picker_blue</item>
|
||||
<item name="toolbarIconsColor">@color/toolbar_white_textColorSecondary</item>
|
||||
<item name="toolbarIconsColor">?header_text</item>
|
||||
</style>
|
||||
|
||||
<style name="Platform.AppCompat" parent="@style/Platform.V21.AppCompat" />
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
<item name="android:activatedBackgroundIndicator">@drawable/highlight</item>
|
||||
<item name="android:selectableItemBackground">@drawable/highlight</item>
|
||||
<item name="android:windowCloseOnTouchOutside">true</item>
|
||||
<item name="android:actionMenuTextColor">@color/base_action_menu_text_color</item>
|
||||
<item name="android:actionMenuTextColor">?header_text</item>
|
||||
<item name="android:actionBarDivider">@null</item>
|
||||
<item name="android:textAppearanceListItem">@style/MaterialMediumText</item>
|
||||
<item name="android:listPreferredItemPaddingLeft">@dimen/standard_list_item_padding</item>
|
||||
@@ -54,7 +54,7 @@
|
||||
<item name="shadowBottom">@drawable/bg_toolbar_shadow_dark</item>
|
||||
<item name="tabBarBorderReference">@drawable/tab_bar_blue_border</item>
|
||||
<item name="tabBarTheme">@style/TabBarTheme</item>
|
||||
<item name="toolbarIconsColor">@color/toolbar_blue_textColorSecondary</item>
|
||||
<item name="toolbarIconsColor">?header_text</item>
|
||||
<item name="windowActionModeOverlay">true</item>
|
||||
</style>
|
||||
|
||||
@@ -72,7 +72,7 @@
|
||||
<item name="android:activatedBackgroundIndicator">@drawable/highlight</item>
|
||||
<item name="android:selectableItemBackground">@drawable/highlight</item>
|
||||
<item name="android:windowCloseOnTouchOutside">true</item>
|
||||
<item name="android:actionMenuTextColor">@color/base_action_menu_text_color</item>
|
||||
<item name="android:actionMenuTextColor">?header_text</item>
|
||||
<item name="android:actionBarDivider">@null</item>
|
||||
<item name="android:textAppearanceListItem">@style/MaterialMediumText</item>
|
||||
<item name="android:listPreferredItemPaddingLeft">@dimen/standard_list_item_padding</item>
|
||||
@@ -107,7 +107,7 @@
|
||||
<item name="shadowBottom">@drawable/bg_toolbar_shadow_dark</item>
|
||||
<item name="tabBarBorderReference">@drawable/tab_bar_blue_border</item>
|
||||
<item name="tabBarTheme">@style/TabBarTheme</item>
|
||||
<item name="toolbarIconsColor">@color/toolbar_blue_textColorSecondary</item>
|
||||
<item name="toolbarIconsColor">?header_text</item>
|
||||
<item name="windowActionModeOverlay">true</item>
|
||||
</style>
|
||||
|
||||
@@ -126,7 +126,7 @@
|
||||
<item name="android:activatedBackgroundIndicator">@drawable/highlight</item>
|
||||
<item name="android:selectableItemBackground">@drawable/highlight</item>
|
||||
<item name="android:windowCloseOnTouchOutside">true</item>
|
||||
<item name="android:actionMenuTextColor">@color/base_action_menu_text_color</item>
|
||||
<item name="android:actionMenuTextColor">?header_text</item>
|
||||
<item name="android:actionBarDivider">@null</item>
|
||||
<item name="android:textAppearanceListItem">@style/MaterialMediumText</item>
|
||||
<item name="android:listPreferredItemPaddingLeft">@dimen/standard_list_item_padding</item>
|
||||
@@ -161,7 +161,7 @@
|
||||
<item name="shadowBottom">@drawable/bg_toolbar_shadow_dark</item>
|
||||
<item name="tabBarBorderReference">@drawable/tab_bar_blue_border</item>
|
||||
<item name="tabBarTheme">@style/TabBarTheme</item>
|
||||
<item name="toolbarIconsColor">@color/toolbar_blue_textColorSecondary</item>
|
||||
<item name="toolbarIconsColor">?header_text</item>
|
||||
<item name="windowActionModeOverlay">true</item>
|
||||
</style>
|
||||
|
||||
|
||||
@@ -62,7 +62,7 @@
|
||||
<item name="statusBarColorFront">@color/toolbar_white_statusBarColorFront</item>
|
||||
<item name="tabBarBorderReference">@drawable/tab_bar_white_border</item>
|
||||
<item name="tabBarTheme">@style/TabBarTheme</item>
|
||||
<item name="toolbarIconsColor">@color/toolbar_white_textColorSecondary</item>
|
||||
<item name="toolbarIconsColor">?header_text</item>
|
||||
</style>
|
||||
|
||||
<style name="CardView" parent="@style/Base.CardView">
|
||||
|
||||
@@ -508,7 +508,7 @@
|
||||
<color name="toolbar_milk_textColorPrimary">#ff444547</color>
|
||||
<color name="toolbar_milk_textColorSecondary">#ff909499</color>
|
||||
<color name="toolbar_white_background">@color/white_with_FixAndroidBug</color>
|
||||
<color name="toolbar_white_searchViewTextColorHint">@color/toolbar_white_textColorSecondary
|
||||
<color name="toolbar_white_searchViewTextColorHint">?header_text
|
||||
</color>
|
||||
<color name="toolbar_white_statusBarColorBack">@color/white_with_FixAndroidBug</color>
|
||||
<color name="toolbar_white_statusBarColorFront">#45bbbbbb</color>
|
||||
@@ -572,4 +572,5 @@
|
||||
<color name="window_bg_transparent">#00000000</color>
|
||||
<color name="yellow">#ffffc107</color>
|
||||
<color name="yellow_light">#ffffd54f</color>
|
||||
<color name="iclauncher">#fffcfcfc</color>
|
||||
</resources>
|
||||
|
||||
@@ -29,11 +29,11 @@
|
||||
<item name="android:textColorSecondary">?header_tint</item>
|
||||
<item name="android:selectableItemBackground">@drawable/highlight_toolbar</item>
|
||||
<item name="android:actionBarItemBackground">@drawable/highlight_icon_white_unbounded</item>
|
||||
<item name="colorAccent">#ffffffff</item>
|
||||
<item name="colorAccent">?header_text</item>
|
||||
<item name="colorPrimary">@color/toolbar_blue_background</item>
|
||||
<item name="layout_scrollFlags">enterAlways|scroll|snap</item>
|
||||
<item name="titleTextAppearance">@style/ToolbarTitle</item>
|
||||
<item name="toolbarIconsColor">@color/toolbar_blue_textColorSecondary</item>
|
||||
<item name="toolbarIconsColor">?header_text</item>
|
||||
</style>
|
||||
|
||||
<style name="ActionBarTheme.ItemsFull" parent="@style/ActionBarTheme" />
|
||||
@@ -50,12 +50,12 @@
|
||||
|
||||
<style name="ActionBarTheme.White" parent="@style/ThemeOverlay.AppCompat.ActionBar">
|
||||
<item name="android:textColorPrimary">@color/toolbar_white_textColorPrimary</item>
|
||||
<item name="android:textColorSecondary">@color/toolbar_white_textColorSecondary</item>
|
||||
<item name="android:textColorSecondary">?header_text</item>
|
||||
<item name="colorAccent">?accent</item>
|
||||
<item name="colorPrimary">@color/toolbar_white_background</item>
|
||||
<item name="layout_scrollFlags">enterAlways|scroll|snap</item>
|
||||
<item name="titleTextAppearance">@style/ToolbarTitle</item>
|
||||
<item name="toolbarIconsColor">@color/toolbar_white_textColorSecondary</item>
|
||||
<item name="toolbarIconsColor">?header_text</item>
|
||||
</style>
|
||||
|
||||
<style name="ActionBarTitleStyle" parent="@android:style/TextAppearance.Holo.Widget.ActionBar.Title.Inverse">
|
||||
@@ -178,7 +178,7 @@
|
||||
<item name="android:windowAnimationStyle">@android:style/Animation</item>
|
||||
<item name="android:colorBackgroundCacheHint">@null</item>
|
||||
<item name="searchViewCursorDrawable">@drawable/toolbar_milk_text_cursor_drawable</item>
|
||||
<item name="toolbarIconsColor">@color/toolbar_white_textColorSecondary</item>
|
||||
<item name="toolbarIconsColor">?header_text</item>
|
||||
</style>
|
||||
|
||||
<style name="AvatarPickerStyle" parent="@style/TransparentTheme">
|
||||
@@ -1374,7 +1374,7 @@
|
||||
<item name="android:activatedBackgroundIndicator">@drawable/highlight</item>
|
||||
<item name="android:selectableItemBackground">@drawable/highlight</item>
|
||||
<item name="android:windowCloseOnTouchOutside">true</item>
|
||||
<item name="android:actionMenuTextColor">@color/base_action_menu_text_color</item>
|
||||
<item name="android:actionMenuTextColor">?header_text</item>
|
||||
<item name="android:actionBarDivider">@null</item>
|
||||
<item name="android:textAppearanceListItem">@style/MaterialMediumText</item>
|
||||
<item name="android:listPreferredItemPaddingLeft">@dimen/standard_list_item_padding</item>
|
||||
@@ -1405,7 +1405,7 @@
|
||||
<item name="shadowBottom">@drawable/bg_toolbar_shadow_dark</item>
|
||||
<item name="tabBarBorderReference">@drawable/tab_bar_blue_border</item>
|
||||
<item name="tabBarTheme">@style/TabBarTheme</item>
|
||||
<item name="toolbarIconsColor">@color/toolbar_blue_textColorSecondary</item>
|
||||
<item name="toolbarIconsColor">?header_text</item>
|
||||
<item name="windowActionModeOverlay">true</item>
|
||||
</style>
|
||||
|
||||
@@ -1708,7 +1708,7 @@
|
||||
<item name="android:activatedBackgroundIndicator">@drawable/highlight</item>
|
||||
<item name="android:selectableItemBackground">@drawable/highlight</item>
|
||||
<item name="android:windowCloseOnTouchOutside">true</item>
|
||||
<item name="android:actionMenuTextColor">@color/base_action_menu_text_color</item>
|
||||
<item name="android:actionMenuTextColor">?header_text</item>
|
||||
<item name="android:actionBarDivider">@null</item>
|
||||
<item name="android:textAppearanceListItem">@style/MaterialMediumText</item>
|
||||
<item name="android:listPreferredItemPaddingLeft">@dimen/standard_list_item_padding</item>
|
||||
@@ -1739,7 +1739,7 @@
|
||||
<item name="shadowBottom">@drawable/bg_toolbar_shadow_dark</item>
|
||||
<item name="tabBarBorderReference">@drawable/tab_bar_blue_border</item>
|
||||
<item name="tabBarTheme">@style/TabBarTheme</item>
|
||||
<item name="toolbarIconsColor">@color/toolbar_blue_textColorSecondary</item>
|
||||
<item name="toolbarIconsColor">?header_text</item>
|
||||
<item name="windowActionModeOverlay">true</item>
|
||||
</style>
|
||||
|
||||
@@ -1750,7 +1750,7 @@
|
||||
</style>
|
||||
|
||||
<style name="BasePickerTheme" parent="@style/Theme.AppCompat.Light.NoActionBar">
|
||||
<item name="toolbarIconsColor">@color/toolbar_white_textColorSecondary</item>
|
||||
<item name="toolbarIconsColor">?header_text</item>
|
||||
</style>
|
||||
|
||||
<style name="BaseStyle" parent="@style/BaseTheme">
|
||||
@@ -1768,7 +1768,7 @@
|
||||
<item name="android:activatedBackgroundIndicator">@drawable/highlight</item>
|
||||
<item name="android:selectableItemBackground">@drawable/highlight</item>
|
||||
<item name="android:windowCloseOnTouchOutside">true</item>
|
||||
<item name="android:actionMenuTextColor">@color/base_action_menu_text_color</item>
|
||||
<item name="android:actionMenuTextColor">?header_text</item>
|
||||
<item name="android:actionBarDivider">@null</item>
|
||||
<item name="android:textAppearanceListItem">@style/MaterialMediumText</item>
|
||||
<item name="android:listPreferredItemPaddingLeft">@dimen/standard_list_item_padding</item>
|
||||
@@ -1799,7 +1799,7 @@
|
||||
<item name="shadowBottom">@drawable/bg_toolbar_shadow_dark</item>
|
||||
<item name="tabBarBorderReference">@drawable/tab_bar_blue_border</item>
|
||||
<item name="tabBarTheme">@style/TabBarTheme</item>
|
||||
<item name="toolbarIconsColor">@color/toolbar_blue_textColorSecondary</item>
|
||||
<item name="toolbarIconsColor">?header_text</item>
|
||||
<item name="windowActionModeOverlay">true</item>
|
||||
</style>
|
||||
|
||||
@@ -1859,7 +1859,7 @@
|
||||
<item name="statusBarColorFront">@color/toolbar_blueDialog_statusBarColorFront</item>
|
||||
<item name="tabBarBorderReference">@drawable/tab_bar_blue_border</item>
|
||||
<item name="tabBarTheme">@style/TabBarTheme</item>
|
||||
<item name="toolbarIconsColor">@color/toolbar_blue_textColorSecondary</item>
|
||||
<item name="toolbarIconsColor">?header_text</item>
|
||||
<item name="windowActionModeOverlay">true</item>
|
||||
</style>
|
||||
|
||||
@@ -1948,7 +1948,7 @@
|
||||
<item name="statusBarColorFront">@color/toolbar_white_statusBarColorFront</item>
|
||||
<item name="tabBarBorderReference">@drawable/tab_bar_white_border</item>
|
||||
<item name="tabBarTheme">@style/TabBarTheme</item>
|
||||
<item name="toolbarIconsColor">@color/toolbar_white_textColorSecondary</item>
|
||||
<item name="toolbarIconsColor">?header_text</item>
|
||||
</style>
|
||||
|
||||
<style name="BaseStyle.WhiteToolbar.Messages" parent="@style/BaseStyle.WhiteToolbar">
|
||||
@@ -2268,7 +2268,7 @@
|
||||
<item name="android:layout_gravity">center</item>
|
||||
<item name="android:layout_margin">0.0dip</item>
|
||||
<item name="android:backgroundDimEnabled">false</item>
|
||||
<item name="toolbarIconsColor">@color/toolbar_white_textColorSecondary</item>
|
||||
<item name="toolbarIconsColor">?header_text</item>
|
||||
</style>
|
||||
|
||||
<style name="GameText">
|
||||
@@ -2780,7 +2780,7 @@
|
||||
<item name="colorAccent">#ffffffff</item>
|
||||
<item name="colorPrimary">@color/picker_blue</item>
|
||||
<item name="colorPrimaryDark">@color/picker_blue</item>
|
||||
<item name="toolbarIconsColor">@color/toolbar_white_textColorSecondary</item>
|
||||
<item name="toolbarIconsColor">?header_text</item>
|
||||
</style>
|
||||
|
||||
<style name="PickerDialogAnimation">
|
||||
@@ -2802,7 +2802,7 @@
|
||||
<item name="android:layout_margin">0.0dip</item>
|
||||
<item name="android:backgroundDimEnabled">false</item>
|
||||
<item name="android:windowSoftInputMode">adjustResize</item>
|
||||
<item name="toolbarIconsColor">@color/toolbar_white_textColorSecondary</item>
|
||||
<item name="toolbarIconsColor">?header_text</item>
|
||||
</style>
|
||||
|
||||
<style name="PickerFullScreenNoStatusDialog" parent="@style/Theme.AppCompat.Light.Dialog">
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<PreferenceCategory android:title="@string/vtlthemes">
|
||||
<Preference
|
||||
android:enabled="false"
|
||||
android:summary="Для примнения изменений тем необходимо переключить тему"
|
||||
android:summary="Для примнений изменений тем необходимо переключить тему"
|
||||
android:title="Полезная информация" />
|
||||
<com.vtosters.lite.ui.SummaryListPreference
|
||||
android:defaultValue="default"
|
||||
|
||||
@@ -2418,25 +2418,6 @@
|
||||
:goto_0
|
||||
invoke-virtual {v0, v2}, Lcom/vk/im/engine/models/attaches/AttachWall;->a(Z)V
|
||||
|
||||
const-string v2, "copyright"
|
||||
|
||||
.line 213
|
||||
invoke-static {p1, v2, v1}, Lcom/vk/core/extensions/JsonObjectExt;->a(Lorg/json/JSONObject;Ljava/lang/String;I)I
|
||||
|
||||
move-result v2
|
||||
|
||||
if-eqz v2, :cond_1
|
||||
|
||||
const/4 v2, 0x1
|
||||
|
||||
goto :goto_1
|
||||
|
||||
:cond_1
|
||||
const/4 v2, 0x0
|
||||
|
||||
:goto_1
|
||||
invoke-virtual {v0, v2}, Lcom/vk/im/engine/models/attaches/AttachWall;->a(Z)V
|
||||
|
||||
const-string v2, "to_id"
|
||||
|
||||
.line 214
|
||||
|
||||
@@ -1457,39 +1457,6 @@
|
||||
const/16 v25, 0x0
|
||||
|
||||
:goto_16
|
||||
invoke-static {}, Lru/vtosters/lite/utils/Prefs;->GetCopyright()Ljava/lang/String;
|
||||
|
||||
move-result-object v2
|
||||
|
||||
.line 373
|
||||
invoke-virtual {v0, v2}, Lorg/json/JSONObject;->has(Ljava/lang/String;)Z
|
||||
|
||||
move-result v2
|
||||
|
||||
if-eqz v2, :cond_28
|
||||
|
||||
const-string v2, "copyright"
|
||||
|
||||
.line 373
|
||||
invoke-virtual {v0, v2}, Lorg/json/JSONObject;->optJSONObject(Ljava/lang/String;)Lorg/json/JSONObject;
|
||||
|
||||
move-result-object v2
|
||||
|
||||
.line 374
|
||||
sget-object v4, Lcom/vk/dto/newsfeed/entries/Post$EasyPromote;->a:Lcom/vk/dto/newsfeed/entries/Post$EasyPromote$b;
|
||||
|
||||
invoke-virtual {v4, v2}, Lcom/vk/dto/newsfeed/entries/Post$EasyPromote$b;->a(Lorg/json/JSONObject;)Lcom/vk/dto/newsfeed/entries/Post$EasyPromote;
|
||||
|
||||
move-result-object v2
|
||||
|
||||
move-object/from16 v25, v2
|
||||
|
||||
goto :goto_17
|
||||
|
||||
:cond_28
|
||||
const/16 v25, 0x0
|
||||
|
||||
:goto_17
|
||||
const-string v2, "poster"
|
||||
|
||||
.line 377
|
||||
|
||||