-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #19982 from wordpress-mobile/issue/19952-add-stats…
…-granularity-spinner Add stats granularity spinner to Traffic tab
- Loading branch information
Showing
10 changed files
with
132 additions
and
56 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,72 +1,79 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| xmlns:app="http://schemas.android.com/apk/res-auto" | ||
| xmlns:tools="http://schemas.android.com/tools" | ||
| android:id="@+id/date_selector_container" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:minHeight="@dimen/one_line_list_item_height"> | ||
| android:gravity="center_vertical" | ||
| android:minHeight="52dp" | ||
| android:orientation="horizontal" | ||
| android:paddingEnd="@dimen/margin_extra_large" | ||
| android:paddingVertical="@dimen/margin_extra_small" | ||
| tools:ignore="RtlSymmetry"> | ||
|
|
||
| <org.wordpress.android.widgets.MaterialTextViewWithNumerals | ||
| android:id="@+id/selectedDateTextView" | ||
| style="@style/StatsDateSelectorTitle" | ||
| android:layout_width="0dp" | ||
| <Spinner | ||
| android:id="@+id/granularity_spinner" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginStart="16dp" | ||
| android:layout_marginTop="10dp" | ||
| android:layout_marginEnd="8dp" | ||
| android:layout_marginBottom="1dp" | ||
| android:text="@string/unknown" | ||
| app:layout_constraintBottom_toTopOf="@+id/currentSiteTimeZone" | ||
| app:layout_constraintEnd_toStartOf="@+id/previousDateButton" | ||
| app:layout_constraintHorizontal_bias="0.0" | ||
| app:layout_constraintStart_toStartOf="parent" | ||
| app:layout_constraintTop_toTopOf="parent" | ||
| app:layout_constraintVertical_chainStyle="packed" | ||
| app:layout_goneMarginBottom="10dp" /> | ||
| android:minHeight="@dimen/min_touch_target_sz" | ||
| android:overlapAnchor="false" | ||
| app:popupTheme="@style/ThemeOverlay.AppCompat.DayNight" /> | ||
|
|
||
| <com.google.android.material.textview.MaterialTextView | ||
| android:id="@+id/currentSiteTimeZone" | ||
| style="@style/StatsDateTimeZone" | ||
| <Space | ||
| android:id="@+id/granularity_space" | ||
| android:layout_width="0dp" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginBottom="10dp" | ||
| android:text="@string/unknown" | ||
| android:visibility="gone" | ||
| app:layout_constraintBottom_toBottomOf="parent" | ||
| app:layout_constraintEnd_toStartOf="@+id/previousDateButton" | ||
| app:layout_constraintStart_toStartOf="@+id/selectedDateTextView" | ||
| app:layout_constraintTop_toBottomOf="@+id/selectedDateTextView" /> | ||
| android:layout_height="0dp" | ||
| android:layout_weight="1" /> | ||
|
|
||
| <LinearLayout | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="match_parent" | ||
| android:gravity="center_vertical" | ||
| android:orientation="vertical"> | ||
|
|
||
| <org.wordpress.android.widgets.MaterialTextViewWithNumerals | ||
| android:id="@+id/selectedDateTextView" | ||
| style="@style/StatsDateSelectorTitle" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:text="@string/unknown" /> | ||
|
|
||
| <com.google.android.material.textview.MaterialTextView | ||
| android:id="@+id/currentSiteTimeZone" | ||
| style="@style/StatsDateTimeZone" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:text="@string/unknown" | ||
| android:visibility="gone" /> | ||
| </LinearLayout> | ||
|
|
||
| <Space | ||
| android:id="@+id/date_space" | ||
| android:layout_width="0dp" | ||
| android:layout_height="0dp" | ||
| android:layout_weight="1" | ||
| android:visibility="gone" /> | ||
|
|
||
| <ImageButton | ||
| android:id="@+id/previousDateButton" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginStart="8dp" | ||
| android:layout_marginEnd="16dp" | ||
| android:layout_height="match_parent" | ||
| android:layout_marginStart="@dimen/margin_medium" | ||
| android:background="?selectableItemBackgroundBorderless" | ||
| android:contentDescription="@string/stats_select_previous_period_description" | ||
| android:padding="4dp" | ||
| android:src="@drawable/ic_chevron_left_white_24dp" | ||
| app:tint="@color/on_surface_disabled_selector" | ||
| android:tintMode="src_in" | ||
| app:layout_constraintBottom_toBottomOf="parent" | ||
| app:layout_constraintEnd_toStartOf="@+id/nextDateButton" | ||
| app:layout_constraintStart_toEndOf="@+id/selectedDateTextView" | ||
| app:layout_constraintTop_toTopOf="parent" /> | ||
| app:tint="@color/on_surface_disabled_selector" /> | ||
|
|
||
| <ImageButton | ||
| android:id="@+id/nextDateButton" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginEnd="12dp" | ||
| android:layout_height="match_parent" | ||
| android:layout_marginStart="@dimen/margin_medium" | ||
| android:background="?selectableItemBackgroundBorderless" | ||
| android:contentDescription="@string/stats_select_next_period_description" | ||
| android:padding="4dp" | ||
| android:src="@drawable/ic_chevron_right_white_24dp" | ||
| app:tint="@color/on_surface_disabled_selector" | ||
| android:tintMode="src_in" | ||
| app:layout_constraintBottom_toBottomOf="parent" | ||
| app:layout_constraintEnd_toEndOf="parent" | ||
| app:layout_constraintTop_toTopOf="parent" /> | ||
|
|
||
| </androidx.constraintlayout.widget.ConstraintLayout> | ||
| app:tint="@color/on_surface_disabled_selector" /> | ||
| </LinearLayout> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.