FALLBACK_INITIAL_TABS_LIST = Collections.unmodifiableList(Arrays.asList(
+ new Tab.KioskTab(YouTube.getServiceId(), "Trending"),
+ Type.SUBSCRIPTIONS.getTab(),
+ Type.BOOKMARKS.getTab()
+ ));
+
+ public static class InvalidJsonException extends Exception {
+ private InvalidJsonException() {
+ super();
+ }
+
+ private InvalidJsonException(String message) {
+ super(message);
+ }
+
+ private InvalidJsonException(Throwable cause) {
+ super(cause);
+ }
+ }
+
+ /**
+ * Try to reads the passed JSON and returns the list of tabs if no error were encountered.
+ *
+ * If the JSON is null or empty, or the list of tabs that it represents is empty, the
+ * {@link #FALLBACK_INITIAL_TABS_LIST fallback list} will be returned.
+ *
+ * Tabs with invalid ids (i.e. not in the {@link Tab.Type} enum) will be ignored.
+ *
+ * @param tabsJson a JSON string got from {@link #getJsonToSave(List)}.
+ * @return a list of {@link Tab tabs}.
+ * @throws InvalidJsonException if the JSON string is not valid
+ */
+ public static List getTabsFromJson(@Nullable String tabsJson) throws InvalidJsonException {
+ if (tabsJson == null || tabsJson.isEmpty()) {
+ return FALLBACK_INITIAL_TABS_LIST;
+ }
+
+ final List returnTabs = new ArrayList<>();
+
+ final JsonObject outerJsonObject;
+ try {
+ outerJsonObject = JsonParser.object().from(tabsJson);
+ final JsonArray tabsArray = outerJsonObject.getArray(JSON_TABS_ARRAY_KEY);
+
+ if (tabsArray == null) {
+ throw new InvalidJsonException("JSON doesn't contain \"" + JSON_TABS_ARRAY_KEY + "\" array");
+ }
+
+ for (Object o : tabsArray) {
+ if (!(o instanceof JsonObject)) continue;
+
+ final Tab tab = Tab.from((JsonObject) o);
+
+ if (tab != null) {
+ returnTabs.add(tab);
+ }
+ }
+ } catch (JsonParserException e) {
+ throw new InvalidJsonException(e);
+ }
+
+ if (returnTabs.isEmpty()) {
+ return FALLBACK_INITIAL_TABS_LIST;
+ }
+
+ return returnTabs;
+ }
+
+ /**
+ * Get a JSON representation from a list of tabs.
+ *
+ * @param tabList a list of {@link Tab tabs}.
+ * @return a JSON string representing the list of tabs
+ */
+ public static String getJsonToSave(@Nullable List tabList) {
+ final JsonStringWriter jsonWriter = JsonWriter.string();
+ jsonWriter.object();
+
+ jsonWriter.array(JSON_TABS_ARRAY_KEY);
+ if (tabList != null) for (Tab tab : tabList) {
+ tab.writeJsonOn(jsonWriter);
+ }
+ jsonWriter.end();
+
+ jsonWriter.end();
+ return jsonWriter.done();
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/schabi/newpipe/settings/tabs/TabsManager.java b/app/src/main/java/org/schabi/newpipe/settings/tabs/TabsManager.java
new file mode 100644
index 000000000..a7d8dffa4
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/settings/tabs/TabsManager.java
@@ -0,0 +1,93 @@
+package org.schabi.newpipe.settings.tabs;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+import android.widget.Toast;
+
+import org.schabi.newpipe.R;
+
+import java.util.List;
+
+public class TabsManager {
+ private final SharedPreferences sharedPreferences;
+ private final String savedTabsKey;
+ private final Context context;
+
+ public static TabsManager getManager(Context context) {
+ return new TabsManager(context);
+ }
+
+ private TabsManager(Context context) {
+ this.context = context;
+ this.sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
+ this.savedTabsKey = context.getString(R.string.saved_tabs_key);
+ }
+
+ public List getTabs() {
+ final String savedJson = sharedPreferences.getString(savedTabsKey, null);
+ try {
+ return TabsJsonHelper.getTabsFromJson(savedJson);
+ } catch (TabsJsonHelper.InvalidJsonException e) {
+ Toast.makeText(context, R.string.saved_tabs_invalid_json, Toast.LENGTH_SHORT).show();
+ return getDefaultTabs();
+ }
+ }
+
+ public void saveTabs(List tabList) {
+ final String jsonToSave = TabsJsonHelper.getJsonToSave(tabList);
+ sharedPreferences.edit().putString(savedTabsKey, jsonToSave).apply();
+ }
+
+ public void resetTabs() {
+ sharedPreferences.edit().remove(savedTabsKey).apply();
+ }
+
+ public List getDefaultTabs() {
+ return TabsJsonHelper.FALLBACK_INITIAL_TABS_LIST;
+ }
+
+ /*//////////////////////////////////////////////////////////////////////////
+ // Listener
+ //////////////////////////////////////////////////////////////////////////*/
+
+ public interface SavedTabsChangeListener {
+ void onTabsChanged();
+ }
+
+ private SavedTabsChangeListener savedTabsChangeListener;
+ private SharedPreferences.OnSharedPreferenceChangeListener preferenceChangeListener;
+
+ public void setSavedTabsListener(SavedTabsChangeListener listener) {
+ if (preferenceChangeListener != null) {
+ sharedPreferences.unregisterOnSharedPreferenceChangeListener(preferenceChangeListener);
+ }
+ savedTabsChangeListener = listener;
+ preferenceChangeListener = getPreferenceChangeListener();
+ sharedPreferences.registerOnSharedPreferenceChangeListener(preferenceChangeListener);
+ }
+
+ public void unsetSavedTabsListener() {
+ if (preferenceChangeListener != null) {
+ sharedPreferences.unregisterOnSharedPreferenceChangeListener(preferenceChangeListener);
+ }
+ preferenceChangeListener = null;
+ savedTabsChangeListener = null;
+ }
+
+ private SharedPreferences.OnSharedPreferenceChangeListener getPreferenceChangeListener() {
+ return (sharedPreferences, key) -> {
+ if (key.equals(savedTabsKey)) {
+ if (savedTabsChangeListener != null) savedTabsChangeListener.onTabsChanged();
+ }
+ };
+ }
+
+}
+
+
+
+
+
+
+
diff --git a/app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java b/app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java
index e445233c3..31ab1a845 100644
--- a/app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java
@@ -32,6 +32,7 @@ import org.schabi.newpipe.extractor.Info;
import org.schabi.newpipe.extractor.ListExtractor.InfoItemsPage;
import org.schabi.newpipe.extractor.NewPipe;
import org.schabi.newpipe.extractor.channel.ChannelInfo;
+import org.schabi.newpipe.extractor.channel.ChannelInfoItem;
import org.schabi.newpipe.extractor.exceptions.ContentNotAvailableException;
import org.schabi.newpipe.extractor.exceptions.ParsingException;
import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
@@ -183,7 +184,7 @@ public final class ExtractorHelper {
cache.removeInfo(serviceId, url);
load = loadFromNetwork;
} else {
- load = Maybe.concat(ExtractorHelper.loadFromCache(serviceId, url),
+ load = Maybe.concat(ExtractorHelper.loadFromCache(serviceId, url),
loadFromNetwork.toMaybe())
.firstElement() //Take the first valid
.toSingle();
diff --git a/app/src/main/java/org/schabi/newpipe/util/InfoCache.java b/app/src/main/java/org/schabi/newpipe/util/InfoCache.java
index ecc66bb40..318db37a1 100644
--- a/app/src/main/java/org/schabi/newpipe/util/InfoCache.java
+++ b/app/src/main/java/org/schabi/newpipe/util/InfoCache.java
@@ -28,9 +28,6 @@ import org.schabi.newpipe.MainActivity;
import org.schabi.newpipe.extractor.Info;
import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-import static org.schabi.newpipe.extractor.ServiceList.SoundCloud;
public final class InfoCache {
@@ -58,7 +55,7 @@ public final class InfoCache {
public Info getFromKey(int serviceId, @NonNull String url) {
if (DEBUG) Log.d(TAG, "getFromKey() called with: serviceId = [" + serviceId + "], url = [" + url + "]");
synchronized (lruCache) {
- return getInfo(lruCache, keyOf(serviceId, url));
+ return getInfo(keyOf(serviceId, url));
}
}
@@ -89,7 +86,7 @@ public final class InfoCache {
public void trimCache() {
if (DEBUG) Log.d(TAG, "trimCache() called");
synchronized (lruCache) {
- removeStaleCache(lruCache);
+ removeStaleCache();
lruCache.trimToSize(TRIM_CACHE_TO);
}
}
@@ -105,23 +102,22 @@ public final class InfoCache {
return serviceId + url;
}
- private static void removeStaleCache(@NonNull final LruCache cache) {
- for (Map.Entry entry : cache.snapshot().entrySet()) {
+ private static void removeStaleCache() {
+ for (Map.Entry entry : InfoCache.lruCache.snapshot().entrySet()) {
final CacheData data = entry.getValue();
if (data != null && data.isExpired()) {
- cache.remove(entry.getKey());
+ InfoCache.lruCache.remove(entry.getKey());
}
}
}
@Nullable
- private static Info getInfo(@NonNull final LruCache cache,
- @NonNull final String key) {
- final CacheData data = cache.get(key);
+ private static Info getInfo(@NonNull final String key) {
+ final CacheData data = InfoCache.lruCache.get(key);
if (data == null) return null;
if (data.isExpired()) {
- cache.remove(key);
+ InfoCache.lruCache.remove(key);
return null;
}
diff --git a/app/src/main/java/org/schabi/newpipe/util/ListHelper.java b/app/src/main/java/org/schabi/newpipe/util/ListHelper.java
index 1a5bf14f7..871d0578f 100644
--- a/app/src/main/java/org/schabi/newpipe/util/ListHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/util/ListHelper.java
@@ -204,7 +204,7 @@ public final class ListHelper {
*/
private static void sortStreamList(List videoStreams, final boolean ascendingOrder) {
Collections.sort(videoStreams, (o1, o2) -> {
- int result = compareVideoStreamResolution(o1, o2, VIDEO_FORMAT_QUALITY_RANKING);
+ int result = compareVideoStreamResolution(o1, o2);
return result == 0 ? 0 : (ascendingOrder ? result : -result);
});
}
@@ -399,8 +399,7 @@ public final class ListHelper {
}
// Compares the quality of two video streams.
- private static int compareVideoStreamResolution(VideoStream streamA, VideoStream streamB,
- List formatRanking) {
+ private static int compareVideoStreamResolution(VideoStream streamA, VideoStream streamB) {
if (streamA == null) {
return -1;
}
@@ -414,7 +413,7 @@ public final class ListHelper {
}
// Same bitrate and format
- return formatRanking.indexOf(streamA.getFormat()) - formatRanking.indexOf(streamB.getFormat());
+ return ListHelper.VIDEO_FORMAT_QUALITY_RANKING.indexOf(streamA.getFormat()) - ListHelper.VIDEO_FORMAT_QUALITY_RANKING.indexOf(streamB.getFormat());
}
diff --git a/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java b/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java
index 13767125d..5b953697d 100644
--- a/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java
@@ -26,7 +26,6 @@ import org.schabi.newpipe.download.DownloadActivity;
import org.schabi.newpipe.extractor.NewPipe;
import org.schabi.newpipe.extractor.StreamingService;
import org.schabi.newpipe.extractor.exceptions.ExtractionException;
-import org.schabi.newpipe.extractor.search.SearchExtractor;
import org.schabi.newpipe.extractor.stream.AudioStream;
import org.schabi.newpipe.extractor.stream.Stream;
import org.schabi.newpipe.extractor.stream.StreamInfo;
diff --git a/app/src/main/java/org/schabi/newpipe/util/StateSaver.java b/app/src/main/java/org/schabi/newpipe/util/StateSaver.java
index 51dceddf3..3115862e0 100644
--- a/app/src/main/java/org/schabi/newpipe/util/StateSaver.java
+++ b/app/src/main/java/org/schabi/newpipe/util/StateSaver.java
@@ -21,7 +21,6 @@ package org.schabi.newpipe.util;
import android.content.Context;
-import android.os.Build;
import android.os.Bundle;
import android.os.Parcel;
import android.os.Parcelable;
diff --git a/app/src/main/java/org/schabi/newpipe/util/StreamItemAdapter.java b/app/src/main/java/org/schabi/newpipe/util/StreamItemAdapter.java
index e3fe4a679..e100a447b 100644
--- a/app/src/main/java/org/schabi/newpipe/util/StreamItemAdapter.java
+++ b/app/src/main/java/org/schabi/newpipe/util/StreamItemAdapter.java
@@ -31,7 +31,7 @@ import us.shandian.giga.util.Utility;
public class StreamItemAdapter extends BaseAdapter {
private final Context context;
- private StreamSizeWrapper streamsWrapper;
+ private final StreamSizeWrapper streamsWrapper;
private final boolean showIconNoAudio;
public StreamItemAdapter(Context context, StreamSizeWrapper streamsWrapper, boolean showIconNoAudio) {
@@ -124,7 +124,7 @@ public class StreamItemAdapter extends BaseAdapter {
public static class StreamSizeWrapper implements Serializable {
private static final StreamSizeWrapper EMPTY = new StreamSizeWrapper<>(Collections.emptyList());
private final List streamsList;
- private long[] streamSizes;
+ private final long[] streamSizes;
public StreamSizeWrapper(List streamsList) {
this.streamsList = streamsList;
diff --git a/app/src/main/java/org/schabi/newpipe/util/ZipHelper.java b/app/src/main/java/org/schabi/newpipe/util/ZipHelper.java
index 3578f34ac..3142ad8dc 100644
--- a/app/src/main/java/org/schabi/newpipe/util/ZipHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/util/ZipHelper.java
@@ -56,7 +56,6 @@ public class ZipHelper {
/**
* This will extract data from Zipfiles.
* Caution this will override the original file.
- * @param inZip The ZipOutputStream where the data is stored in
* @param file The path of the file on the disk where the data should be extracted to.
* @param name The path of the file inside the zip.
* @return will return true if the file was found within the zip file
diff --git a/app/src/main/java/org/schabi/newpipe/views/CollapsibleView.java b/app/src/main/java/org/schabi/newpipe/views/CollapsibleView.java
index adef7e76f..88d525625 100644
--- a/app/src/main/java/org/schabi/newpipe/views/CollapsibleView.java
+++ b/app/src/main/java/org/schabi/newpipe/views/CollapsibleView.java
@@ -81,7 +81,7 @@ public class CollapsibleView extends LinearLayout {
private int targetHeight = -1;
private ValueAnimator currentAnimator;
- private List listeners = new ArrayList<>();
+ private final List listeners = new ArrayList<>();
/**
* This method recalculates the height of this view so it must be called when
diff --git a/app/src/main/java/us/shandian/giga/get/DownloadManagerImpl.java b/app/src/main/java/us/shandian/giga/get/DownloadManagerImpl.java
index 3294f5164..a377d861c 100755
--- a/app/src/main/java/us/shandian/giga/get/DownloadManagerImpl.java
+++ b/app/src/main/java/us/shandian/giga/get/DownloadManagerImpl.java
@@ -123,7 +123,7 @@ public class DownloadManagerImpl implements DownloadManager {
Collections.sort(missions, new Comparator() {
@Override
public int compare(DownloadMission o1, DownloadMission o2) {
- return Long.valueOf(o1.timestamp).compareTo(o2.timestamp);
+ return Long.compare(o1.timestamp, o2.timestamp);
}
});
}
diff --git a/app/src/main/java/us/shandian/giga/get/DownloadMission.java b/app/src/main/java/us/shandian/giga/get/DownloadMission.java
index f02eaae28..79c4baf05 100644
--- a/app/src/main/java/us/shandian/giga/get/DownloadMission.java
+++ b/app/src/main/java/us/shandian/giga/get/DownloadMission.java
@@ -67,8 +67,8 @@ public class DownloadMission implements Serializable {
public long done;
public int threadCount = 3;
public int finishCount;
- private List threadPositions = new ArrayList();
- public final Map blockState = new HashMap();
+ private final List threadPositions = new ArrayList<>();
+ public final Map blockState = new HashMap<>();
public boolean running;
public boolean finished;
public boolean fallback;
@@ -77,7 +77,7 @@ public class DownloadMission implements Serializable {
public transient boolean recovered;
- private transient ArrayList> mListeners = new ArrayList>();
+ private transient ArrayList> mListeners = new ArrayList<>();
private transient boolean mWritingToFile;
private static final int NO_IDENTIFIER = -1;
@@ -232,7 +232,7 @@ public class DownloadMission implements Serializable {
public synchronized void addListener(MissionListener listener) {
Handler handler = new Handler(Looper.getMainLooper());
MissionListener.handlerStore.put(listener, handler);
- mListeners.add(new WeakReference(listener));
+ mListeners.add(new WeakReference<>(listener));
}
public synchronized void removeListener(MissionListener listener) {
diff --git a/app/src/main/java/us/shandian/giga/get/DownloadRunnable.java b/app/src/main/java/us/shandian/giga/get/DownloadRunnable.java
index b53f8aea9..6ad8626c3 100644
--- a/app/src/main/java/us/shandian/giga/get/DownloadRunnable.java
+++ b/app/src/main/java/us/shandian/giga/get/DownloadRunnable.java
@@ -92,7 +92,7 @@ public class DownloadRunnable implements Runnable {
// A server may be ignoring the range request
if (conn.getResponseCode() != 206) {
mMission.errCode = DownloadMission.ERROR_SERVER_UNSUPPORTED;
- notifyError(DownloadMission.ERROR_SERVER_UNSUPPORTED);
+ notifyError();
if (DEBUG) {
Log.e(TAG, mId + ":Unsupported " + conn.getResponseCode());
@@ -161,9 +161,9 @@ public class DownloadRunnable implements Runnable {
}
}
- private void notifyError(final int err) {
+ private void notifyError() {
synchronized (mMission) {
- mMission.notifyError(err);
+ mMission.notifyError(DownloadMission.ERROR_SERVER_UNSUPPORTED);
mMission.pause();
}
}
diff --git a/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java b/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java
index 59f5e2225..ff410a79a 100755
--- a/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java
+++ b/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java
@@ -56,7 +56,7 @@ public class DownloadManagerService extends Service {
private DownloadDataSource mDataSource;
- private MissionListener missionListener = new MissionListener();
+ private final MissionListener missionListener = new MissionListener();
private void notifyMediaScanner(DownloadMission mission) {
diff --git a/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java b/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java
index 8127c3467..d5555c2be 100644
--- a/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java
+++ b/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java
@@ -306,12 +306,12 @@ public class MissionAdapter extends RecyclerView.Adapter {
ProgressDialog prog;
- WeakReference weakReference;
+ final WeakReference weakReference;
ChecksumTask(@NonNull Activity activity) {
weakReference = new WeakReference<>(activity);
diff --git a/app/src/main/java/us/shandian/giga/ui/common/ProgressDrawable.java b/app/src/main/java/us/shandian/giga/ui/common/ProgressDrawable.java
index 6a0e35cff..955ce4c65 100644
--- a/app/src/main/java/us/shandian/giga/ui/common/ProgressDrawable.java
+++ b/app/src/main/java/us/shandian/giga/ui/common/ProgressDrawable.java
@@ -12,7 +12,8 @@ import android.support.v4.content.ContextCompat;
public class ProgressDrawable extends Drawable {
private float mProgress;
- private int mBackgroundColor, mForegroundColor;
+ private final int mBackgroundColor;
+ private final int mForegroundColor;
public ProgressDrawable(Context context, @ColorRes int background, @ColorRes int foreground) {
this(ContextCompat.getColor(context, background), ContextCompat.getColor(context, foreground));
diff --git a/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java b/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java
index 14439f6c8..5241415b2 100644
--- a/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java
+++ b/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java
@@ -16,6 +16,8 @@ import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
@@ -44,7 +46,7 @@ public abstract class MissionsFragment extends Fragment {
private DeleteDownloadManager mDeleteDownloadManager;
private Disposable mDeleteDisposable;
- private ServiceConnection mConnection = new ServiceConnection() {
+ private final ServiceConnection mConnection = new ServiceConnection() {
@Override
public void onServiceConnected(ComponentName name, IBinder binder) {
@@ -144,17 +146,21 @@ public abstract class MissionsFragment extends Fragment {
}
@Override
- public boolean onOptionsItemSelected(MenuItem item) {
- return super.onOptionsItemSelected(item);
+ public void onPrepareOptionsMenu(Menu menu) {
+ mSwitch = menu.findItem(R.id.switch_mode);
+ super.onPrepareOptionsMenu(menu);
+ }
- /*switch (item.getItemId()) {
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ switch (item.getItemId()) {
case R.id.switch_mode:
mLinear = !mLinear;
updateList();
return true;
default:
return super.onOptionsItemSelected(item);
- }*/
+ }
}
public void notifyChange() {
diff --git a/app/src/main/java/us/shandian/giga/util/Utility.java b/app/src/main/java/us/shandian/giga/util/Utility.java
index de9a16a1b..163ac2b14 100644
--- a/app/src/main/java/us/shandian/giga/util/Utility.java
+++ b/app/src/main/java/us/shandian/giga/util/Utility.java
@@ -11,9 +11,7 @@ import android.widget.Toast;
import org.schabi.newpipe.R;
-import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
-import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
@@ -198,7 +196,7 @@ public class Utility {
while ((len = i.read(buf)) != -1) {
md.update(buf, 0, len);
}
- } catch (IOException e) {
+ } catch (IOException ignored) {
}
diff --git a/app/src/main/res/drawable/ic_blank_page_black_24dp.xml b/app/src/main/res/drawable/ic_blank_page_black_24dp.xml
new file mode 100644
index 000000000..e8c60a1a2
--- /dev/null
+++ b/app/src/main/res/drawable/ic_blank_page_black_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_blank_page_white_24dp.xml b/app/src/main/res/drawable/ic_blank_page_white_24dp.xml
new file mode 100644
index 000000000..86a68484f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_blank_page_white_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_settings_backup_restore_black_24dp.xml b/app/src/main/res/drawable/ic_settings_backup_restore_black_24dp.xml
new file mode 100644
index 000000000..aa424c0d4
--- /dev/null
+++ b/app/src/main/res/drawable/ic_settings_backup_restore_black_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_settings_backup_restore_white_24dp.xml b/app/src/main/res/drawable/ic_settings_backup_restore_white_24dp.xml
new file mode 100644
index 000000000..03a26f550
--- /dev/null
+++ b/app/src/main/res/drawable/ic_settings_backup_restore_white_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/layout-v21/drawer_header.xml b/app/src/main/res/layout-v21/drawer_header.xml
index 918bbaf43..4474ee4ed 100644
--- a/app/src/main/res/layout-v21/drawer_header.xml
+++ b/app/src/main/res/layout-v21/drawer_header.xml
@@ -16,7 +16,8 @@
android:layout_height="match_parent"
android:background="?attr/colorPrimary"
android:scaleType="centerCrop"
- android:src="@drawable/background_header" />
+ android:src="@drawable/background_header"
+ android:contentDescription="TODO" />
+ android:src="@drawable/np_logo_nude_shadow"
+ android:contentDescription="TODO" />
+ android:src="@drawable/ic_arrow_down_white"
+ android:contentDescription="TODO" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_error.xml b/app/src/main/res/layout/activity_error.xml
index 7752dc7cb..c47077c73 100644
--- a/app/src/main/res/layout/activity_error.xml
+++ b/app/src/main/res/layout/activity_error.xml
@@ -114,7 +114,8 @@
+ android:layout_height="wrap_content"
+ android:inputType="" />