Compare commits
10
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 gdlbo
|
2747c9efc8 | ||
|
gdlbo
|
c2cc782ee3 | ||
|
gdlbo
|
d414e79b6b | ||
|
gdlbo
|
9e0f95ed94 | ||
|
gdlbo
|
167da56a0b | ||
|
gdlbo
|
af213869c8 | ||
|
gdlbo
|
39b9e42f62 | ||
|
gdlbo
|
1aa07afabc | ||
|
gdlbo
|
84d7d0bef6 | ||
|
gdlbo
|
fbb7f2320e |
+2
-1
@@ -23,4 +23,5 @@ local.properties
|
||||
.idea/compiler.xml
|
||||
smali/assets/version.properties
|
||||
app/src/main/assets/version.properties
|
||||
smali/build/resources.zip
|
||||
smali/build/resources.zip
|
||||
*.idsig
|
||||
|
||||
+1
-1
@@ -72,7 +72,7 @@ public class MultiAccountManager {
|
||||
}
|
||||
|
||||
public static void addAccount() {
|
||||
Helper.GetPreferences().edit().putInt("account", getAccountPrefsCount() + 1).commit();
|
||||
Helper.GetPreferences().edit().putInt("account", getAccountPrefsCount()).commit();
|
||||
}
|
||||
|
||||
public static void deleteAccount(int i) {
|
||||
|
||||
@@ -59,7 +59,7 @@ import ru.vtosters.lite.ui.fragments.dockbar.DockBarManager;
|
||||
import ru.vtosters.lite.ui.fragments.multiaccount.MultiAccountManager;
|
||||
|
||||
public class Prefs {
|
||||
public static String VERSIONNAME = "2.0 DEV";
|
||||
public static String VERSIONNAME = "2.0 Beta";
|
||||
private static List<String> mFilters;
|
||||
private static List<Activity> activities = new ArrayList<>();
|
||||
|
||||
@@ -474,9 +474,6 @@ public class Prefs {
|
||||
}
|
||||
|
||||
public static void setNavbarColor(Window window, int i) {
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && VKThemeHelper.d()) {
|
||||
window.getDecorView().setSystemUiVisibility(FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS | SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
|
||||
}
|
||||
if (navbar() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
|
||||
window.setNavigationBarColor(getNavbarColor());
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<android.support.constraint.ConstraintLayout android:layout_width="fill_parent" android:layout_height="wrap_content"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<ImageView android:id="@id/icon" android:layout_width="64.0dip" android:layout_height="64.0dip" android:src="@drawable/ic_article_64" android:tint="@color/gray_300" android:layout_marginStart="8.0dip" android:layout_marginEnd="8.0dip" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:srcCompat="@drawable/ic_article_64" />
|
||||
<TextView android:textSize="16.0sp" android:textColor="@color/subhead_gray" android:ellipsize="end" android:gravity="center" android:id="@id/text" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="16.0dip" android:text="@string/article_author_group_empty" android:singleLine="true" android:includeFontPadding="false" android:fontFamily="@font/roboto_regular" android:layout_marginStart="16.0dip" android:layout_marginEnd="16.0dip" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/icon" app:layout_constraintWidth_default="wrap" />
|
||||
<ImageView android:id="@id/icon" android:layout_width="64.0dip" android:layout_height="64.0dip" android:src="@drawable/ic_article_64" android:tint="?accent" android:layout_marginStart="8.0dip" android:layout_marginEnd="8.0dip" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:srcCompat="@drawable/ic_article_64" />
|
||||
<TextView android:textSize="16.0sp" android:textColor="?text_primary" android:ellipsize="end" android:gravity="center" android:id="@id/text" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="16.0dip" android:text="@string/article_author_group_empty" android:singleLine="true" android:includeFontPadding="false" android:fontFamily="@font/roboto_regular" android:layout_marginStart="16.0dip" android:layout_marginEnd="16.0dip" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/icon" app:layout_constraintWidth_default="wrap" />
|
||||
</android.support.constraint.ConstraintLayout>
|
||||
@@ -2,20 +2,20 @@
|
||||
<android.support.design.widget.CoordinatorLayout android:fitsSystemWindows="true" android:layout_width="fill_parent" android:layout_height="fill_parent"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<View android:background="?tabbar_background" android:fitsSystemWindows="true" android:layout_width="fill_parent" android:layout_height="fill_parent" />
|
||||
<android.support.design.widget.AppBarLayout android:id="@id/app_bar_layout" android:background="?tabbar_background" android:layout_width="fill_parent" android:layout_height="238.0dip">
|
||||
<android.support.design.widget.CollapsingToolbarLayout android:theme="@style/WhiteThemeActionBar" android:id="@id/collapsing_toolbar_layout" android:layout_width="fill_parent" android:layout_height="238.0dip" app:contentScrim="@color/white" app:layout_scrollFlags="exitUntilCollapsed|scroll" app:statusBarScrim="@color/white_with_FixAndroidBug" app:titleEnabled="false">
|
||||
<android.support.design.widget.AppBarLayout android:id="@id/app_bar_layout" android:background="?background_content" android:layout_width="fill_parent" android:layout_height="238.0dip">
|
||||
<android.support.design.widget.CollapsingToolbarLayout android:theme="@style/WhiteThemeActionBar" android:id="@id/collapsing_toolbar_layout" android:layout_width="fill_parent" android:layout_height="238.0dip" app:contentScrim="?text_primary" app:layout_scrollFlags="exitUntilCollapsed|scroll" app:statusBarScrim="?tabbar_background" app:titleEnabled="false">
|
||||
<LinearLayout android:gravity="center_horizontal" android:orientation="vertical" android:id="@id/header_container" android:background="@drawable/scrim_bottom_4percent" android:layout_width="fill_parent" android:layout_height="238.0dip" app:layout_collapseMode="parallax" app:layout_collapseParallaxMultiplier="0.4">
|
||||
<com.vk.imageloader.view.VKCircleImageView android:id="@id/owner_image" android:layout_width="80.0dip" android:layout_height="80.0dip" android:layout_marginTop="32.0dip" />
|
||||
<TextView android:textSize="20.0dip" android:textColor="@color/dark_grey" android:ellipsize="end" android:id="@id/owner_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="12.0dip" android:singleLine="true" android:includeFontPadding="false" android:drawablePadding="4.0dip" android:layout_marginStart="32.0dip" android:layout_marginEnd="32.0dip" app:fontFamily="@font/roboto_medium" />
|
||||
<TextView android:textSize="13.0dip" android:textColor="@color/caption_gray" android:ellipsize="end" android:id="@id/subscribers_count" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="2.0dip" android:singleLine="true" android:includeFontPadding="false" android:layout_marginStart="32.0dip" android:layout_marginEnd="32.0dip" app:fontFamily="@font/roboto_regular" />
|
||||
<TextView android:textSize="14.0dip" android:textColor="@color/white" android:ellipsize="end" android:gravity="center_vertical" android:id="@id/subscribe_button" android:layout_width="wrap_content" android:layout_height="30.0dip" android:layout_marginTop="8.0dip" android:singleLine="true" android:includeFontPadding="false" android:drawablePadding="5.0dip" android:paddingStart="16.0dip" android:paddingEnd="16.0dip" android:layout_marginStart="32.0dip" android:layout_marginEnd="32.0dip" app:fontFamily="@font/roboto_medium" />
|
||||
<TextView android:textSize="20.0dip" android:textColor="?text_primary" android:ellipsize="end" android:id="@id/owner_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="12.0dip" android:singleLine="true" android:includeFontPadding="false" android:drawablePadding="4.0dip" android:layout_marginStart="32.0dip" android:layout_marginEnd="32.0dip" app:fontFamily="@font/roboto_medium" />
|
||||
<TextView android:textSize="13.0dip" android:textColor="?text_primary" android:ellipsize="end" android:id="@id/subscribers_count" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="2.0dip" android:singleLine="true" android:includeFontPadding="false" android:layout_marginStart="32.0dip" android:layout_marginEnd="32.0dip" app:fontFamily="@font/roboto_regular" />
|
||||
<TextView android:textSize="14.0dip" android:textColor="?accent" android:ellipsize="end" android:gravity="center_vertical" android:id="@id/subscribe_button" android:layout_width="wrap_content" android:layout_height="30.0dip" android:layout_marginTop="8.0dip" android:singleLine="true" android:includeFontPadding="false" android:drawablePadding="5.0dip" android:paddingStart="16.0dip" android:paddingEnd="16.0dip" android:layout_marginStart="32.0dip" android:layout_marginEnd="32.0dip" app:fontFamily="@font/roboto_medium" />
|
||||
</LinearLayout>
|
||||
<android.support.v7.widget.Toolbar android:theme="@style/WhiteThemeActionBar" android:id="@id/toolbar" android:fitsSystemWindows="true" android:layout_width="fill_parent" android:layout_height="?actionBarSize" app:layout_collapseMode="pin">
|
||||
<TextView android:textSize="20.0dip" android:textColor="@color/attach_title" android:ellipsize="end" android:id="@id/custom_toolbar_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" android:fontFamily="@font/roboto_medium" style="@style/ActionBarTitleStyle" />
|
||||
<TextView android:textSize="20.0dip" android:textColor="?text_primary" android:ellipsize="end" android:id="@id/custom_toolbar_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" android:fontFamily="@font/roboto_medium" style="@style/ActionBarTitleStyle" />
|
||||
</android.support.v7.widget.Toolbar>
|
||||
</android.support.design.widget.CollapsingToolbarLayout>
|
||||
</android.support.design.widget.AppBarLayout>
|
||||
<com.vk.articles.author_page.ui.ArticleAuthorPageRecyclerPaginatedView android:id="@id/list" android:layout_width="fill_parent" android:layout_height="fill_parent" app:layout_behavior="@string/appbar_scrolling_view_behavior" />
|
||||
<View android:id="@id/shadow" android:background="@drawable/bg_toolbar_shadow_dark" android:layout_width="fill_parent" android:layout_height="12.0dip" android:alpha="0.0" app:layout_behavior="@string/appbar_scrolling_view_behavior" />
|
||||
<TextView android:textSize="16.0sp" android:textColor="@color/subhead_gray" android:ellipsize="end" android:gravity="center" android:layout_gravity="center" android:id="@id/privacy_error" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/article_private_error" android:singleLine="true" android:includeFontPadding="false" android:drawablePadding="8.0dip" android:layout_marginStart="24.0dip" android:layout_marginEnd="24.0dip" />
|
||||
<TextView android:textSize="16.0sp" android:textColor="?text_primary" android:ellipsize="end" android:gravity="center" android:layout_gravity="center" android:id="@id/privacy_error" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/article_private_error" android:singleLine="true" android:includeFontPadding="false" android:drawablePadding="8.0dip" android:layout_marginStart="24.0dip" android:layout_marginEnd="24.0dip" />
|
||||
</android.support.design.widget.CoordinatorLayout>
|
||||
@@ -2,8 +2,8 @@
|
||||
<android.support.constraint.ConstraintLayout android:background="@drawable/rounded_list_selector" android:paddingBottom="16.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:paddingStart="16.0dip" android:paddingEnd="16.0dip"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<com.vk.imageloader.view.VKImageView android:id="@id/image" android:layout_width="0.0dip" android:layout_height="0.0dip" app:actualImageScaleType="centerCrop" app:layout_constraintBottom_toTopOf="@id/title" app:layout_constraintDimensionRatio="h,5:3" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:roundedCornerRadius="3.0dip" />
|
||||
<TextView android:textSize="15.0sp" android:textColor="@color/black" android:ellipsize="end" android:id="@id/title" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="10.0dip" android:maxLines="2" android:includeFontPadding="false" android:layout_marginEnd="8.0dip" app:fontFamily="@font/roboto_medium" app:layout_constraintBottom_toTopOf="@id/subtitle" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintHorizontal_chainStyle="spread" app:layout_constraintHorizontal_weight="1.0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/image" />
|
||||
<TextView android:textSize="14.0sp" android:textColor="@color/subhead_gray" android:ellipsize="end" android:id="@id/subtitle" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="3.0dip" android:maxLines="2" android:includeFontPadding="false" app:fontFamily="@font/roboto_regular" app:layout_constraintBottom_toTopOf="@id/info" app:layout_constraintEnd_toEndOf="@id/title" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/title" />
|
||||
<TextView android:textSize="13.0sp" android:textColor="@color/caption_gray" android:ellipsize="end" android:id="@id/info" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="3.0dip" android:maxLines="1" android:includeFontPadding="false" app:fontFamily="@font/roboto_regular" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@id/subtitle" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/subtitle" />
|
||||
<TextView android:textSize="15.0sp" android:textColor="?text_primary" android:ellipsize="end" android:id="@id/title" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="10.0dip" android:maxLines="2" android:includeFontPadding="false" android:layout_marginEnd="8.0dip" app:fontFamily="@font/roboto_medium" app:layout_constraintBottom_toTopOf="@id/subtitle" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintHorizontal_chainStyle="spread" app:layout_constraintHorizontal_weight="1.0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/image" />
|
||||
<TextView android:textSize="14.0sp" android:textColor="?text_secondary" android:ellipsize="end" android:id="@id/subtitle" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="3.0dip" android:maxLines="2" android:includeFontPadding="false" app:fontFamily="@font/roboto_regular" app:layout_constraintBottom_toTopOf="@id/info" app:layout_constraintEnd_toEndOf="@id/title" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/title" />
|
||||
<TextView android:textSize="13.0sp" android:textColor="?text_primary" android:ellipsize="end" android:id="@id/info" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="3.0dip" android:maxLines="1" android:includeFontPadding="false" app:fontFamily="@font/roboto_regular" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@id/subtitle" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/subtitle" />
|
||||
<ImageView android:id="@id/fave" android:layout_width="44.0dip" android:layout_height="44.0dip" android:src="@drawable/fave_start_button" android:scaleType="center" app:layout_constraintEnd_toEndOf="@id/image" app:layout_constraintTop_toTopOf="@id/image" app:srcCompat="@drawable/fave_start_button" />
|
||||
</android.support.constraint.ConstraintLayout>
|
||||
@@ -1,9 +1,9 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<android.support.constraint.ConstraintLayout android:background="@drawable/rounded_list_selector" android:layout_width="fill_parent" android:layout_height="wrap_content" android:paddingStart="16.0dip"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<TextView android:textSize="15.0sp" android:textColor="@color/black" android:ellipsize="end" android:id="@id/title" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="16.0dip" android:maxLines="2" android:includeFontPadding="false" app:fontFamily="@font/roboto_medium" app:layout_constraintBottom_toTopOf="@id/subtitle" app:layout_constraintEnd_toStartOf="@id/image_container" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintHorizontal_chainStyle="spread" app:layout_constraintHorizontal_weight="1.0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" />
|
||||
<TextView android:textSize="14.0sp" android:textColor="@color/subhead_gray" android:ellipsize="end" android:id="@id/subtitle" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="3.0dip" android:maxLines="2" android:includeFontPadding="false" app:fontFamily="@font/roboto_regular" app:layout_constraintBottom_toTopOf="@id/info" app:layout_constraintEnd_toEndOf="@id/title" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/title" />
|
||||
<TextView android:textSize="13.0sp" android:textColor="@color/caption_gray" android:ellipsize="end" android:id="@id/info" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="3.0dip" android:layout_marginBottom="16.0dip" android:maxLines="1" android:includeFontPadding="false" app:fontFamily="@font/roboto_regular" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@id/subtitle" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/subtitle" />
|
||||
<TextView android:textSize="15.0sp" android:textColor="?text_primary" android:ellipsize="end" android:id="@id/title" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="16.0dip" android:maxLines="2" android:includeFontPadding="false" app:fontFamily="@font/roboto_medium" app:layout_constraintBottom_toTopOf="@id/subtitle" app:layout_constraintEnd_toStartOf="@id/image_container" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintHorizontal_chainStyle="spread" app:layout_constraintHorizontal_weight="1.0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" />
|
||||
<TextView android:textSize="14.0sp" android:textColor="?text_secondary" android:ellipsize="end" android:id="@id/subtitle" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="3.0dip" android:maxLines="2" android:includeFontPadding="false" app:fontFamily="@font/roboto_regular" app:layout_constraintBottom_toTopOf="@id/info" app:layout_constraintEnd_toEndOf="@id/title" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/title" />
|
||||
<TextView android:textSize="13.0sp" android:textColor="?text_primary" android:ellipsize="end" android:id="@id/info" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="3.0dip" android:layout_marginBottom="16.0dip" android:maxLines="1" android:includeFontPadding="false" app:fontFamily="@font/roboto_regular" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@id/subtitle" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/subtitle" />
|
||||
<FrameLayout android:id="@id/image_container" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintHorizontal_weight="0.0" app:layout_constraintStart_toEndOf="@id/title" app:layout_constraintTop_toTopOf="parent">
|
||||
<com.vk.imageloader.view.VKImageView android:layout_gravity="center" android:id="@id/image" android:layout_width="105.0dip" android:layout_height="76.0dip" android:layout_margin="16.0dip" android:layout_marginTop="16.0dip" android:layout_marginBottom="16.0dip" app:actualImageScaleType="centerCrop" app:roundedCornerRadius="3.0dip" />
|
||||
<ImageView android:layout_gravity="end|center|top" android:id="@id/fave" android:layout_width="44.0dip" android:layout_height="44.0dip" android:layout_margin="2.0dip" android:src="@drawable/fave_start_button" android:scaleType="center" app:srcCompat="@drawable/fave_start_button" />
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merge
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<TextView android:textSize="16.0sp" android:textColor="@color/subhead_gray" android:ellipsize="end" android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxLines="4" android:includeFontPadding="false" android:lineSpacingExtra="1.0sp" android:layout_marginStart="24.0dip" android:layout_marginEnd="24.0dip" app:fontFamily="@font/roboto_regular" />
|
||||
<TextView android:textSize="15.0sp" android:textColor="@color/white" android:ellipsize="end" android:layout_gravity="center_horizontal" android:id="@id/button" android:paddingTop="9.0dip" android:paddingBottom="9.0dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16.0dip" android:singleLine="true" android:includeFontPadding="false" android:drawablePadding="5.0dip" android:layout_marginStart="24.0dip" android:layout_marginEnd="24.0dip" app:fontFamily="@font/roboto_medium" style="@style/VKUIButton.Primary" />
|
||||
<TextView android:textSize="16.0sp" android:textColor="?text_primary" android:ellipsize="end" android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxLines="4" android:includeFontPadding="false" android:lineSpacingExtra="1.0sp" android:layout_marginStart="24.0dip" android:layout_marginEnd="24.0dip" app:fontFamily="@font/roboto_regular" />
|
||||
<TextView android:textSize="15.0sp" android:textColor="?accent" android:ellipsize="end" android:layout_gravity="center_horizontal" android:id="@id/button" android:paddingTop="9.0dip" android:paddingBottom="9.0dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16.0dip" android:singleLine="true" android:includeFontPadding="false" android:drawablePadding="5.0dip" android:layout_marginStart="24.0dip" android:layout_marginEnd="24.0dip" app:fontFamily="@font/roboto_medium" style="@style/VKUIButton.Primary" />
|
||||
</merge>
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<android.support.constraint.ConstraintLayout android:layout_width="fill_parent" android:layout_height="44.0dip"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<TextView android:textSize="13.0sp" android:textColor="@color/caption_gray" android:ellipsize="end" android:gravity="center" android:layout_width="wrap_content" android:layout_height="0.0dip" android:text="@string/article_all" android:singleLine="true" android:includeFontPadding="false" android:textAllCaps="true" android:layout_marginStart="16.0dip" app:fontFamily="@font/roboto_medium" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" />
|
||||
<TextView android:textSize="13.0sp" android:textColor="?text_primary" android:ellipsize="end" android:gravity="center" android:layout_width="wrap_content" android:layout_height="0.0dip" android:text="@string/article_all" android:singleLine="true" android:includeFontPadding="false" android:textAllCaps="true" android:layout_marginStart="16.0dip" app:fontFamily="@font/roboto_medium" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" />
|
||||
<TextView android:textSize="14.0sp" android:textColor="?accent" android:ellipsize="end" android:gravity="center" android:id="@id/sort_type_text" android:background="@drawable/rounded_list_selector" android:layout_width="wrap_content" android:layout_height="0.0dip" android:text="@string/article_sort_time" android:singleLine="true" android:drawablePadding="4.0dip" android:paddingStart="6.0dip" android:paddingEnd="6.0dip" android:layout_marginEnd="6.0dip" app:fontFamily="@font/roboto_medium" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" />
|
||||
</android.support.constraint.ConstraintLayout>
|
||||
@@ -2,12 +2,12 @@
|
||||
<RelativeLayout android:paddingTop="17.0dip" android:clipToPadding="false" android:layout_width="fill_parent" android:layout_height="wrap_content"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<TextView android:textSize="16.0dip" android:textColor="?text_primary" android:id="@id/board_topic_title" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentLeft="true" android:layout_alignParentTop="true" android:layout_alignParentRight="true" />
|
||||
<TextView android:textSize="14.0dip" android:textColor="#ff8c8d8f" android:id="@id/board_topic_info" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="2.0dip" android:layout_below="@id/board_topic_title" android:layout_alignLeft="@id/board_topic_title" android:layout_alignRight="@id/board_topic_title" />
|
||||
<TextView android:textSize="14.0dip" android:textColor="?text_secondary" android:id="@id/board_topic_info" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="2.0dip" android:layout_below="@id/board_topic_title" android:layout_alignLeft="@id/board_topic_title" android:layout_alignRight="@id/board_topic_title" />
|
||||
<RelativeLayout android:id="@id/last_comment" android:background="@drawable/highlight" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:paddingBottom="21.0dip" android:clipToPadding="false" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="16.0dip" android:layout_below="@id/board_topic_info" android:layout_alignLeft="@id/board_topic_info" android:layout_alignRight="@id/board_topic_info">
|
||||
<View android:id="@id/board_topic_divider" android:background="#26000000" android:layout_width="wrap_content" android:layout_height="0.5dip" android:layout_marginLeft="-16.0dip" android:layout_marginRight="-16.0dip" android:layout_marginBottom="12.0dip" />
|
||||
<com.vk.imageloader.view.VKCircleImageView android:id="@id/board_topic_photo" android:layout_width="48.0dip" android:layout_height="48.0dip" android:layout_marginRight="12.0dip" android:layout_below="@id/board_topic_divider" app:placeholderImage="@drawable/photo_loading" />
|
||||
<TextView android:textSize="15.0dip" android:textColor="?accent" android:id="@id/board_topic_l_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_toRightOf="@id/board_topic_photo" android:layout_alignTop="@id/board_topic_photo" android:fontFamily="@string/font_family_medium" />
|
||||
<com.vtosters.lite.ui.CorrectlyMeasuringTextView android:textSize="15.0dip" android:textColor="#dd000000" android:id="@id/board_topic_l_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="3.0dip" android:lines="1" android:layout_below="@id/board_topic_l_name" android:layout_alignLeft="@id/board_topic_l_name" />
|
||||
<TextView android:textSize="13.0dip" android:textColor="#ff8c8d8f" android:id="@id/board_topic_l_updated" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="1.0dip" android:layout_below="@id/board_topic_l_text" android:layout_alignLeft="@id/board_topic_l_text" />
|
||||
<TextView android:textSize="15.0dip" android:textColor="?text_primary" android:id="@id/board_topic_l_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_toRightOf="@id/board_topic_photo" android:layout_alignTop="@id/board_topic_photo" android:fontFamily="@string/font_family_medium" />
|
||||
<com.vtosters.lite.ui.CorrectlyMeasuringTextView android:textSize="15.0dip" android:textColor="?text_secondary" android:id="@id/board_topic_l_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="3.0dip" android:lines="1" android:layout_below="@id/board_topic_l_name" android:layout_alignLeft="@id/board_topic_l_name" />
|
||||
<TextView android:textSize="13.0dip" android:textColor="?text_secondary" android:id="@id/board_topic_l_updated" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="1.0dip" android:layout_below="@id/board_topic_l_text" android:layout_alignLeft="@id/board_topic_l_text" />
|
||||
</RelativeLayout>
|
||||
</RelativeLayout>
|
||||
@@ -2,6 +2,6 @@
|
||||
<FrameLayout android:layout_width="fill_parent" android:layout_height="64.0dip" android:paddingStart="8.0dip" android:paddingEnd="16.0dip"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<com.vk.imageloader.view.VKImageView android:layout_gravity="start|center" android:id="@id/holder_attach_gallery_album_image" android:layout_width="48.0dip" android:layout_height="48.0dip" />
|
||||
<TextView android:textSize="16.0sp" android:textColor="?text_primary" android:layout_gravity="start|bottom|center" android:id="@id/holder_attach_gallery_album_title_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/newsfeed_newpost_holder_attach_gallery_album_title_bottom_space" android:singleLine="true" android:layout_marginStart="60.0dip" />
|
||||
<TextView android:textSize="16.0sp" android:textColor="#ff78797a" android:layout_gravity="start|bottom|center" android:id="@id/holder_attach_gallery_album_title_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/newsfeed_newpost_holder_attach_gallery_album_title_bottom_space" android:singleLine="true" android:layout_marginStart="60.0dip" />
|
||||
<TextView android:textSize="14.0sp" android:textColor="#ff78797a" android:layout_gravity="start|center|top" android:id="@id/holder_attach_gallery_album_amount_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="32.0dip" android:singleLine="true" android:layout_marginStart="60.0dip" />
|
||||
</FrameLayout>
|
||||
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<com.vtosters.lite.ui.FullWidthLinearLayout android:theme="?actionBarTheme" android:gravity="center" android:orientation="horizontal" android:paddingRight="2.0dip" android:layout_width="fill_parent" android:layout_height="fill_parent"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<EditText android:textSize="16.0dip" android:textColorHint="?text_primary" android:id="@id/search_input" android:background="@null" android:paddingRight="16.0dip" android:layout_width="fill_parent" android:layout_height="fill_parent" android:hint="@string/search" android:singleLine="true" android:layout_weight="1.0" android:inputType="textFilter|textCapSentences|textNoSuggestions" android:imeOptions="actionSearch" android:textCursorDrawable="?searchViewCursorDrawable" />
|
||||
<EditText android:textSize="16.0dip" android:textColorHint="?header_text" android:id="@id/search_input" android:background="@null" android:paddingRight="16.0dip" android:layout_width="fill_parent" android:layout_height="fill_parent" android:hint="@string/search" android:singleLine="true" android:layout_weight="1.0" android:inputType="textFilter|textCapSentences|textNoSuggestions" android:imeOptions="actionSearch" android:textCursorDrawable="?searchViewCursorDrawable" />
|
||||
<ImageView android:id="@id/search_clear" android:background="?accent" android:layout_width="48.0dip" android:layout_height="48.0dip" android:src="@drawable/ic_cancel_24" android:scaleType="center" android:tint="?icon_secondary" />
|
||||
<ImageView android:id="@id/search_voice" android:background="?accent" android:layout_width="48.0dip" android:layout_height="48.0dip" android:src="@drawable/ic_voice_24" android:scaleType="center" android:tint="?icon_secondary" />
|
||||
<ImageView android:id="@id/search_done" android:background="?accent" android:layout_width="48.0dip" android:layout_height="48.0dip" android:src="@drawable/ic_check_24" android:scaleType="center" android:tint="?icon_secondary" />
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<android.support.design.widget.AppBarLayout android:layout_width="fill_parent" android:layout_height="wrap_content">
|
||||
<android.support.v7.widget.Toolbar android:id="@id/toolbar" android:layout_width="fill_parent" android:layout_height="?actionBarSize" app:layout_scrollFlags="enterAlways|scroll|snap" app:navigationIcon="@drawable/vkim_ic_back_theme_tinted" style="@style/VkIm.Toolbar.Style" />
|
||||
<android.support.design.widget.TabLayout android:id="@id/vkim_tab_layout" android:layout_width="fill_parent" android:layout_height="wrap_content" app:tabMode="scrollable" style="@style/VkIm.TabLayout" />
|
||||
<android.support.design.widget.TabLayout android:id="@id/vkim_tab_layout" android:background="?header_background" android:layout_width="fill_parent" android:layout_height="wrap_content" app:tabMode="scrollable" style="@style/VkIm.TabLayout" />
|
||||
</android.support.design.widget.AppBarLayout>
|
||||
<android.support.v4.view.ViewPager android:id="@id/vkim_viewpager" android:layout_width="fill_parent" android:layout_height="fill_parent" app:layout_behavior="@string/appbar_scrolling_view_behavior" />
|
||||
<com.vk.core.view.AppBarShadowView style="@style/AppBarShadow" />
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<item android:icon="@drawable/ic_write_24" android:id="@id/tags_change" android:title="@string/fave_tags_change" app:menuTint="?text_primary" app:showAsAction="always" />
|
||||
<item android:icon="@drawable/ic_write_24" android:id="@id/tags_change" android:title="@string/fave_tags_change" app:menuTint="?header_text" app:showAsAction="always" />
|
||||
</menu>
|
||||
@@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<item android:icon="@drawable/ic_tag_24" android:id="@id/tags" android:title="@string/fave_tag_icon_title" app:menuTint="?text_primary" app:showAsAction="always" />
|
||||
<item android:icon="@drawable/ic_tag_24" android:id="@id/tags" android:title="@string/fave_tag_icon_title" app:menuTint="?header_text" app:showAsAction="always" />
|
||||
</menu>
|
||||
@@ -2,7 +2,7 @@
|
||||
<menu
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<item android:icon="@drawable/ic_market_28" android:id="@id/menu_cart" android:title="@string/market_cart" app:showAsAction="always" />
|
||||
<item android:id="@id/menu_fave_add_or_remove" android:title="" app:menuTint="?text_primary" />
|
||||
<item android:id="@id/copy_link" android:title="@string/copy_link" app:menuTint="?text_primary" />
|
||||
<item android:id="@id/report" android:title="@string/report_content" app:menuTint="?text_primary" />
|
||||
<item android:id="@id/menu_fave_add_or_remove" android:title="" app:menuTint="?header_text" />
|
||||
<item android:id="@id/copy_link" android:title="@string/copy_link" app:menuTint="?header_text" />
|
||||
<item android:id="@id/report" android:title="@string/report_content" app:menuTint="?header_text" />
|
||||
</menu>
|
||||
@@ -1,24 +1,24 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<item android:icon="@drawable/ic_newsfeed_24" android:id="@id/menu_newsfeed" android:title="@string/newsfeed" app:menuTint="?text_primary" />
|
||||
<item android:icon="@drawable/ic_notification_24" android:id="@id/menu_feedback" android:title="@string/not_notifications" app:menuTint="?text_primary" />
|
||||
<item android:icon="@drawable/ic_message_24" android:id="@id/menu_messages" android:title="@string/messages" app:menuTint="?text_primary" />
|
||||
<item android:icon="@drawable/ic_search_24" android:id="@id/menu_search" android:title="@string/search" app:menuTint="?text_primary" />
|
||||
<item android:icon="@drawable/ic_user_24" android:id="@id/menu_friends" android:title="@string/friends" app:menuTint="?text_primary" />
|
||||
<item android:icon="@drawable/ic_users_24" android:id="@id/menu_groups" android:title="@string/menu_groups" app:menuTint="?text_primary" />
|
||||
<item android:icon="@drawable/ic_camera_24" android:id="@id/menu_photos" android:title="@string/photos" app:menuTint="?text_primary" />
|
||||
<item android:icon="@drawable/ic_music_24" android:id="@id/menu_audios" android:title="@string/music" app:menuTint="?text_primary" />
|
||||
<item android:icon="@drawable/ic_video_24" android:id="@id/menu_videos" android:title="@string/videos" app:menuTint="?text_primary" />
|
||||
<item android:icon="@drawable/ic_live_filter_24dp" android:id="@id/menu_lives" android:title="@string/sett_live" app:menuTint="?text_primary" />
|
||||
<item android:icon="@drawable/ic_podcast_24" android:id="@id/menu_podcasts" android:title="@string/podcasts" app:menuTint="?text_primary" />
|
||||
<item android:icon="@drawable/ic_games_24" android:id="@id/menu_games" android:title="@string/games" app:menuTint="?text_primary" />
|
||||
<item android:icon="@drawable/ic_favorite_24" android:id="@id/menu_fave" android:title="@string/fave_title" app:menuTint="?text_primary" />
|
||||
<item android:icon="@drawable/ic_menu_like_24" android:id="@id/menu_feed_likes" android:title="@string/sett_likes" app:menuTint="?text_primary" />
|
||||
<item android:icon="@drawable/ic_document_24" android:id="@id/menu_documents" android:title="@string/docs" app:menuTint="?text_primary" />
|
||||
<item android:icon="@drawable/ic_money_transfer_24" android:id="@id/menu_payments" android:title="@string/money_transfer_money_transfers" app:menuTint="?text_primary" />
|
||||
<item android:icon="@drawable/ic_help_24" android:id="@id/menu_support" android:title="@string/help" app:menuTint="?text_primary" />
|
||||
<item android:icon="@drawable/ic_money_circle_24" android:id="@id/menu_vk_pay" android:title="@string/vk_pay" app:menuTint="?text_primary" />
|
||||
<item android:icon="@drawable/ic_services_24" android:id="@id/menu_vk_apps" android:title="@string/menu_apps" app:menuTint="?text_primary" />
|
||||
<item android:icon="@drawable/ic_settings_24" android:id="@id/menu_settings" android:title="@string/menu_settings" app:menuTint="?text_primary" />
|
||||
<item android:icon="@drawable/ic_newsfeed_24" android:id="@id/menu_newsfeed" android:title="@string/newsfeed" app:menuTint="?header_text" />
|
||||
<item android:icon="@drawable/ic_notification_24" android:id="@id/menu_feedback" android:title="@string/not_notifications" app:menuTint="?header_text" />
|
||||
<item android:icon="@drawable/ic_message_24" android:id="@id/menu_messages" android:title="@string/messages" app:menuTint="?header_text" />
|
||||
<item android:icon="@drawable/ic_search_24" android:id="@id/menu_search" android:title="@string/search" app:menuTint="?header_text" />
|
||||
<item android:icon="@drawable/ic_user_24" android:id="@id/menu_friends" android:title="@string/friends" app:menuTint="?header_text" />
|
||||
<item android:icon="@drawable/ic_users_24" android:id="@id/menu_groups" android:title="@string/menu_groups" app:menuTint="?header_text" />
|
||||
<item android:icon="@drawable/ic_camera_24" android:id="@id/menu_photos" android:title="@string/photos" app:menuTint="?header_text" />
|
||||
<item android:icon="@drawable/ic_music_24" android:id="@id/menu_audios" android:title="@string/music" app:menuTint="?header_text" />
|
||||
<item android:icon="@drawable/ic_video_24" android:id="@id/menu_videos" android:title="@string/videos" app:menuTint="?header_text" />
|
||||
<item android:icon="@drawable/ic_live_filter_24dp" android:id="@id/menu_lives" android:title="@string/sett_live" app:menuTint="?header_text" />
|
||||
<item android:icon="@drawable/ic_podcast_24" android:id="@id/menu_podcasts" android:title="@string/podcasts" app:menuTint="?header_text" />
|
||||
<item android:icon="@drawable/ic_games_24" android:id="@id/menu_games" android:title="@string/games" app:menuTint="?header_text" />
|
||||
<item android:icon="@drawable/ic_favorite_24" android:id="@id/menu_fave" android:title="@string/fave_title" app:menuTint="?header_text" />
|
||||
<item android:icon="@drawable/ic_menu_like_24" android:id="@id/menu_feed_likes" android:title="@string/sett_likes" app:menuTint="?header_text" />
|
||||
<item android:icon="@drawable/ic_document_24" android:id="@id/menu_documents" android:title="@string/docs" app:menuTint="?header_text" />
|
||||
<item android:icon="@drawable/ic_money_transfer_24" android:id="@id/menu_payments" android:title="@string/money_transfer_money_transfers" app:menuTint="?header_text" />
|
||||
<item android:icon="@drawable/ic_help_24" android:id="@id/menu_support" android:title="@string/help" app:menuTint="?header_text" />
|
||||
<item android:icon="@drawable/ic_money_circle_24" android:id="@id/menu_vk_pay" android:title="@string/vk_pay" app:menuTint="?header_text" />
|
||||
<item android:icon="@drawable/ic_services_24" android:id="@id/menu_vk_apps" android:title="@string/menu_apps" app:menuTint="?header_text" />
|
||||
<item android:icon="@drawable/ic_settings_24" android:id="@id/menu_settings" android:title="@string/menu_settings" app:menuTint="?header_text" />
|
||||
</menu>
|
||||
@@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<item android:icon="@drawable/ic_menu_search" android:id="@id/search" android:title="@string/search" android:showAsAction="always" app:menuTint="?text_primary" app:showAsAction="always" />
|
||||
<item android:icon="@drawable/ic_menu_search" android:id="@id/search" android:title="@string/search" android:showAsAction="always" app:menuTint="?header_text" app:showAsAction="always" />
|
||||
</menu>
|
||||
@@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<item android:icon="@drawable/ic_check_24" android:id="@id/ok" android:title="@string/ok" android:showAsAction="always" app:menuTint="?text_primary" app:showAsAction="always" />
|
||||
<item android:icon="@drawable/ic_check_24" android:id="@id/ok" android:title="@string/ok" android:showAsAction="always" app:menuTint="?header_text" app:showAsAction="always" />
|
||||
</menu>
|
||||
@@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<item android:icon="@drawable/ic_settings_24" android:id="@id/filter" android:title="@string/filter" android:showAsAction="always" app:menuTint="?text_primary" app:showAsAction="always" />
|
||||
<item android:icon="@drawable/ic_settings_24" android:id="@id/filter" android:title="@string/filter" android:showAsAction="always" app:menuTint="?header_text" app:showAsAction="always" />
|
||||
</menu>
|
||||
@@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<item android:icon="@drawable/ic_search_24" android:id="@id/search" android:title="@string/search" app:menuTint="?text_primary" />
|
||||
<item android:icon="@drawable/ic_search_24" android:id="@id/search" android:title="@string/search" app:menuTint="?header_text" />
|
||||
</menu>
|
||||
@@ -3,10 +3,10 @@
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<item android:icon="@drawable/ic_add_24" android:id="@id/add" android:title="@string/add" android:showAsAction="always" app:showAsAction="always">
|
||||
<menu>
|
||||
<item android:icon="@drawable/ic_camera_24" android:id="@id/add_new_video" android:title="@string/add_video_new" app:menuTint="?text_primary" />
|
||||
<item android:icon="@drawable/ic_gallery_24" android:id="@id/add_existed" android:title="@string/add_video_existing" app:menuTint="?text_primary" />
|
||||
<item android:icon="@drawable/ic_link_24" android:id="@id/add_link" android:title="@string/video_add_link" app:menuTint="?text_primary" />
|
||||
<item android:icon="@drawable/ic_create_folder_24" android:id="@id/add_album" android:title="@string/create_album" app:menuTint="?text_primary" />
|
||||
<item android:icon="@drawable/ic_camera_24" android:id="@id/add_new_video" android:title="@string/add_video_new" app:menuTint="?header_text" />
|
||||
<item android:icon="@drawable/ic_gallery_24" android:id="@id/add_existed" android:title="@string/add_video_existing" app:menuTint="?header_text" />
|
||||
<item android:icon="@drawable/ic_link_24" android:id="@id/add_link" android:title="@string/video_add_link" app:menuTint="?header_text" />
|
||||
<item android:icon="@drawable/ic_create_folder_24" android:id="@id/add_album" android:title="@string/create_album" app:menuTint="?header_text" />
|
||||
</menu>
|
||||
</item>
|
||||
</menu>
|
||||
@@ -11,7 +11,7 @@
|
||||
</style>
|
||||
<style name="ActionBarSpinner" parent="@android:style/Widget.Material.Spinner" />
|
||||
<style name="ActionBarSubtitleStyle" parent="@android:style/TextAppearance.Material.Widget.ActionBar.Subtitle.Inverse">
|
||||
<item name="android:textColor">#80ffffff</item>
|
||||
<item name="android:textColor">?header_text</item>
|
||||
</style>
|
||||
<style name="ActionBarTheme" parent="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
|
||||
<item name="android:textColorPrimary">?header_text</item>
|
||||
@@ -53,7 +53,7 @@
|
||||
</style>
|
||||
<style name="ActionBarTitleStyle" parent="@android:style/TextAppearance.Material.Widget.ActionBar.Title.Inverse">
|
||||
<item name="android:textSize">18.0dip</item>
|
||||
<item name="android:textColor">?text_primary</item>
|
||||
<item name="android:textColor">?header_text</item>
|
||||
</style>
|
||||
<style name="Base.TextAppearance.AppCompat" parent="@android:style/TextAppearance.Material" />
|
||||
<style name="Base.TextAppearance.AppCompat.Body1" parent="@android:style/TextAppearance.Material.Body1" />
|
||||
@@ -423,13 +423,13 @@
|
||||
<item name="toolbarIconsColor">@color/toolbar_white_textColorSecondary</item>
|
||||
</style>
|
||||
<style name="GradientActionBarSubtitleStyle" parent="@android:style/TextAppearance.Material.Widget.ActionBar.Subtitle.Inverse">
|
||||
<item name="android:textColor">#b0ffffff</item>
|
||||
<item name="android:textColor">?header_text</item>
|
||||
<item name="android:shadowColor">#26000000</item>
|
||||
<item name="android:shadowDy">@integer/s1dip</item>
|
||||
<item name="android:shadowRadius">@integer/s2dip</item>
|
||||
</style>
|
||||
<style name="GradientActionBarTitleStyle" parent="@android:style/TextAppearance.Material.Widget.ActionBar.Title.Inverse">
|
||||
<item name="android:textColor">?text_primary</item>
|
||||
<item name="android:textColor">?header_text</item>
|
||||
<item name="android:shadowColor">#26000000</item>
|
||||
<item name="android:shadowDy">@integer/s1dip</item>
|
||||
<item name="android:shadowRadius">@integer/s2dip</item>
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
<item name="android:background">@drawable/spinner_ab_holo_dark</item>
|
||||
</style>
|
||||
<style name="ActionBarSubtitleStyle" parent="@android:style/TextAppearance.Holo.Widget.ActionBar.Subtitle.Inverse">
|
||||
<item name="android:textColor">#80ffffff</item>
|
||||
<item name="android:textColor">?header_text</item>
|
||||
</style>
|
||||
<style name="ActionBarTheme" parent="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
|
||||
<item name="android:textColorPrimary">?header_text</item>
|
||||
@@ -51,7 +51,7 @@
|
||||
</style>
|
||||
<style name="ActionBarTitleStyle" parent="@android:style/TextAppearance.Holo.Widget.ActionBar.Title.Inverse">
|
||||
<item name="android:textSize">18.0dip</item>
|
||||
<item name="android:textColor">?text_primary</item>
|
||||
<item name="android:textColor">?header_text</item>
|
||||
</style>
|
||||
<style name="ActionButton" parent="@style/Widget.AppCompat.Light.ActionButton" />
|
||||
<style name="ActionButton.Blue" parent="@style/ActionButton">
|
||||
@@ -1636,13 +1636,13 @@
|
||||
<item name="android:fontFamily">@string/font_family_medium</item>
|
||||
</style>
|
||||
<style name="GradientActionBarSubtitleStyle" parent="@android:style/TextAppearance.Holo.Widget.ActionBar.Subtitle.Inverse">
|
||||
<item name="android:textColor">#b0ffffff</item>
|
||||
<item name="android:textColor">?header_text</item>
|
||||
<item name="android:shadowColor">#26000000</item>
|
||||
<item name="android:shadowDy">@integer/s1dip</item>
|
||||
<item name="android:shadowRadius">@integer/s2dip</item>
|
||||
</style>
|
||||
<style name="GradientActionBarTitleStyle" parent="@android:style/TextAppearance.Holo.Widget.ActionBar.Title.Inverse">
|
||||
<item name="android:textColor">?text_primary</item>
|
||||
<item name="android:textColor">?header_text</item>
|
||||
<item name="android:shadowColor">#26000000</item>
|
||||
<item name="android:shadowDy">@integer/s1dip</item>
|
||||
<item name="android:shadowRadius">@integer/s2dip</item>
|
||||
|
||||
@@ -134,25 +134,9 @@
|
||||
|
||||
.line 23
|
||||
:cond_3
|
||||
new-instance v0, Ljava/lang/IllegalArgumentException;
|
||||
sget-object p0, Lcom/vk/im/engine/models/MemberType;->UNKNOWN:Lcom/vk/im/engine/models/MemberType;
|
||||
|
||||
new-instance v1, Ljava/lang/StringBuilder;
|
||||
|
||||
invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
|
||||
|
||||
const-string v2, "Unknown dialog id "
|
||||
|
||||
invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
|
||||
|
||||
invoke-virtual {v1, p0}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
|
||||
|
||||
invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
|
||||
|
||||
move-result-object p0
|
||||
|
||||
invoke-direct {v0, p0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
|
||||
|
||||
throw v0
|
||||
return-object p0
|
||||
.end method
|
||||
|
||||
.method private static e(I)I
|
||||
|
||||
@@ -275,7 +275,7 @@
|
||||
|
||||
move-result-object v1
|
||||
|
||||
const-string v2, "scroller"
|
||||
const-string v2, "m"
|
||||
|
||||
.line 112
|
||||
invoke-static {v1, v2}, Lkotlin/jvm/internal/Intrinsics;->a(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
@@ -289,7 +289,7 @@
|
||||
|
||||
move-result-object v2
|
||||
|
||||
const-string v3, "interpolator"
|
||||
const-string v3, "f"
|
||||
|
||||
.line 114
|
||||
invoke-static {v2, v3}, Lkotlin/jvm/internal/Intrinsics;->a(Ljava/lang/Object;Ljava/lang/String;)V
|
||||
|
||||
-201
@@ -52,206 +52,5 @@
|
||||
|
||||
const/4 v2, 0x0
|
||||
|
||||
if-ne v0, v1, :cond_0
|
||||
|
||||
.line 50
|
||||
invoke-static {}, Lcom/twitter/sdk/android/core/Twitter;->g()Lcom/twitter/sdk/android/core/Logger;
|
||||
|
||||
move-result-object v0
|
||||
|
||||
const-string v1, "Twitter"
|
||||
|
||||
const-string v3, "AdvertisingInfoServiceStrategy cannot be called on the main thread"
|
||||
|
||||
invoke-interface {v0, v1, v3}, Lcom/twitter/sdk/android/core/Logger;->a(Ljava/lang/String;Ljava/lang/String;)V
|
||||
|
||||
return-object v2
|
||||
|
||||
.line 56
|
||||
:cond_0
|
||||
:try_start_0
|
||||
iget-object v0, p0, Lcom/twitter/sdk/android/core/internal/AdvertisingInfoServiceStrategy;->a:Landroid/content/Context;
|
||||
|
||||
invoke-virtual {v0}, Landroid/content/Context;->getPackageManager()Landroid/content/pm/PackageManager;
|
||||
|
||||
move-result-object v0
|
||||
|
||||
const-string v1, "com.android.vending"
|
||||
|
||||
const/4 v3, 0x0
|
||||
|
||||
.line 57
|
||||
invoke-virtual {v0, v1, v3}, Landroid/content/pm/PackageManager;->getPackageInfo(Ljava/lang/String;I)Landroid/content/pm/PackageInfo;
|
||||
:try_end_0
|
||||
.catch Landroid/content/pm/PackageManager$NameNotFoundException; {:try_start_0 .. :try_end_0} :catch_3
|
||||
.catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_2
|
||||
|
||||
.line 71
|
||||
new-instance v0, Lcom/twitter/sdk/android/core/internal/AdvertisingInfoServiceStrategy$a;
|
||||
|
||||
invoke-direct {v0, v2}, Lcom/twitter/sdk/android/core/internal/AdvertisingInfoServiceStrategy$a;-><init>(Lcom/twitter/sdk/android/core/internal/AdvertisingInfoServiceStrategy$1;)V
|
||||
|
||||
.line 72
|
||||
new-instance v1, Landroid/content/Intent;
|
||||
|
||||
const-string v3, "com.google.android.gms.ads.identifier.service.START"
|
||||
|
||||
invoke-direct {v1, v3}, Landroid/content/Intent;-><init>(Ljava/lang/String;)V
|
||||
|
||||
const-string v3, "com.google.android.gms"
|
||||
|
||||
.line 73
|
||||
invoke-virtual {v1, v3}, Landroid/content/Intent;->setPackage(Ljava/lang/String;)Landroid/content/Intent;
|
||||
|
||||
.line 75
|
||||
:try_start_1
|
||||
iget-object v3, p0, Lcom/twitter/sdk/android/core/internal/AdvertisingInfoServiceStrategy;->a:Landroid/content/Context;
|
||||
|
||||
const/4 v4, 0x1
|
||||
|
||||
invoke-virtual {v3, v1, v0, v4}, Landroid/content/Context;->bindService(Landroid/content/Intent;Landroid/content/ServiceConnection;I)Z
|
||||
|
||||
move-result v1
|
||||
:try_end_1
|
||||
.catch Ljava/lang/Throwable; {:try_start_1 .. :try_end_1} :catch_1
|
||||
|
||||
if-eqz v1, :cond_1
|
||||
|
||||
.line 77
|
||||
:try_start_2
|
||||
new-instance v1, Lcom/twitter/sdk/android/core/internal/AdvertisingInfoServiceStrategy$b;
|
||||
|
||||
.line 78
|
||||
invoke-virtual {v0}, Lcom/twitter/sdk/android/core/internal/AdvertisingInfoServiceStrategy$a;->a()Landroid/os/IBinder;
|
||||
|
||||
move-result-object v3
|
||||
|
||||
invoke-direct {v1, v3, v2}, Lcom/twitter/sdk/android/core/internal/AdvertisingInfoServiceStrategy$b;-><init>(Landroid/os/IBinder;Lcom/twitter/sdk/android/core/internal/AdvertisingInfoServiceStrategy$1;)V
|
||||
|
||||
.line 79
|
||||
new-instance v3, Lcom/twitter/sdk/android/core/internal/AdvertisingInfo;
|
||||
|
||||
invoke-virtual {v1}, Lcom/twitter/sdk/android/core/internal/AdvertisingInfoServiceStrategy$b;->a()Ljava/lang/String;
|
||||
|
||||
move-result-object v4
|
||||
|
||||
.line 80
|
||||
invoke-static {v1}, Lcom/twitter/sdk/android/core/internal/AdvertisingInfoServiceStrategy$b;->a(Lcom/twitter/sdk/android/core/internal/AdvertisingInfoServiceStrategy$b;)Z
|
||||
|
||||
move-result v1
|
||||
|
||||
invoke-direct {v3, v4, v1}, Lcom/twitter/sdk/android/core/internal/AdvertisingInfo;-><init>(Ljava/lang/String;Z)V
|
||||
:try_end_2
|
||||
.catch Ljava/lang/Exception; {:try_start_2 .. :try_end_2} :catch_0
|
||||
.catchall {:try_start_2 .. :try_end_2} :catchall_0
|
||||
|
||||
.line 86
|
||||
:try_start_3
|
||||
iget-object v1, p0, Lcom/twitter/sdk/android/core/internal/AdvertisingInfoServiceStrategy;->a:Landroid/content/Context;
|
||||
|
||||
invoke-virtual {v1, v0}, Landroid/content/Context;->unbindService(Landroid/content/ServiceConnection;)V
|
||||
:try_end_3
|
||||
.catch Ljava/lang/Throwable; {:try_start_3 .. :try_end_3} :catch_1
|
||||
|
||||
return-object v3
|
||||
|
||||
:catchall_0
|
||||
move-exception v1
|
||||
|
||||
goto :goto_0
|
||||
|
||||
:catch_0
|
||||
move-exception v1
|
||||
|
||||
.line 82
|
||||
:try_start_4
|
||||
invoke-static {}, Lcom/twitter/sdk/android/core/Twitter;->g()Lcom/twitter/sdk/android/core/Logger;
|
||||
|
||||
move-result-object v3
|
||||
|
||||
const-string v4, "Twitter"
|
||||
|
||||
const-string v5, "Exception in binding to Google Play Service to capture AdvertisingId"
|
||||
|
||||
invoke-interface {v3, v4, v5, v1}, Lcom/twitter/sdk/android/core/Logger;->b(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
|
||||
:try_end_4
|
||||
.catchall {:try_start_4 .. :try_end_4} :catchall_0
|
||||
|
||||
.line 86
|
||||
:try_start_5
|
||||
iget-object v1, p0, Lcom/twitter/sdk/android/core/internal/AdvertisingInfoServiceStrategy;->a:Landroid/content/Context;
|
||||
|
||||
invoke-virtual {v1, v0}, Landroid/content/Context;->unbindService(Landroid/content/ServiceConnection;)V
|
||||
|
||||
goto :goto_1
|
||||
|
||||
:goto_0
|
||||
iget-object v3, p0, Lcom/twitter/sdk/android/core/internal/AdvertisingInfoServiceStrategy;->a:Landroid/content/Context;
|
||||
|
||||
invoke-virtual {v3, v0}, Landroid/content/Context;->unbindService(Landroid/content/ServiceConnection;)V
|
||||
|
||||
throw v1
|
||||
|
||||
.line 89
|
||||
:cond_1
|
||||
invoke-static {}, Lcom/twitter/sdk/android/core/Twitter;->g()Lcom/twitter/sdk/android/core/Logger;
|
||||
|
||||
move-result-object v0
|
||||
|
||||
const-string v1, "Twitter"
|
||||
|
||||
const-string v3, "Could not bind to Google Play Service to capture AdvertisingId"
|
||||
|
||||
invoke-interface {v0, v1, v3}, Lcom/twitter/sdk/android/core/Logger;->a(Ljava/lang/String;Ljava/lang/String;)V
|
||||
:try_end_5
|
||||
.catch Ljava/lang/Throwable; {:try_start_5 .. :try_end_5} :catch_1
|
||||
|
||||
goto :goto_1
|
||||
|
||||
:catch_1
|
||||
move-exception v0
|
||||
|
||||
.line 93
|
||||
invoke-static {}, Lcom/twitter/sdk/android/core/Twitter;->g()Lcom/twitter/sdk/android/core/Logger;
|
||||
|
||||
move-result-object v1
|
||||
|
||||
const-string v3, "Twitter"
|
||||
|
||||
const-string v4, "Could not bind to Google Play Service to capture AdvertisingId"
|
||||
|
||||
invoke-interface {v1, v3, v4, v0}, Lcom/twitter/sdk/android/core/Logger;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
|
||||
|
||||
:goto_1
|
||||
return-object v2
|
||||
|
||||
:catch_2
|
||||
move-exception v0
|
||||
|
||||
.line 66
|
||||
invoke-static {}, Lcom/twitter/sdk/android/core/Twitter;->g()Lcom/twitter/sdk/android/core/Logger;
|
||||
|
||||
move-result-object v1
|
||||
|
||||
const-string v3, "Twitter"
|
||||
|
||||
const-string v4, "Unable to determine if Google Play Services is available"
|
||||
|
||||
invoke-interface {v1, v3, v4, v0}, Lcom/twitter/sdk/android/core/Logger;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
|
||||
|
||||
return-object v2
|
||||
|
||||
.line 60
|
||||
:catch_3
|
||||
invoke-static {}, Lcom/twitter/sdk/android/core/Twitter;->g()Lcom/twitter/sdk/android/core/Logger;
|
||||
|
||||
move-result-object v0
|
||||
|
||||
const-string v1, "Twitter"
|
||||
|
||||
const-string v3, "Unable to find Google Play Services package name"
|
||||
|
||||
invoke-interface {v0, v1, v3}, Lcom/twitter/sdk/android/core/Logger;->a(Ljava/lang/String;Ljava/lang/String;)V
|
||||
|
||||
return-object v2
|
||||
.end method
|
||||
|
||||
@@ -657,100 +657,8 @@
|
||||
.method private static d(Landroid/content/Context;)Lcom/facebook/internal/AttributionIdentifiers;
|
||||
.locals 5
|
||||
|
||||
.line 147
|
||||
new-instance v0, Lcom/facebook/internal/AttributionIdentifiers$b;
|
||||
const v1, 0x0
|
||||
|
||||
const/4 v1, 0x0
|
||||
|
||||
invoke-direct {v0, v1}, Lcom/facebook/internal/AttributionIdentifiers$b;-><init>(Lcom/facebook/internal/AttributionIdentifiers$1;)V
|
||||
|
||||
.line 148
|
||||
new-instance v2, Landroid/content/Intent;
|
||||
|
||||
const-string v3, "com.google.android.gms.ads.identifier.service.START"
|
||||
|
||||
invoke-direct {v2, v3}, Landroid/content/Intent;-><init>(Ljava/lang/String;)V
|
||||
|
||||
const-string v3, "com.google.android.gms"
|
||||
|
||||
.line 149
|
||||
invoke-virtual {v2, v3}, Landroid/content/Intent;->setPackage(Ljava/lang/String;)Landroid/content/Intent;
|
||||
|
||||
const/4 v3, 0x1
|
||||
|
||||
.line 150
|
||||
invoke-virtual {p0, v2, v0, v3}, Landroid/content/Context;->bindService(Landroid/content/Intent;Landroid/content/ServiceConnection;I)Z
|
||||
|
||||
move-result v2
|
||||
|
||||
if-eqz v2, :cond_0
|
||||
|
||||
.line 152
|
||||
:try_start_0
|
||||
new-instance v2, Lcom/facebook/internal/AttributionIdentifiers$a;
|
||||
|
||||
invoke-virtual {v0}, Lcom/facebook/internal/AttributionIdentifiers$b;->a()Landroid/os/IBinder;
|
||||
|
||||
move-result-object v3
|
||||
|
||||
invoke-direct {v2, v3}, Lcom/facebook/internal/AttributionIdentifiers$a;-><init>(Landroid/os/IBinder;)V
|
||||
|
||||
.line 153
|
||||
new-instance v3, Lcom/facebook/internal/AttributionIdentifiers;
|
||||
|
||||
invoke-direct {v3}, Lcom/facebook/internal/AttributionIdentifiers;-><init>()V
|
||||
|
||||
.line 154
|
||||
invoke-virtual {v2}, Lcom/facebook/internal/AttributionIdentifiers$a;->a()Ljava/lang/String;
|
||||
|
||||
move-result-object v4
|
||||
|
||||
iput-object v4, v3, Lcom/facebook/internal/AttributionIdentifiers;->c:Ljava/lang/String;
|
||||
|
||||
.line 155
|
||||
invoke-virtual {v2}, Lcom/facebook/internal/AttributionIdentifiers$a;->b()Z
|
||||
|
||||
move-result v2
|
||||
|
||||
iput-boolean v2, v3, Lcom/facebook/internal/AttributionIdentifiers;->e:Z
|
||||
:try_end_0
|
||||
.catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
|
||||
.catchall {:try_start_0 .. :try_end_0} :catchall_0
|
||||
|
||||
.line 160
|
||||
invoke-virtual {p0, v0}, Landroid/content/Context;->unbindService(Landroid/content/ServiceConnection;)V
|
||||
|
||||
return-object v3
|
||||
|
||||
:catchall_0
|
||||
move-exception v1
|
||||
|
||||
goto :goto_0
|
||||
|
||||
:catch_0
|
||||
move-exception v2
|
||||
|
||||
:try_start_1
|
||||
const-string v3, "android_id"
|
||||
|
||||
.line 158
|
||||
invoke-static {v3, v2}, Lcom/facebook/internal/Utility;->a(Ljava/lang/String;Ljava/lang/Exception;)V
|
||||
:try_end_1
|
||||
.catchall {:try_start_1 .. :try_end_1} :catchall_0
|
||||
|
||||
.line 160
|
||||
invoke-virtual {p0, v0}, Landroid/content/Context;->unbindService(Landroid/content/ServiceConnection;)V
|
||||
|
||||
goto :goto_1
|
||||
|
||||
:goto_0
|
||||
invoke-virtual {p0, v0}, Landroid/content/Context;->unbindService(Landroid/content/ServiceConnection;)V
|
||||
|
||||
.line 161
|
||||
throw v1
|
||||
|
||||
:cond_0
|
||||
:goto_1
|
||||
return-object v1
|
||||
.end method
|
||||
|
||||
|
||||
@@ -2556,6 +2556,8 @@
|
||||
|
||||
move-result v0
|
||||
|
||||
const v0, 0x0 ## nedofix anim stickers
|
||||
|
||||
return v0
|
||||
.end method
|
||||
|
||||
|
||||
Reference in New Issue
Block a user