Mholloway has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/366745 )
Change subject: Add offline compilation detail view
......................................................................
Add offline compilation detail view
Uses placeholder compilation info for now (in the form of defaults
added to the CompilationInfo class; these should be removed later).
Todo (separately): add a new button style to match the mocks.
Bug: T163594
Change-Id: I0f31bcb3eaa9625c26c60998004ef64e958d9809
---
M app/src/main/java/org/wikipedia/offline/CompilationDetailActivity.java
M app/src/main/java/org/wikipedia/offline/CompilationDetailFragment.java
M app/src/main/java/org/wikipedia/offline/CompilationInfo.java
M app/src/main/java/org/wikipedia/offline/DiskUsageView.java
M app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java
M app/src/main/java/org/wikipedia/util/FileUtil.java
A app/src/main/res/layout/fragment_compilation_detail.xml
A app/src/main/res/layout/include_compilation_info.xml
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values/attrs.xml
M app/src/main/res/values/colors.xml
M app/src/main/res/values/strings.xml
M app/src/main/res/values/styles_dark.xml
M app/src/main/res/values/styles_light.xml
14 files changed, 345 insertions(+), 38 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/45/366745/1
diff --git
a/app/src/main/java/org/wikipedia/offline/CompilationDetailActivity.java
b/app/src/main/java/org/wikipedia/offline/CompilationDetailActivity.java
index 0c05495..504bba8 100644
--- a/app/src/main/java/org/wikipedia/offline/CompilationDetailActivity.java
+++ b/app/src/main/java/org/wikipedia/offline/CompilationDetailActivity.java
@@ -2,18 +2,35 @@
import android.content.Context;
import android.content.Intent;
+import android.os.Build;
+import android.os.Bundle;
import android.support.annotation.NonNull;
+import android.view.WindowManager;
import org.wikipedia.activity.SingleFragmentActivity;
+import org.wikipedia.json.GsonMarshaller;
+import org.wikipedia.json.GsonUnmarshaller;
public class CompilationDetailActivity extends
SingleFragmentActivity<CompilationDetailFragment> {
+ protected static final String EXTRA_COMPILATION_INFO = "info";
- public static Intent newIntent(@NonNull Context context) {
- return new Intent(context, CompilationDetailActivity.class);
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+
getWindow().setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS,
+ WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+ }
+ }
+
+ public static Intent newIntent(@NonNull Context context, @NonNull
CompilationInfo info) {
+ return new Intent(context, CompilationDetailActivity.class)
+ .putExtra(EXTRA_COMPILATION_INFO,
GsonMarshaller.marshal(info));
}
@Override
protected CompilationDetailFragment createFragment() {
- return CompilationDetailFragment.newInstance();
+ return
CompilationDetailFragment.newInstance(GsonUnmarshaller.unmarshal(CompilationInfo.class,
+ getIntent().getStringExtra(EXTRA_COMPILATION_INFO)));
}
}
diff --git
a/app/src/main/java/org/wikipedia/offline/CompilationDetailFragment.java
b/app/src/main/java/org/wikipedia/offline/CompilationDetailFragment.java
index 2443843..ea73c3f 100644
--- a/app/src/main/java/org/wikipedia/offline/CompilationDetailFragment.java
+++ b/app/src/main/java/org/wikipedia/offline/CompilationDetailFragment.java
@@ -1,12 +1,98 @@
package org.wikipedia.offline;
+import android.net.Uri;
+import android.os.Bundle;
import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
+import android.support.v4.content.ContextCompat;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import org.wikipedia.R;
+import org.wikipedia.json.GsonMarshaller;
+import org.wikipedia.json.GsonUnmarshaller;
+import org.wikipedia.util.DimenUtil;
+import org.wikipedia.util.GradientUtil;
+import org.wikipedia.views.FaceAndColorDetectImageView;
+import org.wikipedia.views.ViewUtil;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.Unbinder;
+
+import static
org.wikipedia.offline.CompilationDetailActivity.EXTRA_COMPILATION_INFO;
+import static org.wikipedia.util.DateUtil.getShortDateString;
+import static org.wikipedia.util.DimenUtil.leadImageHeightForDevice;
+import static org.wikipedia.util.FileUtil.bytesToGB;
public class CompilationDetailFragment extends Fragment {
+ @BindView(R.id.compilation_detail_toolbar) Toolbar toolbar;
+ @BindView(R.id.compilation_detail_header_image)
FaceAndColorDetectImageView imageView;
+ @BindView(R.id.view_compilation_info_title) TextView nameView;
+ @BindView(R.id.view_compilation_info_date_size) TextView dateSizeView;
+ @BindView(R.id.view_compilation_info_summary) TextView summaryView;
+ @BindView(R.id.view_compilation_info_description) TextView descriptionView;
+ @BindView(R.id.button_compilation_detail_download) TextView downloadButton;
+
+ private Unbinder unbinder;
@NonNull
- public static CompilationDetailFragment newInstance() {
- return new CompilationDetailFragment();
+ public static CompilationDetailFragment newInstance(@NonNull
CompilationInfo info) {
+ CompilationDetailFragment instance = new CompilationDetailFragment();
+ Bundle args = new Bundle();
+ args.putString(EXTRA_COMPILATION_INFO, GsonMarshaller.marshal(info));
+ instance.setArguments(args);
+ return instance;
+ }
+
+ @Nullable @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
+ super.onCreateView(inflater, container, savedInstanceState);
+ View view = inflater.inflate(R.layout.fragment_compilation_detail,
container, false);
+ unbinder = ButterKnife.bind(this, view);
+
+ ViewUtil.setTopPaddingDp(toolbar, (int)
DimenUtil.getTranslucentStatusBarHeight(getContext()));
+ ViewUtil.setBackgroundDrawable(toolbar, GradientUtil.getCubicGradient(
+ ContextCompat.getColor(getContext(),
R.color.lead_gradient_start), Gravity.TOP));
+ getAppCompatActivity().setSupportActionBar(toolbar);
+
getAppCompatActivity().getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+ getAppCompatActivity().getSupportActionBar().setTitle("");
+
+ CompilationInfo info =
GsonUnmarshaller.unmarshal(CompilationInfo.class,
+
getActivity().getIntent().getStringExtra(EXTRA_COMPILATION_INFO));
+
+ Uri imageUri = info.thumbUri();
+ int height = imageUri == null ?
DimenUtil.getContentTopOffsetPx(getContext()) : leadImageHeightForDevice();
+ if (imageUri == null) {
+ toolbar.setBackgroundColor(ContextCompat.getColor(getContext(),
R.color.main_toolbar_background));
+ }
+ DimenUtil.setViewHeight(imageView, height);
+
+ imageView.loadImage(imageUri);
+ nameView.setText(info.name());
+
dateSizeView.setText(String.format(getString(R.string.offline_compilation_detail_date_size),
+ getShortDateString(info.timestamp()), bytesToGB(info.size())));
+ summaryView.setText(info.summary());
+ descriptionView.setText(info.description());
+
downloadButton.setText(String.format(getString(R.string.offline_compilation_detail_button_download),
+ bytesToGB(info.size())));
+
+ return view;
+ }
+
+ @Override public void onDestroyView() {
+ unbinder.unbind();
+ unbinder = null;
+ super.onDestroyView();
+ }
+
+ private AppCompatActivity getAppCompatActivity() {
+ return (AppCompatActivity) getActivity();
}
}
diff --git a/app/src/main/java/org/wikipedia/offline/CompilationInfo.java
b/app/src/main/java/org/wikipedia/offline/CompilationInfo.java
index 386dcab..88600d9 100644
--- a/app/src/main/java/org/wikipedia/offline/CompilationInfo.java
+++ b/app/src/main/java/org/wikipedia/offline/CompilationInfo.java
@@ -3,57 +3,112 @@
import android.net.Uri;
import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
import com.google.gson.annotations.SerializedName;
-import java.util.Date;
+import java.util.List;
// A Gson POJO that will model the compilations endpoint response. TODO:
Finalize when the spec is defined.
+@SuppressWarnings("checkstyle:magicnumber") // TODO: Remove this annotation
when dev defaults are removed
class CompilationInfo {
- @SuppressWarnings("unused,NullableProblems") @NonNull private String
filename;
- @SuppressWarnings("unused,NullableProblems") @NonNull private String
summary;
- @SuppressWarnings("unused,NullableProblems") @NonNull private String
description;
- @SuppressWarnings("unused,NullableProblems") @SerializedName("thumb_url")
@NonNull private Uri thumbUrl;
- @SuppressWarnings("unused,NullableProblems") @SerializedName("image_url")
@NonNull private Uri imageUrl; // full-size image
- @SuppressWarnings("unused") @SerializedName("article_count") private int
articleCount;
- @SuppressWarnings("unused") private long size; // bytes
- @SuppressWarnings("unused") private long timestamp;
+ // TODO: Remove placeholder defaults when development is finished
+ @SuppressWarnings("unused") private String name = "The Best Articles Ever";
+ @SuppressWarnings("unused,NullableProblems") @NonNull private Uri uri;
+ @SuppressWarnings("unused") @Nullable private List<String> langCodes;
+ @SuppressWarnings("unused") @Nullable private String summary = "The
awesomest Wikipedia articles of all time";
+ @SuppressWarnings("unused") @Nullable private String description = "I was
sleeping on a bed in the open air. I saw a clear. I saw young girls carrying
sunshades. I saw white swans floating upon placid waters. I carried a new
umbrella over me in a clear shower. I waded in clear water.";
+ @SuppressWarnings("unused") @Nullable private MediaContent media;
+ @SuppressWarnings("unused,NullableProblems") @SerializedName("thumb_url")
@Nullable private Image thumb
+ = new
Image(Uri.parse("https://upload.wikimedia.org/wikipedia/commons/thumb/0/0e/Oolong_the_Rabbit%27s_last_performance_%282003%29.jpg/241px-Oolong_the_Rabbit%27s_last_performance_%282003%29.jpg";),
241, 240);
+ @SuppressWarnings("unused,NullableProblems") @SerializedName("image_url")
@Nullable private Image image
+ = new
Image(Uri.parse("https://upload.wikimedia.org/wikipedia/commons/0/0e/Oolong_the_Rabbit%27s_last_performance_%282003%29.jpg";),
1280, 2276); // full-size image
+ @SuppressWarnings("unused") private int count = 9999;
+ @SuppressWarnings("unused") private long size = 1987654321; // bytes
+ @SuppressWarnings("unused") private long timestamp = 1234567890;
@NonNull
- public String getFilename() {
- return filename;
+ public String name() {
+ return name;
}
@NonNull
- public String getSummary() {
+ public Uri uri() {
+ return uri;
+ }
+
+ @Nullable
+ public String summary() {
return summary;
}
- @NonNull
- public String getDescription() {
+ @Nullable
+ public String description() {
return description;
}
- @NonNull
- public Uri getThumbUrl() {
- return thumbUrl;
+ @Nullable
+ public Image thumb() {
+ return thumb;
}
- @NonNull
- public Uri getImageUrl() {
- return imageUrl;
+ @Nullable
+ public Uri thumbUri() {
+ return thumb != null ? thumb.uri() : null;
}
- public int getArticleCount() {
- return articleCount;
+ @Nullable
+ public Image image() {
+ return image;
}
- public long getSize() {
+ @Nullable
+ public Uri imageUri() {
+ return image != null ? image.uri() : null;
+ }
+
+ public int count() {
+ return count;
+ }
+
+ public long size() {
return size;
}
- @NonNull
- public Date getDate() {
- return new Date(timestamp);
+ @Nullable
+ public MediaContent mediaContent() {
+ return media;
+ }
+
+ public long timestamp() {
+ return timestamp;
+ }
+
+ public static class Image {
+ @NonNull private Uri uri;
+ private int width;
+ private int height;
+
+ Image(@NonNull Uri uri, int width, int height) {
+ this.uri = uri;
+ this.width = width;
+ this.height = height;
+ }
+
+ public Uri uri() {
+ return uri;
+ }
+
+ public int width() {
+ return width;
+ }
+
+ public int height() {
+ return height;
+ }
+ }
+
+ public enum MediaContent {
+ ALL, IMAGES, NONE
}
}
diff --git a/app/src/main/java/org/wikipedia/offline/DiskUsageView.java
b/app/src/main/java/org/wikipedia/offline/DiskUsageView.java
index e20975b..5c33099 100644
--- a/app/src/main/java/org/wikipedia/offline/DiskUsageView.java
+++ b/app/src/main/java/org/wikipedia/offline/DiskUsageView.java
@@ -22,9 +22,9 @@
import butterknife.BindView;
import butterknife.ButterKnife;
-public class DiskUsageView extends LinearLayout {
- private static final int KILOBYTE = 1000;
+import static org.wikipedia.util.FileUtil.bytesToGB;
+public class DiskUsageView extends LinearLayout {
@BindView(R.id.view_disk_usage_size_text) TextView sizeText;
@BindView(R.id.view_disk_usage_text_app) TextView usageAppText;
@BindView(R.id.view_disk_usage_text_free) TextView usageFreeText;
@@ -94,9 +94,5 @@
ViewCompat.setBackgroundTintList(dotView, new ColorStateList(new
int[][]{new int[]{}},
new int[]{ContextCompat.getColor(getContext(),
ResourceUtil.getThemedAttributeId(getContext(),
id))}));
- }
-
- private float bytesToGB(long bytes) {
- return (float) bytes / KILOBYTE / KILOBYTE / KILOBYTE;
}
}
diff --git
a/app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java
b/app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java
index a6e18a1..1fb8820 100644
--- a/app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java
+++ b/app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java
@@ -220,9 +220,11 @@
}
private class ItemCallback implements PageItemView.Callback<Compilation> {
+ // TODO: Wire up real compilation info
@Override
public void onClick(@Nullable Compilation item) {
- startActivity(CompilationDetailActivity.newIntent(getContext()));
+ startActivity(CompilationDetailActivity.newIntent(getContext(),
+ new CompilationInfo()));
}
@Override
diff --git a/app/src/main/java/org/wikipedia/util/FileUtil.java
b/app/src/main/java/org/wikipedia/util/FileUtil.java
index 1130ca8..0573568 100644
--- a/app/src/main/java/org/wikipedia/util/FileUtil.java
+++ b/app/src/main/java/org/wikipedia/util/FileUtil.java
@@ -15,6 +15,7 @@
public final class FileUtil {
public static final int JPEG_QUALITY = 85;
+ private static final int KILOBYTE = 1000;
public static long physicalToLogicalSize(long physical, long blockSize) {
if (physical == 0) {
@@ -97,5 +98,10 @@
return mimeType.contains("image");
}
+
+ public static float bytesToGB(long bytes) {
+ return (float) bytes / KILOBYTE / KILOBYTE / KILOBYTE;
+ }
+
private FileUtil() { }
}
diff --git a/app/src/main/res/layout/fragment_compilation_detail.xml
b/app/src/main/res/layout/fragment_compilation_detail.xml
new file mode 100644
index 0000000..7753b87
--- /dev/null
+++ b/app/src/main/res/layout/fragment_compilation_detail.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+ xmlns:android="http://schemas.android.com/apk/res/android";
+ xmlns:app="http://schemas.android.com/apk/res-auto";
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="?attr/compilation_detail_background_color">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+
+ <!-- Height set dynamically based on device properties -->
+ <org.wikipedia.views.FaceAndColorDetectImageView
+ style="@style/SimpleDraweeViewPlaceholder"
+ android:id="@+id/compilation_detail_header_image"
+ app:actualImageScaleType="focusCrop"
+ app:fadeDuration="0"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"/>
+
+ <include layout="@layout/include_compilation_info"/>
+
+ <!-- Bottom button for available, not-yet-downloaded compilation -->
+ <TextView
+ android:id="@+id/button_compilation_detail_download"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="10dp"
+ android:layout_marginRight="10dp"
+ style="@style/App.Button.Gray"
+ android:text="@string/offline_compilation_detail_button_download"/>
+
+ <!-- Placeholder Bottom button for compilation downloading state; will
be replaced with a download control gadget -->
+ <!-- TODO: replace me -->
+ <TextView
+ android:id="@+id/button_compilation_detail_downloading_placeholder"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="10dp"
+ android:layout_marginRight="10dp"
+ style="@style/App.Button.Gray"
+ android:text="Downloading..."
+ android:visibility="gone"/>
+
+ <!-- Bottom buttons for downloaded compilation -->
+ <LinearLayout
+ android:id="@+id/compilation_detail_downloaded_buttons_container"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="6dp"
+ android:layout_marginRight="6dp"
+ android:visibility="gone">
+
+ <TextView
+ android:id="@+id/button_compilation_detail_remove"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ style="@style/App.Button.Gray"
+
android:text="@string/offline_compilation_detail_button_remove"/>
+
+ <TextView
+ android:id="@+id/button_compilation_detail_view_compilations"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ style="@style/App.Button.Blue"
+
android:text="@string/offline_compilation_detail_button_view_compilations"/>
+ </LinearLayout>
+
+ </LinearLayout>
+
+ <android.support.v7.widget.Toolbar
+ android:id="@+id/compilation_detail_toolbar"
+ android:theme="@style/AppTheme.ToolbarTheme"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"/>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/include_compilation_info.xml
b/app/src/main/res/layout/include_compilation_info.xml
new file mode 100644
index 0000000..0e0f986
--- /dev/null
+++ b/app/src/main/res/layout/include_compilation_info.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android";
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:padding="16dp">
+
+ <TextView
+ android:id="@+id/view_compilation_info_title"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingBottom="4dp"
+ android:textSize="20sp"
+ android:textColor="?attr/feed_text_primary_color"
+ android:fontFamily="sans-serif-medium"
+ android:lineSpacingMultiplier="1.2"
+ style="@style/RtlAwareTextView"/>
+
+ <TextView
+ android:id="@+id/view_compilation_info_date_size"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingBottom="4dp"
+ android:textSize="12sp"
+ android:textColor="?attr/feed_text_tertiary_color"
+ android:lineSpacingMultiplier="1.2"
+ style="@style/RtlAwareTextView"/>
+
+ <TextView
+ android:id="@+id/view_compilation_info_summary"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingTop="4dp"
+ android:paddingBottom="4dp"
+ android:textSize="14sp"
+ android:textColor="?attr/feed_text_secondary_color"
+ android:lineSpacingMultiplier="1.2"
+ style="@style/RtlAwareTextView"/>
+
+ <TextView
+ android:id="@+id/view_compilation_info_description"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingTop="4dp"
+ android:textSize="14sp"
+ android:textColor="?attr/feed_text_secondary_color"
+ android:lineSpacingMultiplier="1.2"
+ style="@style/RtlAwareTextView"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-qq/strings.xml
b/app/src/main/res/values-qq/strings.xml
index 50d16e7..133c456 100644
--- a/app/src/main/res/values-qq/strings.xml
+++ b/app/src/main/res/values-qq/strings.xml
@@ -421,6 +421,10 @@
<string name="offline_compilations_search_by_name">Menu item for searching
compilations by name.</string>
<string name="offline_compilations_found_count">Label that states how many
compilations the user has available. The %d symbol is replaced with the number
of compilations detected.</string>
<string name="offline_compilations_add">Button text for adding an offline
compilation.</string>
+ <string name="offline_compilation_detail_date_size">Information about the
date and size of a compilation. The %1$s and %2$.2f symbols will be replaced
with the date and size. Only the \"GB\" unit needs to be translated (see
storage_size_gb).</string>
+ <string name="offline_compilation_detail_button_download">Label for a button
for downloading an offline compilation. The %.2f symbol is replaced with the
compilation size, in gigabytes (GB). </string>
+ <string name="offline_compilation_detail_button_remove">Label for a button
for removing an offline compilation from storage on the user\'s device.</string>
+ <string name="offline_compilation_detail_button_view_compilations">Label for
a button that takes the user to a screen to view the user\'s downloaded
compilations.</string>
<string name="storage_size_gb">Abbreviated form for the unit of a
gigabyte.</string>
<string name="storage_size_format">Format specifier where %.2f represents a
decimal number with two significant figures to the right of the decimal
point.</string>
<string name="storage_size_free">Label that says how much free space is
available on the device. The %.2f symbol is replaced with the number in
gigabytes.</string>
diff --git a/app/src/main/res/values/attrs.xml
b/app/src/main/res/values/attrs.xml
index 65c6780..38031b6 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -12,6 +12,7 @@
<attr name="edit_text_color" format="reference"/>
<attr name="abusefilter_background_color" format="reference"/>
<attr name="lead_image_drawable" format="reference"/>
+ <attr name="compilation_detail_background_color" format="reference"/>
<!-- TODO: rename? -->
<attr name="lead_text_color" format="reference"/>
<attr name="list_separator_color" format="reference"/>
diff --git a/app/src/main/res/values/colors.xml
b/app/src/main/res/values/colors.xml
index 0453fbd..2b8f1dc 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -84,6 +84,7 @@
<color name="list_item_text_primary_light">#333</color>
<color name="list_item_text_secondary_light">#777</color>
<color name="multi_select_background_light">@color/accent90</color>
+ <color name="compilation_detail_background_light">@color/base80</color>
<color name="window_background_dark">#000</color>
<color name="page_background_dark">#000</color>
@@ -100,6 +101,7 @@
<color name="list_item_text_primary_dark">#d0d0d0</color>
<color name="list_item_text_secondary_dark">#808080</color>
<color name="multi_select_background_dark">@color/accent30</color>
+ <color name="compilation_detail_background_dark">@color/base20</color>
<color name="list_item_highlight">#60808080</color>
<color name="list_item_selected">#20808080</color>
diff --git a/app/src/main/res/values/strings.xml
b/app/src/main/res/values/strings.xml
index 7eb3347..7e15fab 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -475,6 +475,10 @@
<string name="offline_compilations_search_by_name">Search compilations by
name</string>
<string name="offline_compilations_found_count">My compilations
(%d)</string>
<string name="offline_compilations_add">Add offline compilation</string>
+ <string name="offline_compilation_detail_date_size">%1$s · %2$.2f
GB</string>
+ <string name="offline_compilation_detail_button_download">Download · %.2f
GB</string>
+ <string name="offline_compilation_detail_button_remove">Remove</string>
+ <string name="offline_compilation_detail_button_view_compilations">My
compilations</string>
<string name="storage_size_format">%.2f</string>
<string name="storage_size_gb">GB</string>
<string name="storage_size_free">%.2f GB free</string>
diff --git a/app/src/main/res/values/styles_dark.xml
b/app/src/main/res/values/styles_dark.xml
index 5b0135e..89a39eb 100644
--- a/app/src/main/res/values/styles_dark.xml
+++ b/app/src/main/res/values/styles_dark.xml
@@ -39,6 +39,7 @@
<item
name="toc_subsection_text_color">@color/toc_subsection_text_dark</item>
<item name="edit_text_color">@color/edit_text_dark</item>
<item
name="abusefilter_background_color">@color/abusefilter_background_dark</item>
+ <item
name="compilation_detail_background_color">@color/compilation_detail_background_dark</item>
<item name="lead_image_drawable">@drawable/lead_default_dark</item>
<item name="lead_text_color">@color/lead_text_dark</item>
<item name="list_separator_color">@color/list_separator_dark</item>
diff --git a/app/src/main/res/values/styles_light.xml
b/app/src/main/res/values/styles_light.xml
index 4ee2f5e..51503f9 100644
--- a/app/src/main/res/values/styles_light.xml
+++ b/app/src/main/res/values/styles_light.xml
@@ -39,6 +39,7 @@
<item
name="toc_subsection_text_color">@color/toc_subsection_text_light</item>
<item name="edit_text_color">@color/edit_text_light</item>
<item
name="abusefilter_background_color">@color/abusefilter_background_light</item>
+ <item
name="compilation_detail_background_color">@color/compilation_detail_background_light</item>
<!-- TODO: rename? -->
<item name="lead_image_drawable">@drawable/lead_default</item>
<item name="lead_text_color">@color/lead_text_light</item>
--
To view, visit https://gerrit.wikimedia.org/r/366745
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0f31bcb3eaa9625c26c60998004ef64e958d9809
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
![https://upload.wikimedia.org/wikipedia/commons/thumb/0/0e/Oolong_the_Rabbit%27s_last_performance_%282003%29.jpg/241px-Oolong_the_Rabbit%27s_last_performance_%282003%29.jpg"](https://upload.wikimedia.org/wikipedia/commons/thumb/0/0e/Oolong_the_Rabbit%27s_last_performance_%282003%29.jpg/241px-Oolong_the_Rabbit%27s_last_performance_%282003%29.jpg"){kind=link}
![https://upload.wikimedia.org/wikipedia/commons/0/0e/Oolong_the_Rabbit%27s_last_performance_%282003%29.jpg"](https://upload.wikimedia.org/wikipedia/commons/0/0e/Oolong_the_Rabbit%27s_last_performance_%282003%29.jpg"){kind=link}