- */ -public class PlaceholderContent { - - /** - * An array of sample (placeholder) items. - */ - public static final List ITEMS = new ArrayList(); - - /** - * A map of sample (placeholder) items, by ID. - */ - public static final Map ITEM_MAP = new HashMap(); - - private static final int COUNT = 25; - - static { - // Add some sample items. - for (int i = 1; i <= COUNT; i++) { - addItem(createPlaceholderItem(i)); - } - } - - private static void addItem(PlaceholderItem item) { - ITEMS.add(item); - ITEM_MAP.put(item.id, item); - } - - private static PlaceholderItem createPlaceholderItem(int position) { - return new PlaceholderItem(String.valueOf(position), "Item " + position, makeDetails(position)); - } - - private static String makeDetails(int position) { - StringBuilder builder = new StringBuilder(); - builder.append("Details about Item: ").append(position); - for (int i = 0; i < position; i++) { - builder.append("\nMore details information here."); - } - return builder.toString(); - } - - /** - * A placeholder item representing a piece of content. - */ - public static class PlaceholderItem { - public final String id; - public final String content; - public final String details; - - public PlaceholderItem(String id, String content, String details) { - this.id = id; - this.content = content; - this.details = details; - } - - @Override - public String toString() { - return content; - } - } -} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_baseline_delete_outline_24.xml b/app/src/main/res/drawable/ic_baseline_delete_outline_24.xml new file mode 100644 index 00000000..4f5a408b --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_delete_outline_24.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_baseline_open_in_new_24.xml b/app/src/main/res/drawable/ic_baseline_open_in_new_24.xml new file mode 100644 index 00000000..9e8cb14a --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_open_in_new_24.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_delete_all.xml b/app/src/main/res/drawable/ic_delete_all.xml new file mode 100644 index 00000000..e6afffed --- /dev/null +++ b/app/src/main/res/drawable/ic_delete_all.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_link.xml b/app/src/main/res/drawable/ic_link.xml new file mode 100644 index 00000000..87c89b46 --- /dev/null +++ b/app/src/main/res/drawable/ic_link.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_no_results.xml b/app/src/main/res/drawable/ic_no_results.xml new file mode 100644 index 00000000..8dd147c0 --- /dev/null +++ b/app/src/main/res/drawable/ic_no_results.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_refresh.xml b/app/src/main/res/drawable/ic_refresh.xml new file mode 100644 index 00000000..454dda4d --- /dev/null +++ b/app/src/main/res/drawable/ic_refresh.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index fb68b8dc..03576714 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -23,6 +23,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" + app:layout_behavior="com.google.android.material.behavior.HideBottomViewOnScrollBehavior" app:menu="@menu/bottom_nav_menu"/> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_history.xml b/app/src/main/res/layout/fragment_history.xml index acadcae8..3623784b 100644 --- a/app/src/main/res/layout/fragment_history.xml +++ b/app/src/main/res/layout/fragment_history.xml @@ -6,116 +6,105 @@ android:id="@+id/historycoordinator" xmlns:android="http://schemas.android.com/apk/res/android"> - + android:scrollbars="vertical" + app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"> - + android:layout_height="match_parent"> - + + + + + + + + android:id="@+id/shimmer_history_linear_layout" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="10dp" + android:orientation="vertical"> - + - + - + - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + - + - - - - + android:layout_height="wrap_content"> + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 52d76850..3aed07f5 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -6,104 +6,75 @@ android:id="@+id/homecoordinator" xmlns:android="http://schemas.android.com/apk/res/android"> - + android:scrollbars="vertical" + app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"> - + android:layout_height="match_parent"> - + + + + + + + + android:id="@+id/shimmer_linear_layout" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="10dp" + android:orientation="vertical"> + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - + + + diff --git a/app/src/main/res/layout/history_bottom_sheet.xml b/app/src/main/res/layout/history_bottom_sheet.xml new file mode 100644 index 00000000..ee72802b --- /dev/null +++ b/app/src/main/res/layout/history_bottom_sheet.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/history_no_results.xml b/app/src/main/res/layout/history_no_results.xml new file mode 100644 index 00000000..6b862a87 --- /dev/null +++ b/app/src/main/res/layout/history_no_results.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/menu/history_menu.xml b/app/src/main/res/menu/history_menu.xml index e3f23171..b13db6a2 100644 --- a/app/src/main/res/menu/history_menu.xml +++ b/app/src/main/res/menu/history_menu.xml @@ -3,12 +3,25 @@ xmlns:tools="http://schemas.android.com/tools" tools:context=".MainActivity" > + + + + + - diff --git a/app/src/main/res/menu/main_menu.xml b/app/src/main/res/menu/main_menu.xml index ad6f962d..bb284c2a 100644 --- a/app/src/main/res/menu/main_menu.xml +++ b/app/src/main/res/menu/main_menu.xml @@ -10,9 +10,14 @@ app:showAsAction="collapseActionView|always" app:actionViewClass="androidx.appcompat.widget.SearchView"/> + + diff --git a/app/src/main/res/values-sq-rAL/strings.xml b/app/src/main/res/values-sq-rAL/strings.xml index c26154e2..c7c2aaa5 100644 --- a/app/src/main/res/values-sq-rAL/strings.xml +++ b/app/src/main/res/values-sq-rAL/strings.xml @@ -32,4 +32,14 @@ U vendos në rradhë! Duke u përditësuar. Prisni! Filloi Perditesimi + Hap Linkun + Hiqe + Rifresko Rezultatet + Rifresko Historinë + OK + Anullo + Kjo do të fshijë të gjithë elementet në histori! Nuk mund t\'i rikthesh më! + Konfirmo + Kërko nga Historia + Nuk ka Rezultate \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7f1934a7..6f71400e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -32,4 +32,14 @@ Failed Updating Updating in Progress! Please Wait! Updating Started + Open link + Remove + Refresh Results + Refresh History + OK + Cancel + This will delete every item on your history! You can\'t recover them! + Confirm + Search from History + No Results diff --git a/app/src/test/java/com/yausername/ytdl/ExampleUnitTest.java b/app/src/test/java/com/deniscerri/ytdl/ExampleUnitTest.java similarity index 92% rename from app/src/test/java/com/yausername/ytdl/ExampleUnitTest.java rename to app/src/test/java/com/deniscerri/ytdl/ExampleUnitTest.java index a6402711..20ba6072 100644 --- a/app/src/test/java/com/yausername/ytdl/ExampleUnitTest.java +++ b/app/src/test/java/com/deniscerri/ytdl/ExampleUnitTest.java @@ -1,4 +1,4 @@ -package com.yausername.ytdl; +package com.deniscerri.ytdl; import org.junit.Test; diff --git a/build.gradle b/build.gradle index 15769daa..bfa5c796 100644 --- a/build.gradle +++ b/build.gradle @@ -37,7 +37,7 @@ ext { } allprojects { - group = 'com.github.yausername' + group = 'com.github.deniscerri' version = versionName repositories {